[WIN32][BUILD] .

diff --git a/source/build-cmake/buildvars_mingw_cross_win32.dat b/source/build-cmake/buildvars_mingw_cross_win32.dat
index 1cca3c6..0349671 100644 (file)
--- a/source/build-cmake/buildvars_mingw_cross_win32.dat
+++ b/source/build-cmake/buildvars_mingw_cross_win32.dat
@@ -22,17 +22,18 @@ MAKEFLAGS_BASE="-fvect-cost-model=dynamic -ftree-vectorize \
 
 MAKEFLAGS_CXX="-O2 ${MAKEFLAGS_BASE} -DNDEBUG" 
 MAKEFLAGS_CC="-O2 ${MAKEFLAGS_BASE} -DNDEBUG"
-#MAKEFLAGS_CXX="-O0 -flto -ffat-lto-objects -DNDEBUG" 
-#MAKEFLAGS_CC="-O0 -flto -ffat-lto-objects -DNDEBUG"
+#MAKEFLAGS_CXX="-O2 -flto -ffat-lto-objects -DNDEBUG" 
+#MAKEFLAGS_CC="-O2 -flto -ffat-lto-objects -DNDEBUG"
 
 MAKEFLAGS_LIB_CXX="-O2 ${MAKEFLAGS_BASE} -DNDEBUG" 
 MAKEFLAGS_LIB_CC="-O2 ${MAKEFLAGS_BASE}  -DNDEBUG"
-#MAKEFLAGS_LIB_CXX="-O0 -flto -ffat-lto-objects -DNDEBUG" 
-#MAKEFLAGS_LIB_CC="-O0 -flto -ffat-lto-objects -DNDEBUG"
+#MAKEFLAGS_LIB_CXX="-O2 -flto -ffat-lto-objects -DNDEBUG" 
+#MAKEFLAGS_LIB_CC="-O2 -flto -ffat-lto-objects -DNDEBUG"
 
 MAKEFLAGS_GENERAL="-j6"
 
-CMAKE_LINKFLAG="-static-libstdc++ -static-libgcc"
+#CMAKE_LINKFLAG="-static-libstdc++ -static-libgcc"
+CMAKE_LINKFLAG="-s"
 CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON -DUSE_MOVIE_SAVER=ON"
 #CMAKE_APPENDFLAG="-DCMAKE_AR:STRING=i686-w64-mingw32-gcc-ar \
 #                   -DCMAKE_LD:STRING=i686-w64-mingw32-gcc-ld \

diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake
index dbc9f2b..85fb98a 100644 (file)
--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -213,12 +213,12 @@ if(WIN32)
 
 else()
    set(BUNDLE_LIBS 
-       ${OPENGL_LIBRARY}
+#       ${OPENGL_LIBRARY}
        ${OPENCL_LIBRARY}
-       ${GETTEXT_LIBRARY}
+#       ${GETTEXT_LIBRARY}
        ${OPENMP_LIBRARY}
        ${SDL_LIBS}
-       ${LIBAV_LIBRARIES}
+#       ${LIBAV_LIBRARIES}
        ${ADDITIONAL_LIBRARIES}
        )
 

diff --git a/source/build-cmake/config_build_cross_win32.sh b/source/build-cmake/config_build_cross_win32.sh
index 42c80e1..34833e1 100755 (executable)
--- a/source/build-cmake/config_build_cross_win32.sh
+++ b/source/build-cmake/config_build_cross_win32.sh
@@ -53,14 +53,14 @@ function build_dll() {
     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
+#    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 ../..
 }

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index b8d185a..d7ac6c0 100644 (file)
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -25,18 +25,43 @@ SET(s_qt_osd_srcs
 )
 
 if(WIN32)
