[BUILD][CMake] .

diff --git a/source/build-cmake/cmake/config_sharedlibs.cmake b/source/build-cmake/cmake/config_sharedlibs.cmake
index 001440c..5f1db1c 100644 (file)
--- a/source/build-cmake/cmake/config_sharedlibs.cmake
+++ b/source/build-cmake/cmake/config_sharedlibs.cmake
@@ -179,6 +179,7 @@ if(USE_QT_5)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 endif()
 
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/gui)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt)

diff --git a/source/build-cmake/config_build.sh b/source/build-cmake/config_build.sh
index e9dc377..2ec2261 100755 (executable)
--- a/source/build-cmake/config_build.sh
+++ b/source/build-cmake/config_build.sh
@@ -35,12 +35,12 @@ case ${STRIP_SYMBOLS} in
    "Yes" | "yes" | "YES" )
      MAKEFLAGS_BASE2="-s ${MAKEFLAGS_BASE2}"
      MAKEFLAGS_LINK_BASE="-s ${MAKEFLAGS_LINK_BASE2}"
-     MAKEFLAGS_DLL_LINK_BASE="-s ${MAKEFLAGS_LINK_BASE2}"
+     MAKEFLAGS_DLL_LINK_BASE="-s ${MAKEFLAGS_DLL_LINK_BASE2}"
    ;;
    "No" | "no" | "NO" | * )
      MAKEFLAGS_BASE2="-g -ggdb ${MAKEFLAGS_BASE2}"
      MAKEFLAGS_LINK_BASE="-g -ggdb ${MAKEFLAGS_LINK_BASE2}"
-     MAKEFLAGS_DLL_LINK_BASE="-g -ggdb ${MAKEFLAGS_LINK_BASE2}"
+     MAKEFLAGS_DLL_LINK_BASE="-g -ggdb ${MAKEFLAGS_DLL_LINK_BASE2}"
    ;;
 esac
 #################

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index 3a1a8ec..a624e6e 100644 (file)
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -7,7 +7,8 @@ if(USE_QT_5)
 else()
   QT4_WRAP_CPP(s_qt_osd_headers_MOC ${s_qt_osd_headers})
 endif()
