retoor/wren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.0; fix misconfigured nan tagging build, and update travis

Browse Source
This commit is contained in:
underscorediscovery
2020-05-28 09:57:29 -07:00
parent 2fc4be6e38
commit dd510c2995
14 changed files with 247 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/gmake/Makefile
+7 -7
View File
@@ -14,17 +14,17 @@ ifeq ($(config),release_64bit)
else ifeq ($(config),release_32bit)
wren_cli_config = release_32bit
else ifeq ($(config),release_64bit-no-nan-tagging)
wren_cli_config = release_64bit-no-nan-tagging
else ifeq ($(config),debug_64bit)
wren_cli_config = debug_64bit
else ifeq ($(config),debug_32bit)
wren_cli_config = debug_32bit
else ifeq ($(config),64bit-no-nan-tagging_64bit)
wren_cli_config = 64bit-no-nan-tagging_64bit
else ifeq ($(config),64bit-no-nan-tagging_32bit)
wren_cli_config = 64bit-no-nan-tagging_32bit
else ifeq ($(config),debug_64bit-no-nan-tagging)
wren_cli_config = debug_64bit-no-nan-tagging
else
$(error "invalid configuration $(config)")
@@ -51,10 +51,10 @@ help:
@echo "CONFIGURATIONS:"
@echo " release_64bit"
@echo " release_32bit"
@echo " release_64bit-no-nan-tagging"
@echo " debug_64bit"
@echo " debug_32bit"
@echo " 64bit-no-nan-tagging_64bit"
@echo " 64bit-no-nan-tagging_32bit"
@echo " debug_64bit-no-nan-tagging"
@echo ""
@echo "TARGETS:"
@echo " all (default)"
projects/gmake/wren_cli.make
+16 -16
View File
@@ -51,6 +51,15 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O3 -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O3
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s
else ifeq ($(config),release_64bit-no-nan-tagging)
TARGETDIR = ../../bin
TARGET = $(TARGETDIR)/wren_cli
OBJDIR = obj/64bit-no-nan-tagging/Release
DEFINES += -DNDEBUG -DWREN_NAN_TAGGING=0 -D_GNU_SOURCE
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3
ALL_LDFLAGS += $(LDFLAGS) -s
else ifeq ($(config),debug_64bit)
TARGETDIR = ../../bin
TARGET = $(TARGETDIR)/wren_cli_d
@@ -69,23 +78,14 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
else ifeq ($(config),64bit-no-nan-tagging_64bit)
else ifeq ($(config),debug_64bit-no-nan-tagging)
TARGETDIR = ../../bin
TARGET = $(TARGETDIR)/wren_cli
OBJDIR = obj/64bit/64bit-no-nan-tagging
DEFINES += -D_GNU_SOURCE
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s
else ifeq ($(config),64bit-no-nan-tagging_32bit)
TARGETDIR = ../../bin
TARGET = $(TARGETDIR)/wren_cli
OBJDIR = obj/32bit/64bit-no-nan-tagging
DEFINES += -D_GNU_SOURCE
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s
TARGET = $(TARGETDIR)/wren_cli_d
OBJDIR = obj/64bit-no-nan-tagging/Debug
DEFINES += -DDEBUG -DWREN_NAN_TAGGING=0 -D_GNU_SOURCE
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g
ALL_LDFLAGS += $(LDFLAGS)
else
$(error "invalid configuration $(config)")