Merge pull request #1 from Cybermals/linux-compat

Linux compat

Author: DylanCheetah

Game/CMakeLists.txt

@@ -47,12 +47,12 @@ if(UNIX)
         PUBLIC
         include
         ../config
-        ../deps/linux/amd64/gcc/Ogre/include/OGRE
-        ../deps/linux/amd64/gcc/Ogre/include/OIS
-        ../deps/linux/amd64/gcc/PagedGeometry/include/PagedGeometry
+        ../deps/linux/amd64/gcc9/Ogre/include/OGRE
+        ../deps/linux/amd64/gcc9/Ogre/include/OIS
+        ../deps/linux/amd64/gcc9/PagedGeometry/include
         ../deps/linux/amd64/all/fmod/include
-        ../deps/linux/amd64/gcc/zziplib/include
-        ../deps/linux/amd64/gcc/RakNet/include
+        ../deps/linux/amd64/gcc9/zziplib/include
+        ../deps/linux/amd64/gcc9/RakNet/include
         ../Game/include
     )
 endif(UNIX)
@@ -88,10 +88,11 @@ if(UNIX)
     target_link_directories(
         Game
         PUBLIC
-        ../deps/linux/amd64/gcc/Ogre/bin/release
-        ../deps/linux/amd64/gcc/PagedGeometry/lib
-        ../deps/linux/amd64/all/fmod/bin
-        ../deps/linux/amd64/gcc/RakNet/bin
+        ../deps/linux/amd64/gcc9/Ogre/lib
+        ../deps/linux/amd64/gcc9/PagedGeometry/lib
+        ../deps/linux/amd64/all/fmod/lib
+        ../deps/linux/amd64/gcc9/zziplib/lib
+        ../deps/linux/amd64/gcc9/RakNet/lib
     )
 endif(UNIX)
 
@@ -133,9 +134,9 @@ set(
     src/MagixUnitManager.cpp
     src/MagixWorld.cpp
     src/main.cpp
-    src/movabletextoverlay.cpp
-    src/ogremagixApp.cpp
-    src/ogremagixFrameListener.cpp
+    src/MovableTextOverlay.cpp
+    src/OgreMagixApp.cpp
+    src/OgreMagixFrameListener.cpp
     src/SoundManager.cpp
 )
 
@@ -189,6 +190,7 @@ if(UNIX)
     target_link_libraries(
         Game
         ${LIBS}
+        fmod
     )
 endif(UNIX)
 
@@ -199,6 +201,10 @@ if(MINGW)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-stdcall-fixup")
 endif(MINGW)
 
