• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

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


Commit MetaInfo

Revision09ce60e5eb776b12b2149fbb870896f62154c75d (tree)
Time2018-08-01 00:12:13
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[BUILD][WIN32] Update toolchain to Qt5.11.1.

Change Summary

Incremental Difference

--- a/source/build-cmake/cmake/toolchain_win32_cross_linux_llvm.cmake
+++ b/source/build-cmake/cmake/toolchain_win32_cross_linux_llvm.cmake
@@ -14,14 +14,14 @@ SET(CMAKE_NM llvm-nm-3.9)
1414 set(CMAKE_CXX_FLAGS "-target i686-w64-mingw32")
1515 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc -nostdinc++")
1616 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/lib/clang/3.9.0/include")
17-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include/../../../usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++")
18-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include/../../../usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/i686-w64-mingw32")
17+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include/../../../usr/lib/gcc/i686-w64-mingw32/8.2-win32/include/c++")
18+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include/../../../usr/lib/gcc/i686-w64-mingw32/8.2-win32/include/c++/i686-w64-mingw32")
1919 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include")
2020
21-set(CMAKE_EXE_LINKER_FLAGS "-L/usr/lib/gcc/i686-w64-mingw32/6.1-win32 -target i686-w64-mingw32 ")
21+set(CMAKE_EXE_LINKER_FLAGS "-L/usr/lib/gcc/i686-w64-mingw32/8.2-win32 -target i686-w64-mingw32 ")
2222 #set(CMAKE_EXE_LINKER_FLAGS "")
2323
24-set(LIBAV_ROOT_DIR "/usr/local/i586-mingw-msvc/ffmpeg-3.1.1")
24+set(LIBAV_ROOT_DIR "/usr/local/i586-mingw-msvc/ffmpeg-4.0")
2525
2626
2727 # here is the target environment located
@@ -29,14 +29,14 @@ set(USE_SDL2 ON)
2929 if(USE_SDL2)
3030 SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32
3131 /usr/local/i586-mingw-msvc
32- /usr/local/i586-mingw-msvc/SDL2/i686-w64-mingw32
33- /usr/local/i586-mingw-msvc/5.7/mingw_611
32+ /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32
33+ /usr/local/i586-mingw-msvc/5.11.1/mingw_82x
3434 )
3535 else()
3636 SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32
3737 /usr/local/i586-mingw-msvc
3838 /usr/local/i586-mingw-msvc/SDL1/
39- /usr/local/i586-mingw-msvc/5.7/mingw_611
39+ /usr/local/i586-mingw-msvc/5.11.1/mingw_82x
4040 )
4141 endif()
4242 SET(CSP_CROSS_BUILD 1)
@@ -48,7 +48,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
4848 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
4949 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
5050
51-#set(LIBAV_INCLUDE_DIRS /usr/local/i586-mingw-msvc/ffmpeg-3.0/include)
5251
5352 set(SDL2_LIBRARIES
5453 /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32/lib/libSDL2.dll.a
Show on old repository browser