Skip to content

Commit fc6fa25

Browse files
committed
Release 1.0.29
* Support build for MacOS.
2 parents f035eab + ce89b62 commit fc6fa25

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.29 ===
6+
* Support build for MacOS.
7+
58
=== 1.0.28 ===
69
* Updated build scripts.
710

include/lsp-plug.in/test-fw/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// Define header version
2626
#define LSP_TEST_FW_MAJOR 1
2727
#define LSP_TEST_FW_MINOR 0
28-
#define LSP_TEST_FW_MICRO 28
28+
#define LSP_TEST_FW_MICRO 29
2929

3030
#if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
3131
#define LSP_TEST_FW_EXPORT_MODIFIER __declspec(dllexport)

make/tools.mk

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ INSTALL ?= $(X_INSTALL_TOOL)
8888
# Patch flags and tools for (cross) build
8989
FLAG_RELRO := -Wl,-z,relro,-z,now
9090
FLAG_STDLIB :=
91+
FLAG_GC_SECTIONS := -Wl,--gc-sections
9192
NOARCH_CFLAGS :=
9293
NOARCH_CXXFLAGS :=
9394
NOARCH_EXE_FLAGS :=
@@ -105,6 +106,11 @@ else ifeq ($(PLATFORM),Windows)
105106
NOARCH_EXE_FLAGS += -static-libgcc -static-libstdc++
106107
NOARCH_SO_FLAGS += -static-libgcc -static-libstdc++
107108
NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script
109+
else ifeq ($(PLATFORM),MacOS)
110+
FLAG_RELRO =
111+
FLAG_GC_SECTIONS =
112+
NOARCH_CXXFLAGS += -std=c++0x
113+
NOARCH_LDFLAGS += -keep_private_externs
108114
else ifeq ($(PLATFORM),BSD)
109115
NOARCH_EXE_FLAGS += -L/usr/local/lib
110116
NOARCH_SO_FLAGS += -L/usr/local/lib
@@ -194,11 +200,11 @@ NOARCH_LDFLAGS += -r
194200
LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS)
195201
HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS)
196202

197-
NOARCH_EXE_FLAGS += $(FLAG_RELRO) -Wl,--gc-sections
203+
NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS)
198204
EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS)
199205
HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS)
200206

201-
NOARCH_SO_FLAGS += $(FLAG_RELRO) -Wl,--gc-sections -shared $(FLAG_STDLIB) -fPIC
207+
NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC
202208
SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS)
203209
HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS)
204210

project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ ARTIFACT_ID = LSP_TEST_FW
2323
ARTIFACT_NAME = lsp-test-fw
2424
ARTIFACT_DESC = Test framework for executing automated and manual tests
2525
ARTIFACT_HEADERS = lsp-plug.in
26-
ARTIFACT_VERSION = 1.0.28
26+
ARTIFACT_VERSION = 1.0.29
2727
ARTIFACT_EXPORT_SYMBOLS = 1

src/test/ptest/demo/trig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ PTEST_BEGIN("demo", trig, 2.0, 10000)
6363
return;
6464

6565
char buf[80];
66-
sprintf(buf, "%s x %d", label, int(count));
66+
snprintf(buf, sizeof(buf), "%s x %d", label, int(count));
6767
printf("Testing %s numbers...\n", buf);
6868

6969
PTEST_LOOP(buf,

0 commit comments

Comments
 (0)