Clean & update release flags for Linux and Mac
(cherry picked from commit 1bf834f5a77cb6d6b6b00463b6e0bb740591692d)
This commit is contained in:
Joël Troch
Daniel Walder
parent
6353fb88e0
commit
245c67b357
3 changed files with 40 additions and 44 deletions
|
|
@ -8,7 +8,7 @@ OS:=$(shell uname)
|
|||
HOSTNAME:=$(shell hostname)
|
||||
|
||||
ifeq "$(CFG)" ""
|
||||
CFG=release
|
||||
CFG=release
|
||||
endif
|
||||
|
||||
SOURCE_DIR=..
|
||||
|
|
@ -18,9 +18,7 @@ ENGINE_SRC_DIR=$(SOURCE_DIR)/engine
|
|||
COMMON_SRC_DIR=$(SOURCE_DIR)/common
|
||||
PM_SRC_DIR=$(SOURCE_DIR)/pm_shared
|
||||
GAME_SHARED_SRC_DIR=$(SOURCE_DIR)/game_shared
|
||||
GAMEDB_SRC_DIR=$(COMMON_SRC_DIR)/gamedb
|
||||
PUBLIC_SRC_DIR=$(SOURCE_DIR)/public
|
||||
DBG_SRC_DIR=$(SOURCE_DIR)/dbg
|
||||
|
||||
|
||||
BUILD_OBJ_DIR=$(BUILD_DIR)/obj
|
||||
|
|
@ -35,7 +33,7 @@ ifeq ($(OS),Linux)
|
|||
endif
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
OSXVER := $(shell sw_vers -productVersion)
|
||||
OSXVER := $(shell sw_vers -productVersion)
|
||||
DEVELOPER_DIR := $(shell /usr/bin/xcode-select -print-path)
|
||||
ifeq (,$(findstring 10.7, $(OSXVER)))
|
||||
BUILDING_ON_LION := 0
|
||||
|
|
@ -68,34 +66,34 @@ endif
|
|||
CLINK=$(CC)
|
||||
|
||||
ifeq "$(CFG)" "release"
|
||||
ARCH_CFLAGS_I486=-O3 -gdwarf-2 -g2
|
||||
ARCH_CFLAGS_I686=-O3 -gdwarf-2 -g2
|
||||
ARCH_CFLAGS_AMD=-O3 -gdwarf-2 -g2
|
||||
ARCH_CFLAGS_AMD64=-m64 -O3 -gdwarf-2 -g2
|
||||
ARCH_CFLAGS_I486=-O3
|
||||
ARCH_CFLAGS_I686=-O3
|
||||
ARCH_CFLAGS_AMD=-O3
|
||||
ARCH_CFLAGS_AMD64=-m64 -O3
|
||||
else
|
||||
ARCH_CFLAGS_I486=-gdwarf-2 -g2
|
||||
ARCH_CFLAGS_I686=-gdwarf-2 -g2
|
||||
ARCH_CFLAGS_AMD=-gdwarf-2 -g2
|
||||
ARCH_CFLAGS_AMD64=-m64 -gdwarf-2 -g2
|
||||
ARCH_CFLAGS_I486=-gdwarf-2 -g2
|
||||
ARCH_CFLAGS_I686=-gdwarf-2 -g2
|
||||
ARCH_CFLAGS_AMD=-gdwarf-2 -g2
|
||||
ARCH_CFLAGS_AMD64=-m64 -gdwarf-2 -g2
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Linux)
|
||||
ARCH_CFLAGS_I486+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_I686+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_AMD+=-march=k6 -mfpmath=387
|
||||
ARCH_CFLAGS_I486+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_I686+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_AMD+=-march=k6 -mfpmath=387
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
# force 387 for FP math so the precision between win32 and linux and osx match
|
||||
ARCH_CFLAGS_I486+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_I686+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_AMD+=-mfpmath=387
|
||||
# force 387 for FP math so the precision between win32 and linux and osx match
|
||||
ARCH_CFLAGS_I486+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_I686+=-march=pentium-m -mfpmath=387
|
||||
ARCH_CFLAGS_AMD+=-mfpmath=387
|
||||
endif
|
||||
|
||||
|
||||
ARCH_CFLAGS="$(ARCH_CFLAGS_I486)"
|
||||
|
||||
BASE_CFLAGS=-fpermissive -fno-strict-aliasing -DNDEBUG -DPOSIX -D_POSIX -DLINUX -D_LINUX -DGNUC -DHL1 -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -DQUIVER -DQUAKE2 -DVALVE_DLL -D_alloca=alloca -fno-exceptions -fexpensive-optimizations -D_vsnprintf=vsnprintf -DNO_MALLOC_OVERRIDE -Werror=return-type
|
||||
BASE_CFLAGS=-fpermissive -fno-strict-aliasing -DNDEBUG -DPOSIX -D_POSIX -DLINUX -D_LINUX -DGNUC -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_alloca=alloca -fno-exceptions -fexpensive-optimizations -D_vsnprintf=vsnprintf -DNO_MALLOC_OVERRIDE -Werror=return-type
|
||||
BASE_CFLAGS+=-w
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
|
|
@ -104,15 +102,22 @@ else
|
|||
BASE_CFLAGS+= -DLINUX -D_LINUX
|
||||
endif
|
||||
|
||||
DEDICATED_CFLAGS="-DDEDICATED -DSWDS"
|
||||
ifeq ($(OS),Darwin)
|
||||
SHLIBEXT=dylib
|
||||
SHLIBCFLAGS=
|
||||
SHLIBLDFLAGS="-shared -gdwarf-2 -g2"
|
||||
SHLIBEXT=dylib
|
||||
SHLIBCFLAGS=
|
||||
ifeq "$(CFG)" "release"
|
||||
SHLIBLDFLAGS="-shared"
|
||||
else
|
||||
SHLIBLDFLAGS="-shared -gdwarf-2 -g2"
|
||||
endif
|
||||
else
|
||||
SHLIBEXT=so
|
||||
SHLIBCFLAGS=
|
||||
SHLIBLDFLAGS="-shared -gdwarf-2 -g2 -Wl,-Map,$@_map.txt"
|
||||
SHLIBEXT=so
|
||||
SHLIBCFLAGS=
|
||||
ifeq "$(CFG)" "release"
|
||||
SHLIBLDFLAGS="-shared -Wl,-Map,$@_map.txt"
|
||||
else
|
||||
SHLIBLDFLAGS="-shared -gdwarf-2 -g2 -Wl,-Map,$@_map.txt"
|
||||
endif
|
||||
endif
|
||||
AR=ar
|
||||
LIBEXT=a
|
||||
|
|
@ -149,7 +154,7 @@ targets: $(TARGETS)
|
|||
|
||||
|
||||
hl_cdll: build_dir
|
||||
$(MAKE_HL_CDLL) ARCH=i686 CC=$(CC) CPLUS=$(CPLUS) CPP_LIB="$(CPP_LIB)" BUILD_DIR=$(BUILD_DIR) BUILD_OBJ_DIR=$(BUILD_OBJ_DIR) SOURCE_DIR=$(SOURCE_DIR) ENGINE_SRC_DIR=$(ENGINE_SRC_DIR) COMMON_SRC_DIR=$(COMMON_SRC_DIR) BASE_CFLAGS="$(BASE_CFLAGS)" PUBLIC_SRC_DIR=$(PUBLIC_SRC_DIR) DBG_SRC_DIR=$(DBG_SRC_DIR) ARCH_CFLAGS="$(ARCH_CFLAGS_I686)" GAME_SHARED_SRC_DIR=$(GAME_SHARED_SRC_DIR) CLINK=$(CLINK) PM_SRC_DIR=$(PM_SRC_DIR) SHLIBEXT=$(SHLIBEXT) SHLIBCFLAGS=$(SHLIBCFLAGS) SHLIBLDFLAGS=$(SHLIBLDFLAGS) CFG=$(CFG) OS=$(OS)
|
||||
$(MAKE_HL_CDLL) ARCH=i686 CC=$(CC) CPLUS=$(CPLUS) CPP_LIB="$(CPP_LIB)" BUILD_DIR=$(BUILD_DIR) BUILD_OBJ_DIR=$(BUILD_OBJ_DIR) SOURCE_DIR=$(SOURCE_DIR) ENGINE_SRC_DIR=$(ENGINE_SRC_DIR) COMMON_SRC_DIR=$(COMMON_SRC_DIR) BASE_CFLAGS="$(BASE_CFLAGS)" PUBLIC_SRC_DIR=$(PUBLIC_SRC_DIR) ARCH_CFLAGS="$(ARCH_CFLAGS_I686)" GAME_SHARED_SRC_DIR=$(GAME_SHARED_SRC_DIR) CLINK=$(CLINK) PM_SRC_DIR=$(PM_SRC_DIR) SHLIBEXT=$(SHLIBEXT) SHLIBCFLAGS=$(SHLIBCFLAGS) SHLIBLDFLAGS=$(SHLIBLDFLAGS) CFG=$(CFG) OS=$(OS)
|
||||
|
||||
dmc_cdll: build_dir
|
||||
$(MAKE_DMC_CDLL) ARCH=i686 CC=$(CC) CPLUS=$(CPLUS) CPP_LIB="$(CPP_LIB)" BUILD_DIR=$(BUILD_DIR) BUILD_OBJ_DIR=$(BUILD_OBJ_DIR) SOURCE_DIR=$(SOURCE_DIR) ENGINE_SRC_DIR=$(ENGINE_SRC_DIR) COMMON_SRC_DIR=$(COMMON_SRC_DIR) BASE_CFLAGS="$(BASE_CFLAGS)" PUBLIC_SRC_DIR=$(PUBLIC_SRC_DIR) DBG_SRC_DIR=$(DBG_SRC_DIR) ARCH_CFLAGS="$(ARCH_CFLAGS_I686)" GAME_SHARED_SRC_DIR=$(GAME_SHARED_SRC_DIR) CLINK=$(CLINK) PM_SRC_DIR=$(PM_SRC_DIR) SHLIBEXT=$(SHLIBEXT) SHLIBCFLAGS=$(SHLIBCFLAGS) SHLIBLDFLAGS=$(SHLIBLDFLAGS) CFG=$(CFG) OS=$(OS)
|
||||
|
|
@ -158,7 +163,7 @@ ricochet_cdll: build_dir
|
|||
$(MAKE_RICOCHET_CDLL) ARCH=i686 CC=$(CC) CPLUS=$(CPLUS) CPP_LIB="$(CPP_LIB)" BUILD_DIR=$(BUILD_DIR) BUILD_OBJ_DIR=$(BUILD_OBJ_DIR) SOURCE_DIR=$(SOURCE_DIR) ENGINE_SRC_DIR=$(ENGINE_SRC_DIR) COMMON_SRC_DIR=$(COMMON_SRC_DIR) BASE_CFLAGS="$(BASE_CFLAGS)" PUBLIC_SRC_DIR=$(PUBLIC_SRC_DIR) DBG_SRC_DIR=$(DBG_SRC_DIR) ARCH_CFLAGS="$(ARCH_CFLAGS_I686)" GAME_SHARED_SRC_DIR=$(GAME_SHARED_SRC_DIR) CLINK=$(CLINK) PM_SRC_DIR=$(PM_SRC_DIR) SHLIBEXT=$(SHLIBEXT) SHLIBCFLAGS=$(SHLIBCFLAGS) SHLIBLDFLAGS=$(SHLIBLDFLAGS) CFG=$(CFG) OS=$(OS)
|
||||
|
||||
hl: build_dir
|
||||
$(MAKE_HL_LIB) CC=$(CC) ARCH=$(ARCH) CPP_LIB="$(CPP_LIB)" BUILD_DIR=$(BUILD_DIR) BUILD_OBJ_DIR=$(BUILD_OBJ_DIR) SOURCE_DIR=$(SOURCE_DIR) ENGINE_SRC_DIR=$(ENGINE_SRC_DIR) COMMON_SRC_DIR=$(COMMON_SRC_DIR) PM_SRC_DIR=$(PM_SRC_DIR) GAME_SHARED_SRC_DIR=$(GAME_SHARED_SRC_DIR) GAMEDB_SRC_DIR=$(GAMEDB_SRC_DIR) BASE_CFLAGS="$(BASE_CFLAGS)" SHLIBEXT=$(SHLIBEXT) SHLIBCFLAGS=$(SHLIBCFLAGS) SHLIBLDFLAGS=$(SHLIBLDFLAGS) PUBLIC_SRC_DIR=$(PUBLIC_SRC_DIR) CFG=$(CFG) OS=$(OS) ARCH_CFLAGS="$(ARCH_CFLAGS_I686)"
|
||||
$(MAKE_HL_LIB) CC=$(CC) ARCH=$(ARCH) CPP_LIB="$(CPP_LIB)" BUILD_DIR=$(BUILD_DIR) BUILD_OBJ_DIR=$(BUILD_OBJ_DIR) SOURCE_DIR=$(SOURCE_DIR) ENGINE_SRC_DIR=$(ENGINE_SRC_DIR) COMMON_SRC_DIR=$(COMMON_SRC_DIR) PM_SRC_DIR=$(PM_SRC_DIR) GAME_SHARED_SRC_DIR=$(GAME_SHARED_SRC_DIR) BASE_CFLAGS="$(BASE_CFLAGS)" SHLIBEXT=$(SHLIBEXT) SHLIBCFLAGS=$(SHLIBCFLAGS) SHLIBLDFLAGS=$(SHLIBLDFLAGS) PUBLIC_SRC_DIR=$(PUBLIC_SRC_DIR) CFG=$(CFG) OS=$(OS) ARCH_CFLAGS="$(ARCH_CFLAGS_I686)"
|
||||
|
||||
dmc: build_dir
|
||||
$(MAKE_DMC_LIB) CC=$(CC) CPLUS=$(CPLUS) CPP_LIB="$(CPP_LIB)" ARCH=$(ARCH) BUILD_DIR=$(BUILD_DIR) BUILD_OBJ_DIR=$(BUILD_OBJ_DIR) SOURCE_DIR=$(SOURCE_DIR) ENGINE_SRC_DIR=$(ENGINE_SRC_DIR) COMMON_SRC_DIR=$(COMMON_SRC_DIR) GAME_SHARED_SRC_DIR=$(GAME_SHARED_SRC_DIR) BASE_CFLAGS="$(BASE_CFLAGS)" SHLIBEXT=$(SHLIBEXT) SHLIBCFLAGS=$(SHLIBCFLAGS) SHLIBLDFLAGS=$(SHLIBLDFLAGS) PUBLIC_SRC_DIR=$(PUBLIC_SRC_DIR) CFG=$(CFG) OS=$(OS) CLINK=$(CLINK) ARCH_CFLAGS="$(ARCH_CFLAGS_I686)"
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ GAME_SHARED_OBJ_DIR=$(HL1_OBJ_DIR)/game_shared
|
|||
HL1_SERVER_OBJ_DIR=$(HL1_OBJ_DIR)/server
|
||||
PM_SHARED_OBJ_DIR=$(HL1_OBJ_DIR)/pm_shared
|
||||
|
||||
CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_DLL -DCLIENT_WEAPONS -DHL_DLL -I/usr/include/malloc -D_snwprintf=swprintf
|
||||
|
||||
INCLUDEDIRS=-I$(HL_SRC_DIR) -I../dlls -I../tfc -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I../pm_shared -I../engine -I../utils/vgui/include -I ../game_shared -I../external
|
||||
CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_DLL -DCLIENT_WEAPONS -I/usr/include/malloc -D_snwprintf=swprintf
|
||||
|
||||
INCLUDEDIRS=-I$(HL_SRC_DIR) -I../dlls -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I../pm_shared -I../engine -I../utils/vgui/include -I ../game_shared -I../external
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -framework Carbon $(CFG)/vgui.dylib -L. -lSDL2-2.0.0
|
||||
LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -framework Carbon $(CFG)/vgui.dylib -L. -lSDL2-2.0.0
|
||||
else
|
||||
LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -L$(CFG) vgui.so -L. libSDL2-2.0.so.0
|
||||
LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -L$(CFG) vgui.so -L. libSDL2-2.0.so.0
|
||||
endif
|
||||
|
||||
DO_CC=$(CPLUS) $(INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
|
||||
|
|
@ -56,8 +56,6 @@ HL1_OBJS = \
|
|||
$(HL1_OBJ_DIR)/GameStudioModelRenderer.o \
|
||||
$(HL1_OBJ_DIR)/geiger.o \
|
||||
$(HL1_OBJ_DIR)/health.o \
|
||||
$(HL1_OBJ_DIR)/hud_bench.o \
|
||||
$(HL1_OBJ_DIR)/hud_benchtrace.o \
|
||||
$(HL1_OBJ_DIR)/hud_msg.o \
|
||||
$(HL1_OBJ_DIR)/hud_redraw.o \
|
||||
$(HL1_OBJ_DIR)/hud_update.o \
|
||||
|
|
@ -78,19 +76,14 @@ HL1_OBJS = \
|
|||
$(HL1_OBJ_DIR)/view.o \
|
||||
$(HL1_OBJ_DIR)/vgui_int.o \
|
||||
$(HL1_OBJ_DIR)/vgui_ClassMenu.o \
|
||||
$(HL1_OBJ_DIR)/vgui_ConsolePanel.o \
|
||||
$(HL1_OBJ_DIR)/vgui_ControlConfigPanel.o \
|
||||
$(HL1_OBJ_DIR)/vgui_CustomObjects.o \
|
||||
$(HL1_OBJ_DIR)/vgui_MOTDWindow.o \
|
||||
$(HL1_OBJ_DIR)/vgui_SchemeManager.o \
|
||||
$(HL1_OBJ_DIR)/vgui_ScorePanel.o \
|
||||
$(HL1_OBJ_DIR)/vgui_ServerBrowser.o \
|
||||
$(HL1_OBJ_DIR)/vgui_TeamFortressViewport.o \
|
||||
$(HL1_OBJ_DIR)/vgui_SpectatorPanel.o \
|
||||
$(HL1_OBJ_DIR)/vgui_teammenu.o \
|
||||
$(HL1_OBJ_DIR)/voice_status.o \
|
||||
$(HL1_OBJ_DIR)/hud_servers.o \
|
||||
|
||||
|
||||
DLL_OBJS = \
|
||||
$(HL1_SERVER_OBJ_DIR)/crossbow.o \
|
||||
|
|
@ -131,7 +124,6 @@ PM_SHARED_OBJS = \
|
|||
$(PM_SHARED_OBJ_DIR)/pm_debug.o \
|
||||
$(PM_SHARED_OBJ_DIR)/pm_shared.o \
|
||||
$(PM_SHARED_OBJ_DIR)/pm_math.o \
|
||||
|
||||
|
||||
|
||||
all: client.$(SHLIBEXT)
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ HLDLL_OBJS = \
|
|||
$(HLDLL_OBJ_DIR)/gman.o \
|
||||
$(HLDLL_OBJ_DIR)/h_ai.o \
|
||||
$(HLDLL_OBJ_DIR)/h_battery.o \
|
||||
$(HLDLL_OBJ_DIR)/h_cine.o \
|
||||
$(HLDLL_OBJ_DIR)/h_cycler.o \
|
||||
$(HLDLL_OBJ_DIR)/h_export.o \
|
||||
$(HLDLL_OBJ_DIR)/handgrenade.o \
|
||||
|
|
@ -161,7 +160,7 @@ dirs:
|
|||
hl.$(SHLIBEXT): $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(COMMON_OBJS)
|
||||
$(CC) $(LDFLAGS) $(SHLIBLDFLAGS) -o $(BUILD_DIR)/$@ $(HLDLL_OBJS) $(HLWPN_OBJS) $(PM_OBJS) $(GAME_SHARED_OBJS) $(COMMON_OBJS)
|
||||
./gendbg.sh $(BUILD_DIR)/hl.$(SHLIBEXT)
|
||||
|
||||
|
||||
$(HLWPN_OBJ_DIR)/%.o : $(HLWPN_SRC_DIR)/%.cpp
|
||||
$(DO_HLWPN_CC)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue