Merge branch 'master' of https://github.com/FriskTheFallenHuman/Prey2006

.github/README.md

@@ -4,10 +4,15 @@
 > We are currently looking for contributors that wants to contribute into this project.
 
 > [!CAUTION]
-> This project is far from being completed, currently there is 2 major blockers that prevent this from being playable.
-> 1. Death Walk a key feature of Pre 2006 is missing meaning that in some parts you need to do noclip.
-> 2. Spirit Walk visual are broken.
-> The binaries are provide as-is.
+> This project is far from being completed, currently there is ~~2~~ a lot of major blockers that prevent this from being playable.
+> 1. Death Walk a key feature of Prey is missing meaning that in some parts you need to do noclip.
+> 2. Visuals are a major roadblock, Spirit walks is unsable due to the lack of visuals.
+> 3. Multiplayer may work but has not been tested
+> 
+> The binaries are provide as-is, support may be limited due to my lack of knowledge,
+> This project was create due to the insatisfaction of some source ports barely fixing or improving 
+> and or sacrificing features for other platforms.
+> I hope you guys understand, but contributions are welcome :) 
 
 # Introduction
 Prey 2006 SDK integrated with Doom 3 GPL release
@@ -18,8 +23,20 @@ This project is a code integration of the Prey 2006 SDK against the Doom 3 GPL c
 This means this includes new engine side features that were in the Prey 2006 engine,
 and some adjustments to the Prey 2006 SDK code.
 
+This runs in a semi vanilla Dhewm3 v1.5.4 fork that specifically removes imgui, soft particles and joystick support for the time being.
+
+## Compiling
+For Windows:
+  - Visual Studio 2019 or 2022
+  - CMake
+  - Run either cmake_msvc2019.cmd or cmake_msvc2022.cmd
+
+For Linux: At the moment compiling for linux is not supported.
+
 ## Credits
 
+This fork wouldn't be possible by the 3 previous attempts of porting Prey before me:
+
 - [PreyDoom](https://github.com/jmarshall23/PreyDoom)
 - [PreyVR](https://github.com/neitey/PreyVR)
 - [com.n0n3m4.diii4a](https://github.com/glKarin/com.n0n3m4.diii4a)

neo/CMakeLists.txt

@@ -233,18 +233,20 @@ if( D3_COMPILER_IS_GCC_OR_CLANG )
 		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++20-compat" )
 	endif()
 
-	if ( NOT MSVC )
-		find_package( OpenSSL REQUIRED )
-	endif()
+	#if ( NOT MSVC )
+	#	find_package( OpenSSL REQUIRED )
+	#endif()
 
 	if( WIN32 )
 		# use 8MB stack instead of 1MB, so big models don't overflow it with _alloca()
 		set( ldflags "${ldflags} -static-libgcc -static-libstdc++ -Wl, --large-address-aware --stack,8388608" )
 	elseif( os STREQUAL "linux" )
-		set( sys_libs ${sys_libs} dl OpenSSL::SSL OpenSSL::Crypto rt )
+		#set( sys_libs ${sys_libs} dl OpenSSL::SSL OpenSSL::Crypto rt )
+		set( sys_libs ${sys_libs} dl rt )
 	elseif( os STREQUAL "freebsd" )
 		find_library( EXECINFO_LIBRARIES execinfo /usr/lib /usr/local/lib )
-		set( sys_libs ${sys_libs} OpenSSL::SSL OpenSSL::Crypto rt ${EXECINFO_LIBRARIES} )
+		#set( sys_libs ${sys_libs} OpenSSL::SSL OpenSSL::Crypto rt ${EXECINFO_LIBRARIES} )
+		set( sys_libs ${sys_libs} rt ${EXECINFO_LIBRARIES} )
 	endif()
 elseif( MSVC )
 	add_compile_options( /MP ) # parallel build (use all cores, or as many as configured in VS)

neo/vcpkg.json

@@ -2,7 +2,6 @@
 	"name": "prey06",
 	"version": "0.0.1",
 	"dependencies": [
-		"curl",
 		"openal-soft",
 		"sdl2",
 		{