-  include (GenerateExportHeader)
-
-  add_library(qt_osd
+add_library(qt_osd
     ${s_qt_osd_srcs}
     ${s_qt_osd_headers_MOC}
-  )
+    )
+#include (GenerateExportHeader)
+#  add_library(CSPosd SHARED
+#    ${s_qt_osd_srcs}
+#    ${s_qt_osd_headers_MOC}
+#  )
+#target_link_libraries(CSPosd PUBLIC
+#         ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPemu_utils/build-win32/qt/emuutils/libemu_utils.a
+#         ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPavio/build-win32/qt/avio/libqt_avio.a
+#         ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPosd/build-win32/qt/osd/libqt_osd.a
+#        Qt5::Core
+#        Qt5::Gui
+#        Qt5::OpenGL
+#        Qt5::Widgets
+#        ${SDL2_LIBRARIES}
+#        )
+#generate_export_header(CSPosd
+#       BASE_NAME CSPosd
+#       EXPORT_MACRO_NAME CSPosd_EXPORT
+#       EXPORT_FILE_NAME CSPosd_Export.h
+#       STATIC_DEFINE CSPgosd_BUILT_AS_STATIC
+#)
 
 else()
   add_library(CSPosd SHARED
     ${s_qt_osd_srcs}
     ${s_qt_osd_headers_MOC}
   )