- 
+
+SET(THIS_LIB_VERSION 2.9.5) 
 SET(s_qt_osd_srcs
          osd_base.cpp
          osd_screen.cpp
@@ -19,6 +20,7 @@ SET(s_qt_osd_srcs
          osd_video.cpp
          ${s_qt_osd_headers_MOC}
 )
+add_definitions(-D_LIBOSD_VERSION=${THIS_LIB_VERSION})
 
 if(WIN32)
 #add_library(qt_osd
@@ -47,8 +49,8 @@ generate_export_header(CSPosd
        STATIC_DEFINE CSPgosd_BUILT_AS_STATIC
 )
   set_target_properties(CSPosd PROPERTIES 
-     SOVERSION 2.9.5
-     VERSION 2.9.5
+     SOVERSION ${THIS_LIB_VERSION}
+     VERSION ${THIS_LIB_VERSION}
   )
 
 else()
@@ -64,8 +66,8 @@ target_link_libraries(CSPosd PUBLIC
          )
   
   set_target_properties(CSPosd PROPERTIES 
-     SOVERSION 2.9.5
-     VERSION 2.9.5
+     SOVERSION ${THIS_LIB_VERSION}
+     VERSION ${THIS_LIB_VERSION}
   )
   INSTALL(TARGETS CSPosd DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()

diff --git a/source/src/qt/avio/CMakeLists.txt b/source/src/qt/avio/CMakeLists.txt
index b455265..1a485f6 100644 (file)
--- a/source/src/qt/avio/CMakeLists.txt
+++ b/source/src/qt/avio/CMakeLists.txt
@@ -15,6 +15,8 @@ set(s_qt_avio_srcs
          sound_loader.cpp
 )
 
+SET(THIS_LIB_VERSION 2.6.6)
+
 if(USE_QT_5)
   QT5_WRAP_CPP(s_qt_avio_headers_MOC ${s_qt_avio_headers})
 else()
@@ -66,8 +68,8 @@ target_link_libraries(CSPavio PUBLIC
          )
 
 set_target_properties(CSPavio PROPERTIES 
-                            SOVERSION 2.6.6
-                            VERSION 2.6.6
+                            SOVERSION ${THIS_LIB_VERSION}
+                            VERSION ${THIS_LIB_VERSION}
                             )
 INSTALL(TARGETS CSPavio DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()

diff --git a/source/src/qt/emuutils/CMakeLists.txt b/source/src/qt/emuutils/CMakeLists.txt
index 984f30f..6d17a1a 100644 (file)
--- a/source/src/qt/emuutils/CMakeLists.txt
+++ b/source/src/qt/emuutils/CMakeLists.txt
@@ -5,7 +5,9 @@ set(s_qt_emuutils_srcs
          ../../common.cpp
          ../../fifo.cpp
          ../../fileio.cpp
-)
+         )
+       
+SET(THIS_LIB_VERSION 2.6.0) 
 
 if(WIN32)
 include (GenerateExportHeader)
@@ -22,8 +24,8 @@ target_link_libraries(CSPemu_utils PUBLIC
                libz.a
          )
 set_target_properties(CSPemu_utils PROPERTIES
-                            SOVERSION 2.6.0
-                            VERSION 2.6.0
+                            SOVERSION ${THIS_LIB_VERSION}
+                            VERSION ${THIS_LIB_VERSION}
                             LINK_INTERFACE_LIBRARIES ""
                             )
 #QT5_USE_MODULES(CSPgui Widgets Core Gui OpenGL)
@@ -41,8 +43,8 @@ add_library(CSPemu_utils SHARED
 )
 
 set_target_properties(CSPemu_utils PROPERTIES 
-                            SOVERSION 2.6.0
-                            VERSION 2.6.0
+                            SOVERSION ${THIS_LIB_VERSION}
+                            VERSION ${THIS_LIB_VERSION}
                             )
 INSTALL(TARGETS CSPemu_utils DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index bf7d641..d16fb32 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -107,7 +107,7 @@ set(s_qt_gui_srcs
          csp_logger.cpp
          qt_main.cpp
 )
-
+set(THIS_LIB_VERSION 2.9.6)
 if(USE_QT_5)
   QT5_WRAP_CPP(s_qt_gui_headers_MOC ${s_qt_gui_headers})
 #  if(WIN32)
@@ -151,8 +151,8 @@ target_link_libraries(CSPgui
          ${SDL2_LIBRARIES}
          )
 set_target_properties(CSPgui PROPERTIES
-                            SOVERSION 2.9.6
-                            VERSION 2.9.6
+                            SOVERSION ${THIS_LIB_VERSION}
+                            VERSION ${THIS_LIB_VERSION}
                             LINK_INTERFACE_LIBRARIES ""
                             )
 generate_export_header(CSPgui
@@ -176,8 +176,8 @@ target_link_libraries(CSPgui PUBLIC
          )
 
 set_target_properties(CSPgui PROPERTIES 
-                            SOVERSION 2.9.6
-                            VERSION 2.9.6
+                            SOVERSION ${THIS_LIB_VERSION}
+                            VERSION ${THIS_LIB_VERSION}
                             )
 INSTALL(TARGETS CSPgui DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()

diff --git a/source/src/vm/common_vm/CMakeLists.txt b/source/src/vm/common_vm/CMakeLists.txt
index 5208508..7a23603 100644 (file)
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -110,8 +110,9 @@ set(s_vm_common_vm_srcs
        # FM-7/77/AV
        ../fm7/hd6844.cpp
        ../fm7/mb61vh010.cpp
-       ../fm7/dummydevice.cpp
+#      ../fm7/dummydevice.cpp
 )
+SET(THIS_LIB_VERSION 1.1.16)
 
 if(WIN32)
 #include (GenerateExportHeader)
@@ -129,8 +130,8 @@ if(WIN32)
 #        ${SDL2_LIBRARIES}
 #        )
 #set_target_properties(CSPcommon_vm PROPERTIES
-#                           SOVERSION 1.1.15
-#                           VERSION 1.1.15
+#                           SOVERSION ${THIS_LIB_VERSION}
+#                           VERSION ${THIS_LIB_VERSION}
 #                           LINK_INTERFACE_LIBRARIES ""
 #                           )
 #generate_export_header(CSPcommon_vm
@@ -147,8 +148,8 @@ else()
     ${s_vm_common_vm_srcs}
   )
   set_target_properties(CSPcommon_vm PROPERTIES 
-     SOVERSION 1.1.15
-     VERSION 1.1.15
+     SOVERSION ${THIS_LIB_VERSION}
+     VERSION ${THIS_LIB_VERSION}
   )
   INSTALL(TARGETS CSPcommon_vm DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()