X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fbuild-cmake%2Fcmake%2Ftoolchain_mingw_cross_linux.cmake;h=23c891d222117b7eb38700b9b1feb2f69dcac54d;hb=7b29731595f9a97c455e75430477b85a0560f8dd;hp=f494d4b229f301ee453decb4d724a39f36ee9131;hpb=ac472c43a3554da2ccec1115ee362d88e4eec092;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake b/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
index f494d4b22..23c891d22 100644
--- a/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
+++ b/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
@@ -7,16 +7,21 @@ SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
 SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
 SET(CMAKE_AR  i686-w64-mingw32-gcc-ar)
 
+#SET(CMAKE_C_COMPILER i686-w64-mingw32-clang)
+#SET(CMAKE_CXX_COMPILER i686-w64-mingw32-clang++)
+#SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
+#SET(CMAKE_AR  i686-w64-mingw32-gcc-ar)
+
 #set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
 #set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
-set(CMAKE_EXE_LINKER_FLAGS "-flto=6 -fwhole-program")
+#set(CMAKE_EXE_LINKER_FLAGS "-flto=12 -fwhole-program")
 
-#SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-264-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
+#SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-w64-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
 #SET(CMAKE_C_ARCHIVE_FINISH   true)
-#SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-264-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
+#SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-w64-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
 #SET(CMAKE_CXX_ARCHIVE_FINISH   true)
 
-set(LIBAV_ROOT_DIR "/usr/local/i586-mingw-msvc/ffmpeg-4.0")
+set(LIBAV_ROOT_DIR "/usr/local/i586-mingw-msvc/ffmpeg-4.1")
 
 # here is the target environment located
 set(USE_SDL2 ON)
@@ -24,17 +29,13 @@ if(USE_SDL2)
    SET(CMAKE_FIND_ROOT_PATH  /usr/i686-w64-mingw32 
                           /usr/local/i586-mingw-msvc
                           /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32
-#			  /usr/local/i586-mingw-msvc/5.7.1/mingw_621
-			  /usr/local/i586-mingw-msvc/5.10.1/mingw_73x
-#			  /usr/local/i586-mingw-msvc/5.5/mingw_530_win32
+			  /usr/local/i586-mingw-msvc/5.12/mingw_82x
 			  )
 else()
    SET(CMAKE_FIND_ROOT_PATH  /usr/i686-w64-mingw32 
                           /usr/local/i586-mingw-msvc
                           /usr/local/i586-mingw-msvc/SDL1/
-#			  /usr/local/i586-mingw-msvc/5.7.1/mingw_621
-			  /usr/local/i586-mingw-msvc/5.10.1/mingw_73x
-#			  /usr/local/i586-mingw-msvc/5.5/mingw_530_win32
+			  /usr/local/i586-mingw-msvc/5.12/mingw_82x
 			  )
 endif()
 SET(CSP_CROSS_BUILD 1)
@@ -46,8 +47,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
-#set(LIBAV_INCLUDE_DIRS /usr/local/i586-mingw-msvc/ffmpeg-3.0/include)
-
 set(SDL2_LIBRARIES
                          /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32/lib/libSDL2.dll.a 
 			 /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32/lib/libSDL2main.a)