removed squid demo, simplified dir naming scheme

maxattack · Jan 27, 2014 · ea10f4d · ea10f4d
1 parent 1f88626
commit ea10f4d
Show file tree

Hide file tree

Showing 45 changed files with 11 additions and 594 deletions.
diff --git a/Makefile b/Makefile
@@ -18,11 +18,6 @@ PLATFORMER_OBJ_FILES =     \
 	obj/Hero.o             \
 	obj/Kitten.o           \
 	obj/platformer.o
-
-squids_OBJ_FILES =   \
-	obj/SplineTree.o \
-    obj/squids.o
-
 # COMPILER
 CC = clang
 CPP = clang++
@@ -55,44 +50,36 @@ CFLAGS += -arch i386
 AFLAGS = 32
 # AFLAGS = 64
 
-# stest: bin/squids bin/squids.bin
-# 	bin/squids
-
 test : bin/platformer bin/platformer.bin
-	cp platformer/assets/song.mid bin/song.mid
+	cp demo/assets/song.mid bin/song.mid
 	bin/platformer
 
-bin/squids: lib/liblittlepolygon.a $(squids_OBJ_FILES) 
-	$(CPP) -o $@ $(CFLAGS) $(CCFLAGS) $(LIBS) $(squids_OBJ_FILES)
-
-bin/squids.bin: squids/assets/* tools/*.py
-	tools/export_asset_bin.py squids/assets/assets.yaml $@ $(AFLAGS)
-
-
 bin/platformer: lib/liblittlepolygon.a $(PLATFORMER_OBJ_FILES) 
+	mkdir -p bin
 	$(CPP) -o $@ $(CFLAGS) $(CCFLAGS) $(LIBS) $(PLATFORMER_OBJ_FILES)
 
-bin/platformer.bin: platformer/assets/* tools/*.py platformer/tools/*.py
-	platformer/tools/export_game_assets.py platformer/assets/assets.yaml $@ $(AFLAGS)
+bin/platformer.bin: demo/assets/* tools/*.py demo/tools/*.py
+	mkdir -p bin
+	demo/tools/export_game_assets.py demo/assets/assets.yaml $@ $(AFLAGS)
 
 clean:
 	rm -f lib/*
 	rm -f obj/*
 	rm -f bin/*
 
 lib/liblittlepolygon.a: $(LIBRARY_OBJ_FILES)
+	mkdir -p lib
 	ar rcs $@ $^
 
 obj/%.o: src/%.c
+	mkdir -p obj
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 obj/%.o: src/%.cpp include/*.h
+	mkdir -p obj
 	$(CPP) $(CFLAGS) $(CCFLAGS) -c -o $@ $<
 
-obj/%.o: platformer/src/%.cpp platformer/src/*.h
-	$(CPP) $(CFLAGS) $(CCFLAGS) -c -o $@ $<
-
-obj/%.o: squids/src/%.cpp # squids/src/*.h
+obj/%.o: demo/src/%.cpp demo/src/*.h
+	mkdir -p obj
 	$(CPP) $(CFLAGS) $(CCFLAGS) -c -o $@ $<
 
-
diff --git a/platformer/assets/assets.yaml → demo/assets/assets.yaml b/platformer/assets/assets.yaml → demo/assets/assets.yaml
diff --git a/platformer/assets/bg.psd → demo/assets/bg.psd b/platformer/assets/bg.psd → demo/assets/bg.psd
diff --git a/platformer/assets/button.psd → demo/assets/button.psd b/platformer/assets/button.psd → demo/assets/button.psd
diff --git a/platformer/assets/button.wav → demo/assets/button.wav b/platformer/assets/button.wav → demo/assets/button.wav
diff --git a/platformer/assets/button_down.psd → demo/assets/button_down.psd b/platformer/assets/button_down.psd → demo/assets/button_down.psd
diff --git a/platformer/assets/button_right.psd → demo/assets/button_right.psd b/platformer/assets/button_right.psd → demo/assets/button_right.psd
diff --git a/platformer/assets/button_shift.psd → demo/assets/button_shift.psd b/platformer/assets/button_shift.psd → demo/assets/button_shift.psd
diff --git a/platformer/assets/button_up.psd → demo/assets/button_up.psd b/platformer/assets/button_up.psd → demo/assets/button_up.psd
diff --git a/platformer/assets/catturn.wav → demo/assets/catturn.wav b/platformer/assets/catturn.wav → demo/assets/catturn.wav
diff --git a/platformer/assets/death.wav → demo/assets/death.wav b/platformer/assets/death.wav → demo/assets/death.wav
diff --git a/platformer/assets/explosion.psd → demo/assets/explosion.psd b/platformer/assets/explosion.psd → demo/assets/explosion.psd
diff --git a/platformer/assets/explosion.wav → demo/assets/explosion.wav b/platformer/assets/explosion.wav → demo/assets/explosion.wav
diff --git a/platformer/assets/fire.psd → demo/assets/fire.psd b/platformer/assets/fire.psd → demo/assets/fire.psd
diff --git a/platformer/assets/footfall.wav → demo/assets/footfall.wav b/platformer/assets/footfall.wav → demo/assets/footfall.wav
diff --git a/platformer/assets/hero.psd → demo/assets/hero.psd b/platformer/assets/hero.psd → demo/assets/hero.psd
diff --git a/platformer/assets/hero_idle.png → demo/assets/hero_idle.png b/platformer/assets/hero_idle.png → demo/assets/hero_idle.png
diff --git a/platformer/assets/jump.wav → demo/assets/jump.wav b/platformer/assets/jump.wav → demo/assets/jump.wav
diff --git a/platformer/assets/kitten.png → demo/assets/kitten.png b/platformer/assets/kitten.png → demo/assets/kitten.png
diff --git a/platformer/assets/kitten.psd → demo/assets/kitten.psd b/platformer/assets/kitten.psd → demo/assets/kitten.psd
diff --git a/platformer/assets/land.wav → demo/assets/land.wav b/platformer/assets/land.wav → demo/assets/land.wav
diff --git a/platformer/assets/nokiafc22.ttf → demo/assets/nokiafc22.ttf b/platformer/assets/nokiafc22.ttf → demo/assets/nokiafc22.ttf
diff --git a/platformer/assets/pickup.wav → demo/assets/pickup.wav b/platformer/assets/pickup.wav → demo/assets/pickup.wav
diff --git a/platformer/assets/put.wav → demo/assets/put.wav b/platformer/assets/put.wav → demo/assets/put.wav
diff --git a/platformer/assets/song.mid → demo/assets/song.mid b/platformer/assets/song.mid → demo/assets/song.mid
diff --git a/platformer/assets/test.png → demo/assets/test.png b/platformer/assets/test.png → demo/assets/test.png
diff --git a/platformer/assets/test.tmx → demo/assets/test.tmx b/platformer/assets/test.tmx → demo/assets/test.tmx
diff --git a/platformer/assets/throw.wav → demo/assets/throw.wav b/platformer/assets/throw.wav → demo/assets/throw.wav
diff --git a/platformer/src/Environment.cpp → demo/src/Environment.cpp b/platformer/src/Environment.cpp → demo/src/Environment.cpp
diff --git a/platformer/src/Hero.cpp → demo/src/Hero.cpp b/platformer/src/Hero.cpp → demo/src/Hero.cpp
diff --git a/platformer/src/Kitten.cpp → demo/src/Kitten.cpp b/platformer/src/Kitten.cpp → demo/src/Kitten.cpp
diff --git a/platformer/src/platformer.cpp → demo/src/platformer.cpp b/platformer/src/platformer.cpp → demo/src/platformer.cpp
diff --git a/platformer/src/platformer.h → demo/src/platformer.h b/platformer/src/platformer.h → demo/src/platformer.h
diff --git a/platformer/tools/export_game_assets.py → demo/tools/export_game_assets.py b/platformer/tools/export_game_assets.py → demo/tools/export_game_assets.py
diff --git a/squids/assets/Apache License.txt b/squids/assets/Apache License.txt
diff --git a/squids/assets/DroidSans-Bold.ttf b/squids/assets/DroidSans-Bold.ttf
diff --git a/squids/assets/DroidSans.ttf b/squids/assets/DroidSans.ttf
diff --git a/squids/assets/_max.gif b/squids/assets/_max.gif
diff --git a/squids/assets/assets.yaml b/squids/assets/assets.yaml
diff --git a/squids/assets/templates.yaml b/squids/assets/templates.yaml
diff --git a/squids/src/DisplayTree.h b/squids/src/DisplayTree.h