OSDN Git Service

[Build][CMAKE] Update SOVERSION.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 8 Sep 2019 18:33:35 +0000 (03:33 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 8 Sep 2019 18:33:35 +0000 (03:33 +0900)
source/src/qt/CMakeLists.txt
source/src/qt/emuutils/CMakeLists.txt
source/src/qt/gui/CMakeLists.txt
source/src/vm/fmgen/CMakeLists.txt

index 5dc8f34..ab78491 100644 (file)
@@ -40,10 +40,9 @@ include (GenerateExportHeader)
   )
 
 target_link_libraries(CSPosd PUBLIC
-          PRIVATE  ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPemu_utils.dll.a
-#          ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPgui.dll.a
-#          ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libqt_avio.a
-          PUBLIC
+          PRIVATE ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPemu_utils.dll.a
+#          INTERFACE ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPgui.dll.a
+#          ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPavio.dll.a
          Qt5::Core
          Qt5::Gui
          Qt5::OpenGL
index 8b395eb..287f0e7 100644 (file)
@@ -20,6 +20,7 @@ QT5_WRAP_CPP(s_qt_emuutils_headers_MOC ${s_qt_emuutils_headers})
 add_definitions(-D__LIBEMU_UTIL_VERSION=\"libCSPemu_utils.${THIS_LIB_VERSION}\")
 
 if(WIN32)
+
 include (GenerateExportHeader)
 
 add_library(CSPemu_utils SHARED
@@ -27,10 +28,12 @@ add_library(CSPemu_utils SHARED
          ${s_qt_emuutils_headers_MOC}
 )
 
-target_link_libraries(CSPemu_utils PUBLIC
+target_link_libraries(CSPemu_utils PRIVATE
                Qt5::Core
-               libz.a
+               libz.dll.a
+               ${SDL2_LIBRARIES}
          )
+         
 set_target_properties(CSPemu_utils PROPERTIES
                             SOVERSION ${THIS_LIB_VERSION}
                             VERSION ${THIS_LIB_VERSION}
index 84bc21c..a0ce885 100644 (file)
@@ -157,8 +157,7 @@ add_library(CSPgui SHARED
          )
 
 target_link_libraries(CSPgui 
-         ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPosd.dll.a
-#        ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libqt_avio.a
+         PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPosd.dll.a
 #        ${LIBAV_LIBRARIES}
          ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPavio.dll.a
          ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a
index 047f628..79e26ea 100644 (file)
@@ -23,7 +23,7 @@ add_library(CSPfmgen SHARED
     ${s_vm_fmgen_srcs}
     )
 target_link_libraries(CSPfmgen
-       ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a
+       PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a
        )
 set_target_properties(CSPfmgen PROPERTIES
                             SOVERSION ${THIS_LIB_VERSION}