Experiment with a FreeImageLite on LunaLUA

Works fine!
WohlSoft · Jan 10, 2016 · 0995282 · 0995282
1 parent b0dc84f
commit 0995282
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/LunaDll/LunaDll.vcxproj b/LunaDll/LunaDll.vcxproj
@@ -110,7 +110,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;FreeImage.lib;version.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;libluabind.lib;lua51.lib;Dbghelp.lib;Ws2_32.lib;SDL2.lib;SDL2main.lib;SDL2_mixer_ext.lib;comsuppw.lib;opengl32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;FreeImageLite.lib;version.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;libluabind.lib;lua51.lib;Dbghelp.lib;Ws2_32.lib;SDL2.lib;SDL2main.lib;SDL2_mixer_ext.lib;comsuppw.lib;opengl32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ForceFileOutput>
       </ForceFileOutput>
       <GenerateMapFile>true</GenerateMapFile>

diff --git a/LunaDll/Misc/FreeImageUtils/FreeImageData.h b/LunaDll/Misc/FreeImageUtils/FreeImageData.h
@@ -2,7 +2,8 @@
 #define FreeImagePngWriter_hhhhh
 
 #include <string>
-#include <FreeImage.h>
+#define FREEIMAGE_LIB
+#include <FreeImageLite.h>
 
 class FreeImageData
 {

diff --git a/LunaDll/Misc/FreeImageUtils/FreeImageGifData.h b/LunaDll/Misc/FreeImageUtils/FreeImageGifData.h
@@ -1,7 +1,8 @@
 #ifndef FreeImageGifWriter_hhhhh
 #define FreeImageGifWriter_hhhhh
 #include <Windows.h>
-#include <FreeImage.h>
+#define FREEIMAGE_LIB
+#include <FreeImageLite.h>
 #include <string>
 
 class FreeImageGifData

diff --git a/LunaDll/Misc/FreeImageUtils/FreeImageHelper.h b/LunaDll/Misc/FreeImageUtils/FreeImageHelper.h
@@ -1,7 +1,8 @@
 #ifndef FreeImageHelper_hhhhh
 #define FreeImageHelper_hhhhh
 #include <Windows.h>
-#include <FreeImage.h>
+#define FREEIMAGE_LIB
+#include <FreeImageLite.h>
 
 namespace FreeImageHelper {
     HBITMAP CreateEmptyBitmap(int width, int height, int bpp, void** data);

diff --git a/LunaDll/Misc/FreeImageUtils/FreeImageInit.cpp b/LunaDll/Misc/FreeImageUtils/FreeImageInit.cpp
@@ -1,5 +1,6 @@
 #include "FreeImageInit.h"
-#include <FreeImage.h>
+#define FREEIMAGE_LIB
+#include <FreeImageLite.h>
 #include <iostream>
 
 void FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message) {

diff --git a/LunaDll/Rendering/AsyncGifRecorder.cpp b/LunaDll/Rendering/AsyncGifRecorder.cpp
@@ -1,7 +1,8 @@
 #include <iostream>
 #include "AsyncGifRecorder.h"
 #include "../GlobalFuncs.h"
-#include <FreeImage.h>
+#define FREEIMAGE_LIB
+#include <FreeImageLite.h>
 
 AsyncGifRecorder::AsyncGifRecorder() : 
     m_workerThread(nullptr),

diff --git a/deploy.bat b/deploy.bat
@@ -25,8 +25,9 @@ copy "%CurDir%\Release\LunaLoader.exe" "%DeployDirL%"  > NUL
 echo Installing SDL2 and SDL2_mixer_ext...
 copy "%CurDir%\LunaDll\libs\sdl\bin\*.dll" "%DeployDir%"  > NUL
 
-echo Installing FreeImage...
-copy "%CurDir%\LunaDll\libs\freeimage\*.dll" "%DeployDir%"  > NUL
+rem Free image no needed if static FreeImageLite was built
+rem echo Installing FreeImage...
+rem copy "%CurDir%\LunaDll\libs\freeimage\*.dll" "%DeployDir%"  > NUL
 
 echo Installing Glew32...
 copy "%CurDir%\LunaDll\libs\glew\bin\Release\Win32\*.dll" "%DeployDir%"  > NUL