OSDN Git Service

[BUILD][WIN32] Try: Cross build with LLVM CLANG(still be failed).
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 8 Mar 2019 09:27:01 +0000 (18:27 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 8 Mar 2019 09:27:01 +0000 (18:27 +0900)
source/build-cmake/cmake/config_commonsource.cmake
source/build-cmake/cmake/config_sharedlibs.cmake
source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
source/build-cmake/cmake/toolchain_win32_cross_linux_llvm.cmake
source/build-cmake/params/buildvars_mingw_params_llvm.dat

index 7e3ec05..45ff1ff 100644 (file)
@@ -225,8 +225,10 @@ endif(HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP)
 set(SRC_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../src)
 
 if(USE_QT_5)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  if(NOT WIN32)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  endif()
 endif()
 
 if(DEFINED VM_NAME)
index 3454264..39eb44c 100644 (file)
@@ -153,8 +153,10 @@ endif()
 set(SRC_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../src)
 
 if(USE_QT_5)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  if(NOT WIN32)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  endif()
 endif()
 
 if(LIBAV_FOUND)
@@ -193,10 +195,6 @@ endif(HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP)
 
 set(SRC_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../src)
 
-if(USE_QT_5)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-endif()
 
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common)
index afa3d81..23c891d 100644 (file)
@@ -7,6 +7,11 @@ 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=12 -fwhole-program")
index 26f91f7..58cc5bc 100644 (file)
@@ -3,17 +3,17 @@ SET(CMAKE_SYSTEM_NAME Windows)
 
 # which compilers to use for C and C++
 SET(CMAKE_SYSTEM_NAME Windows)
-SET(CMAKE_C_COMPILER clang)
-SET(CMAKE_CXX_COMPILER clang++)
+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  llvm-ar-3.9)
-SET(CMAKE_LD  llvm-link-3.9)
+SET(CMAKE_AR  llvm-ar)
+SET(CMAKE_LD  llvm-link)
 SET(CMAKE_LINKSE  /usr/bin/i686-w64-mingw32-ld)
-SET(CMAKE_NM  llvm-nm-3.9)
+SET(CMAKE_NM  llvm-nm)
 
 set(CMAKE_CXX_FLAGS "-target i686-w64-mingw32")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc -nostdinc++")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/lib/clang/3.9.0/include")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc -nostdinc++")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/lib/clang/3.9.0/include")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include/../../../usr/lib/gcc/i686-w64-mingw32/8.2-win32/include/c++")
 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")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include")
@@ -21,7 +21,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/i686-w64-mingw32/include")
 set(CMAKE_EXE_LINKER_FLAGS "-L/usr/lib/gcc/i686-w64-mingw32/8.2-win32 -target i686-w64-mingw32 ")
 #set(CMAKE_EXE_LINKER_FLAGS "")
 
-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
@@ -30,13 +30,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.11.1/mingw_82x
+                         /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.11.1/mingw_82x
+                         /usr/local/i586-mingw-msvc/5.12/mingw_82x
                          )
 endif()
 SET(CSP_CROSS_BUILD 1)
index a2cba8c..61ddda1 100644 (file)
@@ -138,8 +138,8 @@ esac
 
 CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
                    -DUSE_MOVIE_SAVER=ON \
-                   -DCMAKE_AR:STRING=llvm-ar-3.9 \
+                   -DCMAKE_AR:STRING=llvm-ar \
                    -DCMAKE_LD:STRING=i686-w64-mingw32-ld \
-                  -DCMAKE_NM:STRING=llvm-nm-3.9 \
-                  -DCMAKE_RANLIB:STRING=llvm-ranlib-3.9 \
+                  -DCMAKE_NM:STRING=llvm-nm \
+                  -DCMAKE_RANLIB:STRING=llvm-ranlib \
                   "