Changeset 113

Timestamp:

May 18, 2016, 4:55:47 PM (9 years ago)

Author:

Valery V. Sedletski

Message:

configure: Use rpm SDL instead of svn-supplied one.

Author: _diver. Additions from Dmik and valerius -- now both RPM and SDK
SDL detected. For SDK ones PATH_SDK_LIBSDL is needed.

Location:

trunk

Files:

• Makefile.kmk (modified) (1 diff)
• configure (modified) (4 diffs)

trunk/Makefile.kmk ¶

@@ -90 +90 @@
 
 # The SDL DLLs
-if1of ($(KBUILD_TARGET), win os2)
+if1of ($(KBUILD_TARGET), win) # os2
  ifdef VBOX_WITH_VBOXSDL
   include $(KBUILD_PATH)/sdks/LIBSDL.kmk

trunk/configure ¶

@@ -1149 +1149 @@
       fail
     fi
-  elif [ "$OS" = "os2" ]; then
-    # OS/2 requires special SDL setup, see $KBUILD_PATH/sdks/LIBSDL.kmk
-    if [ -n "$PATH_SDK_LIBSDL" ]; then
-      INCSDL="-I$PATH_SDK_LIBSDL/SDL/include"
-      FLDSDL="-L$PATH_SDK_LIBSDL/SDL -lSDL12"
-      foundsdl=1
-    else
-      log_failure "PATH_SDK_LIBSDL is not set, will expect SDL in \"$DEVDIR/$OS.$BUILD_MACHINE\""
-    fi
+  elif [ "$OS" = "os2" -a -n "$PATH_SDK_LIBSDL" ]; then
+    # OS/2 requires special SDL setup for non-rpm SDL SDK case,
+    # see $KBUILD_PATH/sdks/LIBSDL.kmk
+    INCSDL="-I$PATH_SDK_LIBSDL/SDL/include"
+    FLDSDL="-L$PATH_SDK_LIBSDL/SDL -lSDL12"
+    foundsdl=1
   else
     if which_wrapper sdl-config > /dev/null; then
@@ -1168 +1165 @@
     fi
   fi
-  [ "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""
+  [ "$OS" = "os2" -o  "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""
   if [ -n "$foundsdl" ]; then
     cat > $ODIR.tmp_src.cc << EOF
@@ -1191 +1188 @@
     if test_compile "$LIBSDL $LIBSDLMAIN $I_INCSDL $FLDSDL" SDL SDL; then
       if test_execute; then
-        if [ "$OS" = "os2" ]; then
-          cnf_append "PATH_SDK_LIBSDL" "$PATH_SDK_LIBSDL"
-        else
           cnf_append "LIB_SDK_LIBSDL_SDL"     "`strip_l "$LIBSDL"`"
           cnf_append "SDK_LIBSDL_LIBPATH"     "`strip_L "$LIBSDL"`"
@@ -1199 +1193 @@
           [ -n "$INCSDL" ] && cnf_append "SDK_LIBSDL_INCS"    "$INCSDL"
           [ -n "$FLDSDL" ] && cnf_append "SDK_LIBSDL_LDFLAGS" "$FLDSDL"
-        fi
+          if [ "$OS" = "os2" ]; then
+            cnf_append "PATH_SDK_LIBSDL"      "`strip_L "$LIBSDL"`"
+          fi
       fi
     fi