Aaaand we're up and running again, finally.

Author: hogsy

3rdparty/sdl2/COPYING.txt

@@ -0,0 +1,20 @@
+
+Simple DirectMedia Layer
+Copyright (C) 1997-2020 Sam Lantinga <[email protected]>
+  
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+  
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required. 
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+

engine/CMakeLists.txt

@@ -26,6 +26,7 @@ if (WIN32)
             win32/q_shwin.cpp
             win32/snd_win.cpp
             )
+    link_directories(../3rdparty/sdl2/lib/)
 elseif (APPLE)
     file(GLOB ENGINE_PLATFORM_SOURCE
             null/cd_null.cpp
@@ -136,29 +137,23 @@ target_include_directories(engine PRIVATE
         ../3rdparty/glew/include/
         )
 
-find_package(SDL2 CONFIG REQUIRED)
-if (WIN32)
-    target_link_libraries(engine SDL2::SDL2 SDL2::SDL2main)
-else ()
+find_package(SDL2 CONFIG)
+if (${SDL2_FOUND})
     target_link_libraries(engine SDL2::SDL2-static)
+else ()
+    message("Linking against SDL2 in repository.")
+    target_include_directories(engine PRIVATE ../3rdparty/sdl2/include/)
+    target_link_directories(engine PRIVATE ../3rdparty/sdl2/lib/)
+    target_link_libraries(engine SDL2)
 endif ()
 
 set(OpenGL_GL_PREFERENCE GLVND)
 find_package(OpenGL REQUIRED)
 target_link_libraries(engine ${OPENGL_LIBRARIES})
 
 if (WIN32)
-    if (MSVC)
-        target_link_options(engine PRIVATE
-                /NODEFAULTLIB:libcmt.lib
-                /NODEFAULTLIB:libcmtd.lib
-                )
-    elseif (MINGW)
-        target_link_libraries(engine
-                mingw32
-                )
-    endif ()
     target_link_libraries(engine
+            mingw32
             Imm32
             Setupapi
             Version

engine/app.cpp

@@ -43,9 +43,7 @@ void nox::App::Initialize()
 			SDL_INIT_JOYSTICK |
 			SDL_INIT_TIMER );
 	if ( status != 0 )
-	{
 		Sys_Error( "Failed to initialized SDL2: %s\n", SDL_GetError() );
-	}
 
 	Qcommon_Init( argc_, argv_ );
 }
@@ -156,8 +154,15 @@ void nox::App::ShowCursor( bool show )
 	SDL_ShowCursor( show );
 }
 
+#if defined( _WIN32 )
+int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
+{
+	int    argc = __argc;
+	char **argv = __argv;
+#else
 extern "C" int main( int argc, char **argv )
 {
+#endif
 	nox::globalApp = new nox::App( argc, argv );
 
 	// todo: consider combining these??

qcommon/common.cpp

@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // common.c -- misc functions used in client and server
 
 #include <csetjmp>
-#include <csignal>
 
 #include "qcommon.h"
 #include "app.h"
@@ -39,15 +38,15 @@ FILE *log_stats_file;
 cvar_t *host_speeds;
 cvar_t *log_stats;
 cvar_t *developer;
-cvar_t *timescale;
-cvar_t *fixedtime;
-cvar_t *logfile_active;  // 1 = buffer log, 2 = flush after each print
-cvar_t *showtrace;
+static cvar_t *timescale;
+static cvar_t *fixedtime;
+static cvar_t *logfile_active;  // 1 = buffer log, 2 = flush after each print
+static cvar_t *showtrace;
 cvar_t *dedicated;
 
-FILE *logfile;
+static FILE *logfile;
 
-int server_state;
+static int server_state;
 
 // host_speeds times
 unsigned int time_before_game;

qcommon/files.cpp

@@ -88,7 +88,7 @@ struct Package
 		file.read( ( char * ) src.data(), fileIndex->compressedLength );
 
 		// decompress it
-		auto   dst = new uint8_t[ fileIndex->length ];
+		auto   dst = ( uint8_t   *) Z_Malloc( fileIndex->length );
 		size_t dstLength = fileIndex->length;
 		bool   status = FS_DecompressFile( src.data(), fileIndex->compressedLength, dst, &dstLength, fileIndex->length );
 
@@ -100,7 +100,7 @@ struct Package
 			return dst;
 		}
 
-		delete[] dst;
+		Z_Free( dst );
 
 		return nullptr;
 	}
@@ -245,7 +245,9 @@ The "game directory" is the first tree on the search path and directory that all
  */
 long FS_GetLocalFileLength( const char *path )
 {
-	struct stat buf{};
+	struct stat buf
+	{
+	};
 	if ( stat( path, &buf ) != 0 )
 		return -1;
 
@@ -336,7 +338,7 @@ void *FS_FOpenFile( const char *filename, uint32_t *length )
 		p++;
 
 		// see if we have a match!
-		for ( const auto& i : search->packDirectories )
+		for ( const auto &i : search->packDirectories )
 		{
 			if ( i.second.mappedDir != rootFolder )
 				continue;
@@ -420,7 +422,7 @@ int FS_LoadFile( const char *path, void **buffer )
 
 	// look for it in the filesystem or pack files
 	uint32_t length;
-	void *buf = FS_FOpenFile( upath, &length );
+	void    *buf = FS_FOpenFile( upath, &length );
 	if ( buf == nullptr )
 	{
 		if ( buffer != nullptr )