+if(UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+endif(UNIX)
+
 if(MSVC10)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /TP")
 endif(MSVC10)
@@ -235,17 +241,25 @@ endif(WIN32)
 if(UNIX)
     file(
         GLOB DEPS
-        ../deps/linux/amd64/gcc/Ogre/bin/release/*
-        ../deps/linux/amd64/gcc/PagedGeometry/docs/LICENSE*
-        ../deps/linux/amd64/all/fmod/bin/*
-        ../deps/linux/amd64/gcc/RakNet/bin/*
+        ../deps/linux/amd64/gcc9/Ogre/lib/*
+        ../deps/linux/amd64/gcc9/PagedGeometry/docs/LICENSE*
+        ../deps/linux/amd64/all/fmod/lib/*
+        ../deps/linux/amd64/gcc9/RakNet/lib/*
     )
     file(COPY ${DEPS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 endif(UNIX)
 
 #Copy data files
 file(COPY ../data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(GLOB CONFIG ../static/client/config/*)
+
+if(WIN32)
+    file(GLOB CONFIG ../static/client/config/windows/*)
+endif(WIN32)
+
+if(UNIX)
+    file(GLOB CONFIG ../static/client/config/linux/*)
+endif(UNIX)
+
 file(COPY ${CONFIG} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(GLOB DAT ../static/client/default/*)
 file(COPY ${DAT} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
@@ -254,4 +268,5 @@ file(COPY ${DAT} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 install(TARGETS Game DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/client)
 install(FILES ${DEPS} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/client)
 install(DIRECTORY ../data DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/client)
-install(FILES ${CONFIG} ${DAT} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/client)
+install(FILES ${CONFIG} ${DAT} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/client)
+install(DIRECTORY ../static/client/screenshots DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/client)

Game/include/MagixApplication.h

@@ -28,7 +28,7 @@ class MagixApplication
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
         mResourcePath = macBundlePath() + "/Contents/Resources/";
 #else
-        mResourcePath = "";
+        mResourcePath = "./";
 #endif
     }
 

Game/include/MagixExternalDefinitions.h

@@ -6,6 +6,10 @@
 #include <OgreStreamSerialiser.h>
 #include <OgreException.h>
 
+#ifdef __linux__
+    #define _unlink unlink
+#endif
+
 //using namespace std;
 using namespace Ogre;
 

Game/include/ogremagixApp.h Game/include/OgreMagixApp.hGame/include/ogremagixApp.h renamed to Game/include/OgreMagixApp.h

@@ -3,8 +3,11 @@
 #include <stdarg.h>
 #include <string.h>
 #include <iomanip>
-#include <Windows.h>
-#include <DbgHelp.h>
+
+#ifdef __WIN32__
+    #include <Windows.h>
+    #include <DbgHelp.h>
+#endif
 
 #include "DebugTrace.h"
 
@@ -14,16 +17,21 @@
 
 volatile long *allocateLineCount()
 {
+    #ifdef __WIN32__
     static volatile long *lineCount;
 
     lineCount = (long*)_aligned_malloc(sizeof(long), 32);
     *lineCount = 0;
     return lineCount;
+    #else
+    return NULL;
+    #endif
 }
 
 
 void printStack()
 {
+    #ifdef __WIN32__
     unsigned int   i;
     void         * stack[100];
     volatile unsigned short frames;
@@ -55,11 +63,13 @@ void printStack()
 
     debugTraceVars("STACK %s", buffer);
     free(symbol);
+    #endif
 }
 
 
 void debugTraceStr(const std::wstringstream& item)
 {
+    #ifdef __WIN32__
     static volatile long *lineCount = allocateLineCount();
     FILETIME timestamp;
     GetSystemTimeAsFileTime(&timestamp);
@@ -72,16 +82,19 @@ void debugTraceStr(const std::wstringstream& item)
         << L" " << item.str() << std::endl;
 
     OutputDebugStringW(debug.str().c_str());
+    #endif
 }
 
 
 void debugTraceVars(const char *format, ...)
 {
+    #ifdef __WIN32__
     va_list args;
     va_start(args, format);
     char buffer[500];
     vsprintf_s<500>(buffer, format, args);
     std::wstringstream result;
     result << buffer;
     debugTraceStr(result);
+    #endif
 }

Game/include/ogremagixFrameListener.h Game/include/OgreMagixFrameListener.hGame/include/ogremagixFrameListener.h renamed to Game/include/OgreMagixFrameListener.h

@@ -101,7 +101,7 @@ void MagixAlertBox::showAlert(const String &caption, Real left, Real top,
     //compute text width/height
     const Font *pFont = dynamic_cast<Ogre::Font*>(Ogre::FontManager::getSingleton().getByName(DEFAULT_FONT).getPointer());
 
-    vector<String>::type tText = StringUtil::split(caption, "\n");
+    vector<String>::type tText = StringUtil::split(caption, "\r\n");
     Real tLongestWidth = 0;
 
     for(int i = 0; i<int(tText.size()); i++)

Game/src/DebugTrace.cpp

@@ -2,12 +2,16 @@
 #include "MagixConst.h"
 #include "DebugTrace.h"
 
+#ifdef __WIN32__
 #define DBOUT( s )            \
 {                             \
    std::ostringstream os_;    \
    os_ << s;                   \
    OutputDebugString( os_.str().c_str() );  \
 }
+#else
+#define DBOUT(s)
+#endif
 
 
 //Animated Object Functions

Game/src/MagixAlertBox.cpp

@@ -198,7 +198,7 @@ void MagixApplication::setupResources(void)
                     delete[] tBuffer;
 
                     const vector<String>::type tLine = StringUtil::split(tData,
-                        "\n#");
+                        "\r\n#");
 
                     for(int j = 0; j < (int)tLine.size(); j++)
                     {

Game/src/MagixAnimated.cpp

@@ -1865,7 +1865,7 @@ void MagixCharScreenManager::updateChar(const String &data)
         static_cast<MagixPlayer*>(mUnit)->reset();
     }
 
-    const vector<String>::type tString = StringUtil::split(data, "|\n", 2);
+    const vector<String>::type tString = StringUtil::split(data, "|\r\n", 2);
 
     //Loaded successfully
     if(tString.size() > 0)