Compiles on macOS w/ Apple Silicon (not tested any further than that)

Author: hogsy

engine/CMakeLists.txt

@@ -26,6 +26,14 @@ if (WIN32)
             win32/q_shwin.cpp
             win32/snd_win.cpp
             )
+elseif (APPLE)
+    file(GLOB ENGINE_PLATFORM_SOURCE
+            null/cd_null.cpp
+            null/snd_null.cpp
+            linux/glob.cpp
+            linux/net_udp.cpp
+            linux/q_shlinux.cpp
+            )
 elseif (UNIX)
     file(GLOB ENGINE_PLATFORM_SOURCE
             linux/cd_linux.cpp
@@ -130,6 +138,9 @@ target_include_directories(engine PRIVATE
         )
 
 find_package(SDL2 CONFIG REQUIRED)
+target_link_libraries(engine SDL2::SDL2-static)
+
+find_package(OpenGL REQUIRED)
 
 if (WIN32)
     if (MSVC)
@@ -143,19 +154,20 @@ if (WIN32)
                 )
     endif ()
     target_link_libraries(engine
-            SDL2::SDL2main
-            SDL2::SDL2
             Imm32
             Setupapi
             Version
             Opengl32
             Ws2_32
             Winmm
             )
-elseif (UNIX)
+elseif(APPLE)
+    target_link_libraries(engine
+            ${OPENGL_LIBRARIES}
+            )
+elseif (UNIX AND NOT APPLE)
     target_link_libraries(engine
             dl
             GL
-            SDL2
             )
 endif ()

engine/null/cd_null.cpp

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright © 2022 Mark E Sowden <[email protected]>
+
+void CDAudio_Init()
+{
+}
+
+void CDAudio_Play( int, bool )
+{
+}
+
+void CDAudio_Stop()
+{
+}
+
+void CDAudio_Update()
+{
+}
+
+void CDAudio_Shutdown()
+{
+}

engine/null/snd_null.cpp

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright © 2022 Mark E Sowden <[email protected]>
+
+void SNDDMA_Init()
+{
+}
+
+void SNDDMA_Submit()
+{
+}
+
+void SNDDMA_GetDMAPos()
+{
+}
+
+void SNDDMA_BeginPainting()
+{
+}
+
+void SNDDMA_Shutdown()
+{
+}

readme.md

@@ -57,6 +57,25 @@ If you have experience with either C/C++, have a passion for programming and fam
 
 Alternatively, feel free to ping me an email at [[email protected]](mailto:[email protected]).
 
+## Building
+
+**(these instructions aren't necessarily up-to-date)**
+
+### Windows
+
+#### Visual Studio
+
+1. Use `vcpkg_setup_msvc.bat`; this will fetch vcpkg and install the dependencies
+2. Now use `cmake_generate_vs2022-x64.bat` which will generate the Visual Studio solution for you under a new `build` directory
+
+### macOS w/ Apple Silicon
+
+No plans to support "legacy" x86/x64 based devices right now unless someone else steps in to do it.
+macOS support is generally going to be at the bottom of my priority list for supported platforms.
+
+1. If you don't have vcpkg installed already, use `vcpkg_setup_apple.sh`; this will fetch vcpkg and install the dependencies
+2. Use CMake as usual, but pass `-DCMAKE_TOOLCHAIN_FILE=vcpkg\scripts\buildsystems\vcpkg.cmake` as an argument so it can find packages provided by vcpkg
+
 ## Resources
 
 - [Anachrodox](https://anachrodox.talonbrave.info/)

vcpkg_setup_apple.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+VCDIR="./vcpkg/"
+VCEXE="./vcpkg/vcpkg"
+
+if [ ! -d "$VCDIR" ]; then
+    git clone https://github.com/Microsoft/vcpkg.git
+fi
+if [ ! -f "$VCEXE" ]; then
+    vcpkg/bootstrap-vcpkg.sh -disableMetrics
+fi
+
+# now install what we need
+vcpkg/vcpkg install sdl2:arm64-osx