Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Added missing headers and sources to QT project.

Browse Source
This commit is contained in:
Tamir Atias 2012-01-30 01:04:47 +02:00
parent 3dd248156b
commit 5fdc8edbac
3 changed files with 969 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
Unuk-QT/Makefile
View File

@ -1,25 +1,25 @@
#############################################################################
# Makefile for building: Unuk-QT
# Generated by qmake (2.01a) (Qt 4.7.3) on: Sat Jan 14 18:40:02 2012
# Generated by qmake (2.01a) (Qt 4.7.4) on: Mon Jan 30 01:00:39 2012
# Project: Unuk-QT.pro
# Template: app
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
# Command: /home/kono/QtSDK/Desktop/Qt/474/gcc/bin/qmake -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
#############################################################################
####### Compiler, tools and options
CC = gcc
CXX = g++
DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB
CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I.
INCPATH = -I../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ -I. -I../../../QtSDK/Desktop/Qt/474/gcc/include/QtCore -I../../../QtSDK/Desktop/Qt/474/gcc/include/QtGui -I../../../QtSDK/Desktop/Qt/474/gcc/include -I.
LINK = g++
LFLAGS =
LIBS = $(SUBLIBS) -L/usr/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread
LFLAGS = -Wl,-rpath,/home/kono/QtSDK/Desktop/Qt/474/gcc/lib
LIBS = $(SUBLIBS) -L/home/kono/QtSDK/Desktop/Qt/474/gcc/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/bin/qmake-qt4
QMAKE = /home/kono/QtSDK/Desktop/Qt/474/gcc/bin/qmake
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@ -103,25 +103,26 @@ OBJECTS = WorldManager.o \
LevelGen.o \
MapEntities.o \
MapElement.o
DIST = /usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \
/usr/share/qt4/mkspecs/qconfig.pri \
/usr/share/qt4/mkspecs/features/qt_functions.prf \
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \
/usr/share/qt4/mkspecs/features/debug.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/qt.prf \
/usr/share/qt4/mkspecs/features/unix/thread.prf \
/usr/share/qt4/mkspecs/features/moc.prf \
/usr/share/qt4/mkspecs/features/resources.prf \
/usr/share/qt4/mkspecs/features/uic.prf \
/usr/share/qt4/mkspecs/features/yacc.prf \
/usr/share/qt4/mkspecs/features/lex.prf \
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
DIST = ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf \
Unuk-QT.pro
QMAKE_TARGET = Unuk-QT
DESTDIR =
@ -154,51 +155,49 @@ all: Makefile $(TARGET)
$(TARGET): $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile: Unuk-QT.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \
/usr/share/qt4/mkspecs/qconfig.pri \
/usr/share/qt4/mkspecs/features/qt_functions.prf \
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \
/usr/share/qt4/mkspecs/features/debug.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/qt.prf \
/usr/share/qt4/mkspecs/features/unix/thread.prf \
/usr/share/qt4/mkspecs/features/moc.prf \
/usr/share/qt4/mkspecs/features/resources.prf \
/usr/share/qt4/mkspecs/features/uic.prf \
/usr/share/qt4/mkspecs/features/yacc.prf \
/usr/share/qt4/mkspecs/features/lex.prf \
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
/usr/lib/libQtGui.prl \
/usr/lib/libQtCore.prl
$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
/usr/share/qt4/mkspecs/common/g++.conf:
/usr/share/qt4/mkspecs/common/unix.conf:
/usr/share/qt4/mkspecs/common/linux.conf:
/usr/share/qt4/mkspecs/qconfig.pri:
/usr/share/qt4/mkspecs/features/qt_functions.prf:
/usr/share/qt4/mkspecs/features/qt_config.prf:
/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
/usr/share/qt4/mkspecs/features/default_pre.prf:
/usr/share/qt4/mkspecs/features/debug.prf:
/usr/share/qt4/mkspecs/features/default_post.prf:
/usr/share/qt4/mkspecs/features/warn_on.prf:
/usr/share/qt4/mkspecs/features/qt.prf:
/usr/share/qt4/mkspecs/features/unix/thread.prf:
/usr/share/qt4/mkspecs/features/moc.prf:
/usr/share/qt4/mkspecs/features/resources.prf:
/usr/share/qt4/mkspecs/features/uic.prf:
/usr/share/qt4/mkspecs/features/yacc.prf:
/usr/share/qt4/mkspecs/features/lex.prf:
/usr/share/qt4/mkspecs/features/include_source_dir.prf:
/usr/lib/libQtGui.prl:
/usr/lib/libQtCore.prl:
Makefile: Unuk-QT.pro ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++/qmake.conf ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf
$(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf:
qmake: FORCE
@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
@$(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
dist:
@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0
@ -263,6 +262,8 @@ WorldManager.o: ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/Wor
../src/libUnuk/System/Timer.h \
../src/libUnuk/UI/Text.h \
../src/libUnuk/UI/Font.h \
../src/libUnuk/UI/Bar.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WorldManager.o ../src/libUnuk/Engine/WorldManager.cpp
@ -293,6 +294,8 @@ NPC.o: ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/NPC.h \
../src/libUnuk/System/Timer.h \
../src/libUnuk/UI/Text.h \
../src/libUnuk/UI/Font.h \
../src/libUnuk/UI/Bar.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/Engine/NPC.cpp
@ -321,7 +324,9 @@ Character.o: ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/Character
../src/libUnuk/Engine/WorldManager.h \
../src/libUnuk/System/Timer.h \
../src/libUnuk/UI/Text.h \
../src/libUnuk/UI/Font.h
../src/libUnuk/UI/Font.h \
../src/libUnuk/UI/Bar.h \
../src/libUnuk/System/Rect.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Character.o ../src/libUnuk/Engine/Character.cpp
AStar.o: ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Engine/AStar.h \
@ -474,7 +479,9 @@ Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
../src/libUnuk/Engine/WorldManager.h \
../src/libUnuk/System/Timer.h \
../src/libUnuk/UI/Text.h \
../src/libUnuk/UI/Font.h
../src/libUnuk/UI/Font.h \
../src/libUnuk/UI/Bar.h \
../src/libUnuk/System/Rect.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp
main.o: ../src/Unuk/main.cpp ../src/libUnuk/UI/MainMenu.h \
@ -502,12 +509,14 @@ main.o: ../src/Unuk/main.cpp ../src/libUnuk/UI/MainMenu.h \
../src/libUnuk/Engine/NPC.h \
../src/libUnuk/Engine/Character.h \
../src/libUnuk/Engine/Collision.h \
../src/libUnuk/UI/Bar.h \
../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h \
../src/Unuk/Game.h \
../src/Unuk/Player.h \
../src/libUnuk/UI/IngameMenu.h \
../src/libUnuk/UI/ButtonToggle.h
../src/libUnuk/UI/ButtonToggle.h \
../src/libUnuk/UI/EventHistory.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../src/Unuk/main.cpp
Globals.o: ../src/Unuk/Globals.cpp ../src/Unuk/Globals.h
@ -533,12 +542,14 @@ Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \
../src/libUnuk/System/Timer.h \
../src/libUnuk/UI/Text.h \
../src/libUnuk/UI/Font.h \
../src/libUnuk/UI/Bar.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/UI/IngameMenu.h \
../src/libUnuk/UI/ButtonGroup.h \
../src/libUnuk/UI/Button.h \
../src/libUnuk/System/Input.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/UI/ButtonToggle.h \
../src/libUnuk/UI/EventHistory.h \
../src/libUnuk/Engine/NPC.h \
../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h
@ -563,6 +574,8 @@ LevelGen.o: ../src/libUnuk/LevelGen/LevelGen.cpp ../src/libUnuk/LevelGen/LevelGe
../src/libUnuk/System/Timer.h \
../src/libUnuk/UI/Text.h \
../src/libUnuk/UI/Font.h \
../src/libUnuk/UI/Bar.h \
../src/libUnuk/System/Rect.h \
../src/libUnuk/Engine/AStar.h \
../src/libUnuk/Engine/AStarBase.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o LevelGen.o ../src/libUnuk/LevelGen/LevelGen.cpp

4
Unuk-QT/Unuk-QT.pro
View File

@ -39,7 +39,9 @@ HEADERS += ../src/Libs/wglext.h \
../src/libUnuk/LevelGen/LevelGen.h \
../src/libUnuk/LevelGen/MapEntities.h \
../src/libUnuk/LevelGen/MapElement.h \
../src/libUnuk/LevelGen/MapTile.h
../src/libUnuk/LevelGen/MapTile.h \
../src/libUnuk/UI/EventHistory.h \
../src/libUnuk/UI/Bar.h
SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
../src/libUnuk/Engine/ParticleEmitter.cpp \
../src/libUnuk/Engine/NPC.cpp \

1120
Unuk-QT/Unuk-QT.pro.user
View File

File diff suppressed because it is too large Load Diff