adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More MinGW fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2465 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-10-27 02:00:48 +00:00
parent c243c3a73f
commit 7d87f25fdf
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build.vars.in
+2 -1
View File
@@ -39,8 +39,9 @@ uqm_HAVE_OPENGL='@HAVE_OPENGL@'
uqm_USE_ZIP_IO='@USE_ZIP_IO@' uqm_USE_ZIP_IO='@USE_ZIP_IO@'
uqm_USE_PLATFORM_ACCEL='@USE_PLATFORM_ACCEL@' uqm_USE_PLATFORM_ACCEL='@USE_PLATFORM_ACCEL@'
uqm_NETPLAY='@NETPLAY@' uqm_NETPLAY='@NETPLAY@'
uqm_USE_WINSOCK='@USE_WINSOCK@'
DEBUG='@DEBUG@' DEBUG='@DEBUG@'
export BUILD_SYSTEM HOST_SYSTEM DEBUG export BUILD_SYSTEM HOST_SYSTEM DEBUG
export MACRO_WIN32 MACRO__MCS_VER MACRO___MINGW32__ export MACRO_WIN32 MACRO__MCS_VER MACRO___MINGW32__
export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX uqm_USE_WINSOCK
export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_NETPLAY export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_NETPLAY
sc2/build/unix/build.config
+6 -4
View File
@@ -49,11 +49,13 @@ uqm_requirements()
define_have_symbol getopt_long define_have_symbol getopt_long
define_have_header regex.h define_have_header regex.h
# Add an environment variable for MACRO_WIN32, MACRO__MCS_VER, and # Add an environment variable for MACRO_WIN32 and MACRO___MINGW32__
# MACRO___MINGW32__
define_have_macro WIN32 define_have_macro WIN32
define_have_macro _MCS_VER
define_have_macro __MINGW32__ define_have_macro __MINGW32__
if [ -n "$MACRO___MINGW32__" ]; then
USE_WINSOCK=1
fi
} }
uqm_prepare_config() uqm_prepare_config()
@@ -342,7 +344,7 @@ uqm_process_config() {
MAKE ECHON SED DEBUG JOYSTICK NETPLAY \ MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
SOUNDMODULE USE_INTERNAL_MIKMOD \ SOUNDMODULE USE_INTERNAL_MIKMOD \
HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \ HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
USE_PLATFORM_ACCEL \ USE_PLATFORM_ACCEL USE_WINSOCK \
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \ INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
REZ WINDRES" REZ WINDRES"
SUBSTITUTE_FILES="build.vars" SUBSTITUTE_FILES="build.vars"