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

Take $CFLAGS and $LDFLAGS into account for dependency detection (they were

Browse Source 
already used for the building itself).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2597 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-12-14 23:37:05 +00:00
parent cf311c629b
commit 73006b32c7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.6: Changes towards version 0.6:
- Take $CFLAGS and $LDFLAGS into account for dependency detection
(they were already used for the building itself) - SvdB
- Validate UQM version of either side of a Netplay game - SvdB - Validate UQM version of either side of a Netplay game - SvdB
- Better abort and disconnect handling for Netplay - SvdB - Better abort and disconnect handling for Netplay - SvdB
- Menu sounds in Setup track rest of game (#922), from Nic - Michael - Menu sounds in Setup track rest of game (#922), from Nic - Michael
sc2/build/unix/config_functions
+5 -5
View File
@@ -492,7 +492,7 @@ have_library() {
TEMP_CFLAGS=`evalVar LIB_${LIB}_CFLAGS` TEMP_CFLAGS=`evalVar LIB_${LIB}_CFLAGS`
TEMP_LDFLAGS=`evalVar LIB_${LIB}_LDFLAGS` TEMP_LDFLAGS=`evalVar LIB_${LIB}_LDFLAGS`
try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
(void) argc; /* Get rid of unused variable warning */ (void) argc; /* Get rid of unused variable warning */
(void) argv; /* Get rid of unused variable warning */ (void) argv; /* Get rid of unused variable warning */
@@ -575,7 +575,7 @@ have_symbol_generic() {
CODE=$2 CODE=$2
fi fi
try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1 try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF > /dev/null 2>&1
#include <sys/types.h> #include <sys/types.h>
$EXTRA $EXTRA
@@ -677,7 +677,7 @@ have_header() {
NAME=${HEADER%.h} NAME=${HEADER%.h}
EXTRA=`evalVar HEADER_${NAME}_EXTRA` EXTRA=`evalVar HEADER_${NAME}_EXTRA`
try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1 try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF > /dev/null 2>&1
$EXTRA $EXTRA
#include <$HEADER> #include <$HEADER>
int main() { int main() {
@@ -719,7 +719,7 @@ have_macro() {
EXTRA=`evalVar MACRO_${NAME}_EXTRA` EXTRA=`evalVar MACRO_${NAME}_EXTRA`
try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1 try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF > /dev/null 2>&1
$EXTRA $EXTRA
#ifndef $MACRO #ifndef $MACRO
# error # error
@@ -791,7 +791,7 @@ check_endianness() {
esac esac
else else
# Detect endianness # Detect endianness
try_compile_and_run_c << EOF try_compile_and_run_c "$CFLAGS" "$LDFLAGS" << EOF
int main() { int main() {
int i; int i;