May 25, 2018 updates: Privacy Policy
  • R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revision47ba17cd8c9409f64ce1597a0f7eea0553670d5c (tree)
Time2018-05-10 20:26:43
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[Build][Win32] .

Change Summary

Incremental Difference

--- a/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
+++ b/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
@@ -11,9 +11,9 @@ SET(CMAKE_AR i686-w64-mingw32-gcc-ar)
1111 #set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
1212 set(CMAKE_EXE_LINKER_FLAGS "-flto=6 -fwhole-program")
1313
14-#SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-264-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
14+#SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-w64-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
1515 #SET(CMAKE_C_ARCHIVE_FINISH true)
16-#SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-264-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
16+#SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> --plugin==$(i686-w64-mingw32-gcc --print-file-name=liblto_plugin.so) <LINK_FLAGS> <OBJECTS>")
1717 #SET(CMAKE_CXX_ARCHIVE_FINISH true)
1818
1919 set(LIBAV_ROOT_DIR "/usr/local/i586-mingw-msvc/ffmpeg-4.0")
@@ -24,17 +24,15 @@ if(USE_SDL2)
2424 SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32
2525 /usr/local/i586-mingw-msvc
2626 /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32
27-# /usr/local/i586-mingw-msvc/5.7.1/mingw_621
2827 /usr/local/i586-mingw-msvc/5.10.1/mingw_73x
29-# /usr/local/i586-mingw-msvc/5.5/mingw_530_win32
28+# /usr/local/i586-mingw-msvc/devel-libs/usr/i686-w64-mingw32/sys-root/mingw
3029 )
3130 else()
3231 SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32
3332 /usr/local/i586-mingw-msvc
3433 /usr/local/i586-mingw-msvc/SDL1/
35-# /usr/local/i586-mingw-msvc/5.7.1/mingw_621
3634 /usr/local/i586-mingw-msvc/5.10.1/mingw_73x
37-# /usr/local/i586-mingw-msvc/5.5/mingw_530_win32
35+# /usr/local/i586-mingw-msvc/devel-libs/usr/i686-w64-mingw32/sys-root/mingw
3836 )
3937 endif()
4038 SET(CSP_CROSS_BUILD 1)
Show on old repository browser