fixed windows buiöd

Author: Coreforge

.github/workflows/cmake.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Configure CMake (FUSE)
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: env PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/c/Program Files (x86)/WinFSP/lib" cmake -B $(echo '${{github.workspace}}/build' | tr '\\' '/') -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOODLE_LIBRARY=$(echo '${{github.workspace}}' | tr '\\' '/')/libInfinite/oo2core_8_win64.dll
+      run: env PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/c/Program Files (x86)/WinFSP/lib" cmake -B $(echo '${{github.workspace}}/build' | tr '\\' '/') -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDOWNLOAD_PNGPP=ON -DOODLE_LIBRARY=$(echo '${{github.workspace}}' | tr '\\' '/')/libInfinite/oo2core_8_win64.dll
 
     - name: Build (FUSE)
       # Build your program with the given configuration
@@ -48,7 +48,7 @@ jobs:
     - name: Configure CMake (no FUSE)
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B $(echo '${{github.workspace}}/build2' | tr '\\' '/') -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOODLE_LIBRARY=$(echo '${{github.workspace}}' | tr '\\' '/')/libInfinite/oo2core_8_win64.dll -DFUSE=OFF
+      run: cmake -B $(echo '${{github.workspace}}/build2' | tr '\\' '/') -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOODLE_LIBRARY=$(echo '${{github.workspace}}' | tr '\\' '/')/libInfinite/oo2core_8_win64.dll -DFUSE=OFF -DDOWNLOAD_PNGPP=ON
 
     - name: Build (no FUSE)
       # Build your program with the given configuration

3D/AssImpExporter.cpp

@@ -13,7 +13,7 @@
 #include "libInfinite/BitmapBatchExtractor.h"
 #include "libInfinite/MaterialJsonExporter.h"
 
-#include <png++/png.hpp>
+//#include <png++/png.hpp>
 
 #define INDEX_BUFFER_TYPE_TRIANGLE_LIST 3
 #define INDEX_BUFFER_TYPE_TRIANGLE_STRIP 5
@@ -403,6 +403,7 @@ void AssImpExporter::newScene(){
 	meshinfoHandles.clear();
 	materialMap.clear();
 	usedMaterials.clear();
+	usedBitmaps.clear();
 	// the obj exporter needs at least one material
 	scene->mMaterials = (aiMaterial**)realloc(scene->mMaterials, (++scene->mNumMaterials) * sizeof(aiMaterial*));
 	aiMaterial* aimat = new aiMaterial();

CMakeLists.txt

@@ -17,7 +17,7 @@ set(FUSE ON)
 option(YTTRIUM_3D_VIEWER "Build the 3D viewer" ON)
 option(BUILD_CLI_VERSION "Build CLI" ON)
 option(SANITIZE_ADDRESS "use ASAN" OFF)
-
+option(DOWNLOAD_PNGPP "Download libpng++ 2.10 from launchpad" OFF)
 
 
 

README.md

@@ -43,6 +43,8 @@ Dependencies are
 - glew (libglew-dev)
 - glm (libglm-dev)
 - libassimp-dev
+- libpng-dev
+- libpng++-dev
 
 to compile, run
 ```
@@ -64,13 +66,15 @@ mingw-w64-x86_64-glew
 mingw-w64-x86_64-glfw
 mingw-w64-x86_64-glm
 mingw-w64-x86_64-assimp
+mingw-w64-x86_64-libpng
+mingw-w64-x86_64-jsoncpp
 ```
 
 The build process is like it is on linux, except that oodle has to be specified manually, and pkg-config doesn't work as nicely for WinFSP
 ```
 mkdir build
 cd build
-env PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/c/Program Files (x86)/WinFSP/lib" cmake -DOODLE_LIBRARY=<path/to/oodle.dll> ..
+env PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/c/Program Files (x86)/WinFSP/lib" cmake -DOODLE_LIBRARY=<path/to/oodle.dll> -DDOWNLOAD_PNGPP=ON ..
 make
 ```