[Buyild][Win32] TRY: Adding support MSYS2.

diff --git a/source/build-cmake/buildvars_mingw.dat b/source/build-cmake/buildvars_mingw.dat
index d04544b..6e56910 100644 (file)
--- a/source/build-cmake/buildvars_mingw.dat
+++ b/source/build-cmake/buildvars_mingw.dat
@@ -1,4 +1,4 @@
-#CMAKE=cmake.exe
+#CMAKE="/c/Program Files (x86)/CMake/bin/cmake"
 CCMAKE_CC=gcc
 CCMAKE_CXX=g++
 
@@ -34,7 +34,8 @@ MAKEFLAGS_GENERAL="-j4"
 #CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s -O3 -flto ${MAKEFLAGS_BASE} -fwhole-program -static-libgcc -static-libstdc++"
 CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s -static-libgcc -static-libstdc++"
 
-#CMAKE_APPENDFLAG="-DCMAKE_AR:STRING=gcc-ar -DCMAKE_LD:STRING=gcc-ld -DCMAKE_NM:STRING=gcc-nm -DCMAKE_RANLIB:STRING=gcc-ranlib"
+CMAKE_GENTYPE="MSYS Makefiles"
+CMAKE_GENFLAGS="-DCMAKE_MAKE_PROGRAM=mingw32-make"
 
 
 

diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake
index cbf5e2c..0736e3c 100644 (file)
--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -71,7 +71,7 @@ if(USE_SDL2)
    if(CMAKE_CROSSCOMPILING)
       include_directories(${SDL2_INCLUDE_DIRS})
    else()
-      pkg_search_module(SDL2 REQUIRED sdl2)
+      pkg_search_module(SDL2 REQUIRED  sdl2)
       include_directories(${SDL2_INCLUDE_DIRS})
    endif()
    set(SDL_LIBS ${SDL2_LIBRARIES})

diff --git a/source/build-cmake/config_build_mingw.sh b/source/build-cmake/config_build_mingw.sh
index ac5c66e..d2a5a79 100755 (executable)
--- a/source/build-cmake/config_build_mingw.sh
+++ b/source/build-cmake/config_build_mingw.sh
@@ -7,9 +7,12 @@ CCMAKE_CXX=g++
 MAKEFLAGS_CXX="-g -O2 -DNDEBUG"
 MAKEFLAGS_CC="-g -O2 -DNDEBUG"
 BUILD_TYPE="Relwithdebinfo"
-CMAKE_APPENDFLAG=""
-CMAKE_LINKFLAG=""
 
+CMAKE_LINKFLAG=""
+#CMAKE_GENTYPE="\"MinGW Makefiles\""
+#CMAKE_APPENDFLAG=""
+CMAKE_GENTYPE="\"MSYS Makefiles\""
+CMAKE_GENFLAGS="-DCMAKE_MAKE_PROGRAM=mingw32-make"
 mkdir -p ./bin-win32/
 if [ -e ./buildvars_mingw.dat ] ; then
     . ./buildvars_mingw.dat
@@ -47,7 +50,8 @@ mkdir -p libCSPgui/build-win32
 mkdir -p libCSPosd/build-win32
 cd libCSPgui/build-win32
 echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
-${CMAKE} -G "MinGW Makefiles" \
+${CMAKE} -G "${CMAKE_GENTYPE}" \
+        ${CMAKE_GENFLAGS} \
          -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
         -D CMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
         ${CMAKE_FLAGS1} \
@@ -83,23 +87,26 @@ cd ../..
 #libCSPosd
 cd libCSPosd/build-win32
 echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
-${CMAKE} -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_SCRIPT} \
-       ${CMAKE_FLAGS1} \
-       "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
-       "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
-       "-DUSE_SDL2=ON" \
-       ${CMAKE_APPENDFLAG} \
-       ${CMAKE_LINKFLAG} \
-       .. | tee make.log
-
-${CMAKE} ${CMAKE_FLAGS1} \
-       "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
-       "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
-       "-DUSE_SDL2=ON" \
-       ${CMAKE_APPENDFLAG} \
-       ${CMAKE_LINKFLAG} \
-       .. | tee -a make.log
-       
+${CMAKE} -G "${CMAKE_GENTYPE}" \
+        ${CMAKE_GENFLAGS} \
+         -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
+        -D CMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
+        ${CMAKE_FLAGS1} \
+        "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+        "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+        ${CMAKE_APPENDFLAG} \
+        ${CMAKE_LINKFLAG} \
+        .. | tee make.log
+
+${CMAKE} -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
+         -D CMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
+        ${CMAKE_FLAGS1} \
+        "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+        "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+        ${CMAKE_APPENDFLAG} \
+        ${CMAKE_LINKFLAG} \
+        .. | tee -a make.log
+        
 mingw32-make clean
 mingw32-make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log
 #case $? in
@@ -119,7 +126,8 @@ for SRCDATA in $@ ; do\
     cd ${SRCDATA}/build
     
     echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
-    ${CMAKE} -G "MinGW Makefiles" \
+    ${CMAKE} -G "${CMAKE_GENTYPE}" \
+            ${CMAKE_GENFLAGS} \
              -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
              -D CMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
             ${CMAKE_FLAGS1} \