d840165a32
- `etc` module was renamed to `etcpak` and modified to use the new library. - PKM importer is removed in the process, it's obsolete. - Old library `etc2comp` is removed. - S3TC compression no longer done via `squish` (but decompression still is). - Slight modifications to etcpak sources for MinGW compatibility, to fix LLVM `-Wc++11-narrowing` errors, and to allow using vendored or system libpng. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
14 lines
329 B
Diff
14 lines
329 B
Diff
diff --git a/thirdparty/etcpak/Bitmap.cpp b/thirdparty/etcpak/Bitmap.cpp
|
|
index 6aa36f5caa..ef318318ac 100644
|
|
--- a/thirdparty/etcpak/Bitmap.cpp
|
|
+++ b/thirdparty/etcpak/Bitmap.cpp
|
|
@@ -3,7 +3,7 @@
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
-#include "libpng/png.h"
|
|
+#include <png.h>
|
|
#include "lz4/lz4.h"
|
|
|
|
#include "Bitmap.hpp"
|