Ticket #55: SDL.diff
File SDL.diff, 2.4 KB (added by , 8 years ago) |
---|
-
configure
1148 1148 log_failure "SDL framework not found" 1149 1149 fail 1150 1150 fi 1151 elif [ "$OS" = "os2" ]; then 1152 # OS/2 requires special SDL setup, see $KBUILD_PATH/sdks/LIBSDL.kmk 1153 if [ -n "$PATH_SDK_LIBSDL" ]; then 1154 INCSDL="-I$PATH_SDK_LIBSDL/SDL/include" 1155 FLDSDL="-L$PATH_SDK_LIBSDL/SDL -lSDL12" 1156 foundsdl=1 1157 else 1158 log_failure "PATH_SDK_LIBSDL is not set, will expect SDL in \"$DEVDIR/$OS.$BUILD_MACHINE\"" 1159 fi 1151 elif [ "$OS" = "os2" -a -n "$PATH_SDK_LIBSDL" ]; then 1152 # non-rpm SDL SDK case 1153 INCSDL="-I$PATH_SDK_LIBSDL/SDL/include" 1154 FLDSDL="-L$PATH_SDK_LIBSDL/SDL -lSDL12" 1155 foundsdl=1 1160 1156 else 1161 1157 if which_wrapper sdl-config > /dev/null; then 1162 1158 FLGSDL=`sdl-config --cflags` … … 1167 1163 foundsdl=1 1168 1164 fi 1169 1165 fi 1170 [ "$OS" = " linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""1166 [ "$OS" = "os2" -o "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN="" 1171 1167 if [ -n "$foundsdl" ]; then 1172 1168 cat > $ODIR.tmp_src.cc << EOF 1173 1169 #include <cstdio> … … 1190 1186 [ -n "$INCSDL" ] && I_INCSDL=`prefix_I "$INCSDL"` 1191 1187 if test_compile "$LIBSDL $LIBSDLMAIN $I_INCSDL $FLDSDL" SDL SDL; then 1192 1188 if test_execute; then 1193 if [ "$OS" = "os2" ]; then1194 cnf_append "PATH_SDK_LIBSDL" "$PATH_SDK_LIBSDL"1195 else1196 1189 cnf_append "LIB_SDK_LIBSDL_SDL" "`strip_l "$LIBSDL"`" 1197 1190 cnf_append "SDK_LIBSDL_LIBPATH" "`strip_L "$LIBSDL"`" 1198 1191 cnf_append "LIB_SDK_LIBSDL_SDLMAIN" "`strip_l "$LIBSDLMAIN"`" 1199 1192 [ -n "$INCSDL" ] && cnf_append "SDK_LIBSDL_INCS" "$INCSDL" 1200 1193 [ -n "$FLDSDL" ] && cnf_append "SDK_LIBSDL_LDFLAGS" "$FLDSDL" 1201 fi 1194 if [ "$OS" = "os2" ]; then 1195 cnf_append "PATH_SDK_LIBSDL" "`strip_L "$LIBSDL"`" 1196 fi 1202 1197 fi 1203 1198 fi 1204 1199 else -
Makefile.kmk
89 89 InstallExternalLibs_INST = $(INST_BIN) 90 90 91 91 # The SDL DLLs 92 if1of ($(KBUILD_TARGET), win os2)92 if1of ($(KBUILD_TARGET), win) # os2 93 93 ifdef VBOX_WITH_VBOXSDL 94 94 include $(KBUILD_PATH)/sdks/LIBSDL.kmk 95 95 InstallExternalLibs_SOURCES += \