--- a/project_files/hedgewars.pro Thu Nov 24 13:44:30 2011 +0100
+++ b/project_files/hedgewars.pro Sun Oct 28 13:28:23 2012 +0100
@@ -9,23 +9,17 @@
INCLUDEPATH += ../QTfrontend/ui/dialog
INCLUDEPATH += ../QTfrontend/net
INCLUDEPATH += ../QTfrontend/util
-INCLUDEPATH += /usr/local/include/SDL
-INCLUDEPATH += /usr/include/SDL
INCLUDEPATH += ../misc/quazip/
-DESTDIR = .
-
-win32 {
- RC_FILE = ../QTfrontend/res/hedgewars.rc
-}
+DESTDIR = ../bin
QT += network
QT += webkit
-HEADERS += ../QTfrontend/model/themesmodel.h \
+HEADERS += ../QTfrontend/model/ThemeModel.h \
+ ../QTfrontend/model/MapModel.h \
../QTfrontend/model/ammoSchemeModel.h \
../QTfrontend/model/netserverslist.h \
- ../QTfrontend/model/hats.h \
../QTfrontend/ui/page/pagedrawmap.h \
../QTfrontend/ui/page/pagedata.h \
../QTfrontend/ui/page/pagetraining.h \
@@ -72,7 +66,7 @@
../QTfrontend/ui/widget/mapContainer.h \
../QTfrontend/ui/widget/HistoryLineEdit.h \
../QTfrontend/ui/widget/SmartLineEdit.h \
- ../QTfrontend/util/HWDataManager.h \
+ ../QTfrontend/util/DataManager.h \
../QTfrontend/net/netregister.h \
../QTfrontend/net/netserver.h \
../QTfrontend/net/netudpwidget.h \
@@ -93,13 +87,29 @@
../QTfrontend/achievements.h \
../QTfrontend/binds.h \
../QTfrontend/ui_hwform.h \
- ../QTfrontend/KB.h \
+ ../QTfrontend/KB.h \
../QTfrontend/hwconsts.h \
- ../QTfrontend/sdlkeys.h
+ ../QTfrontend/sdlkeys.h \
+ ../QTfrontend/ui/mouseoverfilter.h \
+ ../QTfrontend/ui/qpushbuttonwithsound.h \
+ ../QTfrontend/ui/widget/qpushbuttonwithsound.h \
+ ../QTfrontend/ui/page/pagefeedback.h \
+ ../QTfrontend/model/roomslistmodel.h \
+ ../QTfrontend/ui/dialog/input_password.h \
+ ../QTfrontend/ui/widget/colorwidget.h \
+ ../QTfrontend/model/HatModel.h \
+ ../QTfrontend/model/GameStyleModel.h \
+ ../QTfrontend/util/libav_iteraction.h \
+ ../QTfrontend/ui/page/pagevideos.h \
+ ../QTfrontend/net/recorder.h \
+ ../QTfrontend/ui/dialog/ask_quit.h \
+ ../QTfrontend/ui/dialog/upload_video.h \
+ ../QTfrontend/campaign.h \
+ ../QTfrontend/model/playerslistmodel.h
SOURCES += ../QTfrontend/model/ammoSchemeModel.cpp \
- ../QTfrontend/model/themesmodel.cpp \
- ../QTfrontend/model/hats.cpp \
+ ../QTfrontend/model/MapModel.cpp \
+ ../QTfrontend/model/ThemeModel.cpp \
../QTfrontend/model/netserverslist.cpp \
../QTfrontend/ui/qaspectratiolayout.cpp \
../QTfrontend/ui/page/pagemain.cpp \
@@ -147,7 +157,7 @@
../QTfrontend/ui/widget/mapContainer.cpp \
../QTfrontend/ui/widget/HistoryLineEdit.cpp \
../QTfrontend/ui/widget/SmartLineEdit.cpp \
- ../QTfrontend/util/HWDataManager.cpp \
+ ../QTfrontend/util/DataManager.cpp \
../QTfrontend/net/tcpBase.cpp \
../QTfrontend/net/netregister.cpp \
../QTfrontend/net/proto.cpp \
@@ -169,58 +179,83 @@
../QTfrontend/util/SDLInteraction.cpp \
../QTfrontend/team.cpp \
../QTfrontend/ui_hwform.cpp \
- ../QTfrontend/hwconsts.cpp
+ ../QTfrontend/hwconsts.cpp \
+ ../QTfrontend/ui/mouseoverfilter.cpp \
+ ../QTfrontend/ui/widget/qpushbuttonwithsound.cpp \
+ ../QTfrontend/ui/page/pagefeedback.cpp \
+ ../QTfrontend/model/roomslistmodel.cpp \
+ ../QTfrontend/ui/dialog/input_password.cpp \
+ ../QTfrontend/ui/widget/colorwidget.cpp \
+ ../QTfrontend/model/HatModel.cpp \
+ ../QTfrontend/model/GameStyleModel.cpp \
+ ../QTfrontend/util/libav_iteraction.cpp \
+ ../QTfrontend/ui/page/pagevideos.cpp \
+ ../QTfrontend/net/recorder.cpp \
+ ../QTfrontend/ui/dialog/ask_quit.cpp \
+ ../QTfrontend/ui/dialog/upload_video.cpp \
+ ../QTfrontend/campaign.cpp \
+ ../QTfrontend/model/playerslistmodel.cpp
-win32 {
- SOURCES += ../QTfrontend/xfire.cpp
-}
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ar.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_bg.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_cs.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_de.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_en.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_es.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_fi.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_fr.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_hu.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_it.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ja.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ko.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_lt.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_nl.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_pl.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ru.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_sk.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_sv.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_uk.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
-TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
+TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ar.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_bg.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_cs.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_de.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_en.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_es.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_fi.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_fr.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_hu.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_it.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_ja.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_ko.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_lt.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_nl.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_pl.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_pt_BR.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_pt_PT.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_ru.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_sk.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_sv.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_tr_TR.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_uk.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_zh_CN.ts \
+ ../share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
RESOURCES += ../QTfrontend/hedgewars.qrc
-LIBS += -L../misc/quazip -lquazip
+LIBS += -L../bin -lquazip
+
+macx {
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+ QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.6.sdk
+
+ OBJECTIVE_SOURCES += ../QTfrontend/*.m ../QTfrontend/*.mm
+ SOURCES += ../QTfrontend/AutoUpdater.cpp ../QTfrontend/InstallController.cpp \
+ ../../build/QTfrontend/hwconsts.cpp
+ HEADERS += ../QTfrontend/M3InstallController.h ../QTfrontend/M3Panel.h \
+ ../QTfrontend/NSWorkspace_RBAdditions.h ../QTfrontend/AutoUpdater.h \
+ ../QTfrontend/CocoaInitializer.h ../QTfrontend/InstallController.h \
+ ../QTfrontend/SparkleAutoUpdater.h
+
+ LIBS += -lobjc -framework AppKit -framework IOKit -framework Foundation -framework SDL -framework SDL_Mixer -framework Sparkle -DSPARKLE_ENABLED
+ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers /Library/Frameworks/SDL_Mixer.framework/Headers
+ CONFIG += warn_on x86
+ #CONFIG += x86 ppc x86_64 ppc64
+}
+
+win32 {
+ RC_FILE = ../QTfrontend/hedgewars.rc
+ SOURCES += ../QTfrontend/xfire.cpp
+ INCLUDEPATH += ../misc/winutils/include
+ LIBS += -L../misc/winutils/lib
+}
!macx {
- LIBS += -lSDL -lSDL_mixer
-} else {
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
- QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.6.sdk
-
- OBJECTIVE_SOURCES += ../QTfrontend/*.m ../QTfrontend/*.mm
- SOURCES += ../QTfrontend/AutoUpdater.cpp ../QTfrontend/InstallController.cpp \
- ../../build/QTfrontend/hwconsts.cpp
- HEADERS += ../QTfrontend/M3InstallController.h ../QTfrontend/M3Panel.h \
- ../QTfrontend/NSWorkspace_RBAdditions.h ../QTfrontend/AutoUpdater.h \
- ../QTfrontend/CocoaInitializer.h ../QTfrontend/InstallController.h \
- ../QTfrontend/SparkleAutoUpdater.h
-
- LIBS += -lobjc -framework AppKit -framework IOKit -framework Foundation -framework SDL -framework SDL_Mixer -framework Sparkle -DSPARKLE_ENABLED
- INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers /Library/Frameworks/SDL_Mixer.framework/Headers
- CONFIG += warn_on x86
+ LIBS += -lSDL -lSDL_mixer
+ !win32 {
+ INCLUDEPATH += /usr/local/include/SDL /usr/include/SDL
+ }
+}
- #CONFIG += x86 ppc x86_64 ppc64
-}
+FORMS +=