ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some OS/2 related changes I missed in the previous commit. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@885 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-11-19 22:31:51 +00:00
parent ac1dbc31cc
commit 764aee30ba
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
stella/configure vendored
View File

@ -66,9 +66,9 @@ cc_check() {
echo >> "$TMPLOG" echo >> "$TMPLOG"
cat "$TMPC" >> "$TMPLOG" cat "$TMPC" >> "$TMPLOG"
echo >> "$TMPLOG" echo >> "$TMPLOG"
echo "$CXX $TMPC -o $TMPO $@" >> "$TMPLOG" echo "$CXX $TMPC -o $TMPO$EXEEXT $@" >> "$TMPLOG"
rm -f "$TMPO$EXEEXT" rm -f "$TMPO$EXEEXT"
( $CXX "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1 ( $CXX "$TMPC" -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
TMP="$?" TMP="$?"
echo >> "$TMPLOG" echo >> "$TMPLOG"
return "$TMP" return "$TMP"
@ -97,9 +97,9 @@ EOF
if test -n "$_host"; then if test -n "$_host"; then
# In cross-compiling mode, we cannot run the result # In cross-compiling mode, we cannot run the result
eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
else else
eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
fi fi
} }
@ -113,9 +113,11 @@ find_sdlconfig()
sdlconfigs="$_sdlconfig:sdl-config:sdl11-config:sdl12-config" sdlconfigs="$_sdlconfig:sdl-config:sdl11-config:sdl12-config"
_sdlconfig= _sdlconfig=
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR"
done=0 done=0
for path_dir in $_sdlpath; do for path_dir in $_sdlpath; do
#reset separator to parse sdlconfigs
IFS=":"
for sdlconfig in $sdlconfigs; do for sdlconfig in $sdlconfigs; do
if test -x "$path_dir/$sdlconfig" ; then if test -x "$path_dir/$sdlconfig" ; then
_sdlconfig="$path_dir/$sdlconfig" _sdlconfig="$path_dir/$sdlconfig"
@ -394,7 +396,7 @@ esac
# Determine extension used for executables # Determine extension used for executables
# #
case $_host_os in case $_host_os in
mingw* | cygwin*) mingw* | cygwin* |os2-emx*)
EXEEXT=".exe" EXEEXT=".exe"
;; ;;
arm-riscos-aof) arm-riscos-aof)
@ -408,6 +410,19 @@ psp)
;; ;;
esac esac
#
# Determine separator used for $PATH
#
case $_host_os in
os2-emx* )
SEPARATOR=";"
;;
* )
SEPARATOR=":"
;;
esac
# #
# Determine the C++ compiler # Determine the C++ compiler
# #
@ -557,6 +572,11 @@ else
LIBS="$LIBS -mno-cygwin -lmingw32 -lwinmm" LIBS="$LIBS -mno-cygwin -lmingw32 -lwinmm"
_host_os=win32 _host_os=win32
;; ;;
os2*)
DEFINES="$DEFINES -DUNIX -DOS2"
LIBS="$LIBS -lpng -lz"
_host_os=unix
;;
# given this is a shell script assume some type of unix # given this is a shell script assume some type of unix
*) *)
echo "WARNING: could not establish system type, assuming unix like" echo "WARNING: could not establish system type, assuming unix like"