andrey/aliendefender
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correct core module with new types

Browse Source
This commit is contained in:
Бычков Андрей
2010-08-23 14:40:52 +03:00
parent 191e5ed1a1
commit 9c8f9fb98c
15 changed files with 146 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Makefile
View File

@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: aliendefender
# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? ???. 17 20:37:06 2010
# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? ???. 23 12:02:15 2010
# Project: aliendefender.pro
# Template: app
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile aliendefender.pro
@@ -51,7 +51,6 @@ SOURCES = map.cpp \
splashes.cpp \
adcore.cpp \
player.cpp \
settreader.cpp \
loader.cpp moc_map.cpp \
moc_game_data.cpp \
moc_aliens.cpp \
@@ -69,7 +68,6 @@ OBJECTS = map.o \
splashes.o \
adcore.o \
player.o \
settreader.o \
loader.o \
moc_map.o \
moc_game_data.o \
@@ -190,7 +188,7 @@ qmake: FORCE
dist:
@$(CHK_DIR_EXISTS) .tmp/aliendefender1.0.0 || $(MKDIR) .tmp/aliendefender1.0.0
$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents base_types.h map.h game_data.h aliens.h towers.h splashes.h adcore.h player.h settreader.h loader.h .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents images.qrc .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents map.cpp game_data.cpp aliens.cpp towers.cpp main.cpp splashes.cpp adcore.cpp player.cpp settreader.cpp loader.cpp .tmp/aliendefender1.0.0/ && (cd `dirname .tmp/aliendefender1.0.0` && $(TAR) aliendefender1.0.0.tar aliendefender1.0.0 && $(COMPRESS) aliendefender1.0.0.tar) && $(MOVE) `dirname .tmp/aliendefender1.0.0`/aliendefender1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/aliendefender1.0.0
$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents base_types.h map.h game_data.h aliens.h towers.h splashes.h adcore.h player.h loader.h .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents images.qrc .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents map.cpp game_data.cpp aliens.cpp towers.cpp main.cpp splashes.cpp adcore.cpp player.cpp loader.cpp .tmp/aliendefender1.0.0/ && (cd `dirname .tmp/aliendefender1.0.0` && $(TAR) aliendefender1.0.0.tar aliendefender1.0.0 && $(COMPRESS) aliendefender1.0.0.tar) && $(MOVE) `dirname .tmp/aliendefender1.0.0`/aliendefender1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/aliendefender1.0.0
clean:compiler_clean
@@ -213,64 +211,49 @@ compiler_moc_header_make_all: moc_map.cpp moc_game_data.cpp moc_aliens.cpp moc_t
compiler_moc_header_clean:
-$(DEL_FILE) moc_map.cpp moc_game_data.cpp moc_aliens.cpp moc_towers.cpp moc_splashes.cpp moc_adcore.cpp moc_player.cpp moc_loader.cpp
moc_map.cpp: base_types.h \
settreader.h \
map.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) map.h -o moc_map.cpp
moc_game_data.cpp: player.h \
map.h \
base_types.h \
settreader.h \
game_data.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) game_data.h -o moc_game_data.cpp
moc_aliens.cpp: game_data.h \
player.h \
map.h \
base_types.h \
settreader.h \
aliens.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) aliens.h -o moc_aliens.cpp
moc_towers.cpp: game_data.h \
player.h \
map.h \
base_types.h \
settreader.h \
towers.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) towers.h -o moc_towers.cpp
moc_splashes.cpp: game_data.h \
player.h \
map.h \
base_types.h \
settreader.h \
splashes.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) splashes.h -o moc_splashes.cpp
moc_adcore.cpp: aliens.h \
game_data.h \
player.h \
map.h \
base_types.h \
settreader.h \
towers.h \
splashes.h \
loader.h \
adcore.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) adcore.h -o moc_adcore.cpp
moc_player.cpp: map.h \
base_types.h \
settreader.h \
moc_player.cpp: base_types.h \
player.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) player.h -o moc_player.cpp
moc_loader.cpp: game_data.h \
player.h \
map.h \
base_types.h \
settreader.h \
loader.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) loader.h -o moc_loader.cpp
@@ -318,40 +301,31 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean
####### Compile
map.o: map.cpp map.h \
base_types.h \
settreader.h
base_types.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o map.o map.cpp
game_data.o: game_data.cpp game_data.h \
player.h \
map.h \
base_types.h \
settreader.h
base_types.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o game_data.o game_data.cpp
aliens.o: aliens.cpp aliens.h \
game_data.h \
player.h \
map.h \
base_types.h \
settreader.h
base_types.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o aliens.o aliens.cpp
towers.o: towers.cpp towers.h \
game_data.h \
player.h \
map.h \
base_types.h \
settreader.h
base_types.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o towers.o towers.cpp
main.o: main.cpp adcore.h \
aliens.h \
game_data.h \
player.h \
map.h \
base_types.h \
settreader.h \
towers.h \
splashes.h \
loader.h
@@ -360,38 +334,27 @@ main.o: main.cpp adcore.h \
splashes.o: splashes.cpp splashes.h \
game_data.h \
player.h \
map.h \
base_types.h \
settreader.h
base_types.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o splashes.o splashes.cpp
adcore.o: adcore.cpp adcore.h \
aliens.h \
game_data.h \
player.h \
map.h \
base_types.h \
settreader.h \
towers.h \
splashes.h \
loader.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o adcore.o adcore.cpp
player.o: player.cpp player.h \
map.h \
base_types.h \
settreader.h
base_types.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o player.o player.cpp
settreader.o: settreader.cpp settreader.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o settreader.o settreader.cpp
loader.o: loader.cpp loader.h \
game_data.h \
player.h \
map.h \
base_types.h \
settreader.h
base_types.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o loader.o loader.cpp
moc_map.o: moc_map.cpp