Add SDL submodule

Author: ugozapad

.gitignore

@@ -0,0 +1 @@
+build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Externals/SDL"]
+	path = Externals/SDL
+	url = https://github.com/libsdl-org/SDL.git

CMakeLists.txt

@@ -14,4 +14,5 @@ if (MSVC)
     add_compile_options(/W3) # Warning level
 endif()
 
+add_subdirectory(Externals)
 add_subdirectory(SourceCode)

Externals/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(SDL)

Externals/SDL

@@ -9,6 +9,7 @@ add_executable(${PROJECT_NAME} WIN32 ${SRC_FILES})
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_SOURCE_DIR}/SourceCode/CryCommon
+    ${CMAKE_SOURCE_DIR}/Externals/SDL/include
 )
 
-target_link_libraries(${PROJECT_NAME})
+target_link_libraries(${PROJECT_NAME} SDL2)

SourceCode/FARCRY/CMakeLists.txt

@@ -13,6 +13,8 @@
 
 #define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
 
+#include <SDL.h>
+
 #ifdef WIN32
 #include <windows.h>
 #include <process.h>
@@ -96,7 +98,7 @@ static bool g_bSystemRelaunch = false;
 static char szMasterCDFolder[_MAX_PATH];
 
 #ifdef WIN32
-static HMODULE g_hSystemHandle=NULL;
+static void* g_hSystemHandle=NULL;
 #define DLL_SYSTEM "CrySystem.dll"
 #define DLL_GAME	 "CryGame.dll"
 #endif
@@ -645,7 +647,9 @@ InvokeExternalConfigTool()
 //////////////////////////////////////////////////////////////////////////
 bool RunGame(HINSTANCE hInstance,const char *sCmdLine)
 {
-	InvokeExternalConfigTool();
+	SDL_Init(SDL_INIT_EVERYTHING);
+
+//	InvokeExternalConfigTool();
 
 	HWND hWnd=NULL;
 	// initialize the system
@@ -673,26 +677,27 @@ bool RunGame(HINSTANCE hInstance,const char *sCmdLine)
 #ifndef _XBOX
 		/////////////////////////////////////////////////////
 		/////////////////////////////////////////////////////
-		if (!hWnd && !RegisterWindow(hInstance))
-		{
-			if (!hWnd && RegisterWindow(hInstance))
-			{
-				MessageBox(0, "Cannot Register Window\n", "Error", MB_OK | MB_DEFAULT_DESKTOP_ONLY);
-				return false;
-			}
-		}
-
-		g_hSystemHandle = LoadLibrary(DLL_SYSTEM);
+		//if (!hWnd && !RegisterWindow(hInstance))
+		//{
+		//	if (!hWnd && RegisterWindow(hInstance))
+		//	{
+		//		MessageBox(0, "Cannot Register Window\n", "Error", MB_OK | MB_DEFAULT_DESKTOP_ONLY);
+		//		return false;
+		//	}
+		//}
+
+		g_hSystemHandle = SDL_LoadObject(DLL_SYSTEM);
 		if (!g_hSystemHandle)
 		{
-			DWORD dwLastError = GetLastError();
+			string errorStr = "CrySystem.dll Loading Failed:\n";
+			errorStr += SDL_GetError();
+
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "FarCry Error", errorStr.c_str(), nullptr);
 
-			MessageBox( NULL,("CrySystem.dll Loading Failed:\n" + TryFormatWinError(dwLastError)).c_str(),"FarCry Error",MB_OK|MB_ICONERROR );
 			return false;
 		}
 
-		PFNCREATESYSTEMINTERFACE pfnCreateSystemInterface =
-			(PFNCREATESYSTEMINTERFACE)::GetProcAddress( g_hSystemHandle,"CreateSystemInterface" );
+		PFNCREATESYSTEMINTERFACE pfnCreateSystemInterface = (PFNCREATESYSTEMINTERFACE)SDL_LoadFunction( g_hSystemHandle,"CreateSystemInterface" );
 
 		// Initialize with instance and window handles.
 		sip.hInstance = hInstance;
@@ -704,7 +709,7 @@ bool RunGame(HINSTANCE hInstance,const char *sCmdLine)
 		g_pISystem = pfnCreateSystemInterface( sip );
 		if (!g_pISystem)
 		{
-			MessageBox( NULL,"CreateSystemInterface Failed","FarCry Error",MB_OK|MB_ICONERROR );
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "FarCry Error", "CreateSystemInterface Failed", nullptr);
 			return false;
 		}
 #else
@@ -746,7 +751,7 @@ bool RunGame(HINSTANCE hInstance,const char *sCmdLine)
 
 			if (!g_pISystem->CreateGame( ip ))
 			{
-				MessageBox( NULL,"CreateGame Failed: CryGame.dll","FarCry Error",MB_OK|MB_ICONERROR );
+				SDL_ShowSimpleMessageBox( SDL_MESSAGEBOX_ERROR, "FarCry Error", "CreateGame Failed: CryGame.dll", nullptr);
 				return false;
 			}
 
@@ -848,7 +853,8 @@ bool RunGame(HINSTANCE hInstance,const char *sCmdLine)
 		*/
 
 		if (!bRelaunch)
-			::FreeLibrary(g_hSystemHandle);
+			SDL_UnloadObject(g_hSystemHandle);
+
 		g_hSystemHandle= NULL;
 
 		if (hWnd)