Changeset 98314 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Jan 26, 2023 1:28:47 PM (2 years ago)

Author:

vboxsync

Message:

FE/SDL: Fixed some anachronisms in the Makefile. bugref:10348

File:

• trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

@@ -76 +76 @@
         $(VBOX_GRAPHICS_INCS) \
         ../Common
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
 VBoxSDL_INCS += \
         $(VBOX_XCURSOR_INCS)
 endif
-ifneq ($(filter-out solaris,$(KBUILD_TARGET)),)
-
+ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
 VBoxSDL_LIBS = \
         $(LIB_SDK_LIBSDL_SDLMAIN)
 endif
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
+ifeq ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
 VBoxSDL_LIBS += \
         $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
@@ -138 +137 @@
 tstSDL_LIBS = \
         $(LIB_RUNTIME)
-ifneq ($(filter-out solaris,$(KBUILD_TARGET)),)
+ifn1of ($(KBUILD_TARGET), solaris)
 tstSDL_LIBS += \
         $(LIB_SDK_LIBSDL_SDLMAIN)
@@ -146 +145 @@
 tstSDL_LIBS.linux += GL
 endif
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
 tstSDL_LIBPATH = \
         $(VBOX_LIBPATH_X11)