ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2025-01-22 01:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert osx to c++98

Browse source
This commit is contained in:
pierow 2018-08-12 21:41:20 -04:00
parent 7cf4db2810
commit 0960ad6c53
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/source/linux/Makefile
View file

@ -52,16 +52,16 @@ ifeq ($(OS),Darwin)
SDKROOT ?= $(SDK_DIR)/MacOSX10.8.sdk
ARCH_FLAGS ?= -arch i386 -m32 -march=prescott -gdwarf-2 -g2 -Wno-typedef-redefinition -momit-leaf-frame-pointer -mtune=core2
CPP_LIB=-stdlib=libc++ -lpthread
CPP_LIB=-lstdc++ -lpthread
ifeq ($(origin AR), default)
AR = libtool -static -o
endif
ifeq ($(origin CC), default)
CC ="$(COMPILER_BIN_DIR)/clang -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.7 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
CC ="$(COMPILER_BIN_DIR)/clang -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
endif
ifeq ($(origin CPLUS), default)
CPLUS ="$(COMPILER_BIN_DIR)/clang++ -std=c++11 -stdlib=libc++ -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.7 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
CPLUS ="$(COMPILER_BIN_DIR)/clang++ -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
endif
LINK ?= $(CPLUS)
endif
@ -109,7 +109,7 @@ DEDICATED_CFLAGS="-DDEDICATED -DSWDS"
ifeq ($(OS),Darwin)
SHLIBEXT=dylib
SHLIBCFLAGS=
SHLIBLDFLAGS="-shared -gdwarf-2 -g2 -mmacosx-version-min=10.7 -DCMAKE_OSX_ARCHITECTURES=i386 -target i386-apple-darwin"
SHLIBLDFLAGS="-shared -gdwarf-2 -g2 -DCMAKE_OSX_ARCHITECTURES=i386 -target i386-apple-darwin"
else
SHLIBEXT=so
SHLIBCFLAGS=

2
main/source/linux/Makefile.nsdll
View file

@ -31,7 +31,7 @@ UTIL_INCLUDEDIRS = -I../ -I../util
TEXTREP_INCLUDEDIRS=..
ifeq ($(OS),Darwin)
LDFLAGS=-lm -lcurl -stdlib=libc++ -L. libparticleMP.a
LDFLAGS=-lm -lcurl -lstdc++ -L. libparticleMP.a
else
LDFLAGS=-lm -lcurl -lstdc++ -L. libparticleMP.a
endif