This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 49254431f6850cfc81f1da8325f13c4d7eae1a9a
Author: Tobias Frost <t...@coldtobi.de>
Date: Fri Jun 19 21:51:20 2015 +0200
Refactor patch to disable precompiled headers -- making it ready to be
upstreamable
---
.../patches/75-local-no-precompiled-header.patch | 291 ++++++++++++++-------
debian/patches/80-disable-cpu-features.patch | 4 +-
debian/rules | 5 +-
3 files changed, 204 insertions(+), 96 deletions(-)
diff --git a/debian/patches/75-local-no-precompiled-header.patch
b/debian/patches/75-local-no-precompiled-header.patch
index 26f3258..ccace27 100644
--- a/debian/patches/75-local-no-precompiled-header.patch
+++ b/debian/patches/75-local-no-precompiled-header.patch
@@ -1,79 +1,150 @@
Description: Do not precompile headers
As this will break ccache (at least without introducing CCACHE_SLOPPINESS)
+ Updated to use a CMake option to disable/enable
Author: Tobias Frost <t...@debian.org>
Forwarded: no, Debian specific
-Last-Update: 2014-10-07
+Last-Update: 2015-06-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/neo/idlib/CMakeLists.txt
+++ b/neo/idlib/CMakeLists.txt
-@@ -101,38 +101,38 @@
+@@ -101,6 +101,7 @@
add_library(idlib ${ID_SOURCES_ALL} ${ID_INCLUDES_ALL})
else()
-- foreach( src_file ${ID_PRECOMPILED_SOURCES} )
-- #message(STATUS "-include precompiled.h for ${src_file}")
-- set_source_files_properties(
-- ${src_file}
-- PROPERTIES
-- COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h"
-- )
-- endforeach()
++ if (USE_PRECOMPILED_HEADERS)
+ foreach( src_file ${ID_PRECOMPILED_SOURCES} )
+ #message(STATUS "-include precompiled.h for ${src_file}")
+ set_source_files_properties(
+@@ -109,9 +110,11 @@
+ COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h"
+ )
+ endforeach()
-
-+## foreach( src_file ${ID_PRECOMPILED_SOURCES} )
-+## #message(STATUS "-include precompiled.h for ${src_file}")
-+## set_source_files_properties(
-+## ${src_file}
-+## PROPERTIES
-+## COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h"
-+## )
-+## endforeach()
-+##
++ endif()
++
include_directories(.)
-- # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-- STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
-- SET(_compiler_FLAGS ${${_flags_var_name}})
-- GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-- FOREACH(item ${_directory_flags})
-- LIST(APPEND _compiler_FLAGS " -I${item}")
-- ENDFOREACH(item)
-+## # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-+## STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
-+## SET(_compiler_FLAGS ${${_flags_var_name}})
-+## GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-+## FOREACH(item ${_directory_flags})
-+## LIST(APPEND _compiler_FLAGS " -I${item}")
-+## ENDFOREACH(item)
++ if (USE_PRECOMPILED_HEADERS)
+ # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
+ STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
+ SET(_compiler_FLAGS ${${_flags_var_name}})
+@@ -119,20 +122,25 @@
+ FOREACH(item ${_directory_flags})
+ LIST(APPEND _compiler_FLAGS " -I${item}")
+ ENDFOREACH(item)
++ endif()
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
LIST(APPEND _compiler_FLAGS ${_directory_flags})
SEPARATE_ARGUMENTS(_compiler_FLAGS)
-- add_custom_target(precomp_header_idlib ALL
-- COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
-- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- COMMENT "Creating idlib/precompiled.h.gch for idlib"
-- )
-+## add_custom_target(precomp_header_idlib ALL
-+## COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
-+## WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+## COMMENT "Creating idlib/precompiled.h.gch for idlib"
-+## )
++ if (USE_PRECOMPILED_HEADERS)
+ add_custom_target(precomp_header_idlib ALL
+ COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMENT "Creating idlib/precompiled.h.gch for idlib"
+ )
++ endif()
add_library(idlib ${ID_SOURCES_ALL} ${ID_INCLUDES_ALL})
-- add_dependencies(idlib precomp_header_idlib)
-+## add_dependencies(idlib precomp_header_idlib)
++ if (USE_PRECOMPILED_HEADERS)
+ add_dependencies(idlib precomp_header_idlib)
++ endif()
endif()
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
-@@ -1491,22 +1491,22 @@
- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
+@@ -8,6 +8,9 @@
+
+ option(MONOLITH
+ "Embed game logic into main executable" ON)
++
++option(USE_PRECOMPILED_HEADERS
++ "Use precompiled headers during build" ON)
+
+ option(SDL2
+ "Use SDL2 instead of SDL1.2" ON)
+@@ -1347,33 +1364,35 @@
+ list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
+
+- set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES}
${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/framework/precompiled.cpp)
+-
+-
+- set_source_files_properties(
+- ${RBDOOM3_PRECOMPILED_SOURCES}
+- PROPERTIES
+- COMPILE_FLAGS "/Yuprecompiled.h"
+- OBJECT_DEPENDS "precompiled.pch"
+-
+- )
++ if(USE_PRECOMPILED_HEADERS)
++ set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES}
${GLEW_SOURCES})
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/framework/precompiled.cpp)
+
+- set_source_files_properties(framework/precompiled.cpp
+- PROPERTIES
+- COMPILE_FLAGS "/Ycprecompiled.h"
+- OBJECT_OUTPUTS "precompiled.pch"
+- )
++
++ set_source_files_properties(
++ ${RBDOOM3_PRECOMPILED_SOURCES}
++ PROPERTIES
++ COMPILE_FLAGS "/Yuprecompiled.h"
++ OBJECT_DEPENDS "precompiled.pch"
++
++ )
++
++ set_source_files_properties(framework/precompiled.cpp
++ PROPERTIES
++ COMPILE_FLAGS "/Ycprecompiled.h"
++ OBJECT_OUTPUTS "precompiled.pch"
++ )
++ endif()
+
+ list(APPEND RBDOOM3_SOURCES ${WIN32_RESOURCES})
+
+@@ -1479,73 +1498,81 @@
+
+ list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
+
+- set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES}
${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
+- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
+-
- foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
- #message(STATUS "-include precompiled.h for ${src_file}")
- set_source_files_properties(
@@ -82,15 +153,7 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
- COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h"
- )
- endforeach()
-+## foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
-+## #message(STATUS "-include precompiled.h for ${src_file}")
-+## set_source_files_properties(
-+## ${src_file}
-+## PROPERTIES
-+## COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h"
-+## )
-+## endforeach()
-
+-
- # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
- STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
- SET(_compiler_FLAGS ${${_flags_var_name}})
@@ -98,60 +161,106 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
- FOREACH(item ${_directory_flags})
- LIST(APPEND _compiler_FLAGS " -I${item}")
- ENDFOREACH(item)
-+## # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-+## STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
-+## SET(_compiler_FLAGS ${${_flags_var_name}})
-+## GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-+## FOREACH(item ${_directory_flags})
-+## LIST(APPEND _compiler_FLAGS " -I${item}")
-+## ENDFOREACH(item)
++ if(USE_PRECOMPILED_HEADERS)
++ set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES}
${GLEW_SOURCES})
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
++ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
++
++ foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
++ #message(STATUS "-include precompiled.h for
${src_file}")
++ set_source_files_properties(
++ ${src_file}
++ PROPERTIES
++ COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h"
++ )
++ endforeach()
++ # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
++ STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}"
_flags_var_name)
++ SET(_compiler_FLAGS ${${_flags_var_name}})
++ GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
++ FOREACH(item ${_directory_flags})
++ LIST(APPEND _compiler_FLAGS " -I${item}")
++ ENDFOREACH(item)
++ endif()
++
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
LIST(APPEND _compiler_FLAGS ${_directory_flags})
-@@ -1515,11 +1515,11 @@
- # we need to recreate the precompiled header for RBDoom3BFG
- # (i.e. can't use the one created for idlib before)
- # because some definitions (e.g. -D__IDLIB__ -D__DOOM_DLL__) differ
+ SEPARATE_ARGUMENTS(_compiler_FLAGS)
+
+- # we need to recreate the precompiled header for RBDoom3BFG
+- # (i.e. can't use the one created for idlib before)
+- # because some definitions (e.g. -D__IDLIB__ -D__DOOM_DLL__) differ
- add_custom_target(precomp_header_rbdoom3bfg ALL
- COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header idlib/precompiled.h -o idlib/precompiled.h.gch
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT "Creating idlib/precompiled.h.gch for
RBDoom3BFG"
- )
-+## add_custom_target(precomp_header_rbdoom3bfg ALL
-+## COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header idlib/precompiled.h -o idlib/precompiled.h.gch
-+## WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+## COMMENT "Creating idlib/precompiled.h.gch for
RBDoom3BFG"
-+## )
++ if(USE_PRECOMPILED_HEADERS)
++ # we need to recreate the precompiled header for RBDoom3BFG
++ # (i.e. can't use the one created for idlib before)
++ # because some definitions (e.g. -D__IDLIB__ -D__DOOM_DLL__)
differ
++ add_custom_target(precomp_header_rbdoom3bfg ALL
++ COMMAND ${CMAKE_CXX_COMPILER}
${_compiler_FLAGS} -x c++-header idlib/precompiled.h -o idlib/precompiled.h.gch
++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++ COMMENT "Creating idlib/precompiled.h.gch for
RBDoom3BFG"
++ )
++ endif()
if(WIN32)
set(remove_command "del")
-@@ -1529,14 +1529,14 @@
- # it's ugly enough that the precompiled header binary needs to be in
the
- # source directory (instead of the build directory), so let's at least
- # delete it after build.
+ else()
+ set(remove_command "rm")
+ endif()
+- # it's ugly enough that the precompiled header binary needs to be in
the
+- # source directory (instead of the build directory), so let's at least
+- # delete it after build.
- add_custom_target(rm_precomp_header ALL
- COMMAND ${remove_command} "idlib/precompiled.h.gch"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT "remove idlib/precompiled.h.gch"
- )
-+## add_custom_target(rm_precomp_header ALL
-+## COMMAND ${remove_command} "idlib/precompiled.h.gch"
-+## WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+## COMMENT "remove idlib/precompiled.h.gch"
-+## )
- # make sure this is run after creating idlib
+- # make sure this is run after creating idlib
- add_dependencies(precomp_header_rbdoom3bfg idlib)
-+# add_dependencies(precomp_header_rbdoom3bfg idlib)
++ if (USE_PRECOMPILED_HEADERS)
++ # it's ugly enough that the precompiled header binary needs to
be in the
++ # source directory (instead of the build directory), so let's
at least
++ # delete it after build.
++ add_custom_target(rm_precomp_header ALL
++ COMMAND ${remove_command}
"idlib/precompiled.h.gch"
++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++ COMMENT "remove idlib/precompiled.h.gch"
++ )
++
++ # make sure this is run after creating idlib
++ add_dependencies(precomp_header_rbdoom3bfg idlib)
++ endif()
add_executable(rbdoom3bfg WIN32 ${RBDOOM3_SOURCES})
-
-@@ -1544,7 +1544,7 @@
- add_dependencies(rbdoom3bfg precomp_header_rbdoom3bfg)
-
- # make sure precompiled header is deleted after executable is compiled
+-
+- # make sure precompiled header is created before executable is compiled
+- add_dependencies(rbdoom3bfg precomp_header_rbdoom3bfg)
+-
+- # make sure precompiled header is deleted after executable is compiled
- add_dependencies(rm_precomp_header rbdoom3bfg)
-+## add_dependencies(rm_precomp_header rbdoom3bfg)
-
+-
++
++ if (USE_PRECOMPILED_HEADERS)
++ # make sure precompiled header is created before executable is
compiled
++ add_dependencies(rbdoom3bfg precomp_header_rbdoom3bfg)
++
++ # make sure precompiled header is deleted after executable is
compiled
++ add_dependencies(rm_precomp_header rbdoom3bfg)
++ endif()
if(NOT WIN32)
+ if(NOT "${CMAKE_SYSTEM}" MATCHES "Darwin")
diff --git a/debian/patches/80-disable-cpu-features.patch
b/debian/patches/80-disable-cpu-features.patch
index dbb0ded..ebf1c59 100644
--- a/debian/patches/80-disable-cpu-features.patch
+++ b/debian/patches/80-disable-cpu-features.patch
@@ -9,7 +9,7 @@ Last-Update: 2015-06-19
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
-@@ -36,6 +36,12 @@
+@@ -39,6 +39,12 @@
option(USE_SYSTEM_LIBGLEW
"Use the system libglew instead of the bundled one" OFF)
@@ -22,7 +22,7 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
if(UNIX)
set(OPENAL TRUE)
endif()
-@@ -61,7 +67,15 @@
+@@ -64,7 +70,15 @@
#add_definitions(-Wall)
add_definitions(-Werror=format-security)
add_definitions(-Werror=format)
diff --git a/debian/rules b/debian/rules
index 2e8aa43..cc77dd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,8 @@ override_dh_auto_configure:
-DSDL2=ON -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-DUSE_SYSTEM_ZLIB=ON -DUSE_SYSTEM_LIBPNG=ON \
-DUSE_SYSTEM_LIBJPEG=ON -DUSE_SYSTEM_LIBGLEW=ON \
- -DCPU_TYPE=$(DEB_BUILD_ARCH_CPU) -DCPU_OPTIMIZATION=""
-DUSE_INTRINSICS=OFF
-
- #-DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DCPU_TYPE=$(DEB_BUILD_ARCH_CPU) -DCPU_OPTIMIZATION=""
-DUSE_INTRINSICS=OFF \
+ -DUSE_PRECOMPILED_HEADERS=OFF
override_dh_installchangelogs:
# We won't have a ChangeLog if packaging from a released tarball.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
