CMake|Windows: API exports, running windeployqt, .pack output

skyjake · Feb 22, 2015 · 8057272 · 8057272
1 parent 67a2369
commit 8057272
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 17 deletions.
diff --git a/doomsday/apps/plugins/dehread/CMakeLists.txt b/doomsday/apps/plugins/dehread/CMakeLists.txt
@@ -5,4 +5,4 @@ include (../PluginConfig.cmake)
 include_directories (include)
 file (GLOB SOURCES src/*.cpp include/*.h)
 
-deng_add_plugin (dehread ${SOURCES})
+deng_add_plugin (dehread ${SOURCES} api/dpdehread.def)
diff --git a/doomsday/apps/plugins/doom/CMakeLists.txt b/doomsday/apps/plugins/doom/CMakeLists.txt
@@ -14,4 +14,4 @@ file (GLOB SOURCES src/*.c src/*.cpp include/*.h)
 
 deng_find_resources (libdoom.pk3)
 
-deng_add_plugin (doom ${SOURCES} ${COMMON_SOURCES})
+deng_add_plugin (doom ${SOURCES} ${COMMON_SOURCES} api/doom.def)
diff --git a/doomsday/apps/plugins/doom64/CMakeLists.txt b/doomsday/apps/plugins/doom64/CMakeLists.txt
@@ -14,4 +14,4 @@ file (GLOB SOURCES src/*.c src/*.cpp include/*.h)
 
 deng_find_resources (libdoom64.pk3)
 
-deng_add_plugin (doom64 ${SOURCES} ${COMMON_SOURCES})
+deng_add_plugin (doom64 ${SOURCES} ${COMMON_SOURCES} api/doom64.def)
diff --git a/doomsday/apps/plugins/example/CMakeLists.txt b/doomsday/apps/plugins/example/CMakeLists.txt
@@ -7,4 +7,4 @@ include (../PluginConfig.cmake)
 
 include_directories (include)
 
-deng_add_plugin (example src/example.c include/version.h)
+deng_add_plugin (example src/example.c include/version.h api/example.def)
diff --git a/doomsday/apps/plugins/fluidsynth/CMakeLists.txt b/doomsday/apps/plugins/fluidsynth/CMakeLists.txt
@@ -110,7 +110,7 @@ append (CMAKE_CXX_FLAGS_DEBUG "-DDENG_DSFLUIDSYNTH_DEBUG")
 include_directories (include)
 file (GLOB src src/*.cpp include/*.h)
 
-deng_add_plugin (${tgt} ${src} ${SOURCES})
+deng_add_plugin (${tgt} ${src} ${SOURCES} api/dsfluidsynth.def)
 
 # Additional compiler options.
 if (DENG_FLUIDSYNTH_EMBEDDED)

diff --git a/doomsday/apps/plugins/fmod/CMakeLists.txt b/doomsday/apps/plugins/fmod/CMakeLists.txt
@@ -18,7 +18,7 @@ if (TARGET fmodex)
 
     include_directories (include)
     file (GLOB SOURCES src/*.cpp include/*.h)
-    deng_add_plugin (audio_fmod ${SOURCES})
+    deng_add_plugin (audio_fmod ${SOURCES} api/dsfmod.def)
     target_link_libraries (audio_fmod PRIVATE fmodex)
 
     if (APPLE)

diff --git a/doomsday/apps/plugins/heretic/CMakeLists.txt b/doomsday/apps/plugins/heretic/CMakeLists.txt
@@ -14,4 +14,4 @@ file (GLOB SOURCES src/*.c src/*.cpp include/*.h)
 
 deng_find_resources (libheretic.pk3)
 
-deng_add_plugin (heretic ${SOURCES} ${COMMON_SOURCES})
+deng_add_plugin (heretic ${SOURCES} ${COMMON_SOURCES} api/heretic.def)
diff --git a/doomsday/apps/plugins/hexen/CMakeLists.txt b/doomsday/apps/plugins/hexen/CMakeLists.txt
@@ -14,4 +14,4 @@ file (GLOB SOURCES src/*.c src/*.cpp include/*.h)
 
 deng_find_resources (libhexen.pk3)
 
-deng_add_plugin (hexen ${SOURCES} ${COMMON_SOURCES})
+deng_add_plugin (hexen ${SOURCES} ${COMMON_SOURCES} api/hexen.def)
diff --git a/doomsday/apps/plugins/idtech1converter/CMakeLists.txt b/doomsday/apps/plugins/idtech1converter/CMakeLists.txt
@@ -7,4 +7,4 @@ append (CMAKE_CXX_FLAGS_DEBUG "-DDENG_IDTECH1CONVERTER_DEBUG")
 include_directories (include)
 file (GLOB SOURCES src/*.cpp include/*.h)
 
-deng_add_plugin (idtech1converter ${SOURCES})
+deng_add_plugin (idtech1converter ${SOURCES} api/dpidtech1converter.def)
diff --git a/doomsday/apps/plugins/openal/CMakeLists.txt b/doomsday/apps/plugins/openal/CMakeLists.txt
@@ -22,6 +22,6 @@ if (OPENAL_FOUND)
     include_directories (SYSTEM ${OPENAL_INCLUDE_DIR})
 
     file (GLOB SOURCES src/*.cpp include/*.h)
-    deng_add_plugin (audio_openal ${SOURCES})
+    deng_add_plugin (audio_openal ${SOURCES} api/dsopenal.def)
     target_link_libraries (audio_openal PRIVATE ${OPENAL_LIBRARY})
 endif ()
diff --git a/doomsday/apps/plugins/savegameconverter/CMakeLists.txt b/doomsday/apps/plugins/savegameconverter/CMakeLists.txt
@@ -5,4 +5,4 @@ include (../PluginConfig.cmake)
 include_directories (include)
 file (GLOB SOURCES src/*.cpp include/*.h)
 
-deng_add_plugin (savegameconverter ${SOURCES})
+deng_add_plugin (savegameconverter ${SOURCES} api/dpsavegameconverter.def)
diff --git a/doomsday/build/scripts/buildpackage.py b/doomsday/build/scripts/buildpackage.py
@@ -62,7 +62,7 @@ def descend(path):
             pack.write(full, internal)
 
         # Write it out.
-        print "Wrote %s (contains %i files)." % (outputName, len(pack.namelist()))
+        print "Wrote %s (contains %i files)." % (outputName.replace("\\", "/"), len(pack.namelist()))
         pack.close()
 
 if __name__ == "__main__":

diff --git a/doomsday/cmake/Macros.cmake b/doomsday/cmake/Macros.cmake
@@ -519,10 +519,14 @@ function (deng_install_deployqt target)
         if (NOT WINDEPLOYQT_COMMAND)
             message (FATAL_ERROR "windeployqt not available")            
         endif ()
+        set (script "${CMAKE_CURRENT_BINARY_DIR}/deploy-${target}.bat")
+        string (REPLACE "/" "\\" qtPath ${QT_PREFIX_DIR})
+        file (WRITE ${script} "
+            set PATH=${qtPath}\\bin
+            windeployqt --no-translations \"${CMAKE_INSTALL_PREFIX}/bin/${_outName}.exe\"
+        ")
         install (CODE "message (STATUS \"Running windeployqt on ${_outName}.exe...\")
-            execute_process (COMMAND ${WINDEPLOYQT_COMMAND} --no-translations 
-                \"${CMAKE_INSTALL_PREFIX}/bin/${_outName}.exe\" )")
-               # OUTPUT_QUIET ERROR_QUIET)")
+            execute_process (COMMAND ${script} OUTPUT_QUIET ERROR_QUIET)")
     endif ()
 endfunction (deng_install_deployqt)
 

diff --git a/doomsday/sdk/libgui/CMakeLists.txt b/doomsday/sdk/libgui/CMakeLists.txt
@@ -40,8 +40,7 @@ list_remove_matches (SOURCES ".*/displaymode_.*")
 if (NOT DENG_ENABLE_DISPLAYMODE)
     list (APPEND SOURCES src/displaymode_dummy.cpp)
 else ()
-    file (GLOB src src/displaymode_${DENG_PLATFORM_SUFFIX}.*)
-    list (APPEND SOURCES ${src})
+    list (APPEND SOURCES src/displaymode_${DENG_PLATFORM_SUFFIX})
 endif ()
 
 deng_add_library (libgui ${SOURCES} ${HEADERS})