diff options
| -rw-r--r-- | Makefile.common | 5 | ||||
| -rw-r--r-- | Makefile.rules | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common index 74c865a67a..b13db1802d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -78,7 +78,7 @@ endif CompileCommonOpts = $(PROFILE) -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include # Compile a file, don't link... -Compile = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) $(PROFILE) +Compile = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) CompileG = $(Compile) -g -D_DEBUG CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums @@ -160,6 +160,8 @@ LIBNAME_AG := $(LIBDEBUG)/lib$(LIBRARYNAME).a LIBNAME_OBJO := $(LIBRELEASE)/$(LIBRARYNAME).o LIBNAME_OBJG := $(LIBDEBUG)/$(LIBRARYNAME).o + +ifndef ENABLE_OPTIMIZED BUILD_LIBNAME_G := $(LIBNAME_G) ifndef DONT_BUILD_RELINKED BUILD_LIBNAME_OBJG := $(LIBNAME_OBJG) @@ -167,6 +169,7 @@ endif ifdef BUILD_ARCHIVE BUILD_LIBNAME_AG := $(LIBNAME_AG) endif +endif # If optimized builds are enabled... ifdef ENABLE_OPTIMIZED diff --git a/Makefile.rules b/Makefile.rules index 74c865a67a..b13db1802d 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -78,7 +78,7 @@ endif CompileCommonOpts = $(PROFILE) -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include # Compile a file, don't link... -Compile = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) $(PROFILE) +Compile = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) CompileG = $(Compile) -g -D_DEBUG CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums @@ -160,6 +160,8 @@ LIBNAME_AG := $(LIBDEBUG)/lib$(LIBRARYNAME).a LIBNAME_OBJO := $(LIBRELEASE)/$(LIBRARYNAME).o LIBNAME_OBJG := $(LIBDEBUG)/$(LIBRARYNAME).o + +ifndef ENABLE_OPTIMIZED BUILD_LIBNAME_G := $(LIBNAME_G) ifndef DONT_BUILD_RELINKED BUILD_LIBNAME_OBJG := $(LIBNAME_OBJG) @@ -167,6 +169,7 @@ endif ifdef BUILD_ARCHIVE BUILD_LIBNAME_AG := $(LIBNAME_AG) endif +endif # If optimized builds are enabled... ifdef ENABLE_OPTIMIZED |