Improved Windows support

CMakeLists.txt

@@ -70,6 +70,15 @@ add_subdirectory (src)
 
 #################################################################
 
+if (${CMAKE_GENERATOR} STREQUAL "MinGW Makefiles")
+
+	# Target for running the setup
+    add_custom_target (setup "${PROJECT_SOURCE_DIR}/cmake/setup_win.bat"
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
+
+endif (${CMAKE_GENERATOR} STREQUAL "MinGW Makefiles") 
+
 if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 
     # Target for running the setup

ChangeLog.md

@@ -2,6 +2,11 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140702 ]
+	* Compiled successfully in Windows 7 using MinGW
+	* Added Windows setup script
+	* FontTRLE lps parser no longer using std::stoi
+
     [ 20140626 ]
     * ColorMode enum now global
     * Entities setAngles now sets all three angles

cmake/setup_win.bat

@@ -0,0 +1,17 @@
+@echo off
+
+if not exist "%UserProfile%\.OpenRaider" (
+	echo Setting up for %UserName%...
+	mkdir "%UserProfile%\.OpenRaider"
+	copy data\OpenRaider.ini %UserProfile%\.OpenRaider
+	mkdir %UserProfile%\.OpenRaider\paks
+	mkdir %UserProfile%\.OpenRaider\music
+	mkdir %UserProfile%\.OpenRaider\data
+	mkdir %UserProfile%\.OpenRaider\sshots
+	copy data\*.tga %UserProfile%\.OpenRaider\data
+	copy data\*.ttf %UserProfile%\.OpenRaider\data
+	copy data\*.pc %UserProfile%\.OpenRaider\data
+	echo Done!
+) else (
+	echo Already done
+)

include/WindowSDL.h

@@ -9,7 +9,6 @@
 #define _WINDOW_SDL_H_
 
 #include "SDL.h"
-#include "SDL_ttf.h"
 
 #include "Window.h"
 

include/global.h

@@ -102,6 +102,7 @@ KeyboardButton stringToKeyboardButton(const char *key);
 #include <windows.h>
 #endif
 #include <GL/gl.h>
+#include <GL/glext.h>
 #endif
 
 // If available, use our own assert that prints the call stack

src/FontManager.cpp

@@ -9,9 +9,12 @@
 #include "utils/strings.h"
 #include "FontManager.h"
 #include "Font.h"
-#include "FontSDL.h"
 #include "FontTRLE.h"
 
