r11668 - in packages/trunk/freegish/debian: . patches

[Lubos Novak]

Author: lubos-guest
Date: 2011-01-17 09:05:04 +0000 (Mon, 17 Jan 2011)
New Revision: 11668

Modified:
   packages/trunk/freegish/debian/patches/cmake_installation.patch
   packages/trunk/freegish/debian/rules
Log:
rename cmake option
include embedded glext.h only for Windows

Modified: packages/trunk/freegish/debian/patches/cmake_installation.patch
===================================================================
--- packages/trunk/freegish/debian/patches/cmake_installation.patch	2011-01-17 08:58:56 UTC (rev 11667)
+++ packages/trunk/freegish/debian/patches/cmake_installation.patch	2011-01-17 09:05:04 UTC (rev 11668)
@@ -1,8 +1,9 @@
+Include embedded glext.h only for windows
 Add installation
 Index: freegish-1.53/CMakeLists.txt
 ===================================================================
---- freegish-1.53.orig/CMakeLists.txt	2010-12-30 14:14:43.000000000 +0100
-+++ freegish-1.53/CMakeLists.txt	2010-12-30 14:18:04.000000000 +0100
+--- freegish-1.53.orig/CMakeLists.txt	2011-01-16 19:10:25.000000000 +0100
++++ freegish-1.53/CMakeLists.txt	2011-01-16 19:11:59.000000000 +0100
 @@ -1,9 +1,15 @@
  cmake_minimum_required(VERSION 2.6)
  
@@ -12,20 +13,32 @@
  set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-extras/;${CMAKE_MODULE_PATH}")
 -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_SOURCE_DIR}")
 +
-+OPTION(INSTALL_HFS "Install into Linux HFS" OFF)
++OPTION(INSTALL_FHS "Install into Linux FHS" OFF)
 +
 +#don't pollute source dir
-+if(NOT ${INSTALL_HFS})
++if(NOT ${INSTALL_FHS})
 +    set(EXECUTABLE_OUTPUT_PATH "${PROJECT_SOURCE_DIR}")
-+endif(NOT ${INSTALL_HFS})
++endif(NOT ${INSTALL_FHS})
  
  # Uncomment this to hardcode the data path. On the command line, you
  # would actually give -DDATAPATH='"/usr/share/games/gish"' or similar
-@@ -149,12 +155,44 @@
+@@ -141,7 +147,6 @@
+     sdl/file.h
+     sdl/sdl.h
+     sdl/video.h
+-    video/glext.h
+     video/glfunc.h
+     video/opengl.h
+     video/text.h
+@@ -149,12 +154,48 @@
      config.h
  )
  
 -add_executable(gish ${GISH_SRCS} ${GISH_H})
++if(WIN)
++    list(append GISH_H video/glext.h)
++endif(WIN)
++
 +add_executable(freegish ${GISH_SRCS} ${GISH_H})
  
 -target_link_libraries(gish
@@ -49,9 +62,9 @@
 +    endif(UNIX)
 +endif(NOT DATA_DIR)
 +
-+if(${INSTALL_HFS})
++if(${INSTALL_FHS})
 +    ADD_DEFINITIONS(-DDATAPATH="${DATA_DIR}")
-+endif(${INSTALL_HFS})
++endif(${INSTALL_FHS})
 +
 +install(TARGETS freegish DESTINATION ${BIN_DIR})
 +

Modified: packages/trunk/freegish/debian/rules
===================================================================
--- packages/trunk/freegish/debian/rules	2011-01-17 08:58:56 UTC (rev 11667)
+++ packages/trunk/freegish/debian/rules	2011-01-17 09:05:04 UTC (rev 11668)
@@ -3,7 +3,7 @@
 	dh --buildsystem=cmake --with quilt $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DINSTALL_HFS=1 -DBIN_DIR=/usr/games -DDATA_DIR=/usr/share/games/freegish
+	dh_auto_configure -- -DINSTALL_FHS=1 -DBIN_DIR=/usr/games -DDATA_DIR=/usr/share/games/freegish
 
 override_dh_strip:
 	dh_strip --dbg-package=freegish-dbg