diff --git a/sc2/build/unix/README.crossbuild b/sc2/build/unix/README.crossbuild index 2c3e60bff..bcdc4ed56 100644 --- a/sc2/build/unix/README.crossbuild +++ b/sc2/build/unix/README.crossbuild @@ -19,6 +19,7 @@ Make sure that it isn't being reset by subshells that are started. Set the environment variable 'BUILD_HOST' to the host system. This is whatever 'uname -s' returns on such a system (like "MINGW32"). +When building for Windows CE, using the cegcc tools, you should use "cegcc". If your host system is big-endian, set the environment variable 'BUILD_HOST_ENDIAN' to "big". For a little-endian system, you don't diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config index 0e2697865..ef81c2113 100644 --- a/sc2/build/unix/build.config +++ b/sc2/build/unix/build.config @@ -12,7 +12,7 @@ uqm_requirements() have_build_tools_language C || exit 1 have_build_tool LINK || exit 1 case "$HOST_SYSTEM" in - MINGW32*) + MINGW32*|cegcc) have_build_tool WINDRES || exit 1 ;; Darwin) @@ -75,7 +75,7 @@ uqm_prepare_config() Darwin) # Installation directory not modifiable ;; - MINGW32*) + MINGW32*|cegcc) # No install procedure available for MinGW ;; *) @@ -429,6 +429,10 @@ uqm_install() { echo "No installation procedure available for MinGW." echo "Read the manual for more information." ;; + cegcc*) + echo "No installation procedure available for Windows CE." + echo "Read the manual for more information." + ;; *) generic_install ;; diff --git a/sc2/build/unix/config_functions b/sc2/build/unix/config_functions index a34aa623c..38642dc45 100644 --- a/sc2/build/unix/config_functions +++ b/sc2/build/unix/config_functions @@ -1007,6 +1007,8 @@ set_host_system() { HOST_SYSTEM="SunOS" ;; [Qq][Nn][Xx]) HOST_SYSTEM="QNX" ;; + [Cc][Ee][Gg][Cc][Cc]) + HOST_SYSTEM="cegcc" ;; *) build_message "Warning: host type '$BUILD_HOST' unknown. Using defaults." ;; diff --git a/sc2/build/unix/config_proginfo_build b/sc2/build/unix/config_proginfo_build index 80502c30d..c8a02e981 100644 --- a/sc2/build/unix/config_proginfo_build +++ b/sc2/build/unix/config_proginfo_build @@ -77,7 +77,7 @@ case "$HOST_SYSTEM" in BUILDTOOL_REZ_COMMAND='$PROG_Rez_FILE' BUILDTOOL_REZ_DEPEND='Rez' ;; - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) BUILDTOOL_WINDRES_NAME="Windows resource linker (windres)" BUILDTOOL_WINDRES_COMMAND='$PROG_windres_FILE' BUILDTOOL_WINDRES_DEPEND='windres' diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host index d47d7e2b1..f4c5c3fb4 100644 --- a/sc2/build/unix/config_proginfo_host +++ b/sc2/build/unix/config_proginfo_host @@ -104,7 +104,7 @@ case "$HOST_SYSTEM" in FreeBSD|OpenBSD) LIB_openal_LDFLAGS="-L/usr/local/lib -pthread -lopenal" ;; - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) LIB_openal_LDFLAGS="-lopenal32" ;; Darwin) @@ -127,7 +127,7 @@ case "$HOST_SYSTEM" in LIB_opengl_CFLAGS="-I/usr/X11R6/include -D_THREAD_SAFE" LIB_opengl_LDFLAGS="-L/usr/X11R6/lib -lX11 -lXext -pthread -lGL" ;; - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) LIB_opengl_CFLAGS="" LIB_opengl_LDFLAGS="-lopengl32" ;; @@ -157,7 +157,7 @@ case "$HOST_SYSTEM" in LIB_vorbisfile_CFLAGS="-I/usr/local/include" LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis" ;; - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) LIB_vorbisfile_CFLAGS="" LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -lm -logg" ;; @@ -210,7 +210,7 @@ LIB_libmikmod_VERSION="$(libmikmod-config --version)" LIB_zlib_NAME="zlib" LIB_zlib_CFLAGS="" case "$HOST_SYSTEM" in - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) LIB_zlib_LDFLAGS="-lzdll" ;; *) diff --git a/sc2/src/config.h b/sc2/src/config.h index 70658fb2a..1dbbfd598 100644 --- a/sc2/src/config.h +++ b/sc2/src/config.h @@ -7,7 +7,7 @@ * If you want anything else than the defaults, you'll have to edit * that file manually. */ # include "msvc++/config.h" -#elif defined (__MINGW32__) || defined (__CYGWIN__) || defined(_WIN32_WCE) +#elif defined (__MINGW32__) || defined (__CYGWIN__) /* If we're compiling on MS Windows using build.sh, use * config_win.h, generated from src/config_win.h.in. */ # include "config_win.h"