Prepared for Windows support

CMakeLists.txt

@@ -15,8 +15,8 @@ site_name (OpenRaider_HOSTNAME)
 
 # Set a default build type if none was specified
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    message(STATUS "Setting build type to 'Debug' as none was specified.")
-    set(CMAKE_BUILD_TYPE Debug)
+    message (STATUS "Setting build type to 'Debug' as none was specified.")
+    set (CMAKE_BUILD_TYPE Debug)
 endif()
 
 #################################################################
@@ -30,17 +30,18 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 #################################################################
 
-# Build warnings
-if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+# Compiler specific flags
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed")
     set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
     set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
     set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
     set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
-
     set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
-else()
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set (WARNINGS "${WARNINGS} -Wall -Wextra -Wpedantic")
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    # TODO Visual C++ compiler flags?
 endif()
 
 # Flags for all builds
@@ -72,53 +73,57 @@ add_custom_target (setup "${PROJECT_SOURCE_DIR}/cmake/setup.sh"
 #################################################################
 
 # Target for running cppcheck
-set (CHECK_STD "--std=c++11" "--std=posix")
-set (CHECK_FLAGS "--quiet" "--force")
-set (CHECK_NORMAL "--enable=information,warning,performance,portability")
-set (CHECK_FULL "--enable=all")
-set (CHECK_CONFIG "--check-config")
-add_custom_target (check echo "Running cppcheck..."
-    COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_STD} ${CHECK_NORMAL} ${PROJECT_SOURCE_DIR}
-)
-add_custom_target (checkFull echo "Running full cppcheck..."
-    COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_STD} ${CHECK_FULL} ${PROJECT_SOURCE_DIR}
-)
-add_custom_target (checkConfig echo "Checking cppcheck config..."
-    COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_CONFIG} ${PROJECT_SOURCE_DIR}
-)
+if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    set (CHECK_STD "--std=c++11" "--std=posix")
+    set (CHECK_FLAGS "--quiet" "--force")
+    set (CHECK_NORMAL "--enable=information,warning,performance,portability")
+    set (CHECK_FULL "--enable=all")
+    set (CHECK_CONFIG "--check-config")
+    add_custom_target (check echo "Running cppcheck..."
+        COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_STD} ${CHECK_NORMAL} ${PROJECT_SOURCE_DIR}
+    )
+    add_custom_target (checkFull echo "Running full cppcheck..."
+        COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_STD} ${CHECK_FULL} ${PROJECT_SOURCE_DIR}
+    )
+    add_custom_target (checkConfig echo "Checking cppcheck config..."
+        COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_CONFIG} ${PROJECT_SOURCE_DIR}
+    )
+endif (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 
 #################################################################
 
 # Generate Doxygen Documentation
-find_package (Doxygen)
-if (DOXYGEN_FOUND)
-    # Configure the Template Doxyfile for our specific project
-    configure_file (cmake/Doxyfile.in 
-        ${PROJECT_BINARY_DIR}/Doxyfile  @ONLY IMMEDIATE)
-
-    # Add a custom target to run Doxygen when ever the project is built
-    add_custom_target (doc
-  	    COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
-  		SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
-
-    # Add custom target to create local documentation without graphs
-    add_custom_target (docLocal
-        COMMAND sed -i '' "s/HAVE_DOT               = YES/HAVE_DOT               = NO/g" Doxyfile
-        COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
-        COMMAND cp -R doc/html/* ${PROJECT_SOURCE_DIR}/../apache/
-        COMMAND sed -i '' "s/HAVE_DOT               = NO/HAVE_DOT               = YES/g" Doxyfile
-        SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
-
-    # Add custom target to create local documentation with call and caller graphs
-    add_custom_target (docLocalFull
-        COMMAND sed -i '' "s/CALL_GRAPH             = NO/CALL_GRAPH             = YES/g" Doxyfile
-        COMMAND sed -i '' "s/CALLER_GRAPH           = NO/CALLER_GRAPH           = YES/g" Doxyfile
-        COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
-        COMMAND cp -R doc/html/* ${PROJECT_SOURCE_DIR}/../apache/
-        COMMAND sed -i '' "s/CALL_GRAPH             = YES/CALL_GRAPH             = NO/g" Doxyfile
-        COMMAND sed -i '' "s/CALLER_GRAPH           = YES/CALLER_GRAPH           = NO/g" Doxyfile
-        SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
-endif (DOXYGEN_FOUND)
+if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    find_package (Doxygen)
+    if (DOXYGEN_FOUND)
+        # Configure the Template Doxyfile for our specific project
+        configure_file (cmake/Doxyfile.in 
+            ${PROJECT_BINARY_DIR}/Doxyfile  @ONLY IMMEDIATE)
+
+        # Add a custom target to run Doxygen when ever the project is built
+        add_custom_target (doc
+            COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
+            SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
+
+        # Add custom target to create local documentation without graphs
+        add_custom_target (docLocal
+            COMMAND sed -i '' "s/HAVE_DOT               = YES/HAVE_DOT               = NO/g" Doxyfile
+            COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
+            COMMAND cp -R doc/html/* ${PROJECT_SOURCE_DIR}/../apache/
+            COMMAND sed -i '' "s/HAVE_DOT               = NO/HAVE_DOT               = YES/g" Doxyfile
+            SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
+
+        # Add custom target to create local documentation with call and caller graphs
+        add_custom_target (docLocalFull
+            COMMAND sed -i '' "s/CALL_GRAPH             = NO/CALL_GRAPH             = YES/g" Doxyfile
+            COMMAND sed -i '' "s/CALLER_GRAPH           = NO/CALLER_GRAPH           = YES/g" Doxyfile
+            COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
+            COMMAND cp -R doc/html/* ${PROJECT_SOURCE_DIR}/../apache/
+            COMMAND sed -i '' "s/CALL_GRAPH             = YES/CALL_GRAPH             = NO/g" Doxyfile
+            COMMAND sed -i '' "s/CALLER_GRAPH           = YES/CALLER_GRAPH           = NO/g" Doxyfile
+            SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
+    endif (DOXYGEN_FOUND)
+endif (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 
 # Clean doc files
 set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "doc")

ChangeLog.md

@@ -2,6 +2,13 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140507 ]
+    * Prepared for Windows support using Visual C++
+      - Wrote utils/time implementation for Windows
+      - Audio output optional, added Null Sound implementation
+      - Added support for getting home folder location in Windows
+      - Added support for recursively looking for level paks in Windows
+
     [ 20140505 ]
     * Moved setup of Room, Portal, Box, Sector, ... into their
       Constructors.

README.md

@@ -50,6 +50,8 @@ Get, compile and install freealut like this:
 
 Linux Distributions will probably provide an ALUT library ready to install with their package manager, so you won't need to compile freealut.
 
+Sound support is optional now, however. If cmake can’t find OpenAL and ALUT, Audio will be deactivated. If you want to explicitly deactivate it, call cmake with `-DENABLE_AUDIO=NO`.
+
 ## Building
 
 Do a standard cmake out-of-source build to get a debug configuration and then run the resulting executable:

include/SoundNull.h

@@ -0,0 +1,101 @@
+/*!
+ * \file include/SoundNull.h
+ * \brief This is the null audio manager Header
+ *
+ * \author xythobuz
+ */
+
+#ifndef _SOUND_NULL_H_
+#define _SOUND_NULL_H_
+
+#include "Sound.h"
+
+/*!
+ * \brief This is the null audio manager
+ */
+class SoundNull : public Sound {
+public:
+
+    /*!
+     * \brief Constructs an object of SoundNull
+     */
+    SoundNull();
+
+    /*!
+     * \brief Deconstructs an object of SoundNull
+     */
+    virtual ~SoundNull();
+
+    /*!
+     * \brief Initialize sound system
+     * \returns 0 on success or < 0 error flags
+     */
+    virtual int initialize();
+
+    virtual void setEnabled(bool on);
+
+    /*!
+     * \brief Set the volume
+     * \param vol new source gain
+     */
+    virtual void setVolume(float vol);
+
+    /*!
+     * \brief Get number of registered sources
+     * \returns number of registered sources
+     */
+    virtual int registeredSources();
+
+    /*!
+     * \brief Remove all loaded sounds
+     */
+    virtual void clear();
+
+    /*!
+     * \brief Move listener and repositions them
+     * \param pos New position for listener
+     * \param angle New orientation for listener
+     */
+    virtual void listenAt(float pos[3], float angle[3]);
+
+    /*!
+     * \brief Move sound source to position
+     * \param source valid source id
+     * \param pos new position for source
+     */
+    virtual void sourceAt(int source, float pos[3]);
+
+    /*!
+     * \brief Load wav file from disk
+     * \param filename not NULL!
+     * \param source not NULL! Returns new source ID or -1 on error.
+     * \param flags set options. Use SoundFlags enum bitwise OR-ed
+     * \returns 0 for no error or < 0 error flag
+     */
+    virtual int addFile(const char *filename, int *source, unsigned int flags);
+
+    /*!
+     * \brief Load wav file from buffer
+     * \param wav not NULL! Is a valid waveform buffer!
+     * \param length length of wav buffer
+     * \param source not NULL! Returns new source ID or -1 on error.
+     * \param flags set options. Use SoundFlags enum bitwise OR-ed
+     * \returns 0 for no error or < 0 error flag
+     */
+    virtual int addWave(unsigned char *wav, unsigned int length, int *source, unsigned int flags);
+
+    /*!
+     * \brief Play sound source
+     * \param source sound source to play
+     */
+    virtual void play(int source);
+
+    /*!
+     * \brief Stop playing sound source
+     * \param source sound source to stop
+     */
+    virtual void stop(int source);
+};
+
+#endif
+

include/TombRaider.h

@@ -11,6 +11,12 @@
 
 #include <cstdint>
 
+#ifdef WIN32
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+#endif
+
 #include "TombRaiderData.h"
 
 /*!

include/Window.h

@@ -8,6 +8,10 @@
 #ifndef _WINDOW_H_
 #define _WINDOW_H_
 
+#ifdef WIN32
+#define __attribute__(x)
+#endif
+
 #include <ctime>
 
 #include "global.h"

include/WindowSDL.h

@@ -14,6 +14,9 @@
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #include <GL/glu.h>

include/math/math.h

@@ -12,6 +12,10 @@
 #ifndef _MATH_MATH_H
 #define _MATH_MATH_H
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 #define OR_PI           ((float)M_PI) //!< pi
 #define OR_2_PI         (OR_PI * 2.0f) //!< pi*2
 #define OR_PI_OVER_4    (OR_PI / 4.0f) //!< pi/4

include/utils/strings.h

@@ -9,6 +9,10 @@
 #ifndef _UTILS_STRINGS_H_
 #define _UTILS_STRINGS_H_
 
+#ifdef WIN32
+#define __attribute__(x)
+#endif
+
 #include <cstdarg>
 #include <vector>
 

include/utils/tga.h

@@ -8,6 +8,10 @@
 #ifndef _UTILS_TGA_H
 #define _UTILS_TGA_H
 
+#ifdef WIN32
+#define __attribute__(x)
+#endif
+
 /*!
  * \brief Possible TGA image types
  */

src/CMakeLists.txt

@@ -60,13 +60,14 @@ set (SRCS ${SRCS} "Window.cpp")
 set (SRCS ${SRCS} "World.cpp")
 
 # Select available Sound library
-if (OPENAL_FOUND AND ALUT_FOUND)
+option (ENABLE_AUDIO "Enable Sound Output" YES)
+if (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
     set (SRCS ${SRCS} "SoundAL.cpp")
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_AL")
-else (OPENAL_FOUND AND ALUT_FOUND)
-    # Currently only OpenAL support
-    message (FATAL_ERROR "OpenAL and ALUT are required!")
-endif (OPENAL_FOUND AND ALUT_FOUND)
+else (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
+    set (SRCS ${SRCS} "SoundNull.cpp")
+    message (STATUS "Disabled Sound support (no OpenAL and ALUT)!")
+endif (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
 
 # Select available Windowing library
 if (SDL2_FOUND AND SDL2TTF_FOUND)
@@ -74,7 +75,7 @@ if (SDL2_FOUND AND SDL2TTF_FOUND)
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_SDL")
 else (SDL2_FOUND AND SDL2TTF_FOUND)
     # Currently only SDL2 support
-    message (FATAL_ERROR "SDL2 and SDL2-TTF are required!")
+    message (FATAL_ERROR "SDL2 and SDL2-TTF are required at the moment!")
 endif (SDL2_FOUND AND SDL2TTF_FOUND)
 
 #################################################################
@@ -140,6 +141,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     if (NOT "${SSE_FOUND_MSG}" STREQUAL "")
         message (STATUS "Enabled${SSE_FOUND_MSG}...")
     endif (NOT "${SSE_FOUND_MSG}" STREQUAL "")
+# TODO support SSE with other compilers than Clang
 endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
 # Apply Flags
@@ -198,7 +200,9 @@ endif (NOT APPLE)
 #################################################################
 
 # Add Math Library
-set (LIBS ${LIBS} m)
+if (UNIX)
+    set (LIBS ${LIBS} m)
+endif (UNIX)
 
 # Add utils Library
 set (LIBS ${LIBS} OpenRaider_math)

src/Console.cpp

@@ -7,6 +7,9 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #endif

src/Game.cpp

@@ -7,6 +7,9 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #endif

src/Menu.cpp

@@ -6,11 +6,19 @@
  */
 
 #include <assert.h>
-#include <dirent.h>
 #include <cctype>
 
+#ifdef WIN32
+#include <Windows.h>
+#else
+#include <dirent.h>
+#endif
+
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined WIN32
+#include <GL/glew.h>
+#include <GL/wglew.h>
 #else
 #include <GL/gl.h>
 #endif
@@ -57,14 +65,60 @@ bool Menu::isVisible() {
     return mVisible;
 }
 
+#ifdef WIN32
+void loadPakFolderHelper(std::list<char *> &list) {
+    WIN32_FIND_DATA fd;
+    char *tmp = bufferString("%s\\*", list.at(0));
+    HANDLE hFind = FindFirstFile(tmp, &fd);
+    do {
+        if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+            list.push_back(bufferString("%s\\%s", list.at(0), fd.cFileName));
+        } else {
+            char *fullPathMap = bufferString("%s\\%s", list.at(0), fd.cFileName);
+
+            char *lowerPath = bufferString("%s", fullPathMap);
+            for (char *p = lowerPath; *p; ++p) *p = (char)tolower(*p);
+
+            // Check for valid extension
+            if (stringEndsWith(lowerPath, ".phd")
+                 || stringEndsWith(lowerPath, ".tr2")
+                 || stringEndsWith(lowerPath, ".tr4")
+                 || stringEndsWith(lowerPath, ".trc")) {
+                int error = TombRaider::checkMime(fullPathMap);
+                if (error == 0) {
+                    // Just load relative filename
+                    mMapList.push_back(bufferString("%s", (fullPathMap + strlen(getOpenRaider().mPakDir) + 1)));
+                } else {
+                    getConsole().print("Error: pak file '%s' %s",
+                            fullPathMap, (error == -1) ? "not found" : "invalid");
+                }
+            }
+
+            delete [] lowerPath;
+            delete [] fullPathMap;
+        }
+    } while (FindNextFile(hFind, &fd) != 0);
+    FindClose(hFind);
+    delete [] tmp;
+    delete [] list.at(0);
+    list.pop_front();
+}
+#endif
+
 void Menu::loadPakFolderRecursive(const char *dir) {
+    assert(dir != NULL);
+    assert(dir[0] != '\0');
+#ifdef WIN32
+    std::list<char *> list;
+    list.push_back(bufferString("%s", dir));
+    do {
+        loadPakFolderHelper(list);
+    } while (list.size() > 0);
+#else
     struct dirent entry;
     struct dirent *ep = NULL;
     DIR *pakDir;
 
-    assert(dir != NULL);
-    assert(dir[0] != '\0');
-
     pakDir = opendir(dir);
     if (pakDir != NULL) {
         readdir_r(pakDir, &entry, &ep);
@@ -108,6 +162,7 @@ void Menu::loadPakFolderRecursive(const char *dir) {
     } else {
         getConsole().print("Could not open PAK dir %s!", dir);
     }
+#endif
 }
 
 void Menu::fillMapList() {

src/Mesh.cpp

@@ -10,6 +10,9 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #endif

src/OpenRaider.cpp

@@ -133,14 +133,13 @@ int OpenRaider::command(const char *command) {
         }
     }
 
-    char *strtokState;
-    char *token = strtok_r(cmd, " \t", &strtokState);
+    char *token = strtok(cmd, " \t");
     if (token != NULL) {
         // token is the command to execute
         // get arguments
         std::vector<char *> args;
         char *next;
-        while ((next = strtok_r(NULL, " \t", &strtokState)) != NULL) {
+        while ((next = strtok(NULL, " \t")) != NULL) {
             args.push_back(next);
         }
 

src/Render.cpp

@@ -10,6 +10,9 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #endif
@@ -23,6 +26,7 @@
 #include "Game.h"
 #include "OpenRaider.h"
 #include "Render.h"
+#include "utils/strings.h"
 
 bool compareEntites(const void *voidA, const void *voidB)
 {
@@ -94,7 +98,7 @@ void Render::loadTexture(unsigned char *image,
 
 
 int Render::initTextures(char *textureDir) {
-    char filename[128];
+    char *filename;
     unsigned int numTextures = 0;
     unsigned char color[4];
 
@@ -113,10 +117,10 @@ int Render::initTextures(char *textureDir) {
         numTextures++;
 
     //! \fixme Error Checking. Return negative error code, check in calling place too
-    snprintf(filename, 126, "%s/%s", textureDir, "splash.tga");
-    filename[127] = 0;
+    filename = bufferString("%s/%s", textureDir, "splash.tga");
     if (mTexture.loadTGA(filename) > -1)
         numTextures++;
+    delete [] filename;
 
     return numTextures;
 }

src/SoundNull.cpp

@@ -0,0 +1,52 @@
+/*!
+ * \file src/SoundNull.cpp
+ * \brief This is the null audio manager Implementation
+ *
+ * \author xythobuz
+ */
+
+#include "SoundNull.h"
+
+SoundNull::SoundNull() {
+}
+
+SoundNull::~SoundNull() {
+}
+
+int SoundNull::initialize() {
+    return 0;
+}
+
+void SoundNull::setEnabled(bool on) {
+}
+
+void SoundNull::setVolume(float vol) {
+}
+
+int SoundNull::registeredSources() {
+    return 0;
+}
+
+void SoundNull::clear() {
+}
+
+void SoundNull::listenAt(float pos[3], float angle[3]) {
+}
+
+void SoundNull::sourceAt(int source, float pos[3]) {
+}
+
+int SoundNull::addFile(const char *filename, int *source, unsigned int flags) {
+    return 0;
+}
+
+int SoundNull::addWave(unsigned char *wav, unsigned int length, int *source, unsigned int flags) {
+    return 0;
+}
+
+void SoundNull::play(int source) {
+}
+
+void SoundNull::stop(int source) {
+}
+

src/Sprite.cpp

@@ -8,6 +8,9 @@
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #include <GL/glu.h>

src/Texture.cpp

@@ -14,10 +14,14 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #endif
 
+#include "utils/strings.h"
 #include "utils/tga.h"
 #include "Texture.h"
 
@@ -287,7 +291,7 @@ void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
     FILE *f;
     int sz = width * height;
     unsigned char *image = new unsigned char[sz * 3];
-    char filename[1024];
+    char *filename = NULL;
     static int count = 0;
     bool done = false;
 
@@ -297,7 +301,7 @@ void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
 
     // Don't overwrite files
     while (!done) {
-        snprintf(filename, 1024, "%s-%04i.tga", base, count++);
+        filename = bufferString("%s-%04i.tga", base, count++);
 
         f = fopen(filename, "rb");
 
@@ -313,6 +317,7 @@ void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
     tgaSaveFilename(image, width, height, 0, "%s", filename);
     printf("Took screenshot '%s'.\n", filename);
 
+    delete [] filename;
     delete [] image;
 }
 

src/Window.cpp

@@ -12,6 +12,9 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined WIN32
+#include <gl/glew.h>
+#include <gl/wglew.h>
 #else
 #include <GL/gl.h>
 #endif

src/main.cpp

@@ -17,7 +17,7 @@
 #ifdef USING_AL
 #include "SoundAL.h"
 #else
-#error No Sound Library selected!
+#include "SoundNull.h"
 #endif
 
 #ifdef USING_SDL
@@ -36,6 +36,9 @@ World gWorld;
 
 #ifdef USING_AL
 SoundAL gSound;
+#else
+#warn Sound output deactivated!
+SoundNull gSound;
 #endif
 
 #ifdef USING_SDL

src/utils/strings.cpp

@@ -13,6 +13,8 @@
 
 #if defined(unix) || defined(__APPLE__) || defined(__linux__)
 #include <wordexp.h>
+#elif defined(WIN32)
+#include <Windows.h>
 #endif
 
 #include "utils/strings.h"
@@ -119,7 +121,6 @@ char *bufferString(const char *string, ...) {
 
 char *fullPath(const char *path, char end) {
     unsigned int lenPath;
-    wordexp_t word;
     char *dir;
 
     assert(path != NULL);
@@ -128,6 +129,8 @@ char *fullPath(const char *path, char end) {
     if (path[0] == '~') {
 #if defined(unix) || defined(__APPLE__) || defined(__linux__)
 
+        wordexp_t word;
+
 #ifdef __APPLE__
         // Workaround for Mac OS X. See:
         // http://stackoverflow.com/questions/20534788/why-does-wordexp-fail-with-wrde-syntax-on-os-x
@@ -164,6 +167,22 @@ char *fullPath(const char *path, char end) {
         }
 
         wordfree(&word);
+#elif defined(WIN32)
+        WCHAR newPath[MAX_PATH];
+        if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PROFILE, NULL, 0, newPath)) {
+            lenPath = strlen(newPath);
+            unsigned int lenPath2 = strlen(path);
+            dir = new char[lenPath + lenPath2 + 2]; // space for end char
+            strncpy(dir, newPath, lenPath);
+            dir[lenPath] = '\\';
+            strncpy((dir + lenPath + 1), (path + 1), lenPath2 - 1);
+            lenPath += lenPath2;
+        } else {
+            printf("WARNING: Could not get home folder location for tilde expansion!\n");
+            lenPath = strlen(path);
+            dir = new char[lenPath + 2]; // space for end char
+            strncpy(dir, path, lenPath);
+        }
 #else
         printf("WARNING: Tilde expansion not supported on this platform:\n\t%s\n", path);
         lenPath = strlen(path);

src/utils/time.cpp

@@ -5,10 +5,12 @@
  * \author xythobuz
  */
 
-#include <sys/time.h>
-
 #include "utils/time.h"
 
+#if defined(unix) || defined(__APPLE__) || defined (__linux__)
+
+#include <sys/time.h>
+
 struct timeval system_timer_start;
 struct timeval system_timer_stop;
 struct timezone system_timer_zone;
@@ -23,3 +25,26 @@ void systemTimerReset() {
     gettimeofday(&system_timer_start, &system_timer_zone);
 }
 
+#elif defined(WIN32)
+
+#include <Windows.h>
+
+DWORD system_timer_start = 0;
+
+unsigned long systemTimerGet() {
+    return GetTickCount() - system_timer_start;
+}
+
+void systemTimerReset() {
+    system_timer_start = GetTickCount();
+}
+
+#else
+#warn "No support for timer on this platform!"
+
+unsigned long systemTimerGet() { return 0; }
+
+void systemTimerReset() { }
+
+#endif
+