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

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

Revision: 813
          http://armadeus.svn.sourceforge.net/armadeus/?rev=813&view=rev
Author:   artemys
Date:     2008-05-31 02:38:57 -0700 (Sat, 31 May 2008)

Log Message:
-----------
[DEMOS] Makes armanoid compiles again + install it in correct directories

Modified Paths:
--------------
    trunk/target/demos/armanoid/Makefile
    trunk/target/demos/armanoid/README
    trunk/target/demos/armanoid/armanoid.c

Added Paths:
-----------
    trunk/target/demos/armanoid/data/
    trunk/target/demos/armanoid/data/ball.bmp
    trunk/target/demos/armanoid/data/bar.bmp
    trunk/target/demos/armanoid/data/block.bmp

Removed Paths:
-------------
    trunk/target/demos/armanoid/ball.bmp
    trunk/target/demos/armanoid/bar.bmp
    trunk/target/demos/armanoid/block.bmp

Modified: trunk/target/demos/armanoid/Makefile
===================================================================
--- trunk/target/demos/armanoid/Makefile	2008-05-21 20:51:34 UTC (rev 812)
+++ trunk/target/demos/armanoid/Makefile	2008-05-31 09:38:57 UTC (rev 813)
@@ -7,14 +7,16 @@
 	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/
+        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
-	INSTALL_DIR="."
+	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
@@ -34,18 +36,19 @@
 collide.o: collide.c
 	$(CC) $(CFLAGS) -c -o $@ $^
 
-#timer.o: timer.cpp
-#	$(CC) $(CFLAGS) -c -o $@ $^
-
 buzzer.o: buzzer.c
 	$(CC) $(CFLAGS) -D$(DEFINES) -c -o $@ $^
 
 armanoid: armanoid.o collide.o buzzer.o
 	$(CC)  $(LIBS) -o $@ $^
 
-install: armanoid ball.bmp block.bmp bar.bmp
-	cp $^  $(INSTALL_DIR)
+install: armanoid data/ball.bmp data/block.bmp data/bar.bmp
+	mkdir -p $(INSTALL_DIR)
+	mkdir -p $(INSTALL_DATA_DIR)/data/
+	cp data/*.bmp  $(INSTALL_DATA_DIR)/data/
+	cp armanoid $(INSTALL_DIR)
 
 clean: 
 	rm -rf armanoid
 	rm -rf *.o
+

Modified: trunk/target/demos/armanoid/README
===================================================================
--- trunk/target/demos/armanoid/README	2008-05-21 20:51:34 UTC (rev 812)
+++ trunk/target/demos/armanoid/README	2008-05-31 09:38:57 UTC (rev 813)
@@ -10,6 +10,8 @@
 
 * ARM compiling:
  $ make clean; make install
+
 * x86 compiling (SDL devt package should be installed on your system)
- $ make clean; make TARGET=x86
-
+ $ make clean TARGET=x86; make TARGET=x86
+* x86 installing:
+ $ sudo make install TARGET=x86

Modified: trunk/target/demos/armanoid/armanoid.c
===================================================================
--- trunk/target/demos/armanoid/armanoid.c	2008-05-21 20:51:34 UTC (rev 812)
+++ trunk/target/demos/armanoid/armanoid.c	2008-05-31 09:38:57 UTC (rev 813)
@@ -44,6 +44,8 @@
 #define false 0
 #define true  1
 
+#define DEFAULT_DATA_DIR "/usr/share/games/armanoid/data/"
+
 SDL_Surface *back;
 SDL_Surface* block;
 SDL_Surface *screen;
@@ -112,10 +114,10 @@
 {
     int result = 0;
 
-    loadImage( &ball, "./ball.bmp");
-    loadImage( &bar, "./bar.bmp");
+    loadImage( &ball, DEFAULT_DATA_DIR "/ball.bmp");
+    loadImage( &bar, DEFAULT_DATA_DIR "/bar.bmp");
 
-    block = SDL_LoadBMP("./block.bmp");
+    block = SDL_LoadBMP( DEFAULT_DATA_DIR "/block.bmp" );
     BLOCK_HORI_SIZE = block->w;
     BLOCK_VERT_SIZE = block->h;
     // Check if we got all images

Deleted: trunk/target/demos/armanoid/ball.bmp
===================================================================
(Binary files differ)

Deleted: trunk/target/demos/armanoid/bar.bmp
===================================================================
(Binary files differ)

Deleted: trunk/target/demos/armanoid/block.bmp
===================================================================
(Binary files differ)

Copied: trunk/target/demos/armanoid/data/ball.bmp (from rev 800, trunk/target/demos/armanoid/ball.bmp)
===================================================================
(Binary files differ)

Copied: trunk/target/demos/armanoid/data/bar.bmp (from rev 800, trunk/target/demos/armanoid/bar.bmp)
===================================================================
(Binary files differ)

Copied: trunk/target/demos/armanoid/data/block.bmp (from rev 800, trunk/target/demos/armanoid/block.bmp)
===================================================================
(Binary files differ)


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