[Armadeus-commitlog] SF.net SVN: armadeus:[1049] trunk/target/demos/input_test

[<ar...@us...>]

Revision: 1049
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1049&view=rev
Author:   artemys
Date:     2009-02-02 21:20:24 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
[DEMOS] input_test was crashing on APF due to SDL_DOUBLEBUF option

Modified Paths:
--------------
    trunk/target/demos/input_test/Makefile
    trunk/target/demos/input_test/main.c

Modified: trunk/target/demos/input_test/Makefile
===================================================================
--- trunk/target/demos/input_test/Makefile	2009-02-02 19:45:22 UTC (rev 1048)
+++ trunk/target/demos/input_test/Makefile	2009-02-02 21:20:24 UTC (rev 1049)
@@ -6,7 +6,7 @@
         INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
 
 	CC:=$(STAGING_DIR)/usr/bin/arm-linux-gcc
-	DEFINES="TARGET"
+	DEFINES="-DAPF"
 	CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
 	LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs)
 else
@@ -14,7 +14,7 @@
 	CFLAGS=`/usr/bin/sdl-config --cflags`
 	LIBS=`/usr/bin/sdl-config --libs`
 	CC=gcc
-	DEFINES="HOST"
+	DEFINES="-DHOST"
 endif
 
 CFLAGS+="-g"
@@ -27,7 +27,7 @@
 
 
 main.o: main.c
-	$(CC) $(CFLAGS) -c -o $@ $^
+	$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
 
 $(EXEC_NAME): main.o
 	$(CC)  $(LIBS) -o $@ $^

Modified: trunk/target/demos/input_test/main.c
===================================================================
--- trunk/target/demos/input_test/main.c	2009-02-02 19:45:22 UTC (rev 1048)
+++ trunk/target/demos/input_test/main.c	2009-02-02 21:20:24 UTC (rev 1049)
@@ -190,8 +190,11 @@
     }
 }
 
-
+#ifdef APF
+#define SDL_VIDEO_FLAGS (SDL_ANYFORMAT)
+#else /* SDL_DOUBLEBUF crashes on APF */
 #define SDL_VIDEO_FLAGS (SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_ANYFORMAT)
+#endif
 #define SCREEN_WIDTH  320
 #define SCREEN_HEIGHT 240
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.