[openjk] 04/04: Add patch to fix installation of game modules

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openjk.

commit 4f8107ae449ca851b2a17a346992c60eed1e9a8b
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 19 22:12:53 2015 +0000

    Add patch to fix installation of game modules
---
 ...stall-game-cgame-ui-DLLs-on-non-Mac-again.patch | 74 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 75 insertions(+)

diff --git a/debian/patches/MP-Install-game-cgame-ui-DLLs-on-non-Mac-again.patch b/debian/patches/MP-Install-game-cgame-ui-DLLs-on-non-Mac-again.patch
new file mode 100644
index 0000000..5b89a2b
--- /dev/null
+++ b/debian/patches/MP-Install-game-cgame-ui-DLLs-on-non-Mac-again.patch
@@ -0,0 +1,74 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Thu, 19 Mar 2015 17:49:38 +0000
+Subject: [MP] Install game, cgame, ui DLLs on non-Mac again
+
+Bug: https://github.com/JACoders/OpenJK/issues/643
+---
+ codemp/cgame/CMakeLists.txt | 10 ++++++++++
+ codemp/game/CMakeLists.txt  | 10 ++++++++++
+ codemp/ui/CMakeLists.txt    | 10 ++++++++++
+ 3 files changed, 30 insertions(+)
+
+diff --git a/codemp/cgame/CMakeLists.txt b/codemp/cgame/CMakeLists.txt
+index 85abfc7..f4c1326 100644
+--- a/codemp/cgame/CMakeLists.txt
++++ b/codemp/cgame/CMakeLists.txt
+@@ -129,6 +129,16 @@ if(MakeApplicationBundles AND BuildMPEngine)
+ 		LIBRARY
+ 		DESTINATION "${MPEngine}.app/Contents/MacOS/base"
+ 		COMPONENT ${JKAMPCoreComponent})
++elseif(WIN32)
++	install(TARGETS ${MPCGame}
++		RUNTIME
++		DESTINATION "OpenJK"
++		COMPONENT ${JKAMPCoreComponent})
++else()
++	install(TARGETS ${MPCGame}
++		LIBRARY
++		DESTINATION "OpenJK"
++		COMPONENT ${JKAMPCoreComponent})
+ endif()
+ 
+ set_target_properties(${MPCGame} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "${MPCGameDefines};${ReleaseDefines}")
+diff --git a/codemp/game/CMakeLists.txt b/codemp/game/CMakeLists.txt
+index c852687..10ad5e2 100644
+--- a/codemp/game/CMakeLists.txt
++++ b/codemp/game/CMakeLists.txt
+@@ -197,6 +197,16 @@ if(MakeApplicationBundles AND BuildMPEngine)
+ 		LIBRARY
+ 		DESTINATION "${MPEngine}.app/Contents/MacOS/base"
+ 		COMPONENT ${JKAMPCoreComponent})
++elseif(WIN32)
++	install(TARGETS ${MPGame}
++		RUNTIME
++		DESTINATION "OpenJK"
++		COMPONENT ${JKAMPCoreComponent})
++else()
++	install(TARGETS ${MPGame}
++		LIBRARY
++		DESTINATION "OpenJK"
++		COMPONENT ${JKAMPCoreComponent})
+ endif()
+ 
+ set_target_properties(${MPGame} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "${MPGameDefines};${ReleaseDefines}")
+diff --git a/codemp/ui/CMakeLists.txt b/codemp/ui/CMakeLists.txt
+index 00a1909..82199c0 100644
+--- a/codemp/ui/CMakeLists.txt
++++ b/codemp/ui/CMakeLists.txt
+@@ -82,6 +82,16 @@ if(MakeApplicationBundles AND BuildMPEngine)
+ 		LIBRARY
+ 		DESTINATION "${MPEngine}.app/Contents/MacOS/base"
+ 		COMPONENT ${JKAMPCoreComponent})
++elseif(WIN32)
++	install(TARGETS ${MPUI}
++		RUNTIME
++		DESTINATION "OpenJK"
++		COMPONENT ${JKAMPCoreComponent})
++else()
++	install(TARGETS ${MPUI}
++		LIBRARY
++		DESTINATION "OpenJK"
++		COMPONENT ${JKAMPCoreComponent})
+ endif()
+ 
+ set_target_properties(${MPUI} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "${MPUIDefines};${ReleaseDefines}")
diff --git a/debian/patches/series b/debian/patches/series
index dc3734f..ce86f60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+MP-Install-game-cgame-ui-DLLs-on-non-Mac-again.patch
 g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
 Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
 Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git