[FIX] cmake fixes

[FIX] spec fixes

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

7 files changed, 72 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a6699d..a304d608 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,17 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
 PROJECT(pokegen)
 
 SET(BUILT_FROM_ROOT
     TRUE
 )
 
+IF(MINGW_CROSS)
+    SET(CMAKE_TOOLCHAIN_FILE
+        cross-mingw32.cmake
+    )
+ENDIF(MINGW_CROSS)
+
 FIND_PACKAGE(Qt4 REQUIRED)
 INCLUDE(${QT_USE_FILE})
 
diff --git a/Changelog b/Changelog
index 93972b20..1d6d927f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
 -----------------
+Rev:  215
+Date: 22 June 2008
+User: MathStuf
+-----------------
+[FIX] cmake fixes
+[FIX] spec fixes
+
+-----------------
 Rev:  214
 Date: 21 June 2008
 User: MathStuf
diff --git a/cross-mingw32.cmake b/cross-mingw32.cmake
index b5e0c066..8b6b07c6 100644
--- a/cross-mingw32.cmake
+++ b/cross-mingw32.cmake
@@ -1,11 +1,34 @@
-SET(CMAKE_SYSTEM_NAME Windows)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-SET(CMAKE_C_COMPILER i386-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER i386-mingw32-g++)
+SET(CMAKE_SYSTEM_NAME
+    Windows
+)
 
-SET(CMAKE_FIND_ROOT_PATH ~/.wine/c/kde4)
-SET(CMAKE_INSTALL_PREFIX ${CMAKE_FIND_ROOT_PATH})
+SET(CMAKE_C_COMPILER
+    i386-mingw32-gcc
+)
+SET(CMAKE_CXX_COMPILER
+    i386-mingw32-g++
+)
 
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\
+SET(CMAKE_FIND_ROOT_PATH
+    ~/.wine/c/kde4
+)
+SET(CMAKE_INSTALL_PREFIX
+    ${CMAKE_FIND_ROOT_PATH}
+)
+
+# Dirty fixes
+SET(QT_LIBRARY_DIR
+    ${CMAKE_FIND_ROOT_PATH}/lib
+)
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
+    NEVER
+)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
+    ONLY
+)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
+    ONLY
+)
diff --git a/pokebattle/CMakeLists.txt b/pokebattle/CMakeLists.txt
index 7baff6b0..1304c5cc 100644
--- a/pokebattle/CMakeLists.txt
+++ b/pokebattle/CMakeLists.txt
@@ -1,5 +1,11 @@
 PROJECT(pokebattle)
 
+IF(NOT BUILT_FROM_ROOT)
+    MESSAGE(FATAL_ERROR "Not built from source root")
+ENDIF(NOT BUILT_FROM_ROOT)
+
+ADD_DEFINITIONS(-DMAKE_POKEBATTLE_LIB)
+
 SET(pokebattle_MOC_HEADERS
     Arena.h
     Bot.h
diff --git a/pokegen.spec b/pokegen.spec
index 63b7ffe9..03af94f2 100644
--- a/pokegen.spec
+++ b/pokegen.spec
@@ -1,6 +1,6 @@
 Name:           pokegen
 Version:        0.0.2
-Release:        0.4%{?dist}.20080618svn214
+Release:        0.5.20080622svn215%{?dist}
 Summary:        Pokégen is a game aiming to be a customizable Pokémon-like game
 
 Group:          Amusements/Games
@@ -19,13 +19,13 @@ Pokémodr - modding program for Pokémod files
 Pokébattle - library for handling battles
 
 %package devel
-Summary: Files needed to develop programs which use PokéGen
+Summary: Files needed to develop programs which use Pokégen
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: qt4-devel
 
 %description devel
-Development files used for creating apps based on the PokéMod
+Development files used for creating apps based on the Pokémod
 library, Pokémodr modding program, or the Pokégen game engine.
 
 
@@ -41,7 +41,7 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 mkdir %{buildroot}
-make INSTALL_ROOT=%{buildroot} install
+make install
 # Following is based off of KTIGCC's .spec file
 # GNOME (shared-mime-info) MIME type registration
 mkdir -p %{buildroot}%{_datadir}/mime/packages
@@ -69,11 +69,11 @@ Comment=Pokémod
 Type=bool
 Value=true
 EOF2
-# PokéModr menu entry
+# Pokémodr menu entry
 mkdir -p %{buildroot}%{_datadir}/applications
 cat > %{buildroot}%{_datadir}/applications/pokemodr.desktop << EOF3
 [Desktop Entry]
-Name=PokéModr
+Name=Pokémodr
 Comment=Program to edit Pokémods
 GenericName=Program to edit Pokémods
 Encoding=UTF-8
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/LICENSE
+%doc %{_docdir}/%{name}-%{version}/DISCLAIMER
+%doc %{_docdir}/%{name}-%{version}/pokemodr.pdf
 %{_bindir}/pokemodr
 %{_libdir}/libpokemod.so.0
 %{_libdir}/libpokemod.so.0.0.2
@@ -113,24 +116,22 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/DISCLAIMER
-%doc %{_docdir}/%{name}-%{version}/pokemodr.pdf
 %{_libdir}/libpokemod.so
 %{_libdir}/libpokebattle.so
-%{_includedir}/%{name}/pokemod/*.h
-%{_includedir}/%{name}/pokemodr/*.h
-%{_includedir}/%{name}/pokemodr/models/*.h
-%{_includedir}/%{name}/pokebattle/*.h
+%{_includedir}/%{name}/
 
 
 %changelog
-* Fri Jun 20 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-0.4
+* Sun Jun 22 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-5
+- Fixed the versions in the changelog
+- Minor spelling mistakes in descriptions/summaries
+
+* Fri Jun 20 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-4
 - Using cmake now
 - Fixed up the -devel package
 - .0.0 libs not made with cmake
 
-* Tue Jun 17 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-0.3
+* Tue Jun 17 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-3
 - New SVN revision
 - Fixes for release versioning
 - clean section fixed
diff --git a/pokemod/CMakeLists.txt b/pokemod/CMakeLists.txt
index b8614f4e..bf06f867 100644
--- a/pokemod/CMakeLists.txt
+++ b/pokemod/CMakeLists.txt
@@ -4,6 +4,8 @@ IF(NOT BUILT_FROM_ROOT)
     MESSAGE(FATAL_ERROR "Not built from source root")
 ENDIF(NOT BUILT_FROM_ROOT)
 
+ADD_DEFINITIONS(-DMAKE_POKEMOD_LIB)
+
 SET(pokemod_MOC_HEADERS
     Ability.h
     Author.h
diff --git a/pokemod/Global.h b/pokemod/Global.h
index 9573cfeb..903ea89b 100644
--- a/pokemod/Global.h
+++ b/pokemod/Global.h
@@ -25,7 +25,7 @@
 #include <kdemacros.h>
 
 #ifndef POKEMOD_EXPORT
-# if defined(MAKE_POKEMOD_LIB)
+# ifdef MAKE_POKEMOD_LIB
    /* We are building this library */
 #  define POKEMOD_EXPORT KDE_EXPORT
 # else