+target_link_libraries(CSPosd PUBLIC
+         Qt5::Core
+         Qt5::Gui
+         Qt5::Widgets
+         ${SDL2_LIBRARIES}
+         )
   
   set_target_properties(CSPosd PROPERTIES 
      SOVERSION 2.0.0

diff --git a/source/src/qt/avio/CMakeLists.txt b/source/src/qt/avio/CMakeLists.txt
index 33e3526..1ea739e 100644 (file)
--- a/source/src/qt/avio/CMakeLists.txt
+++ b/source/src/qt/avio/CMakeLists.txt
@@ -18,13 +18,12 @@ else()
 endif()
 
 if(WIN32)
-include (GenerateExportHeader)
-
+#include (GenerateExportHeader)
 add_library(qt_avio
          ${s_qt_avio_srcs}
          ${s_qt_avio_headers_MOC}
 )
-
+#
 #add_library(CSPavio SHARED
 #        ${s_qt_avio_srcs}
 #        ${s_qt_avio_headers_MOC}
@@ -32,7 +31,7 @@ add_library(qt_avio
 
 #target_link_libraries(CSPavio PUBLIC
 #                 ${LIBAV_LIBRARIES}
-#          ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPavio/build-win32/qt/avio/CSPavio.dll
+#                 ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPavio/build-win32/qt/avio/CSPavio.dll
 #                 Qt5::Core
 #                 Qt5::Gui
 #                 Qt5::Widgets
@@ -47,48 +46,17 @@ add_library(qt_avio
 #)
 
 else()
-#add_library(CSPavio SHARED
-#        ${s_qt_avio_srcs}
-#        ${s_qt_avio_headers_MOC}
-#)
-#SET(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-#find_library(LIBAV_STATIC_LIBAVCODEC  avcodec)
-#find_library(LIBAV_STATIC_LIBAVDEVICE avdevice)
-#find_library(LIBAV_STATIC_LIBAVFILTER avfilter)
-#find_library(LIBAV_STATIC_LIBAVFORMAT avformat)
-#find_library(LIBAV_STATIC_LIBAVUTIL avutil)
-#find_library(LIBAV_STATIC_LIBAVRESAMPLE avresample)
-#find_library(LIBAV_STATIC_LIBSWRESAMPLE swresample)
-#find_library(LIBAV_STATIC_LIBSWSCALE swscale)
-#find_library(LIBAV_STATIC_LIBPOSTPROC postproc)
-
-
-#if(NOT (LIBAV_STATIC_LIBAVCODEC-NOTFOUND OR LIBAV_STATIC_LIBAVDEVICE-NOTFOUND
-#  OR LIBAV_STATIC_LIBAVFILTER-NOTFOUND OR LIBAV_STATIC_LIBAVFORMAT-NOTFOUND 
-#   OR LIBAV_STATIC_LIBAVUTIL-NOTFOUND  OR LIBAV_STATIC_LIBAVRESAMPLE-NOTFOUND 
-#   OR LIBAV_STATIC_LIBSWRESAMPLE-NOTFOUND OR LIBAV_STATIC_LIBSWSCAPE-NOTFOUND
-#   OR LIBAV_STATIC_LIBPOSTPROC-NOTFOUND ))
 add_library(CSPavio SHARED
          ${s_qt_avio_srcs}
          ${s_qt_avio_headers_MOC}
          )
 #set(LIBAV_STATIC_PREFIX /usr/local/ffmpeg-2.8.7/lib)
-#target_link_libraries(CSPavio LINK_PRIVATE
-#        ${LIBAV_STATIC_PREFIX}/libavcodec.a
-#        ${LIBAV_STATIC_PREFIX}/libavfilter.a
-#        ${LIBAV_STATIC_PREFIX}/libavformat.a
-#        ${LIBAV_STATIC_PREFIX}/libavutil.a
-#        avresample
-#        ${LIBAV_STATIC_PREFIX}/libswresample.a
-#        ${LIBAV_STATIC_PREFIX}/libswscale.a
-#        ${LIBAV_STATIC_PREFIX}/libpostproc.a
-#        )
-#else()
-#   add_library(CSPavio SHARED
-#        ${s_qt_avio_srcs}
-#        ${s_qt_avio_headers_MOC}
-#        )
-#endif()
+target_link_libraries(CSPavio PUBLIC
+                  ${LIBAV_LIBRARIES}
+                  Qt5::Core
+                  Qt5::Gui
+                  Qt5::Widgets
+         )
 
 set_target_properties(CSPavio PROPERTIES 
                             SOVERSION 2.0.0

diff --git a/source/src/qt/emuutils/CMakeLists.txt b/source/src/qt/emuutils/CMakeLists.txt
index 0c1162a..2b49e6b 100644 (file)
--- a/source/src/qt/emuutils/CMakeLists.txt
+++ b/source/src/qt/emuutils/CMakeLists.txt
@@ -13,23 +13,21 @@ include (GenerateExportHeader)
 add_library(emu_utils
          ${s_qt_emuutils_srcs}
 )
-
+#add_library(CSPemu_utils SHARED
+#        ${s_qt_emuutils_srcs}
+#)
 
 #target_link_libraries(CSPemu_utils PUBLIC
 #         ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPosd/build-win32/qt/osd/CSPosd.dll
 #        Qt5::Core
-#        Qt5::Gui
-#        Qt5::OpenGL
-#        Qt5::Svg
-#        Qt5::Widgets
 #        )
 #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
+#generate_export_header(CSPemu_utils
+#        BASE_NAME CSPemu_utils
+#        EXPORT_MACRO_NAME CSPemu_utils_EXPORT
+#        EXPORT_FILE_NAME CSPemu_utils_Export.h
+#        STATIC_DEFINE CSPemu_utils_BUILT_AS_STATIC
 #)
 
 else()

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index 8947ee8..1a215a5 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -99,24 +99,22 @@ add_library(qt_gui
          ${s_qt_gui_srcs}
          ${s_qt_gui_headers_MOC}
 )
-
 #include (GenerateExportHeader)
 #add_library(CSPgui SHARED
 #        ${s_qt_gui_srcs}
-#        ${s_qt_gui_headers_MOC}
+##       ${s_qt_gui_headers_MOC}
 #        )
 #target_link_libraries(CSPgui PUBLIC
 #         ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPemu_utils/build-win32/qt/emuutils/libemu_utils.a
 #         ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPavio/build-win32/qt/avio/libqt_avio.a
 #         ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPosd/build-win32/qt/osd/libqt_osd.a
-##       Qt5::Core
+#        Qt5::Core
 #        Qt5::Gui
 #        Qt5::OpenGL
 #        Qt5::Widgets
 #        ${SDL2_LIBRARIES}
 #        )
 #QT5_USE_MODULES(CSPgui Widgets Core Gui OpenGL)
-#
 #generate_export_header(CSPgui
 #       BASE_NAME CSPgui
 #        EXPORT_MACRO_NAME CSPgui_EXPORT
@@ -129,6 +127,13 @@ add_library(CSPgui SHARED
          ${s_qt_gui_srcs}
          ${s_qt_gui_headers_MOC}
 )
+target_link_libraries(CSPgui PUBLIC
+         Qt5::Core
+         Qt5::Gui
+         Qt5::OpenGL
+         Qt5::Widgets
+         ${SDL2_LIBRARIES}
+         )
 
 set_target_properties(CSPgui PROPERTIES 
                             SOVERSION 2.0.0