Ticket #55: stdout_2.diff
File stdout_2.diff, 2.3 KB (added by , 8 years ago) |
---|
-
Makefile.kmk
89 89 InstallExternalLibs_INST = $(INST_BIN) 90 90 91 91 # The SDL DLLs 92 if 1of ($(KBUILD_TARGET), win os2)92 ifeq ($(KBUILD_TARGET), win) 93 93 ifdef VBOX_WITH_VBOXSDL 94 94 include $(KBUILD_PATH)/sdks/LIBSDL.kmk 95 95 InstallExternalLibs_SOURCES += \ … … 98 98 InstallExternalLibs_SOURCES += \ 99 99 $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(DLL_SDK_LIBSDL_SDLTTF)) 100 100 endif 101 ifeq ($(KBUILD_TARGET),os2)102 InstallExternalLibs_SOURCES += \103 $(DLL_SDK_LIBSDL_FSLIB)104 endif105 101 endif 106 102 endif 107 103 -
configure
1148 1148 log_failure "SDL framework not found" 1149 1149 fail 1150 1150 fi 1151 elif [ "$OS" = "os2" ]; then1152 # OS/2 requires special SDL setup, see $KBUILD_PATH/sdks/LIBSDL.kmk1153 if [ -n "$PATH_SDK_LIBSDL" ]; then1154 INCSDL="-I$PATH_SDK_LIBSDL/SDL/include"1155 FLDSDL="-L$PATH_SDK_LIBSDL/SDL -lSDL12"1156 foundsdl=11157 else1158 log_failure "PATH_SDK_LIBSDL is not set, will expect SDL in \"$DEVDIR/$OS.$BUILD_MACHINE\""1159 fi1160 1151 else 1161 1152 if which_wrapper sdl-config > /dev/null; then 1162 1153 FLGSDL=`sdl-config --cflags` … … 1167 1158 foundsdl=1 1168 1159 fi 1169 1160 fi 1170 [ "$OS" = " linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""1161 [ "$OS" = "os2" -o "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN="" 1171 1162 if [ -n "$foundsdl" ]; then 1172 1163 cat > $ODIR.tmp_src.cc << EOF 1173 1164 #include <cstdio> … … 1190 1181 [ -n "$INCSDL" ] && I_INCSDL=`prefix_I "$INCSDL"` 1191 1182 if test_compile "$LIBSDL $LIBSDLMAIN $I_INCSDL $FLDSDL" SDL SDL; then 1192 1183 if test_execute; then 1193 if [ "$OS" = "os2" ]; then1194 cnf_append "PATH_SDK_LIBSDL" "$PATH_SDK_LIBSDL"1195 else1196 1184 cnf_append "LIB_SDK_LIBSDL_SDL" "`strip_l "$LIBSDL"`" 1197 1185 cnf_append "SDK_LIBSDL_LIBPATH" "`strip_L "$LIBSDL"`" 1198 1186 cnf_append "LIB_SDK_LIBSDL_SDLMAIN" "`strip_l "$LIBSDLMAIN"`" 1199 1187 [ -n "$INCSDL" ] && cnf_append "SDK_LIBSDL_INCS" "$INCSDL" 1200 1188 [ -n "$FLDSDL" ] && cnf_append "SDK_LIBSDL_LDFLAGS" "$FLDSDL" 1201 fi1202 1189 fi 1203 1190 fi 1204 1191 else