# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1274656753 -10800
# Node ID 678924af914990d27646235b16394c986edbca28
# Parent  561fa061caf66fb1c16f899bf33fe7f41408f4ff
Buildsystem changes, build zaxplay or orig only when the target probably allows it.

diff -r 561fa061caf6 -r 678924af9149 Makefile
--- a/Makefile	Mon May 24 02:18:39 2010 +0300
+++ b/Makefile	Mon May 24 02:19:13 2010 +0300
@@ -1,7 +1,8 @@
 ### Global settings
 CFLAGS += -W -Wall -O3
 LDFLAGS +=
-MINGW_PATH=/usr/local/i386-mingw32
+MINGW32_PATH=/usr/local/i386-mingw32
+MINGW64_PATH=/foo/bar
 
 ### Subdirectories to build
 SUBDIRS=pwplib peluce nykyaeka oldchsool pwpzax
@@ -32,6 +33,7 @@
 config.mak:
 	@echo "" > $@
 	@echo "# Build target: $(XTARGET)" >> $@
+	@echo "XTARGET=$(XTARGET)" >> $@
 	@echo "PATH=$(PATH)" >> $@
 	@echo "CC=$(CC)" >> $@
 	@echo "AR=$(AR)" >> $@
@@ -73,11 +75,18 @@
 	$(MAKE) config.mak XTARGET="$@" XCFLAGS="-DUNIX -DDRIVE_SDL $$endianflags `sdl-config --cflags`" XLDFLAGS="`sdl-config --libs` -lm" && \
 	$(MAKE) all
 
-sdl-win32: endianchk
+sdl-win32:
 	$(RM) config.mak && \
-	$(MAKE) config.mak PATH="$(MINGW_PATH)/bin:/usr/bin:/bin" BINEXT=".exe" CC="gcc" \
-	XTARGET="$@" XCFLAGS="-DDRIVE_SDL `$(MINGW_PATH)/bin/sdl-config --cflags`" \
-	XLDFLAGS="-s -L$(MINGW_PATH)/lib/ `$(MINGW_PATH)/bin/sdl-config --libs` -lwinmm" && \
+	$(MAKE) config.mak PATH="$(MINGW32_PATH)/bin:/usr/bin:/bin" BINEXT=".exe" CC="gcc" \
+	XTARGET="$@" XCFLAGS="-DDRIVE_SDL `$(MINGW32_PATH)/bin/sdl-config --cflags`" \
+	XLDFLAGS="-s -L$(MINGW32_PATH)/lib/ `$(MINGW32_PATH)/bin/sdl-config --libs` -lwinmm" && \
+	$(MAKE) all
+
+sdl-win64:
+	$(RM) config.mak && \
+	$(MAKE) config.mak PATH="$(MINGW64_PATH)/bin:/usr/bin:/bin" BINEXT=".exe" CC="gcc" \
+	XTARGET="$@" XCFLAGS="-DDRIVE_SDL `$(MINGW64_PATH)/bin/sdl-config --cflags`" \
+	XLDFLAGS="-s -L$(MINGW64_PATH)/lib/ `$(MINGW64_PATH)/bin/sdl-config --libs` -lwinmm" && \
 	$(MAKE) all
 
 .dummy:
diff -r 561fa061caf6 -r 678924af9149 pwpzax/Makefile
--- a/pwpzax/Makefile	Mon May 24 02:18:39 2010 +0300
+++ b/pwpzax/Makefile	Mon May 24 02:19:13 2010 +0300
@@ -1,6 +1,15 @@
 include ../config.mak
 
-TARGETS=zaxplay$(BINEXT)
+TARGETS=
+ifeq ($(XTARGET),sdl)
+TARGETS += zaxplay$(BINEXT)
+endif
+ifeq ($(XTARGET),sdl-win32)
+TARGETS += zaxplay$(BINEXT)
+endif
+ifeq ($(XTARGET),linux)
+TARGETS += orig$(BINEXT)
+endif
 
 all: $(TARGETS)
 
@@ -9,3 +18,7 @@
 zaxplay$(BINEXT): zaxplay.c
 	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
 
+
+orig: orig.c
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+