X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fqt%2Favio%2FCMakeLists.txt;h=76291e590e671a549814481ec8dc8622f06cb563;hb=90a1d498c79c26d69c78435600856b152aa07291;hp=0cd5b4c235570e2c4bb73915cf7bbd09e92c15d1;hpb=708484f11469998cfa7b7cebc1c6cb2ddc5d69c8;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/qt/avio/CMakeLists.txt b/source/src/qt/avio/CMakeLists.txt
index 0cd5b4c23..76291e590 100644
--- a/source/src/qt/avio/CMakeLists.txt
+++ b/source/src/qt/avio/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* qt/avio")
 
-SET(THIS_LIB_VERSION 2.7.3)
+SET(THIS_LIB_VERSION 2.9.2)
 set(s_qt_avio_headers
 	  movie_saver.h
 	  movie_loader.h
@@ -15,6 +15,7 @@ set(s_qt_avio_srcs
 	  movie_saver_fileio.cpp
 	  sound_loader.cpp
 )
+add_definitions(-D__LIBAVIO_VERSION=\"libCSPavio.${THIS_LIB_VERSION}\")
 
 if(USE_QT_5)
   QT5_WRAP_CPP(s_qt_avio_headers_MOC ${s_qt_avio_headers})
@@ -23,42 +24,45 @@ else()
 endif()
 
 if(WIN32)
-add_library(qt_avio
-	  ${s_qt_avio_srcs}
-	  ${s_qt_avio_headers_MOC}
-)
-
-#include (GenerateExportHeader)
-#add_library(CSPavio SHARED
+#add_library(qt_avio
 #	  ${s_qt_avio_srcs}
 #	  ${s_qt_avio_headers_MOC}
 #)
 
-#target_link_libraries(CSPavio PUBLIC
-#		   ${LIBAV_LIBRARIES}
-#		   Qt5::Core
-#		   Qt5::Gui
-#		   Qt5::Widgets
-#	  )
+include (GenerateExportHeader)
+add_library(CSPavio SHARED
+	  ${s_qt_avio_srcs}
+	  ${s_qt_avio_headers_MOC}
+)
+
+target_link_libraries(CSPavio PUBLIC
+		   ${LIBAV_LIBRARIES}
+		   ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPosd.dll.a
+#		   ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPgui.dll.a
+	  	   ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a
+		   Qt5::Core
+		   Qt5::Gui
+		   Qt5::Widgets
+	  )
 #QT5_USE_MODULES(CSPavio Widgets Core Gui OpenGL)
+set_target_properties(CSPavio PROPERTIES 
+			     SOVERSION ${THIS_LIB_VERSION}
+			     VERSION ${THIS_LIB_VERSION}
+			     )
 
-#set_target_properties(CSPavio PROPERTIES 
-#			     SOVERSION 2.6.3
-#			     VERSION 2.6.3
-#			     )
-#generate_export_header(CSPavio
-#       BASE_NAME CSPavio
-#        EXPORT_MACRO_NAME CSPavio_EXPORT
-#        EXPORT_FILE_NAME CSPavio_Export.h
-#        STATIC_DEFINE CSPavio_BUILT_AS_STATIC
-#)
+generate_export_header(CSPavio
+       BASE_NAME CSPavio
+        EXPORT_MACRO_NAME CSPavio_EXPORT
+        EXPORT_FILE_NAME CSPavio_Export.h
+        STATIC_DEFINE CSPavio_BUILT_AS_STATIC
+)
 
 else()
 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 PUBLIC
 		   ${LIBAV_LIBRARIES}
 		   Qt5::Core