[FIX] Fixed some qmake options for Windows

[FIX] climits needed in Object

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@114 6ecfd1a5-f3ed-3746-8530-beee90d26b22

17 files changed, 71 insertions, 34 deletions

diff --git a/Changelog b/Changelog
index f2b23629..88fe6077 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
 -----------------
+Rev:  114
+Date: 28 April 2008
+User: MathStuf
+-----------------
+[FIX] Fixed some qmake options for Windows
+[FIX] climits needed in Object
+
+-----------------
 Rev:  113
 Date: 28 April 2008
 User: MathStuf
diff --git a/general/general.pro b/general/general.pro
index 95ec09cf..5810ce03 100644
--- a/general/general.pro
+++ b/general/general.pro
@@ -7,8 +7,11 @@ LIBS += -lphonon \
  -lkdeui \
  -lkdecore
 
-CONFIG += qt warn_on dll exceptions debug
-CONFIG -= release
+CONFIG += qt \
+ warn_on \
+ dll \
+ exceptions
+!win32:CONFIG += debug
 
 # Following is reformatted from the KTIGCC .pro file
 win32 {
@@ -65,6 +68,12 @@ HEADERS += Audio.h \
  Point.h
 
 INSTALLS += target
-target.path = /usr/lib`kde4-config --libsuffix`
+isEmpty(PREFIX) {
+    PREFIX = $$(PREFIX)/lib
+}
+isEmpty(PREFIX) {
+    PREFIX = /usr/lib`kde4-config --libsuffix`
+}
+target.path = $$PREFIX
 
 DISTFILES += TODO
diff --git a/pokegen.pro b/pokegen.pro
index 77168850..065876c8 100755
--- a/pokegen.pro
+++ b/pokegen.pro
@@ -1,6 +1,10 @@
 VERSION = 0.0.1
 TEMPLATE = subdirs
-CONFIG += ordered qt warn_on debug
+CONFIG += ordered \
+ qt \
+ warn_on
+
+!win32:CONFIG += debug
 
 SUBDIRS = general \
  pokemod \
diff --git a/pokemod/Object.h b/pokemod/Object.h
index 22a59ce2..fc13dc6e 100644
--- a/pokemod/Object.h
+++ b/pokemod/Object.h
@@ -21,6 +21,9 @@
 // Qt includes
 #include <QDomElement>
 
+// C includes
+#include <climits>
+
 class Object
 {
     public:
diff --git a/pokemod/pokemod.pro b/pokemod/pokemod.pro
index 175b51d7..cfe81a1c 100644
--- a/pokemod/pokemod.pro
+++ b/pokemod/pokemod.pro
@@ -4,8 +4,11 @@ DESTDIR = ../../bin
 LIBS += -L../../bin \
  -lgeneral
 
-CONFIG += qt warn_on dll exceptions debug
-CONFIG -= release
+CONFIG += qt \
+ warn_on \
+ dll \
+ exceptions
+!win32:CONFIG += debug
 QT += xml
 
 win32 {
@@ -84,6 +87,12 @@ HEADERS += AbilityEffect.h \
  Type.h
 
 INSTALLS += target
-target.path = /usr/lib`kde4-config --libsuffix`
+isEmpty(PREFIX) {
+    PREFIX = $$(PREFIX)/lib
+}
+isEmpty(PREFIX) {
+    PREFIX = /usr/lib`kde4-config --libsuffix`
+}
+target.path = $$PREFIX
 
-TARGETDEPS += ../../bin/libgeneral.so
+DISTFILES += TODO
diff --git a/pokemodr/gui/abilityeffect.ui b/pokemodr/gui/abilityeffect.ui
index 067c74a4..6a7357d5 100644
--- a/pokemodr/gui/abilityeffect.ui
+++ b/pokemodr/gui/abilityeffect.ui
@@ -180,7 +180,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui
index 41fc47ea..5adda5af 100644
--- a/pokemodr/gui/badge.ui
+++ b/pokemodr/gui/badge.ui
@@ -213,7 +213,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/itemeffect.ui b/pokemodr/gui/itemeffect.ui
index 089c3032..79e3441f 100644
--- a/pokemodr/gui/itemeffect.ui
+++ b/pokemodr/gui/itemeffect.ui
@@ -171,7 +171,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui
index fa6e1b18..f4e21bee 100644
--- a/pokemodr/gui/mapwarp.ui
+++ b/pokemodr/gui/mapwarp.ui
@@ -270,7 +270,7 @@
   <customwidget>
    <class>PointWidget</class>
    <extends>QWidget</extends>
-   <header>PointWidget.h</header>
+   <header>../PointWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index 7b7432fd..946c3528 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -297,7 +297,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui
index f40afceb..4f51a948 100644
--- a/pokemodr/gui/nature.ui
+++ b/pokemodr/gui/nature.ui
@@ -121,7 +121,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index 570132b4..8d0a317e 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -483,7 +483,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui
index 75ce5735..f5454f37 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -501,7 +501,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui
index 1ec00b0d..97a0ce77 100644
--- a/pokemodr/gui/species.ui
+++ b/pokemodr/gui/species.ui
@@ -662,7 +662,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui
index 3025e0ba..603ee65f 100644
--- a/pokemodr/gui/tile.ui
+++ b/pokemodr/gui/tile.ui
@@ -244,7 +244,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui
index 2c058e0a..2faeba8b 100644
--- a/pokemodr/gui/type.ui
+++ b/pokemodr/gui/type.ui
@@ -79,7 +79,7 @@
   <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header>../FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index ab13ba3d..51d37c3c 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -3,12 +3,20 @@ OBJECTS_DIR = .obj
 UI_DIR = .ui
 MOC_DIR = .moc
 DESTDIR = ../../bin
+LIBS += -L../../bin \
+  -lgeneral \
+  -lpokemod \
+  -lkdecore \
+  -lkdeui \
+  -lkio
 
-CONFIG += qt gui warn_on exceptions debug
-CONFIG -= release
+CONFIG += qt \
+ gui \
+ warn_on \
+ exceptions
+!win32:CONFIG += debug
 QT += xml
 
-
 RESOURCES += images/overlays.qrc
 
 win32 {
@@ -204,17 +212,13 @@ FORMS += gui/ability.ui \
  gui/trainer.ui \
  gui/type.ui
 
-DISTFILES += ../INSTALL
-
 INSTALLS += target
-target.path = /usr/bin
-LIBS += -L../../bin \
-  -lgeneral \
-  -lpokemod \
-  -lkdecore \
-  -lkdeui \
-  -lkio
-
-TARGETDEPS += ../../bin/libpokemod.so \
-  ../../bin/libgeneral.so
+isEmpty(PREFIX) {
+    PREFIX = $$(PREFIX)
+}
+isEmpty(PREFIX) {
+    PREFIX = /usr
+}
+target.path = $$PREFIX/bin
 
+DISTFILES += TODO