diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-02-23 03:40:24 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-02-23 03:40:24 +0000 |
| commit | d7bc310363c98994457e7882e7010e276169f00a (patch) | |
| tree | b59a7e27c9c5a9fc15c959a289b9ab105127a4aa /battle | |
| parent | 426721374e515ed14fc3b8d2afabfbb34e223e60 (diff) | |
[FIX] Frac bug with type of Over1
[FIX] PokemodUI vtable errors
[FIX] Manual .pro file clean up
[FIX] Was attempting to emit a slot...
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@72 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/battle.pro | 68 |
1 files changed, 52 insertions, 16 deletions
diff --git a/battle/battle.pro b/battle/battle.pro index 6d2538e3..818d3fe7 100644 --- a/battle/battle.pro +++ b/battle/battle.pro @@ -3,22 +3,58 @@ DESTDIR = ../../lib TEMPLATE = lib LIBS += -L../../lib -lgeneral -lpokemod -CONFIG += qt \ -warn_on \ -dll \ -exceptions +CONFIG += qt warn_on dll exceptions + +# Following is reformatted from the KTIGCC .pro file +win32 { + KDEPREFIX = $$(KDEPREFIX) + isEmpty(KDEPREFIX){ + # Try running kde4-config, however chances are it's not in the path or it was compiled with a bad prefix. + KDEPREFIX = $$system(kde4-config --prefix) + isEmpty(KDEPREFIX) : error("KDE 4 kdelibs not found, set KDEPREFIX.") + !exists($$KDEPREFIX) : error("KDE 4 kdelibs not found, set KDEPREFIX.") + } + KDEINCDIR = $$KDEPREFIX/include + # $$KDEINCDIR/mingw contains the kdewin32 headers, defining stuff like mkdtemp. + INCLUDEPATH += $$KDEINCDIR/mingw $$KDEINCDIR + LIBS += -lkdewin32 + QMAKE_LIBDIR = $$KDEPREFIX/lib $$QMAKE_LIBDIR +}else { + KDEPREFIX = $$system(kde4-config --prefix) + isEmpty(KDEPREFIX) : error("KDE 4 kdelibs required.") + exists($$KDEPREFIX/include/kde4/KDE){ + KDEINCDIR = $$KDEPREFIX/include/kde4 + } else : exists($$KDEPREFIX/include/kde/KDE){ + KDEINCDIR = $$KDEPREFIX/include/kde + } else { + KDEINCDIR = $$KDEPREFIX/include + } + INCLUDEPATH += $$KDEINCDIR + KDELIBDIR = $$KDEPREFIX/lib$$system(kde4-config --libsuffix) + KDEDEVELLIBDIR = $$KDELIBDIR + exists($$KDEDEVELLIBDIR/kde4/devel){ + KDEDEVELLIBDIR = $$KDEDEVELLIBDIR/kde4/devel + } + !equals(KDEDEVELLIBDIR,/usr/lib) : !equals(KDEDEVELLIBDIR,/usr/lib64){ + QMAKE_LIBDIR = $$KDEDEVELLIBDIR $$QMAKE_LIBDIR + } + !equals(KDELIBDIR,/usr/lib):!equals(KDELIBDIR,/usr/lib64){ + !darwin-* : !macx-* { + LIBS += -Wl,--rpath,"$$KDELIBDIR" + } + } +} + +INCLUDEPATH += ../pokemod ../general +TARGETDEPS += ../../lib/libpokemod.so ../../lib/libgeneral.so -INCLUDEPATH += ../pokemod \ -../general \ -/usr/lib64/kde4 -TARGETDEPS += ../../lib/libpokemod.so \ -../../lib/libgeneral.so SOURCES += Arena.cpp \ -Ghost.cpp \ -Team.cpp + Ghost.cpp \ + Team.cpp + HEADERS += Arena.h \ -Bot.h \ -GhostBot.h \ -Ghost.h \ -Pokemon.h \ -Team.h + Bot.h \ + GhostBot.h \ + Ghost.h \ + Pokemon.h \ + Team.h |