mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
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:
parent
f50b284fda
commit
3aa1c6c361
4 changed files with 12 additions and 8 deletions
|
@ -48,6 +48,8 @@
|
|||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
EnableFunctionLevelLinking="true"
|
||||
RuntimeTypeInfo="false"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
|
|
|
@ -3,7 +3,7 @@ CXX ?= g++
|
|||
CC ?= gcc
|
||||
NASM ?= nasm
|
||||
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
|
||||
CFLAGS ?= -pipe -Wall -Wno-unused
|
||||
endif
|
||||
|
@ -38,7 +38,7 @@ ZDOOMDEBUG = zdoomd
|
|||
ifndef DEBUG
|
||||
OBJDIR = $(RELEASEOBJ)
|
||||
CFLAGS += -DNDEBUG
|
||||
LDFLAGS += -Wl,-Map=$(ZDOOM).map
|
||||
LDFLAGS += -s -Wl,--gc-sections,-Map=$(ZDOOM).map
|
||||
ZDOOMBIN = $(ZDOOM)
|
||||
else
|
||||
OBJDIR = $(DEBUGOBJ)
|
||||
|
@ -81,8 +81,8 @@ ifndef RESTART
|
|||
$(OBJDIR)/autozend.o -o $(ZDOOMBIN)
|
||||
endif
|
||||
|
||||
# include any of the dep files that already exist
|
||||
$(foreach dep,$(DEPS),$(if $(wildcard $(dep)),$(eval include $(dep))))
|
||||
# include any of the dep files that already exist if we aren't making clean
|
||||
$(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
|
||||
# for creating dependency files without any existing dependency files
|
||||
|
|
|
@ -52,10 +52,10 @@ do ifopt debug
|
|||
TARGET = "${DEBUGTARGET}"
|
||||
else
|
||||
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"
|
||||
CXXFLAGS = "${CFLAGS}"
|
||||
LDFLAGS += " -Wl,-Map=zdoomgcc.map"
|
||||
LDFLAGS += " -s -Wl,--gc-sections,-Map=zdoomgcc.map"
|
||||
TARGET = "${RELEASETARGET}"
|
||||
done
|
||||
|
||||
|
@ -446,12 +446,12 @@ if "${EVILCLEAN}"="0" ifexist zdoom.pk3 exit 0
|
|||
|
||||
CFLAGS = '-Os -Wall -fomit-frame-pointer'
|
||||
|
||||
LDFLAGS = '-lz'
|
||||
LDFLAGS = '-s -lz'
|
||||
src_paths tools/makewad
|
||||
${COMPILER} makewad.c ioapi.c zip.c
|
||||
${LINK} tools/makewad/makewad
|
||||
|
||||
LDFLAGS = ''
|
||||
LDFLAGS = '-s'
|
||||
src_paths tools/xlatcc
|
||||
${COMPILER} xlat-parse.tab.c gen.c
|
||||
${LINK} tools/xlatcc/xlatcc
|
||||
|
|
|
@ -48,6 +48,8 @@
|
|||
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
EnableFunctionLevelLinking="true"
|
||||
RuntimeTypeInfo="false"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderFile=""
|
||||
AssemblerListingLocation=".\Debug/"
|
||||
|
|
Loading…
Reference in a new issue