X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fqt%2FCMakeLists.txt;h=7e40a560758a508fd9067563611b61de044be9e7;hb=90a1d498c79c26d69c78435600856b152aa07291;hp=9ff4fa3fb7fe9d2bfc91183195e3b98a4c15fd3b;hpb=6f36fdf69e44917fb1dae7bb95aaab4ccdfce82a;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index 9ff4fa3fb..7e40a5607 100644
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -1,19 +1,20 @@
 message("* qt/osd")
+SET(THIS_LIB_VERSION 2.13.2)
+
 set(s_qt_osd_headers
-	  osd_base.h
+	osd_base.h
 )
+#include(PrecompiledHeader)
+
 if(USE_QT_5)
   QT5_WRAP_CPP(s_qt_osd_headers_MOC ${s_qt_osd_headers})
 else()
   QT4_WRAP_CPP(s_qt_osd_headers_MOC ${s_qt_osd_headers})
 endif()
-#if(USE_SOCKET)
-#  set(QT_COMMON_BASE ${QT_COMMON_BASE} qt_socket.cpp)
-#endif()
 
- 
 SET(s_qt_osd_srcs
-	  osd_base.cpp
+#	  pch.cpp
+      osd_base.cpp
 	  osd_screen.cpp
 	  osd_console.cpp
 	  osd_input.cpp
@@ -22,26 +23,69 @@ SET(s_qt_osd_srcs
 	  osd_sound.cpp
 	  osd_video.cpp
 	  ${s_qt_osd_headers_MOC}
+
 )
+add_definitions(-D__LIBOSD_VERSION=\"libCSPosd.${THIS_LIB_VERSION}\")
 
 if(WIN32)
-  include (GenerateExportHeader)
-
-  add_library(qt_osd
-    ${s_qt_osd_srcs}
-    ${s_qt_osd_headers_MOC}
-  )
-
-else()
+#add_library(qt_osd
+#    ${s_qt_osd_srcs}
+#    ${s_qt_osd_headers_MOC}
+#    )
+#set_property(TARGET qt_osd PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+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/bin-win32/libCSPemu_utils.dll.a
+#          ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libqt_avio.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
+)
   set_target_properties(CSPosd PROPERTIES 
-     SOVERSION 1.1.3
-     VERSION 1.1.3
+     SOVERSION ${THIS_LIB_VERSION}
+     VERSION ${THIS_LIB_VERSION}
   )
-  INSTALL(TARGETS CSPosd DESTINATION ${LIBCSP_INSTALL_DIR})
+
+else()
+	#if(USE_DEVICES_SHARED_LIB)
+	  add_library(CSPosd SHARED
+		${s_qt_osd_srcs}
+		${s_qt_osd_headers_MOC}
+#		pch.cpp
+		)
+#	  add_precompiled_header(CSPosd pch_list
+#		SOURCE_CXX pch.cpp FORCEINCLUDE
+#		)
+	  target_link_libraries(CSPosd PUBLIC
+		Qt5::Core
+		Qt5::Gui
+		Qt5::Widgets
+		${SDL2_LIBRARIES}
+		)
+	  set_target_properties(CSPosd PROPERTIES 
+		SOVERSION ${THIS_LIB_VERSION}
+		VERSION ${THIS_LIB_VERSION}
+		)
+	  INSTALL(TARGETS CSPosd DESTINATION ${LIBCSP_INSTALL_DIR})
+	#else()
+	#  add_library(osd STATIC
+	#	${s_qt_osd_srcs}
+	#	${s_qt_osd_headers_MOC}
+	#	)
+	#endif()
 endif()
 
+