Revert OpenGL-related changes from this PR. Omit precompiled.h. Add o…

…wner.h, vega_collection_utils.cpp, and vega_collection_utils.h. In CMakeLists.txt, change C++ standard to C++14. (Hurray!)
vegastrike · Apr 28, 2024 · a9a6f03 · a9a6f03
1 parent 55d740d
commit a9a6f03
Show file tree

Hide file tree

Showing 26 changed files with 166 additions and 22,134 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -91,7 +91,7 @@ CONFIGURE_FILE(src/version.h.in ${Vega_Strike_BINARY_DIR}/setup/src/include/vers
 
 MESSAGE("== Vega Strike Version: ${VEGASTRIKE_VERSION_LONG_STR}")
 
-SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_STANDARD 14)
 SET(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 SET(CMAKE_CXX_EXTENSIONS ON)
 SET(CMAKE_C_STANDARD 11)
@@ -120,8 +120,6 @@ SET(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 SET(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
 INCLUDE(InstallRequiredSystemLibraries)
 
-INCLUDE_DIRECTORIES(BEFORE SYSTEM ${Vega_Strike_SOURCE_DIR}/src/OpenGL_downloaded)
-
 IF (UNIX)
     INCLUDE_DIRECTORIES(
         ${Vega_Strike_SOURCE_DIR}/src
@@ -1092,6 +1090,7 @@ ADD_LIBRARY(vegastrike-engine_com
     ${LIBROOTGENERIC_SOURCES}
     ${LIBSCRIPT_SOURCES}
     ${LIBGFXGENERIC_SOURCES}
+        src/vega_collection_utils.cpp
 )
 
 #TARGET_COMPILE_FEATURES(vegastrike-engine_com PUBLIC cxx_std_11)
@@ -1705,6 +1704,7 @@ IF (USE_GTEST)
         ${LIBRESOURCE}
         ${LIBCMD_SOURCES}
         ${LIBVS_LOGGING}
+            src/vega_collection_utils.cpp
     )
     target_compile_definitions(vegastrike-testing PUBLIC "BOOST_ALL_DYN_LINK" "$<$<CONFIG:Debug>:BOOST_DEBUG_PYTHON>")
     set_property(TARGET vegastrike-testing PROPERTY POSITION_INDEPENDENT_CODE TRUE)

diff --git a/engine/objconv/basemaker/base_maker.cpp b/engine/objconv/basemaker/base_maker.cpp
@@ -44,15 +44,13 @@
 #include <direct.h>
 #else
 #include <unistd.h>
-#   define GL_GLEXT_PROTOTYPES 1
 #endif
 #include <sys/stat.h> //for mkdir
 #include <sys/types.h>
 
 #if defined(__APPLE__) && defined(__MACH__)
-#   include <OpenGL/gl.h>
-#   include <GL/glext.h>
 #   include <GLUT/glut.h>
+#   include <OpenGL/glext.h>
 #else
 #   include <GL/glut.h>
 #   include <GL/glext.h>

diff --git a/engine/objconv/basemaker/sprite.h b/engine/objconv/basemaker/sprite.h
@@ -30,14 +30,9 @@
 #include "gfx/hud.h"
 #include "vs_globals.h"
 
-#if !defined(_WIN32)
-#   define GL_GLEXT_PROTOTYPES 1
-#endif
-
 #if defined(__APPLE__) && defined(__MACH__)
-#   include <OpenGL/gl.h>
-#   include <GL/glext.h>
 #   include <GLUT/glut.h>
+#   include <OpenGL/glext.h>
 #else
 #   include <GL/glut.h>
 #   include <GL/glext.h>

diff --git a/engine/src/OpenGL_downloaded/GL/glcorearb.h b/engine/src/OpenGL_downloaded/GL/glcorearb.h
diff --git a/engine/src/OpenGL_downloaded/GL/glext.h b/engine/src/OpenGL_downloaded/GL/glext.h
diff --git a/engine/src/OpenGL_downloaded/GL/glxext.h b/engine/src/OpenGL_downloaded/GL/glxext.h
diff --git a/engine/src/OpenGL_downloaded/GL/wgl.h b/engine/src/OpenGL_downloaded/GL/wgl.h
diff --git a/engine/src/OpenGL_downloaded/GL/wglext.h b/engine/src/OpenGL_downloaded/GL/wglext.h
diff --git a/engine/src/OpenGL_downloaded/KHR/khrplatform.h b/engine/src/OpenGL_downloaded/KHR/khrplatform.h