diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-01-25 22:57:54 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-01-25 22:57:54 +0000 |
| commit | 404d1e3419e85ad06cf4d1cdef185877f4a57771 (patch) | |
| tree | 7979c422e3a82285e9ac442b84f50f8d590841ab /general | |
| parent | 2d8ee00f42b980d8351c810062d17271b3a65cf6 (diff) | |
[ADD] win32 support (KDE) into .pro files
[FIX] Ref.h extern variables
[FIX] Nature include
[FIX[ GUI fixes
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@48 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'general')
| -rw-r--r-- | general/Ref.h | 8 | ||||
| -rw-r--r-- | general/general.pro | 43 |
2 files changed, 50 insertions, 1 deletions
diff --git a/general/Ref.h b/general/Ref.h index 7dd32769..6f17a86e 100644 --- a/general/Ref.h +++ b/general/Ref.h @@ -40,6 +40,8 @@ enum EnumStat ST_Evasion = 7, ST_End_Battle = 8, }; +extern const QStringList StatRBYStr; +extern const QStringList StatGSCStr; enum EnumBattleMember { @@ -47,6 +49,7 @@ enum EnumBattleMember BM_Enemy = 1, BM_End = 2 }; +extern const QStringList BattleMemberStr; enum EnumWeather { @@ -58,6 +61,7 @@ enum EnumWeather W_All = 4, W_End_All = 5 }; +extern const QStringList WeatherStr; enum EnumDirection { @@ -69,6 +73,7 @@ enum EnumDirection D_None = 4, D_End_None = 5 }; +extern const QStringList DirectionStr; enum EnumRelative { @@ -80,6 +85,7 @@ enum EnumRelative REL_NotEqual = 5, REL_End = 6 }; +extern const QStringList RelativeStr; enum EnumStatus { @@ -92,6 +98,7 @@ enum EnumStatus STS_Any = 6, STS_End = 7 }; +extern const QStringList StatusStr; enum HMMove { @@ -110,5 +117,6 @@ enum HMMove HM_Flash = 11, HM_End_All = 12 }; +extern const QStringList HMStr; #endif diff --git a/general/general.pro b/general/general.pro index d0754b7e..13a78d0d 100644 --- a/general/general.pro +++ b/general/general.pro @@ -3,9 +3,50 @@ DESTDIR = ../../lib MOC_DIR = .moc LANGUAGE = C++ TEMPLATE = lib -LIBS += -L/usr/lib64/kde4/devel -lphonon +LIBS += -lphonon INCLUDEPATH+=/usr/include/kde4 +# 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" + } + } +} + + CONFIG += qt warn_on dll SOURCES += *.cpp |