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

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

Revision: 825
          http://armadeus.svn.sourceforge.net/armadeus/?rev=825&view=rev
Author:   artemys
Date:     2008-07-04 11:11:58 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
[DEMOS] Correct Armanoid Makefile to let it handle TARGET=arm

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

Modified: trunk/target/demos/armanoid/Makefile
===================================================================
--- trunk/target/demos/armanoid/Makefile	2008-06-28 13:11:33 UTC (rev 824)
+++ trunk/target/demos/armanoid/Makefile	2008-07-04 18:11:58 UTC (rev 825)
@@ -1,26 +1,26 @@
 
-ifeq ($(TARGET),)
-	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/games/
-	INSTALL_DATA_DIR:=$(ROOT_DIR)/usr/share/games/armanoid/
-
-	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
+ifeq ($(TARGET),x86)
 	INSTALL_DIR="/usr/games/"
 	INSTALL_DATA_DIR="/usr/share/games/armanoid/"
 	CFLAGS=`/usr/bin/sdl-config --cflags`
 	LIBS=`/usr/bin/sdl-config --libs`
 	CC=gcc
 	DEFINES="HOST"
+else
+        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/games/
+        INSTALL_DATA_DIR:=$(ROOT_DIR)/usr/share/games/armanoid/
+
+        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)
 endif
 
 CFLAGS+="-g"


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