Mercurial > hg > Members > koba > t_dandy

changeset 16:5e10d43156bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile fix.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Wed, 15 Dec 2010 19:06:42 +0900
parents ab0cce79402f
children 927401604461
files Makefile Makefile.mac Makefile.ps3 tama2.c
diffstat 4 files changed, 25 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Dec 16 16:49:29 2010 +0900
+++ b/Makefile	Wed Dec 15 19:06:42 2010 +0900
@@ -1,27 +1,22 @@
-default: macosx FORCE
+default: macosx
 
 macosx: 
 	@echo "Make for Mac OS X"
 	@$(MAKE) -f Makefile.mac
 
-fifo64: FORCE
+demo:
+	@$(MAKE) -f Makefile.mac demo
+
+dandy:
+	@$(MAKE) -f Makefile.mac dandy
+
+fifo64:
 	@$(MAKE) -f Makefile.macosx ABIBIT=64
 
-cell: FORCE
+cell:
 	@echo "Make for PS3 (Cell)"
 	@$(MAKE) -f Makefile.ps3
 
-macosx-depend: FORCE
-	@$(MAKE) -f Makefile.mac depend
-
-cell-depend: FORCE
-	@$(MAKE) -f Makefile.ps3 depend
-
-FORCE:
-	-mkdir -p ../../include/Cerium
-	rsync `find . -name Test -prune -or -name spe -prune -or -name task -prune -or -name '*.h' -print` ../../include/Cerium
-
-
 clean:
 	@$(MAKE) -f Makefile.mac clean
 	@$(MAKE) -f Makefile.ps3 clean
--- a/Makefile.mac	Thu Dec 16 16:49:29 2010 +0900
+++ b/Makefile.mac	Wed Dec 15 19:06:42 2010 +0900
@@ -7,7 +7,7 @@
 OBJS    =  Character.o Bom.o tokuten.o collision.o count2.o Character_state.o schedule3.o tama2.o syokika.o Ss.o sound.o  profile.o debug.o trace.o LoadSprite.o xml.o b64_de.o tree_controll.o object.o sys.o 
 
 CFLAGS  += -g $(ABI) -O2 -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
-LIBS	+=  `sdl-config --libs`,-framework,OpenGL -lSDL_mixer -lSDL_image `xml2-config --libs`
+LIBS	+=  `sdl-config --libs`, -lSDL_mixer -lSDL_image `xml2-config --libs` #-framework,OpenGL
 LIBS += -lCerium -lFifoManager
 
 all: $(TARGET)
--- a/Makefile.ps3	Thu Dec 16 16:49:29 2010 +0900
+++ b/Makefile.ps3	Wed Dec 15 19:06:42 2010 +0900
@@ -6,14 +6,26 @@
 
 CFLAGS  += -g $(ABI) -O2 -Wall `/usr/bin/sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
 LIBS	+=  `/usr/bin/sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_image `xml2-config --libs`
-LIBS +=  -lCerium -lCellManager  -lspe2
+LIBS +=  -lCerium -lCellManager  -lspe2 -lpthread
 
 
-TARGET = demo dandy
+TARGET = dandy spe-main
 OBJS    =  Character.o Bom.o tokuten.o collision.o count2.o Character_state.o schedule3.o tama2.o syokika.o Ss.o sound.o  profile.o debug.o trace.o LoadSprite.o xml.o b64_de.o tree_controll.o object.o sys.o 
 
 all: $(TARGET)
 
+speobject:
+	cd spe; $(MAKE)
+
+spe-main:
+	ln -s $(CERIUM)/Renderer/Engine/spe-main .
+
+run: $(TARGET)
+	sudo ./$(TARGET) -width 576 -height 384 -bpp 32
+run-hd: $(TARGET)
+	sudo /usr/sbin/ps3-video-mode -v 133
+	sudo ./$(TARGET) -video fb -width 1920 -height 1080 -bpp 32
+
 test: $(TARGET)
 	./demo  -test
 
--- a/tama2.c	Thu Dec 16 16:49:29 2010 +0900
+++ b/tama2.c	Wed Dec 15 19:06:42 2010 +0900
@@ -1,10 +1,10 @@
 #include <stdlib.h>
+#include <SDL_mixer.h>
 #include "Character.h"
 #include "Character_state.h"
 //#include "Enemy.h"
 #include "sankaku.h"
 #include"debug.h"
-#include <SDL_mixer.h>
 #include "sound.h"
 
 /*たまたまたま*/