GLFW to replace LowLevelWindow

CMake/Modules/MacOSXBundleInfo.plist.in

@@ -1,35 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-        <key>CFBundleExecutable</key>
-        <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
-        <key>CFBundleGetInfoString</key>
-        <string>${MACOSX_BUNDLE_INFO_STRING}</string>
-        <key>CFBundleIconFile</key>
-        <string>${MACOSX_BUNDLE_ICON_FILE}</string>
-        <key>CFBundleIdentifier</key>
-        <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundleLongVersionString</key>
-        <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
-        <key>CFBundleName</key>
-        <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-        <key>CSResourcesFileMapped</key>
-        <true/>
-        <key>NSHumanReadableCopyright</key>
-        <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-        <key>NSHighResolutionCapable</key>
-        <string>False</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
+	<key>CFBundleIconFile</key>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
 </dict>
 </plist>

CMakeLists.txt

@@ -94,7 +94,6 @@ target_link_libraries(Etterna PRIVATE websocketpp)
 target_link_libraries(Etterna PRIVATE libluajit)
 target_link_libraries(Etterna PRIVATE discord-rpc)
 target_link_libraries(Etterna PRIVATE muFFT)
-target_link_libraries(Etterna PRIVATE glfw)
 target_link_libraries(Etterna PRIVATE ogg)
 target_link_libraries(Etterna PRIVATE vorbis)
 target_link_libraries(Etterna PRIVATE pcre)
@@ -105,6 +104,8 @@ target_link_libraries(Etterna PRIVATE fmt::fmt)
 target_link_libraries(Etterna PRIVATE plog::plog)
 target_link_libraries(Etterna PRIVATE nowide::nowide)
 target_link_libraries(Etterna PRIVATE ghc_filesystem)
+target_link_libraries(Etterna PRIVATE glfw)
+target_link_libraries(Etterna PRIVATE glad)
 
 # If the user wants crashpad, and the target exists (in-case
 # the user wants it, but crashpad couldn't find python)

extern/CMakeLists.txt

@@ -46,13 +46,14 @@ add_subdirectory(stb)
 ## Remaining Libraries
 add_subdirectory(luajit)
 add_subdirectory(muFFT)
-add_subdirectory(glew-1.5.8)
 add_subdirectory(pcre)
 add_subdirectory(zlib)
 add_subdirectory(mad-0.15.1b)
 add_subdirectory(fmt)
 add_subdirectory(boost/nowide)
 add_subdirectory(filesystem)
+add_subdirectory(glfw)
+add_subdirectory(glad)
 
 ## Vorbis depends on ogg
 add_subdirectory(newogg)

extern/crashpad/CMakeLists.txt

@@ -126,7 +126,6 @@ ExternalProject_Add(crashpad_init
 # Re-running gn every single time is not the most efficient, though it has a very short runtime
 # on subsequent runs, and if nothing is changed the build step will do nothing.c
 ExternalProject_Add_Step(crashpad_init gn_configure
-	ALWAYS 1
 	USES_TERMINAL 1
 	WORKING_DIRECTORY ${SOURCE_DIR}
 	COMMAND ${EXE_DEPOT_GN} gen ${BINARY_DIR} "--args=target_cpu=\"${GN_TARGET_CPU}\" is_debug=${GN_IS_DEBUG} extra_cflags=\"${GN_WIN_LINK_FLAG}\"" && ${EXE_DEPOT_NINJA} -C ${BINARY_DIR} crashpad_handler

extern/glad/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(glad src/glad.c)
+target_include_directories(glad PUBLIC include)