Merge branch 'master' of github.com:xythobuz/OpenRaider

Linux compilation Pull Request merged

CMakeLists.txt

@@ -31,13 +31,17 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 #################################################################
 
 # Build warnings
-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")
+if("${CMAKE_C_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()
+    set (WARNINGS "${WARNINGS} -Wall -Wextra -Wpedantic")
+endif()
 
 # Flags for all builds
 set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")

include/Render.h

@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include "Config.h"
+#include "config.h"
 #include "math/Matrix.h"
 #include "ViewVolume.h"
 #include "World.h"

src/CMakeLists.txt

@@ -68,8 +68,8 @@ endif (SDL2_FOUND AND SDL2TTF_FOUND)
 
 # Configuration Header file
 configure_file (
-    "${PROJECT_SOURCE_DIR}/include/Config.h.in"
-    "${PROJECT_BINARY_DIR}/Config.h"
+    "${PROJECT_SOURCE_DIR}/include/config.h.in"
+    "${PROJECT_BINARY_DIR}/config.h"
 )
 
 #################################################################
@@ -177,7 +177,7 @@ endif (APPLE)
 
 if (NOT APPLE)
     # Install binary
-    install (TARGET OpenRaider
+    install (TARGETS OpenRaider
         RUNTIME DESTINATION bin
     )
 endif (NOT APPLE)

src/Menu.cpp

@@ -7,6 +7,7 @@
 
 #include <assert.h>
 #include <dirent.h>
+#include <cctype>
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>

src/SkeletalModel.cpp

@@ -6,6 +6,7 @@
  * \author xythobuz
  */
 
+#include <cstddef>
 #include "SkeletalModel.h"
 
 SkeletalModel::SkeletalModel() {

src/World.cpp

@@ -5,6 +5,7 @@
  * \author Mongoose
  */
 
+#include <cstdio>
 #include <math.h>
 #include <assert.h>
 

src/utils/strings.cpp

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <assert.h>
 
-#if defined(unix) || defined(__APPLE__)
+#if defined(unix) || defined(__APPLE__) || defined(__linux__)
 #include <wordexp.h>
 #endif
 
@@ -31,7 +31,7 @@ char *stringRemoveQuotes(const char *s) {
 }
 
 char *stringReplace(const char *s, const char *search, const char *replace) {
-    char *tmp = strstr(s, search);
+    char *tmp = strstr((char *)s, search);
     if (tmp == NULL)
         return NULL;
     size_t offset = tmp - s;
@@ -130,7 +130,7 @@ char *fullPath(const char *path, char end) {
     assert(path[0] != '\0');
 
     if (path[0] == '~') {
-#if defined(unix) || defined(__APPLE__)
+#if defined(unix) || defined(__APPLE__) || defined(__linux__)
 
 #ifdef __APPLE__
         // Workaround for Mac OS X. See: