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
|
Index: openmsx-debugger/build/main.mk
===================================================================
--- openmsx-debugger.orig/build/main.mk
+++ openmsx-debugger/build/main.mk
@@ -259,14 +259,15 @@ endif
CXX?=c++
WINDRES?=windres
-CXXFLAGS:= -g -fPIC
+CXXFLAGS:= -g -fPIC $(DEB_CXX_FLAGS)
INCLUDE_INTERNAL:=$(sort $(foreach header,$(HEADERS_FULL),$(patsubst %/,%,$(dir $(header)))))
INCLUDE_INTERNAL+=$(BUILD_PATH)/config
-COMPILE_FLAGS:=$(addprefix -I,$(QT_HEADER_DIRS) $(INCLUDE_INTERNAL) $(GEN_SRC_PATH))
+COMPILE_FLAGS:=$(addprefix -I,$(QT_HEADER_DIRS) $(INCLUDE_INTERNAL) $(GEN_SRC_PATH)) $(DEB_COMPILE_FLAGS)
# Enable C++11
COMPILE_FLAGS+=-std=c++11
+LINK_FLAGS:=$(DEB_LINK_FLAGS)
ifeq ($(OPENMSX_TARGET_OS),darwin)
-LINK_FLAGS:=-F$(QT_INSTALL_LIBS) $(addprefix -framework Qt,$(QT_COMPONENTS))
+LINK_FLAGS+=-F$(QT_INSTALL_LIBS) $(addprefix -framework Qt,$(QT_COMPONENTS))
OSX_VER:=10.7
COMPILE_FLAGS+=-mmacosx-version-min=$(OSX_VER)
LINK_FLAGS+=-mmacosx-version-min=$(OSX_VER)
@@ -275,9 +276,9 @@ COMPILE_ENV:=
LINK_ENV:=
ifeq ($(OPENMSX_TARGET_OS),mingw32)
COMPILE_FLAGS+=-static-libgcc -static-libstdc++
-LINK_FLAGS:=-Wl,-rpath,$(QT_INSTALL_BINS) -L$(QT_INSTALL_BINS) $(addprefix -lQt5,$(QT_COMPONENTS)) -lws2_32 -lsecur32 -mwindows -static-libgcc -static-libstdc++
+LINK_FLAGS+=-Wl,-rpath,$(QT_INSTALL_BINS) -L$(QT_INSTALL_BINS) $(addprefix -lQt5,$(QT_COMPONENTS)) -lws2_32 -lsecur32 -mwindows -static-libgcc -static-libstdc++
else
-LINK_FLAGS:=-Wl,-rpath,$(QT_INSTALL_LIBS) -L$(QT_INSTALL_LIBS) $(addprefix -lQt5,$(QT_COMPONENTS))
+LINK_FLAGS+=-Wl,-rpath,$(QT_INSTALL_LIBS) -L$(QT_INSTALL_LIBS) $(addprefix -lQt5,$(QT_COMPONENTS))
endif
endif
DEPEND_FLAGS:=
|
