Merge branch 'master' of https://github.com/team-eternity/calico-doom

Author: haleyjd

CMakeLists.txt

@@ -7,7 +7,7 @@ add_definitions("-Wall -Wextra")
 
 # Once CMake 3.1 is required, you can replace this with CMAKE_CXX_STANDARD
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "--std=gnu++17 ${CMAKE_CXX_FLAGS}")
 endif()
 
 find_package(SDL2 2.0.0)

src/CMakeLists.txt

@@ -15,7 +15,6 @@ set(CALICO_SOURCES
                     jagpad.h
     j_eeprom.c
                     keywords.h
-    m_argv.c        m_argv.h
     m_main.c
                     music.h
     o_main.c
@@ -76,6 +75,7 @@ set(ELIB_SOURCES
                         elib/dllist.h
                         elib/elib.h
                         elib/m_ctype.h
+    elib/m_argv.c       elib/m_argv.h
     elib/misc.cpp       elib/misc.h
     elib/parser.cpp     elib/parser.h
     elib/qstring.cpp    elib/qstring.h

src/posix/posix_platform.cpp

@@ -135,7 +135,9 @@ static hal_bool POSIX_FileExists(const char *path)
     qstring normpath { path };
     normpath.normalizeSlashes();
 
-    return (!stat(normpath.constPtr(), &st) && !S_ISDIR(st.st_mode));
+    if (!stat(normpath.constPtr(), &st) && !S_ISDIR(st.st_mode))
+        return HAL_TRUE;
+    return HAL_FALSE;
 }
 
 //