# HG changeset patch # User koda # Date 1255785067 0 # Node ID 42986b9ebc740dfd8d6336695ae42b01ecc95fea # Parent fc8d26d14ed03ebe063d2549da90d99bec88ccba moves project files to proper directory diff -r fc8d26d14ed0 -r 42986b9ebc74 QTfrontend/hedgewars.pro --- a/QTfrontend/hedgewars.pro Sat Oct 17 09:54:26 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -TEMPLATE = app -TARGET = hedgewars -DEPENDPATH += . -INCLUDEPATH += . -DESTDIR = ../bin - -win32 { - RC_FILE = ./res/hedgewars.rc -} - -QT += network svg xml - -HEADERS += KB.h SDLs.h SquareLabel.h \ - about.h ammoSchemeModel.h \ - bgwidget.h binds.h \ - chatwidget.h \ - fpsedit.h frameTeam.h \ - game.h gamecfgwidget.h gameuiconfig.h \ - hats.h hedgehogerWidget.h hwconsts.h hwform.h hwmap.h \ - igbox.h input_ip.h itemNum.h \ - mapContainer.h misc.h \ - namegen.h netregister.h netserver.h netserverslist.h \ - netudpserver.h netudpwidget.h newnetclient.h \ - pages.h playrecordpage.h predefteams.h proto.h \ - sdlkeys.h selectWeapon.h statsPage.h \ - tcpBase.h team.h teamselect.h teamselhelper.h togglebutton.h \ - ui_hwform.h \ - vertScrollArea.h \ - weaponItem.h - - -SOURCES += SDLs.cpp SquareLabel.cpp \ - about.cpp ammoSchemeModel.cpp \ - bgwidget.cpp binds.cpp \ - chatwidget.cpp \ - fpsedit.cpp frameTeam.cpp \ - game.cpp gamecfgwidget.cpp gameuiconfig.cpp \ - hats.cpp hedgehogerWidget.cpp hwconsts.cpp hwform.cpp hwmap.cpp \ - igbox.cpp input_ip.cpp itemNum.cpp \ - main.cpp mapContainer.cpp misc.cpp \ - namegen.cpp netregister.cpp netserver.cpp netserverslist.cpp \ - netudpserver.cpp netudpwidget.cpp newnetclient.cpp \ - pages.cpp playrecordpage.cpp proto.cpp \ - selectWeapon.cpp statsPage.cpp \ - tcpBase.cpp team.cpp teamselect.cpp teamselhelper.cpp togglebutton.cpp \ - ui_hwform.cpp \ - vertScrollArea.cpp \ - weaponItem.cpp - -TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_bg.ts -TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_de.ts -TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_cs.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_it.ts -TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ja.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 - -RESOURCES += hedgewars.qrc - -!macx{ - LIBS += -lSDL -lopenalbridge -}else{ - LIBS += -framework SDL -framework OpenAL -framework Ogg -framework Vorbis -lopenalbridge - INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers - CONFIG += warn_on x86 - - #-framework Sparkle - #SOURCES += AutoUpdater.cpp CocoaInitializer.mm SparkleAutoUpdater.mm - #HEADERS += AutoUpdater.h CocoaInitializer.h SparkleAutoUpdater.h - - #CONFIG += x86 ppc x86_64 ppc64 -} diff -r fc8d26d14ed0 -r 42986b9ebc74 QTfrontend/res/Hedgehog.png Binary file QTfrontend/res/Hedgehog.png has changed diff -r fc8d26d14ed0 -r 42986b9ebc74 QTfrontend/teamselect.cpp --- a/QTfrontend/teamselect.cpp Sat Oct 17 09:54:26 2009 +0000 +++ b/QTfrontend/teamselect.cpp Sat Oct 17 13:11:07 2009 +0000 @@ -24,7 +24,7 @@ #include #include -#include +#include "vertScrollArea.h" #include "teamselect.h" #include "teamselhelper.h" #include "frameTeam.h" diff -r fc8d26d14ed0 -r 42986b9ebc74 hedgewars.kdevelop --- a/hedgewars.kdevelop Sat Oct 17 09:54:26 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,243 +0,0 @@ - - - - Igor Ulyanov - disinbox@gmail.com - 1 - KDevCustomProject - C++ - - kdevfilegroups - kdevdoxygen - kdevregexptest - kdevabbrev - kdevdistpart - kdevscripting - kdevfilter - kdevastyle - - hedgewars - . - false - - kdevsubversion - - - - - executable - / - bin/hedgewars - -style plastique - false - true - - - /usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-FF/trunk - false - false - false - - - *.h - *.c - *.cc - *.cpp - *.c++ - CMakeLists.txt - *.pas - *.inc - *.dpr - *.hs - *.pro - Find*.cmake - *.cfg - - - - - - - make - - - - true - 4 - 0 - false - - - - default - - - - - - 0 - - - - default - - - - - - - - - - - - - - true - false - false - false - - - false - true - 10 - - - - - ada - ada_bugs_gcc - bash - bash_bugs - clanlib - fortran_bugs_gcc - gnome1 - gnustep - gtk - gtk_bugs - haskell - haskell_bugs_ghc - java_bugs_gcc - java_bugs_sun - kde2book - opengl - pascal_bugs_fp - php - php_bugs - perl - perl_bugs - python - python_bugs - qt-kdev3 - ruby - ruby_bugs - sdl - sw - w3c-dom-level2-html - w3c-svg - w3c-uaag10 - wxwidgets_bugs - - - Guide to the Qt Translation Tools - Qt Assistant Manual - Qt Designer Manual - Qt Reference Documentation - qmake User Guide - - - KDE Libraries (Doxygen) - - - - - - - - - - - - - true - 4 - 4 - /usr/qt/3 - EmbeddedKDevDesigner - /usr/local/bin/qmake-qt4 - /usr/local/bin/designer-qt4 - - - - - true - true - true - 250 - 400 - 250 - false - 0 - true - true - false - std=_GLIBCXX_STD;__gnu_cxx=std - true - false - false - false - false - true - true - false - .; - true - true - true - false - - - - set - m_,_ - theValue - true - true - - - false - true - Vertical - - - - - false - false - - - - true - false - - - - - .h - .cpp - - - - - - - - - - - - /usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-GNA/tags - - - diff -r fc8d26d14ed0 -r 42986b9ebc74 project_files/hedgewars.kdevelop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/hedgewars.kdevelop Sat Oct 17 13:11:07 2009 +0000 @@ -0,0 +1,243 @@ + + + + Igor Ulyanov + disinbox@gmail.com + 1 + KDevCustomProject + C++ + + kdevfilegroups + kdevdoxygen + kdevregexptest + kdevabbrev + kdevdistpart + kdevscripting + kdevfilter + kdevastyle + + hedgewars + . + false + + kdevsubversion + + + + + executable + / + bin/hedgewars + -style plastique + false + true + + + /usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-FF/trunk + false + false + false + + + *.h + *.c + *.cc + *.cpp + *.c++ + CMakeLists.txt + *.pas + *.inc + *.dpr + *.hs + *.pro + Find*.cmake + *.cfg + + + + + + + make + + + + true + 4 + 0 + false + + + + default + + + + + + 0 + + + + default + + + + + + + + + + + + + + true + false + false + false + + + false + true + 10 + + + + + ada + ada_bugs_gcc + bash + bash_bugs + clanlib + fortran_bugs_gcc + gnome1 + gnustep + gtk + gtk_bugs + haskell + haskell_bugs_ghc + java_bugs_gcc + java_bugs_sun + kde2book + opengl + pascal_bugs_fp + php + php_bugs + perl + perl_bugs + python + python_bugs + qt-kdev3 + ruby + ruby_bugs + sdl + sw + w3c-dom-level2-html + w3c-svg + w3c-uaag10 + wxwidgets_bugs + + + Guide to the Qt Translation Tools + Qt Assistant Manual + Qt Designer Manual + Qt Reference Documentation + qmake User Guide + + + KDE Libraries (Doxygen) + + + + + + + + + + + + + true + 4 + 4 + /usr/qt/3 + EmbeddedKDevDesigner + /usr/local/bin/qmake-qt4 + /usr/local/bin/designer-qt4 + + + + + true + true + true + 250 + 400 + 250 + false + 0 + true + true + false + std=_GLIBCXX_STD;__gnu_cxx=std + true + false + false + false + false + true + true + false + .; + true + true + true + false + + + + set + m_,_ + theValue + true + true + + + false + true + Vertical + + + + + false + false + + + + true + false + + + + + .h + .cpp + + + + + + + + + + + + /usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-GNA/tags + + + diff -r fc8d26d14ed0 -r 42986b9ebc74 project_files/hedgewars.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/hedgewars.pro Sat Oct 17 13:11:07 2009 +0000 @@ -0,0 +1,32 @@ +TEMPLATE = app +TARGET = hedgewars +DEPENDPATH += ../QTfrontend/ +INCLUDEPATH += ../QTfrontend/ +DESTDIR = . + +win32 { + RC_FILE = ../QTfrontend/res/hedgewars.rc +} + +QT += network svg xml + +HEADERS += ../QTfrontend/*.h +SOURCES += ../QTfrontend/*.cpp +TRANSLATIONS += ../share/hedgewars/Data/Locale/*.ts +RESOURCES += ../QTfrontend/hedgewars.qrc + +!macx { + LIBS += -lSDL -lSDL_Mixer +} else { + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 + QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk + + OBJECTIVE_SOURCES= ../QTfrontend/*.m ../QTfrontend/*.mm + + LIBS += -framework IOKit -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 + + hedgewars.commands = echo "REMEMBER TO INSERT hwconst.cpp IN SOURCE DIRECTORY" + #CONFIG += x86 ppc x86_64 ppc64 +} diff -r fc8d26d14ed0 -r 42986b9ebc74 tools/CreateMacBundle.cmake.in --- a/tools/CreateMacBundle.cmake.in Sat Oct 17 09:54:26 2009 +0000 +++ b/tools/CreateMacBundle.cmake.in Sat Oct 17 13:11:07 2009 +0000 @@ -6,6 +6,7 @@ execute_process(COMMAND cp -pPR ${SDLIMAGE_LIBRARY} ${CMAKE_BINARY_DIR}/${frameworks_dir}/SDL_image.framework) execute_process(COMMAND cp -pPR ${SDLNET_LIBRARY} ${CMAKE_BINARY_DIR}/${frameworks_dir}/SDL_net.framework) execute_process(COMMAND cp -pPR ${SDLTTF_LIBRARY} ${CMAKE_BINARY_DIR}/${frameworks_dir}/SDL_ttf.framework) +execute_process(COMMAND cp -pPR ${SDLMIXER_LIBRARY} ${CMAKE_BINARY_DIR}/${frameworks_dir}/SDL_mixer.framework) execute_process(COMMAND cp -pPR ${OGG_LIBRARY} ${CMAKE_BINARY_DIR}/${frameworks_dir}/Ogg.framework) execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY} ${CMAKE_BINARY_DIR}/${frameworks_dir}/Vorbis.framework)