This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository openjk.
commit cac96b48da7d54e2cf2d4fba487050487031a21a Author: Simon McVittie <[email protected]> Date: Mon Mar 23 21:39:28 2015 +0000 remove upstreamed patch --- ...stall-game-cgame-ui-DLLs-on-non-Mac-again.patch | 74 ---------------------- debian/patches/series | 1 - 2 files changed, 75 deletions(-) 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 deleted file mode 100644 index 5b89a2b..0000000 --- a/debian/patches/MP-Install-game-cgame-ui-DLLs-on-non-Mac-again.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Simon McVittie <[email protected]> -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 ce86f60..dc3734f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
