[Armadeus-commitlog] SF.net SVN: armadeus: [790] trunk/target/demos/armanoid

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

Revision: 790
          http://armadeus.svn.sourceforge.net/armadeus/?rev=790&view=rev
Author:   artemys
Date:     2008-04-03 07:08:15 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
[DEMOS] Backport from apf2/ branch correction (rev [789]: Armanoid compilation)

Modified Paths:
--------------
    trunk/target/demos/armanoid/Makefile

Added Paths:
-----------
    trunk/target/demos/armanoid/README

Modified: trunk/target/demos/armanoid/Makefile
===================================================================
--- trunk/target/demos/armanoid/Makefile	2008-04-03 13:37:46 UTC (rev 789)
+++ trunk/target/demos/armanoid/Makefile	2008-04-03 14:08:15 UTC (rev 790)
@@ -1,16 +1,24 @@
 
 ifeq ($(TARGET),)
-INSTALL_DIR="../../../buildroot/build_arm_nofpu/root/usr/bin/"
-CC=arm-linux-gcc
-DEFINES=TARGET
-CFLAGS:=`sh ../../../buildroot/build_arm_nofpu/SDL-1.2.11/sdl-config --cflags`
-LIBS=`sh ../../../buildroot/build_arm_nofpu/SDL-1.2.11/sdl-config --libs`
+	BUILDROOT_DIR:=../../../buildroot/
+	BUILD_DIR_EXT:=$(shell ls $(BUILDROOT_DIR) | grep -e "^build_arm*")
+	BUILD_DIR:=$(BUILDROOT_DIR)/$(BUILD_DIR_EXT)
+
+	SDL_DIR:=$(BUILD_DIR)/SDL-1.2.11/
+	STAGING_DIR:=$(BUILD_DIR)/staging_dir/
+	ROOT_DIR:=$(BUILDROOT_DIR)/project_$(BUILD_DIR_EXT)/armadeus/root/
+        INSTALL_DIR:=$(ROOT_DIR)/usr/bin/
+
+	CC:=$(STAGING_DIR)/bin/arm-linux-gcc
+	DEFINES="TARGET"
+	CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags)
+	LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
 else
-INSTALL_DIR="."
-CFLAGS:=`/usr/bin/sdl-config --cflags`
-LIBS=`/usr/bin/sdl-config --libs`
-CC=gcc
-DEFINES=HOST
+	INSTALL_DIR="."
+	CFLAGS=`/usr/bin/sdl-config --cflags`
+	LIBS=`/usr/bin/sdl-config --libs`
+	CC=gcc
+	DEFINES="HOST"
 endif
 
 CFLAGS+="-g"
@@ -35,11 +43,8 @@
 armanoid: armanoid.o collide.o buzzer.o
 	$(CC)  $(LIBS) -o $@ $^
 
-install: armanoid
-	cp armanoid  $INSTALL_DIR
-	cp ball.bmp  $INSTALL_DIR
-	cp block.bmp $INSTALL_DIR
-	cp bar.bmp   $INSTALL_DIR
+install: armanoid ball.bmp block.bmp bar.bmp
+	cp $^  $(INSTALL_DIR)
 
 clean: 
 	rm -rf armanoid

Copied: trunk/target/demos/armanoid/README (from rev 789, branches/apf2/target/demos/armanoid/README)
===================================================================
--- trunk/target/demos/armanoid/README	                        (rev 0)
+++ trunk/target/demos/armanoid/README	2008-04-03 14:08:15 UTC (rev 790)
@@ -0,0 +1,15 @@
+***********
+OOOOOOOOOO
+OOO OOOOOO
+O        O
+    *
+___---____
+
+ Armanoid
+***********
+
+* ARM compiling:
+ $ make clean; make install
+* x86 compiling (SDL devt package should be installed on your system)
+ $ make clean; make TARGET=x86
+


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