From 9a70e5543cc9e3681e1742df01aeb3a76f87848b Mon Sep 17 00:00:00 2001 From: Sylvain Debaudringhien Date: Tue, 15 May 2018 11:21:56 +0200 Subject: [PATCH 1/2] --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9886e723..6d1b8ab4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.12) project(flif) - + include(GNUInstallDirs) include(FindPkgConfig) find_package(PNG REQUIRED) From 07390d2a5318a7662e67837b8405308b3f49eaea Mon Sep 17 00:00:00 2001 From: Sylvain Debaudringhien Date: Tue, 15 May 2018 11:58:15 +0200 Subject: [PATCH 2/2] Sylvain Debaudringhien: Updated Visual Studio build script, to get it to work using VS2017 command prompt. Added .obj files cleanup. --- build/MSVC/make_vs.bat | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/build/MSVC/make_vs.bat b/build/MSVC/make_vs.bat index 20502529..ad6a7ab5 100644 --- a/build/MSVC/make_vs.bat +++ b/build/MSVC/make_vs.bat @@ -1,16 +1,14 @@ -cd /d %~dp0..\..\ - -echo release -cl /nologo /DFLIF_USE_STB_IMAGE /Feflif.exe flif.cpp build\MSVC\getopt\*.c* -I build\MSVC\getopt\ /DSTATIC_GETOPT flif-dec.cpp flif-enc.cpp common.cpp io.cpp maniac\*.c* transform\*.cpp image\*.c* /WX /EHsc /Ox /Oy /MT /DNDEBUG - -echo debug -cl /nologo /DFLIF_USE_STB_IMAGE /Feflif-d.exe flif.cpp build\MSVC\getopt\*.c* -I build\MSVC\getopt\ /DSTATIC_GETOPT flif-dec.cpp flif-enc.cpp common.cpp io.cpp maniac\*.c* transform\*.cpp image\*.c* /WX /EHsc /Zi /Oy- /MDd /DDEBUG - -echo test -if exist output.flif del output.flif -flif tools/kodim01.png output.flif -if exist output.png del output.png -flif output.flif output.png -start output.png - - +echo release +cl /nologo /DFLIF_USE_STB_IMAGE /Feflif.exe -I getopt\ /DSTATIC_GETOPT ..\..\src\flif.cpp ..\..\src\flif-dec.cpp ..\..\src\flif-enc.cpp ..\..\src\common.cpp ..\..\src\io.cpp ..\..\src\maniac\*.c* ..\..\src\transform\*.cpp ..\..\src\image\*.c* getopt/getopt.c ..\..\extern\lodepng.cpp /WX /EHsc /Ox /Oy /MT /DNDEBUG + +echo debug +cl /nologo /DFLIF_USE_STB_IMAGE /Feflif-d.exe -I getopt\ /DSTATIC_GETOPT ..\..\src\flif.cpp ..\..\src\flif-dec.cpp ..\..\src\flif-enc.cpp ..\..\src\common.cpp ..\..\src\io.cpp ..\..\src\maniac\*.c* ..\..\src\transform\*.cpp ..\..\src\image\*.c* getopt/getopt.c ..\..\extern\lodepng.cpp /WX /EHsc /Zi /Oy- /MDd /DDEBUG + +del *.obj + +echo test +if exist output.flif del output.flif +flif ..\..\tools/kodim01.png output.flif +if exist output.png del output.png +flif output.flif output.png +start output.png \ No newline at end of file