Changeset 2240 for box/trunk/infrastructure

Timestamp:

21/08/2008 10:59:17 (4 years ago)

Author:

chris

Message:

Build lib/win32.a (even if empty) on all platforms, to help Boxi
linking.

Allow overriding CXXFLAGS from Configure (was broken before).

Use make -q to test whether module dependencies should be rebuilt, more
quietly than before.

Reformat for readability.

File:

• box/trunk/infrastructure/makebuildenv.pl.in (modified) (9 diffs)

box/trunk/infrastructure/makebuildenv.pl.in

@@ -40 +40 @@
 my %env_flags;
 
-my $windows_include_path = "";
-if ($target_windows)
-{
-        $module_dependency{"lib/common"} = ["lib/win32"];
-        push @implicit_deps, "lib/win32";
-}
-else
-{
-        # $env_flags{'IGNORE_lib/win32'} = 1;
-}
+$module_dependency{"lib/common"} = ["lib/win32"];
+push @implicit_deps, "lib/win32";
 
 # print "Flag: $_\n" for(keys %env_flags);
@@ -502 +494 @@
 
         # make include path
-        my $include_paths = $windows_include_path .
-                join(' ',map {'-I../../'.$_} @all_deps_for_module);
+        my $include_paths = join(' ',map {'-I../../'.$_} @all_deps_for_module);
 
         # is target a library?
@@ -531 +522 @@
 
         my $default_cxxflags = '@CXXFLAGS@';
-        my $default_cxxflags =~ s/ -O2//g;
+        $default_cxxflags =~ s/ -O2//g;
 
         my $release_flags = "-O2";
@@ -551 +542 @@
 WINDRES = windres
 
-CXXFLAGS = @CPPFLAGS@ $default_cxxflags @CXXFLAGS_STRICT@ \\
+DEFAULT_CXXFLAGS = @CPPFLAGS@ $default_cxxflags @CXXFLAGS_STRICT@ \\
         $include_paths $extra_platform_defines \\
         -DBOX_VERSION="\\"$product_version\\""
@@ -557 +548 @@
 
 .ifdef RELEASE
-CXXFLAGS += -DNDEBUG $release_flags
+CXXFLAGS = -DNDEBUG $release_flags \$(DEFAULT_CXXFLAGS)
 OUTBASE = ../../release
 OUTDIR = ../../release/$mod
@@ -563 +554 @@
 VARIENT = RELEASE
 .else
-CXXFLAGS += -g
+CXXFLAGS = -g \$(DEFAULT_CXXFLAGS)
 OUTBASE = ../../debug
 OUTDIR = ../../debug/$mod
@@ -751 +742 @@
                 for my $dep (@all_deps_for_module)
                 {
-                        $deps_makeinfo .= "\t\t\$(HIDE) (cd ../../$dep; \$(MAKE)$sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS)\n";
-                }
+                        $deps_makeinfo .= "\t\t\$(HIDE) (cd ../../$dep; \$(MAKE)$sub_make_options -q \$(DEPENDMAKEFLAGS) -D NODEPS || \$(MAKE)$sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS)\n";
+                }
+
                 $deps_makeinfo .= ".\tendif\n.endif\n\n";
         }
@@ -841 +833 @@
         
         # and a clean target
-        print MAKE "clean:\n\t-rm -rf \$(OUTDIR)/*\n.\tifndef SUBCLEAN\n";
+        print MAKE <<EOF;
+clean:
+        -rm -rf \$(OUTDIR)/*
+.       ifndef SUBCLEAN
+EOF
         for my $dep (@all_deps_for_module)
         {
@@ -878 +874 @@
                         s/\A\.\s*(ifdef|else|endif|ifndef)/$1/;
                         s/\A\.\s*include\s+<(.+?)>/include $1/;
-                        s/-D\s+(\w+)/$1=1/;
+                        s/-D\s+(\w+)/$1=1/g;
                         print MAKE;
                 }