Hopefull Linux Fixes

Author: FriskTheFallenHuman

.github/workflows/build_baker.yml

@@ -16,7 +16,7 @@ jobs:
 
       - name: Download dependencies
         if: matrix.os == 'ubuntu-latest' 
-        run: sudo apt install build-essential pkgconf autoconf libtool libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libibus-1.0-dev
+        run: sudo apt install build-essential pkgconf autoconf libtool libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libgl1-mesa-dev libibus-1.0-dev libcurl4-openssl-dev
 
       - name: Get latest CMake if possible
         uses: lukka/get-cmake@latest

neo/CMakeLists.txt

@@ -289,10 +289,6 @@ if( D3_COMPILER_IS_GCC_OR_CLANG )
 	if( cxx_has_Wno-cpp20-compat )
 		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++20-compat" )
 	endif()
-	
-	if ( NOT MSVC )
-		find_package( OpenSSL REQUIRED )
-	endif()
 
 	if(APPLE)
 		add_definitions(-DMACOS_X=1)
@@ -325,15 +321,15 @@ if( D3_COMPILER_IS_GCC_OR_CLANG )
 			message( FATAL_ERROR "Unsupported CPU architecture for OSX" )
 		endif()
 
-		set( sys_libs ${sys_libs} "OpenSSL::SSL OpenSSL::Crypto -framework Carbon -framework Cocoa -framework IOKit" )
+		set( sys_libs ${sys_libs} "-framework Carbon -framework Cocoa -framework IOKit" )
 	elseif( 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 )
 	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} ${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,10 @@
 	"name": "d3moddingkit",
 	"version": "0.0.1",
 	"dependencies": [
-		"curl",
+		{
+			"name": "curl",
+			"platform": "!linux"
+		},
 		"openal-soft",
 		"sdl2",
 		{
@@ -13,7 +16,7 @@
 		{
 			"name": "freetype",
 			"default-features": false,
-			"features": ["error-strings","subpixel-rendering"]
+			"features": [ "error-strings", "subpixel-rendering" ]
 		}
 	]
 }