1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
diff --git a/src/Makefile b/src/Makefile
index 50736fd..8dbfcfa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,8 +39,8 @@ DESTDIR = /usr/local/bin
#***************************************************************************************************
# Which compiler and linker (eg. g++ or clang++)
-CXX = g++
-LD = g++
+CXX ?= g++
+LD ?= g++
ifneq ($(GSPICEUI_MSWIN),0)
LD += -static-libstdc++ -static-libgcc
WINDRES = windres
@@ -91,13 +91,7 @@ BINDIR = $(ROOT)/bin
# -Os Optimize for size
# -Og Optimize debugging experience but don't break debugging
# -std=[C++NO] The C++ standard to use where C++NO is eg. c++98, c++03, c++11, c++14, c++17, etc.
-ifeq ($(GSPICEUI_DEBUG),0)
- # Options for release (not using -Wall since it's GCC specific)
- CXXFLAGS := -O3 -std=c++17 -pipe $(shell $(WXCFG) --cxxflags)
-else
- # Options for development
- CXXFLAGS := -g -Og -std=c++17 -Wall -Wextra -Wpedantic -pipe $(shell $(WXCFG) --cxxflags)
-endif
+CXXFLAGS += $(shell $(WXCFG) --cxxflags)
# I like to compile using the option "-Wall" etc., tests that break wxWidgets are turned off below
ifeq ($(GSPICEUI_DEBUG),1)
@@ -117,6 +111,7 @@ INCLUDES = -I.
# Libraries
LIBS := $(shell $(WXCFG) --libs core,base,html)
+LIBS += -lm -lstdc++
# (The pkg-config stuff was requested by a user, somehow pangox was missing) 2019-08-07 ???
#ifeq ($(GSPICEUI_MSWIN),0)
#LIBS := $(shell $(WXCFG) --libs core,base,html) # $(shell pkg-config --libs-only-l pangox)
@@ -181,7 +176,7 @@ $(OBJDIR)/%.o : %.cpp
# -o specify the output file name
$(BINDIR)/$(PROG) : $(OBJS)
- $(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
+ $(CXX) -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
endif
@@ -223,7 +218,7 @@ tests : test_Component test_NetList test_CnvtType test_CmdNgSpiceOPT test_CmdNgS
# Compiler options
-test_% : CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
+test_% : CXXFLAGS += $(shell $(WXCFG) --cxxflags)
ifeq ($(GSPICEUI_WXLIB),2.8) # This suppresses spurious warnings from gcc with wxWidgets v2.8.12
test_% : CXXFLAGS += -Wno-unused-local-typedefs
endif
|
