[SCM] logic game ported from ATARI XE/XL branch, master, updated. debian/0.65.6+dfsg-1-10-g70a01e5

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 70a01e57a0ccb85e6cfeecb051a49d8f2c7b8430
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun Dec 5 18:52:12 2010 +0100

    Actually use CPPFLAGS in the build, if it's defined (thanks again to Peter Pentchev!).

diff --git a/debian/patches/Makefile.diff b/debian/patches/Makefile.diff
index 925f3f9..6517f92 100644
--- a/debian/patches/Makefile.diff
+++ b/debian/patches/Makefile.diff
@@ -46,12 +46,13 @@ Last-Update: 2010-12-03
  # Comment out the line below if you want to disable the designer
  DESIGNER=-DHAVE_DESIGNER
  
-@@ -36,17 +36,17 @@
+@@ -36,17 +36,18 @@
  
  # These should be ok for most
  SDL_CONFIG?=sdl-config
 -CFLAGS?=-O3 -pipe
 -CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
++CPPFLAGS?=
 +CFLAGS?=-O3
 +CFLAGS+=-pipe -Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
  	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
@@ -68,7 +69,13 @@ Last-Update: 2010-12-03
  
  # You won't need to alter anything below
  all: $(SOURCES) $(TARGET)
-@@ -60,7 +60,7 @@
+@@ -55,12 +56,12 @@
+ 	$(LINK) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
  .PHONY: all clean install
  
  clean:
@@ -77,7 +84,7 @@ Last-Update: 2010-12-03
  
  install:
  	@if [ "$(PACKAGE_DATA_DIR)" = ./data ] ; then \
-@@ -68,10 +68,6 @@
+@@ -68,10 +69,6 @@
  		exit 2; \
  	fi			
  	mkdir -p $(PACKAGE_DATA_DIR)/levels
@@ -88,7 +95,7 @@ Last-Update: 2010-12-03
  	mkdir -p $(PACKAGE_DATA_DIR)/rob
  	mkdir -p $(PACKAGE_DATA_DIR)/skins/original
  	mkdir -p $(PACKAGE_DATA_DIR)/skins/tronic
-@@ -87,19 +83,10 @@
+@@ -87,19 +84,10 @@
  	mkdir -p $(BINDIR)
  	mkdir -p $(DOCDIR)
  	cp data/levels/* $(PACKAGE_DATA_DIR)/levels/
@@ -108,7 +115,7 @@ Last-Update: 2010-12-03
  	cp data/locales/cz_CZ/* $(PACKAGE_DATA_DIR)/locales/cz_CZ/
  	cp data/locales/de_DE/* $(PACKAGE_DATA_DIR)/locales/de_DE/
  	cp data/locales/en_GB/* $(PACKAGE_DATA_DIR)/locales/en_GB/
-@@ -109,8 +96,3 @@
+@@ -109,8 +97,3 @@
  	cp data/locales/sk_SK/* $(PACKAGE_DATA_DIR)/locales/sk_SK/
  	cp data/locales/sv_SE/* $(PACKAGE_DATA_DIR)/locales/sv_SE/
  	cp $(TARGET) $(BINDIR)/

-- 
logic game ported from ATARI XE/XL