Browse Source

Respect CFLAGS and RPM_OPT_FLAGS

rdb 16 years ago
parent
commit
6b4aeb7ed5
1 changed files with 8 additions and 0 deletions
  1. 8 0
      makepanda/makepanda.py

+ 8 - 0
makepanda/makepanda.py

@@ -37,6 +37,7 @@ GENMAN=0
 VERBOSE=1
 COMPRESSOR="zlib"
 THREADCOUNT=0
+CFLAGS=""
 
 PkgListSet(MAYAVERSIONS + MAXVERSIONS + DXVERSIONS + [
   "PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN",
@@ -137,6 +138,12 @@ def parseopts(args):
 
 parseopts(sys.argv[1:])
 
+# Now check if CFLAGS happens to be set
+if (os.environ.has_key("CFLAGS")):
+  CFLAGS=os.environ["CFLAGS"]
+if (os.environ.has_key("RPM_OPT_FLAGS")):
+  CFLAGS+=os.environ["RPM_OPT_FLAGS"]
+
 ########################################################################
 ##
 ## Locate various SDKs.
@@ -482,6 +489,7 @@ def CompileCxx(obj,src,opts):
         if (optlevel==2): cmd = cmd + " -O1"
         if (optlevel==3): cmd = cmd + " -O2"
         if (optlevel==4): cmd = cmd + " -O2 -DNDEBUG"
+        if (CFLAGS !=""): cmd = cmd + " " + CFLAGS
         building = GetValueOption(opts, "BUILDING:")
         if (building): cmd = cmd + " -DBUILDING_" + building
         cmd = cmd + ' ' + src