Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

This commit is contained in:
walzer 2011-01-18 17:58:46 +08:00
parent 29cf6fc66b 3a844f5527
commit b5c70139c4
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CocosDenshion/proj.uphone/Makefile.ARM
View File

@ -29,7 +29,6 @@ first: all
OBJECTS = \ OBJECTS = \
$(OBJECTS_DIR)/FileUtils.o \ $(OBJECTS_DIR)/FileUtils.o \
$(OBJECTS_DIR)/ResourceHandle.o \
$(OBJECTS_DIR)/SimpleAudioEngine.o \ $(OBJECTS_DIR)/SimpleAudioEngine.o \
$(OBJECTS_DIR)/SoundDataManager.o \ $(OBJECTS_DIR)/SoundDataManager.o \
$(OBJECTS_DIR)/SoundPlayer.o \ $(OBJECTS_DIR)/SoundPlayer.o \
@ -55,10 +54,7 @@ clean :
$(OBJECTS_DIR)/FileUtils.o : ../uphone/FileUtils.cpp $(OBJECTS_DIR)/FileUtils.o : ../uphone/FileUtils.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/FileUtils.o ../uphone/FileUtils.cpp $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/FileUtils.o ../uphone/FileUtils.cpp
$(OBJECTS_DIR)/ResourceHandle.o : ../uphone/ResourceHandle.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ResourceHandle.o ../uphone/ResourceHandle.cpp
$(OBJECTS_DIR)/SimpleAudioEngine.o : ../uphone/SimpleAudioEngine.cpp $(OBJECTS_DIR)/SimpleAudioEngine.o : ../uphone/SimpleAudioEngine.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SimpleAudioEngine.o ../uphone/SimpleAudioEngine.cpp $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SimpleAudioEngine.o ../uphone/SimpleAudioEngine.cpp