Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 04:26:03 +08:00
Code Activity

Build 64-bit Linux libraries with clang.

Browse Source
This commit is contained in:
Scott Ehlert
2017-09-15 03:55:22 -05:00
parent 7a988dce0b
commit b8ef1b5393
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
linux_sdk/x86-64/Makefile
View File

@ -32,9 +32,9 @@ CPLUS = /usr/bin/clang++
CLINK = /usr/bin/clang CLINK = /usr/bin/clang
CPP_LIB = CPP_LIB =
else else
CC = /usr/bin/gcc CC = /usr/bin/clang
CPLUS = /usr/bin/g++ CPLUS = /usr/bin/clang++
CLINK = /usr/bin/gcc CLINK = /usr/bin/clang
CPP_LIB = CPP_LIB =
endif endif
@ -87,7 +87,7 @@ endif
# the CPU target for the build, must be i486 for now # the CPU target for the build, must be i486 for now
ARCH = x86_64 ARCH = x86_64
ARCH_CFLAGS = -mtune=x86-64 -march=core2 -mmmx -msse -msse2 ARCH_CFLAGS = -mtune=generic -march=core2 -mmmx -msse -msse2 -std=gnu++11
ifeq "$(OS)" "Darwin" ifeq "$(OS)" "Darwin"
DEFINES = -D_OSX -DOSX -D_DLL_EXT=.dylib DEFINES = -D_OSX -DOSX -D_DLL_EXT=.dylib
@ -115,6 +115,10 @@ ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(
BASE_CFLAGS += -Wno-delete-non-virtual-dtor -Wno-narrowing BASE_CFLAGS += -Wno-delete-non-virtual-dtor -Wno-narrowing
endif endif
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \& $(CPP_MINOR) \>= 4 \| $(CPP_MAJOR) \>= 4)" "1"
BASE_CFLAGS += -Wno-deprecated-register
endif
# Flags passed to the c compiler # Flags passed to the c compiler
CFLAGS = $(DEFINES) $(ARCH_CFLAGS) -O3 $(BASE_CFLAGS) CFLAGS = $(DEFINES) $(ARCH_CFLAGS) -O3 $(BASE_CFLAGS)
ifdef USER_CFLAGS ifdef USER_CFLAGS
@ -144,8 +148,6 @@ MAKE_TIER1 = Makefile.tier1
MAKE_MATH = Makefile.mathlib MAKE_MATH = Makefile.mathlib
MAKE_IFACE = Makefile.interfaces MAKE_IFACE = Makefile.interfaces
MAKE_CHOREO = Makefile.choreo MAKE_CHOREO = Makefile.choreo
MAKE_APPFRMWRK = Makefile.appframework
MAKE_DEDICATED = Makefile.dedicated
all: check vcpm mod all: check vcpm mod
@ -155,7 +157,6 @@ check:
cd $(BUILD_DIR) cd $(BUILD_DIR)
if [ ! -e "$(LIB_DIR)/tier1.a" ]; then $(MAKE) tier1;fi if [ ! -e "$(LIB_DIR)/tier1.a" ]; then $(MAKE) tier1;fi
if [ ! -e "$(LIB_DIR)/mathlib.a" ]; then $(MAKE) mathlib;fi if [ ! -e "$(LIB_DIR)/mathlib.a" ]; then $(MAKE) mathlib;fi
if [ ! -e "$(LIB_DIR)/appframework.a" ]; then $(MAKE) appframework;fi
if [ ! -f "libtier0.$(SHLIBEXT)" ]; then ln -s $(LIB_DIR)/libtier0.$(SHLIBEXT) .; fi if [ ! -f "libtier0.$(SHLIBEXT)" ]; then ln -s $(LIB_DIR)/libtier0.$(SHLIBEXT) .; fi
if [ ! -f "libvstdlib.$(SHLIBEXT)" ]; then ln -s $(LIB_DIR)/libvstdlib.$(SHLIBEXT) .; fi if [ ! -f "libvstdlib.$(SHLIBEXT)" ]; then ln -s $(LIB_DIR)/libvstdlib.$(SHLIBEXT) .; fi
if [ ! -f "libsteam_api.$(SHLIBEXT)" ]; then ln -s $(LIB_DIR)/libsteam_api.$(SHLIBEXT) .; fi if [ ! -f "libsteam_api.$(SHLIBEXT)" ]; then ln -s $(LIB_DIR)/libsteam_api.$(SHLIBEXT) .; fi
@ -185,12 +186,6 @@ interfaces:
choreo: choreo:
$(MAKE) -f $(MAKE_CHOREO) $(BASE_DEFINES) $(MAKE) -f $(MAKE_CHOREO) $(BASE_DEFINES)
appframework:
$(MAKE) -f $(MAKE_APPFRMWRK) $(BASE_DEFINES)
dedicated: check
$(MAKE) -f $(MAKE_DEDICATED) $(BASE_DEFINES)
install: install:
cp -f $(NAME)_$(ARCH).$(SHLIBEXT) $(GAME_DIR)/bin/$(NAME)_$(ARCH).$(SHLIBEXT) cp -f $(NAME)_$(ARCH).$(SHLIBEXT) $(GAME_DIR)/bin/$(NAME)_$(ARCH).$(SHLIBEXT)
@ -207,5 +202,3 @@ clean:
$(MAKE) -f $(MAKE_MATH) $(BASE_DEFINES) clean $(MAKE) -f $(MAKE_MATH) $(BASE_DEFINES) clean
$(MAKE) -f $(MAKE_IFACE) $(BASE_DEFINES) clean $(MAKE) -f $(MAKE_IFACE) $(BASE_DEFINES) clean
$(MAKE) -f $(MAKE_CHOREO) $(BASE_DEFINES) clean $(MAKE) -f $(MAKE_CHOREO) $(BASE_DEFINES) clean
$(MAKE) -f $(MAKE_APPFRMWRK) $(BASE_DEFINES) clean
$(MAKE) -f $(MAKE_DEDICATED) $(BASE_DEFINES) clean

5
public/mathlib/vector.h
View File

@ -236,8 +236,9 @@ private:
}; };
#if !defined(_X360)
#define USE_M64S ( ( !defined( _X360 ) ) ) #define USE_M64S 1
#endif