Enable Windows SSPI for SDL2 builds

nzp-team · Nov 26, 2024 · 475cc7e · 475cc7e
1 parent e4f9a6b
commit 475cc7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/engine/Makefile b/engine/Makefile
@@ -1092,6 +1092,11 @@ ifeq (1,$(LINK_OPENSSL))
     endif
 endif
 
+# bad hack -- make sure we build sspi if we're building windows sdl
+ifeq (win_SDL,$(findstring win,$(FTE_TARGET))$(findstring _SDL,$(FTE_TARGET)))
+	COMMON_OBJS += net_ssl_winsspi.o
+endif
+
 ifeq (1,$(shell $(PKGCONFIG) --exists gnutls && echo 1))
     ALL_CFLAGS+=$(shell $(PKGCONFIG) gnutls --cflags --silence-errors)
     #ALL_CFLAGS+=-DGNUTLS_STATIC

diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h
@@ -190,7 +190,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(ANDROID)
 //	#undef HAVE_GNUTLS
 //#endif
-#if !defined(_WIN32) || (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(FTE_SDL)
+#if !defined(_WIN32) || (defined(_MSC_VER) && (_MSC_VER < 1300))
 	#undef HAVE_WINSSPI
 #endif
 //subservers only has code for win32 threads and linux