[BUILD][CMAKE][WIN32] Compile qt/gui/libqt_gui.a (a.k.a. libCSPgui) at once with...

diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake
index 3137157..c99a23d 100644 (file)
--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -135,7 +135,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/gui)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt)
 
 if(WIN32)
-  add_subdirectory(../../src/qt/gui qt/gui)
+#  add_subdirectory(../../src/qt/gui qt/gui)
 endif()  
 add_subdirectory(../../src/qt qt/osd)
 add_subdirectory(../../src common)
@@ -153,7 +153,7 @@ if(DEFINED VM_NAME)
 if(WIN32)
           set(LOCAL_LIBS 
                   common_emu
-                  qt_gui
+#                 qt_gui
                    qt_${VM_NAME}
                   vm_${VM_NAME}
                   ${VM_APPEND_LIBS}
@@ -162,7 +162,7 @@ if(WIN32)
                   qt_osd
                   ${DEBUG_LIBS}
                   common_common
-                  
+#                 qt_gui
                   )
           else()
           set(LOCAL_LIBS     
@@ -190,7 +190,7 @@ set(BUNDLE_LIBS
                           ${ADDITIONAL_LIBRARIES}
 )
 if(WIN32)
-
+   set(BUNDLE_LIBS ${BUNDLE_LIBS})
 else()
    set(BUNDLE_LIBS ${BUNDLE_LIBS} -lCSPgui)
 endif()

diff --git a/source/build-cmake/config_build_cross_win32.sh b/source/build-cmake/config_build_cross_win32.sh
index d9feb0d..88cf630 100755 (executable)
--- a/source/build-cmake/config_build_cross_win32.sh
+++ b/source/build-cmake/config_build_cross_win32.sh
@@ -51,6 +51,42 @@ case ${BUILD_TYPE} in
            ;;
 esac
 
+# libCSPGui
+mkdir -p libCSPgui/build-win32
+cd libCSPgui/build-win32
+    
+echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
+${CMAKE} -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_SCRIPT} \
+       ${CMAKE_FLAGS1} \
+       "${CMAKE_FLAGS2}=${MAKEFLAGS_CXX}" \
+       "${CMAKE_FLAGS3}=${MAKEFLAGS_CC}" \
+       "-DUSE_SDL2=ON" \
+       ${CMAKE_APPENDFLAG} \
+       ${CMAKE_LINKFLAG} \
+       .. | tee make.log
+
+${CMAKE} ${CMAKE_FLAGS1} \
+       "${CMAKE_FLAGS2}=${MAKEFLAGS_CXX}" \
+       "${CMAKE_FLAGS3}=${MAKEFLAGS_CC}" \
+       "-DUSE_SDL2=ON" \
+       ${CMAKE_APPENDFLAG} \
+       ${CMAKE_LINKFLAG} \
+       .. | tee -a make.log
+       
+make clean
+    
+make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log
+#case $? in
+#      0 ) 
+#      cp ./qt/gui/libqt_gui.a ../../bin-win32/ 
+#      cp ./qt/gui/*.lib ../../bin-win32/ 
+#      cp ./qt/gui/*.dll ../../bin-win32/ 
+#      ;;
+#      * ) exit $? ;;
+#esac
+#make clean
+cd ../..
+
 for SRCDATA in $@ ; do\
 
     mkdir -p ${SRCDATA}/build-win32
@@ -85,6 +121,8 @@ for SRCDATA in $@ ; do\
     make clean
     cd ../..
 done
-
+cd libCSPgui/build-win32
+make clean
+cd ../..
 exit 0
 

diff --git a/source/build-cmake/libCSPgui/CMakeLists.txt b/source/build-cmake/libCSPgui/CMakeLists.txt
index b78f755..a9f4082 100644 (file)
--- a/source/build-cmake/libCSPgui/CMakeLists.txt
+++ b/source/build-cmake/libCSPgui/CMakeLists.txt
@@ -51,18 +51,10 @@ SET(CMAKE_AUTOMOC OFF)
 SET(CMAKE_AUTORCC ON)
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-
 add_definitions(-D_USE_QT)
 add_definitions(-DUSE_QT)
 add_definitions(-DQT_MAJOR_VERSION=${Qt5Widgets_VERSION_MAJOR})
 add_definitions(-DQT_MINOR_VERSION=${Qt5Widgets_VERSION_MINOR})
-# Build Flags
-if(WITH_JOYSTICK)
-endif()
-
-if(WITH_MOUSE)
-endif()
-
 
 if(USE_OPENMP)
   find_package(OpenMP)

diff --git a/source/src/qt/common/CMakeLists.txt b/source/src/qt/common/CMakeLists.txt
index 7b69171..b0219b7 100644 (file)
--- a/source/src/qt/common/CMakeLists.txt
+++ b/source/src/qt/common/CMakeLists.txt
@@ -47,7 +47,9 @@ if(USE_QT_5)
   endif()
 endif()
 if(WIN32)
- target_link_libraries(${EXEC_TARGET} ${LOCAL_LIBS} ${BUNDLE_LIBS} Qt5::OpenGL)
+ target_link_libraries(${EXEC_TARGET} 
+ ${LOCAL_LIBS}
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a ${BUNDLE_LIBS} Qt5::OpenGL)
 else()
  target_link_libraries(${EXEC_TARGET} ${LOCAL_LIBS} ${BUNDLE_LIBS})
 endif()

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index 76162ab..a7b0b2f 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -87,11 +87,27 @@ else()
 endif()
 
 if(WIN32)
+include (GenerateExportHeader)
+
 add_library(qt_gui
          ${s_qt_gui_srcs}
          ${s_qt_gui_headers_MOC}
 )
 
+
+#add_library(CSPgui SHARED
+#        ${s_qt_gui_srcs}
+#        ${s_qt_gui_headers_MOC}
+#)
+#QT5_USE_MODULES(CSPgui Widgets Core Gui OpenGL)
+#
+#generate_export_header(CSPgui
+#        BASE_NAME CSPgui
+#        EXPORT_MACRO_NAME CSPgui_EXPORT
+#        EXPORT_FILE_NAME CSPgui_Export.h
+#        STATIC_DEFINE CSPgui_BUILT_AS_STATIC
+#)
+
 else()
 add_library(CSPgui SHARED
          ${s_qt_gui_srcs}