Added Jim's latest Makefile.linux and default.cbd and added options for no RTTI and function level linking to FLAC.vcproj and zlib.vcproj.

SVN r143 (trunk)
This commit is contained in:
Christoph Oelckers 2006-05-24 20:25:02 +00:00
parent f50b284fda
commit 3aa1c6c361
4 changed files with 12 additions and 8 deletions

View file

@ -48,6 +48,8 @@
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"

View file

@ -3,7 +3,7 @@ CXX ?= g++
CC ?= gcc CC ?= gcc
NASM ?= nasm NASM ?= nasm
ifndef DEBUG ifndef DEBUG
CFLAGS ?= -pipe -Wall -Wno-unused -O2 -fomit-frame-pointer CFLAGS ?= -pipe -Wall -Wno-unused -O2 -fomit-frame-pointer -ffunction-sections -fvtable-gc -fno-rtti
else else
CFLAGS ?= -pipe -Wall -Wno-unused CFLAGS ?= -pipe -Wall -Wno-unused
endif endif
@ -38,7 +38,7 @@ ZDOOMDEBUG = zdoomd
ifndef DEBUG ifndef DEBUG
OBJDIR = $(RELEASEOBJ) OBJDIR = $(RELEASEOBJ)
CFLAGS += -DNDEBUG CFLAGS += -DNDEBUG
LDFLAGS += -Wl,-Map=$(ZDOOM).map LDFLAGS += -s -Wl,--gc-sections,-Map=$(ZDOOM).map
ZDOOMBIN = $(ZDOOM) ZDOOMBIN = $(ZDOOM)
else else
OBJDIR = $(DEBUGOBJ) OBJDIR = $(DEBUGOBJ)
@ -81,8 +81,8 @@ ifndef RESTART
$(OBJDIR)/autozend.o -o $(ZDOOMBIN) $(OBJDIR)/autozend.o -o $(ZDOOMBIN)
endif endif
# include any of the dep files that already exist # include any of the dep files that already exist if we aren't making clean
$(foreach dep,$(DEPS),$(if $(wildcard $(dep)),$(eval include $(dep)))) $(if !$(findstring clean,$(MAKECMDGOALS)),$(foreach dep,$(DEPS),$(if $(wildcard $(dep)),$(eval include $(dep)))))
# textually substitute in the _dep_ and the _src_ it depends on to create rules # textually substitute in the _dep_ and the _src_ it depends on to create rules
# for creating dependency files without any existing dependency files # for creating dependency files without any existing dependency files

View file

@ -52,10 +52,10 @@ do ifopt debug
TARGET = "${DEBUGTARGET}" TARGET = "${DEBUGTARGET}"
else else
OBJDIR = "${RELEASEOBJDIR}" OBJDIR = "${RELEASEOBJDIR}"
CFLAGS += "-march=${ARCH_TYPE} -mtune=${TUNE_TYPE} -Wall -Wno-unused -O${OPTLEVEL} -fomit-frame-pointer" CFLAGS += "-march=${ARCH_TYPE} -mtune=${TUNE_TYPE} -Wall -Wno-unused -O${OPTLEVEL} -fomit-frame-pointer -ffunction-sections -fvtable-gc -fno-rtti"
CPPFLAGS += " -DNDEBUG" CPPFLAGS += " -DNDEBUG"
CXXFLAGS = "${CFLAGS}" CXXFLAGS = "${CFLAGS}"
LDFLAGS += " -Wl,-Map=zdoomgcc.map" LDFLAGS += " -s -Wl,--gc-sections,-Map=zdoomgcc.map"
TARGET = "${RELEASETARGET}" TARGET = "${RELEASETARGET}"
done done
@ -446,12 +446,12 @@ if "${EVILCLEAN}"="0" ifexist zdoom.pk3 exit 0
CFLAGS = '-Os -Wall -fomit-frame-pointer' CFLAGS = '-Os -Wall -fomit-frame-pointer'
LDFLAGS = '-lz' LDFLAGS = '-s -lz'
src_paths tools/makewad src_paths tools/makewad
${COMPILER} makewad.c ioapi.c zip.c ${COMPILER} makewad.c ioapi.c zip.c
${LINK} tools/makewad/makewad ${LINK} tools/makewad/makewad
LDFLAGS = '' LDFLAGS = '-s'
src_paths tools/xlatcc src_paths tools/xlatcc
${COMPILER} xlat-parse.tab.c gen.c ${COMPILER} xlat-parse.tab.c gen.c
${LINK} tools/xlatcc/xlatcc ${LINK} tools/xlatcc/xlatcc

View file

@ -48,6 +48,8 @@
PreprocessorDefinitions="WIN32,_DEBUG,_LIB" PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
PrecompiledHeaderFile="" PrecompiledHeaderFile=""
AssemblerListingLocation=".\Debug/" AssemblerListingLocation=".\Debug/"