Includes optional BUILD_NUMBER when building.

Nuked more windows-style newlines.

Makefile.linux

@@ -9,12 +9,20 @@ STRIP = strip
 NAME=wizznic
 TARGET= $(NAME)
 
+ifeq ($(DATADIR),)
+  DATADIR="./"
+endif 
+
+DEFS = -DDATADIR="\"$(DATADIR)\""
+
 #Add the PER_USER_FILES define if the DATADIR is set
 ifneq ($(DATADIR),)
-	PUF=-DPER_USER_FILES
+        DEFS +=-DPER_USER_FILES
 endif
 
-DEFS = $(PUF) -DDATADIR="\"$(DATADIR)\""
+ifneq ($(BUILD_NUMBER),)
+  DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
+endif
 
 INCS =  -I. -I/usr/include -I/usr/include/SDL
 

Makefile.psp

@@ -1,3 +1,12 @@
+ifeq ($(DATADIR),)
+  DATADIR="./"
+endif 
+
+DEFS = -DDATADIR="\"$(DATADIR)\""
+
+ifneq ($(BUILD_NUMBER),)
+  DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
+endif
 
 TARGET	= wizznic
 

Makefile.win

@@ -14,6 +14,10 @@ TARGET= $(NAME)
 
 DEFS = -DDATADIR="\"./\"" -DWIN32 -DWIN32_CROSS
 
+ifneq ($(BUILD_NUMBER),)
+  DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
+endif
+
 INCS =  -I.
 
 LDFLAGS=$(CFLAGS)

Makefile.wiz

@@ -13,6 +13,10 @@ TARGET= $(NAME)-wiz
 
 DEFS = -DWIZ -DIS_LITTLE_ENDIAN -D_REENTRANT -DGP2X_ASM
 
+ifneq ($(BUILD_NUMBER),)
+  DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
+endif
+
 INCS =  -I. -I$(OPEN2X)/include -I$(OPEN2X)/include/SDL
 
 LDFLAGS=$(CFLAGS) -L$(OPEN2X)/lib

defs.h

@@ -1,4 +1,4 @@
-#ifndef DEFS_H_INCLUDED
+#ifndef DEFS_H_INCLUDED
 #define DEFS_H_INCLUDED
 
 /************************************************************************
@@ -17,42 +17,37 @@
  * You should have received a copy of the GNU General Public License    *
  * along with Foobar.  If not, see <http://www.gnu.org/licenses/>.      *
  ************************************************************************/
-
-#define FIELDSIZE 11
-
-//Bricks
-#define BRICKSBEGIN 1 //The first brick
-#define BRICKSEND 10  //The last brick
-
-//Tiles
-#define MOVERVERT 11  //Vertical (up-down) moving platform
-#define MOVERHORIZ 12 //Horizontal (left-right) moving platform
-#define ONEWAYLEFT 13 //Bricks standing directly on this can only be moved left
-#define ONEWAYRIGHT 14//Only moved right
-#define GLUE 15       //Can't be moved at all
-#define STDWALL 16    //Standard issue free-standing wall-tile
-#define RESERVED 17   //Reserved for bricks that are moving/exploding.
-#define TELESRC 18    //Teleport source brick
-
-#define NUMTILES 18 //type 1 = index 0 in tile array
-
-#define MOVERCOUNTDOWN 500  //Ms pause before mover switch direction
+
+#define FIELDSIZE 11
+
+//Bricks
+#define BRICKSBEGIN 1 //The first brick
+#define BRICKSEND 10  //The last brick
+
+//Tiles
+#define MOVERVERT 11  //Vertical (up-down) moving platform
+#define MOVERHORIZ 12 //Horizontal (left-right) moving platform
+#define ONEWAYLEFT 13 //Bricks standing directly on this can only be moved left
+#define ONEWAYRIGHT 14//Only moved right
+#define GLUE 15       //Can't be moved at all
+#define STDWALL 16    //Standard issue free-standing wall-tile
+#define RESERVED 17   //Reserved for bricks that are moving/exploding.
+#define TELESRC 18    //Teleport source brick
+
+#define NUMTILES 18 //type 1 = index 0 in tile array
+
+#define MOVERCOUNTDOWN 500  //Ms pause before mover switch direction
 
 //Milliseconds we show the small pointer before hiding it again (in case people don't want to use mouse anyway)
-#define POINTER_SHOW_TIMEOUT 4000
-
-#define ONEWAYSPEED 10
-
-#define DIRLEFT -1
-#define DIRRIGHT 1
-
-#define DIRUP -1
-#define DIRDOWN 1
-
-//Data directory
-#ifndef DATADIR
-  #define DATADIR "./"
-#endif
+#define POINTER_SHOW_TIMEOUT 4000
+
+#define ONEWAYSPEED 10
+
+#define DIRLEFT -1
+#define DIRRIGHT 1
+
+#define DIRUP -1
+#define DIRDOWN 1
 
 //Get defines from platform .h file
 #if defined(PANDORA)  //Pandora
@@ -69,45 +64,45 @@
 
 
 //Half the resolution is practical for centering content
-#define HSCREENW  SCREENW/2
-#define HSCREENH  SCREENH/2
-
-
-//Board offsets
-#define boardOffsetX 90 + ( HSCREENW - 160 )
-#define boardOffsetY 10 + ( HSCREENH - 120 )
-
-//Board sizes
-#define brickSize 20
-#define NOBLOCK 0
-#define DOBLOCK 1
-#define CURLOCK 2
-
-//Speeds
-#define CURSORMOVESPEED 5
-#define VERTMOVERSPEED 1
-#define HORIZMOVERSPEED 1
+#define HSCREENW  SCREENW/2
+#define HSCREENH  SCREENH/2
+
+
+//Board offsets
+#define boardOffsetX 90 + ( HSCREENW - 160 )
+#define boardOffsetY 10 + ( HSCREENH - 120 )
+
+//Board sizes
+#define brickSize 20
+#define NOBLOCK 0
+#define DOBLOCK 1
+#define CURLOCK 2
+
+//Speeds
+#define CURSORMOVESPEED 5
+#define VERTMOVERSPEED 1
+#define HORIZMOVERSPEED 1
 #define FALLINGSPEED 2
-
-//Delays
-#define REPEATDELAY 200
+
+//Delays
+#define REPEATDELAY 200
 
 //Particle system layer
 #define PSYS_LAYER_NODRAW 0
 #define PSYS_LAYER_TOP 1
 #define PSYS_LAYER_UNDERBRICK 2
 #define PSYS_LAYER_UNDERDEATHANIM 3
-
-//To avoid crashing a new version trying to read old highscore files (hmm, as if it's ever gonna happen)
-#define STATS_FILE_FORMAT_VERSION 1
 
-//Url where stats are
+//To avoid crashing a new version trying to read old highscore files (hmm, as if it's ever gonna happen)
+#define STATS_FILE_FORMAT_VERSION 1
+
+//Url where stats are
 #define STATS_SERVER_URL "http://dusted.dk/wizznic"
 
 #ifndef STR_PLATFORM
   #ifndef STR_PLATFORM
     #define STR_PLATFORM "Unknown"
   #endif
-#endif
-
+#endif
+
 #endif // DEFS_H_INCLUDED