+#ifdef USING_SDL_FONT
+#include "FontSDL.h"
+#endif
+
 FontManager::FontManager() {
     add(new FontTRLE(), ".pc");
 

src/FontSDL.cpp

@@ -5,6 +5,8 @@
  * \author xythobuz
  */
 
+#include <stdio.h>
+
 #include "global.h"
 #include "FontSDL.h"
 

src/FontTRLE.cpp

@@ -72,32 +72,23 @@ void FontTRLE::loadLPS(const char *f) {
 
     for (std::string line; std::getline(file, line);) {
         std::istringstream stream(line);
-        std::string tok1, tok2;
-        std::getline(stream, tok1, '=');
-        std::getline(stream, tok2);
-
-        // we are only interested in lines starting with
-        // xxx=
-        // Where xxx is a 3 digit number
-        try {
-            int index = std::stoi(tok1);
-            if ((index >= 0) && (index <= 105)) {
-                std::istringstream row(tok2);
-                std::string a, b, c, d, e;
-                std::getline(row, a, ',');
-                std::getline(row, b, ',');
-                std::getline(row, c, ',');
-                std::getline(row, d, ',');
-                std::getline(row, e);
-                offsets[index][0] = std::stoi(a);
-                offsets[index][1] = std::stoi(b);
-                offsets[index][2] = std::stoi(c);
-                offsets[index][3] = std::stoi(d);
-                offsets[index][4] = std::stoi(e);
-            }
-        } catch (std::invalid_argument) {
-
-        }
+		int index;
+		stream >> index;
+		if (stream.get() != '=')
+			return;
+		stream >> offsets[index][0];
+		if (stream.get() != ',')
+			return;
+		stream >> offsets[index][1];
+		if (stream.get() != ',')
+			return;
+		stream >> offsets[index][2];
+		if (stream.get() != ',')
+			return;
+		stream >> offsets[index][3];
+		if (stream.get() != ',')
+			return;
+		stream >> offsets[index][4];
     }
 }
 

src/Menu.cpp

@@ -17,7 +17,7 @@
 #if defined(HAVE_DIRENT_H) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR_R) && defined(HAVE_CLOSEDIR) && defined(HAVE_DT_DIR)
 #include <dirent.h>
 #define USE_DIRENT
-#elif defined(HAVE_WINDOWS_H) && defined(HAVE_FINDFIRSTFILE) && defined(HAVE_FINDNEXTFILE) && defined(HAVE_FINDCLOSE)
+#elif (defined(HAVE_WINDOWS_H) && defined(HAVE_FINDFIRSTFILE) && defined(HAVE_FINDNEXTFILE) && defined(HAVE_FINDCLOSE)) || defined (_WIN32)
 #include <windows.h>
 #define USE_FINDFILE
 #else

src/TextureManager.cpp

@@ -45,7 +45,7 @@ int TextureManager::initialize() {
     delete [] image;
 
     //! \fixme Temporary
-    char *filename = bufferString("%s/tr2/TITLE.PCX", getOpenRaider().mPakDir);
+    char *filename;// = bufferString("%s/tr2/TITLE.PCX", getOpenRaider().mPakDir);
     if (loadPCX(filename) < 0) {
         delete [] filename;
         //! \fixme Error Checking. Return negative error code, check in calling place too
@@ -72,16 +72,20 @@ int TextureManager::getTextureCount() {
 void TextureManager::disableMultiTexture() {
     mFlags &= ~fUseMultiTexture;
 
+#ifdef MULTITEXTURE
     glDisable(GL_TEXTURE_2D);
     glActiveTextureARB(GL_TEXTURE0_ARB);
+#endif
 }
 
 void TextureManager::useMultiTexture(float aU, float aV, float bU, float bV) {
     if (!(mFlags & fUseMultiTexture))
         return;
 
+#ifdef MULTITEXTURE
     glMultiTexCoord2fARB(GL_TEXTURE0_ARB, aU, aV);
     glMultiTexCoord2fARB(GL_TEXTURE1_ARB, bU, bV);
+#endif
 }
 
 void TextureManager::bindMultiTexture(int texture0, int texture1) {
@@ -92,6 +96,7 @@ void TextureManager::bindMultiTexture(int texture0, int texture1) {
 
     mFlags |= fUseMultiTexture;
 
+#ifdef MULTITEXTURE
     glActiveTextureARB(GL_TEXTURE0_ARB);
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, mTextureIds.at(texture0));
@@ -99,6 +104,7 @@ void TextureManager::bindMultiTexture(int texture0, int texture1) {
     glActiveTextureARB(GL_TEXTURE1_ARB);
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, mTextureIds.at(texture1));
+#endif
 }
 
 int TextureManager::loadBufferSlot(unsigned char *image,

src/WindowSDL.cpp

@@ -25,7 +25,7 @@ WindowSDL::WindowSDL() {
     mWindow = NULL;
     mGLContext = NULL;
 
-#ifdef WIN32
+#ifdef _WIN32
     setDriver("libGL32.dll");
 #elif !defined(__APPLE__)
     setDriver("/usr/lib/libGL.so.1");
@@ -84,7 +84,7 @@ int WindowSDL::initialize() {
         return -1;
     }
 
-#ifndef __APPLE__
+#if !(defined(__APPLE__) || defined(_WIN32))
     assert(mDriver != NULL);
     assert(mDriver[0] != '\0');
 

src/utils/strings.cpp

@@ -12,7 +12,7 @@
 
 #if defined(unix) || defined(__APPLE__) || defined(__linux__)
 #include <wordexp.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #include <Windows.h>
 #include <shlobj.h>
 #ifndef va_copy
@@ -171,16 +171,18 @@ char *fullPath(const char *path, char end) {
         }
 
         wordfree(&word);
-#elif defined(WIN32)
-        WCHAR newPath[MAX_PATH];
-        if (SHGetFolderPathW(NULL, CSIDL_PROFILE, NULL, 0, newPath) == S_OK) {
-            lenPath = strlen((const char *)newPath);
+#elif defined(_WIN32)
+        char newPath[MAX_PATH];
+        if (SHGetFolderPath(NULL, CSIDL_PROFILE, NULL, 0, newPath) == S_OK) {
+            lenPath = strlen(newPath);
             unsigned int lenPath2 = strlen(path);
             dir = new char[lenPath + lenPath2 + 2]; // space for end char
-            strncpy(dir, (const char *)newPath, lenPath);
-            dir[lenPath] = '\\';
-            strncpy((dir + lenPath + 1), (path + 1), lenPath2 - 1);
-            lenPath += lenPath2;
+            strncpy(dir, newPath, lenPath);
+            strncpy((dir + lenPath), (path + 1), lenPath2 - 1);
+            lenPath += lenPath2 - 1;
+			for (unsigned int i = 0; i < lenPath; i++)
+				if(dir[i] == '\\')
+					dir[i] = '/';
         } else {
             printf("WARNING: Could not get home folder location for tilde expansion!\n");
             lenPath = strlen(path);

src/utils/time.cpp

@@ -26,7 +26,7 @@ void systemTimerReset() {
     gettimeofday(&system_timer_start, &system_timer_zone);
 }
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
 
 #include <Windows.h>