blob: 60f2acf0477c8266f0403db5baf7f0a73dd94575 (
plain)
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
|
--- src/Makefile.old 2015-07-03 18:06:15.000000000 +0200
+++ src/Makefile 2015-07-03 18:08:50.000000000 +0200
@@ -69,13 +69,7 @@
# -Ofast Optimize till it hurts : "-O3" + enable opts not valid for all standard-compliants
# -Os Optimize for size
# -Og Optimize debugging experience but don't break debugging
-ifeq ($(GSPICEUI_DBG),0)
- # Options for release (not using -Wall since it's GCC specific)
- CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags)
-else
- # Options for development
- CXXFLAGS := -g -Og -Wall -Wextra -pipe $(shell $(WXCFG) --cxxflags)
-endif
+ CXXFLAGS += $(shell $(WXCFG) --cxxflags)
# The following suppresses spurious warnings from gcc with wxWidgets v2.8.12
ifeq ($(GSPICEUI_WXLIB),2.8)
@@ -134,7 +128,7 @@
# -o specify the output file name
$(BINDIR)/$(PROG) : $(OBJS)
- $(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
+ $(CXX) -pipe -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
|
GitWeb
