File dark-oberon-Makefile.patch of Package dark-oberon

--- dark-oberon/src/doberon.cpp
+++ dark-oberon/src/doberon.cpp
@@ -254,7 +254,7 @@
 {
 #ifdef WINDOWS
   // data directory is application path on Windows
-  data_dir = argv[0];
+  data_dir = "<DATADIR>";
   data_dir = data_dir.substr(0, data_dir.rfind('\\') + 1);
 
   user_dir = data_dir;
--- dark-oberon/src/dodata.h
+++ dark-oberon/src/dodata.h
@@ -47,13 +47,13 @@
 #define TEX_MAX_COUNT       50
 
 /** Filename of common data. */ 
-#define DAT_COMMON_NAME     (data_dir + "dat/common.dat").c_str()
+#define DAT_COMMON_NAME     "<DATADIR>/dat/common.dat"
 /** Filename of fonts data. */
-#define DAT_FONTS_NAME      (data_dir + "dat/fonts.dat").c_str()
+#define DAT_FONTS_NAME      "<DATADIR>/dat/fonts.dat"
 /** Filename of mouse cursors data. */
-#define DAT_CURSORS_NAME    (data_dir + "dat/cursors.dat").c_str()
+#define DAT_CURSORS_NAME    "<DATADIR>/dat/cursors.dat"
 /** Filename of gui data. */
-#define DAT_GUI_NAME        (data_dir + "dat/gui.dat").c_str()
+#define DAT_GUI_NAME        "<DATADIR>/dat/gui.dat"
 
 #define DAT_SEGMENTS_COUNT  3           //!< Number of segments.
 
--- dark-oberon/src/domap.h
+++ dark-oberon/src/domap.h
@@ -45,7 +45,7 @@
 // Definitions
 //=========================================================================
 
-#define MAP_PATH  (data_dir + "maps/").c_str()  //!< Directory containing maps.
+#define MAP_PATH  "<DATADIR>/maps/"  //!< Directory containing maps.
 
 #define MAP_MAX_SIZE          240   //!< Maximal map width or height.
 #define MAP_AREA_SIZE         10    //!< Map area size.
--- dark-oberon/src/doraces.h
+++ dark-oberon/src/doraces.h
@@ -53,7 +53,7 @@
 // Definitions
 //=========================================================================
 
-#define RAC_PATH  (data_dir + "races/").c_str()       //!< Path to data race directory.
+#define RAC_PATH  "<DATADIR>/races/"      //!< Path to data race directory.
   
 #define RAC_MAX_UNIT_SIZE           15    //!< Max. unit width or height.
 #define RAC_MAX_NAME_LENGTH         30    //!< Max. available race name length.
--- dark-oberon/src/doschemes.h
+++ dark-oberon/src/doschemes.h
@@ -43,7 +43,7 @@
 // Macros
 //=========================================================================
 
-#define SCH_PATH    (data_dir + "schemes/").c_str()
+#define SCH_PATH    "<DATADIR>/schemes/"
 
 #define SCH_MAX_NAME_LENGTH  30
 #define SCH_SEGMENT_MAX_NAME_LENGTH  30
diff -Nur dark-oberon/src/create_makefile.sh dark-oberon-new/src/create_makefile.sh
--- dark-oberon/src/create_makefile.sh	2008-11-17 21:13:39.000000000 +0100
+++ dark-oberon-new/src/create_makefile.sh	2015-11-22 23:50:16.900243063 +0100
@@ -6,10 +6,10 @@
 
 ##############################################################################
 
-CPPFLAGS='-g -Wall -O -D_GNU_SOURCE=1 -D_REENTRANT'
+CPPFLAGS='$(CXXFLAGS) -Wall -O -D_GNU_SOURCE=1 -D_REENTRANT'
 TARGETS='../dark-oberon'
 INCLUDES='-I/usr/include -I/usr/include/SDL -I../libs'
-LIBPATHS='-L/usr/lib -L/usr/local/lib -L../libs'
+LIBPATHS='-L/usr/lib -L/usr/lib/glfw2 -L/usr/local/lib -L../libs'
 LIBRARIES='-lpthread -lglfw -lGL -lX11 -lGLU -lXrandr -lSDL -lSDL_mixer'
 CPP='g++ $(CPPFLAGS) $(INCLUDES) $(DEFINES)'
 DATA_DIR=''
openSUSE Build Service is sponsored by