zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

I've been meaning to do this for ages: all the Makefiles now give

Browse Source 
$(XFLAGS) _after_ $(CFLAGS) on the compiler command lines, meaning
that you can provide options in XFLAGS on the makefile which will
override the ones in CFLAGS. For example, `make XFLAGS=-O0' to make
debugging easier.

[originally from svn r6123]
This commit is contained in:
Simon Tatham
2005-07-21 17:26:46 +00:00
parent 11ce8d7abd
commit d2d4b07e15
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mkfiles.pl
View File

@ -428,14 +428,6 @@ if (defined $makefiles{'cygwin'}) {
"LDFLAGS = -mno-cygwin -s\n". "LDFLAGS = -mno-cygwin -s\n".
&splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1". &splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1".
" --define WINVER=0x0400 --define MINGW32_FIX=1")."\n". " --define WINVER=0x0400 --define MINGW32_FIX=1")."\n".
"\n".
".SUFFIXES:\n".
"\n".
"%.o: %.c\n".
"\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n".
"\n".
"%.res.o: %.rc\n".
"\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n".
"\n"; "\n";
print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C")); print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C"));
print "\n\n"; print "\n\n";
@ -456,8 +448,8 @@ if (defined $makefiles{'cygwin'}) {
print "\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n"; print "\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n";
} else { } else {
$deflist = join "", map { " -D$_" } @{$d->{defs}}; $deflist = join "", map { " -D$_" } @{$d->{defs}};
print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS)" . print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS)" .
" \$(CFLAGS)$deflist -c \$< -o \$\@\n"; " \$(XFLAGS)$deflist -c \$< -o \$\@\n";
} }
} }
print "\n"; print "\n";
@ -555,7 +547,7 @@ if (defined $makefiles{'borland'}) {
} else { } else {
$deflist = join "", map { " -D$_" } @{$d->{defs}}; $deflist = join "", map { " -D$_" } @{$d->{defs}};
print &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)" . print &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)" .
" \$(FWHACK) \$(XFLAGS) \$(CFLAGS)$deflist ". " \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist ".
(join " ", map {"-I$dirpfx$_"} @srcdirs) . (join " ", map {"-I$dirpfx$_"} @srcdirs) .
" /o$d->{obj} /c ".$d->{deps}->[0],69)."\n"; " /o$d->{obj} /c ".$d->{deps}->[0],69)."\n";
} }
@ -632,7 +624,7 @@ if (defined $makefiles{'vc'}) {
"-DWINVER=0x0400 ".$d->{deps}->[0]."\n"; "-DWINVER=0x0400 ".$d->{deps}->[0]."\n";
} else { } else {
$deflist = join "", map { " /D$_" } @{$d->{defs}}; $deflist = join "", map { " /D$_" } @{$d->{defs}};
print "\tcl \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS)$deflist". print "\tcl \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist".
" /c ".$d->{deps}->[0]." /Fo$d->{obj}\n"; " /c ".$d->{deps}->[0]." /Fo$d->{obj}\n";
} }
} }
@ -969,7 +961,7 @@ if (defined $makefiles{'gtk'}) {
print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
"\n"; "\n";
$deflist = join "", map { " -D$_" } @{$d->{defs}}; $deflist = join "", map { " -D$_" } @{$d->{defs}};
print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS)$deflist" . print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist" .
" -c \$< -o \$\@\n"; " -c \$< -o \$\@\n";
} }
print "\n"; print "\n";
@ -1166,8 +1158,8 @@ if (defined $makefiles{'lcc'}) {
print &splitline("\tlrc \$(FWHACK) \$(RCFL) -r \$*.rc",69)."\n"; print &splitline("\tlrc \$(FWHACK) \$(RCFL) -r \$*.rc",69)."\n";
} else { } else {
$deflist = join "", map { " -D$_" } @{$d->{defs}}; $deflist = join "", map { " -D$_" } @{$d->{defs}};
print &splitline("\tlcc -O -p6 \$(COMPAT) \$(FWHACK) \$(XFLAGS)". print &splitline("\tlcc -O -p6 \$(COMPAT) \$(FWHACK) \$(CFLAGS)".
" \$(CFLAGS)$deflist ".$d->{deps}->[0]." -o \$\@",69)."\n"; " \$(XFLAGS)$deflist ".$d->{deps}->[0]." -o \$\@",69)."\n";
} }
} }
print "\n"; print "\n";
@ -1245,10 +1237,10 @@ if (defined $makefiles{'osx'}) {
"\n"; "\n";
$deflist = join "", map { " -D$_" } @{$d->{defs}}; $deflist = join "", map { " -D$_" } @{$d->{defs}};
if ($d->{deps}->[0] =~ /\.m$/) { if ($d->{deps}->[0] =~ /\.m$/) {
print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(XFLAGS)". print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS)".
" \$(CFLAGS)$deflist -c \$< -o \$\@\n"; " \$(XFLAGS)$deflist -c \$< -o \$\@\n";
} else { } else {
print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS)$deflist" . print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist" .
" -c \$< -o \$\@\n"; " -c \$< -o \$\@\n";
} }
} }