blob: a6f6ee32f08deedbb3d4fe1d2f3675682307ee90 (
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
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
diff --git a/src/scsi2sd-util6/Makefile b/src/scsi2sd-util6/Makefile
index 76ac0234..1646f256 100755
--- a/src/scsi2sd-util6/Makefile
+++ b/src/scsi2sd-util6/Makefile
@@ -38,7 +38,8 @@ LIBZIPPER_CONFIG = --disable-shared LDFLAGS="-L../zlib" CPPFLAGS="-I../zlib"
endif
ifeq ($(USE_SYSTEM_WX),Yes)
-LDFLAGS_WX=$(shell wx-config-3.0 --libs)
+CPPFLAGS_WX=$(shell wx-config-gtk3 --cflags)
+LDFLAGS_WX=$(shell wx-config-gtk3 --libs)
else
LDFLAGS_WX=$(shell $(BUILD)/wx/wx-config --libs)
endif
@@ -47,6 +48,7 @@ CPPFLAGS = $(CPPFLAGS_HIDAPI) -I. -I ../../include -ITerminalWx/src \
-Ilibzipper-1.0.4 \
$(CPPFLAGS_ZLIB) \
$(CPPFLAGS_LIBUSB) \
+ $(CPPFLAGS_WX) \
-DHAVE_LIBUSB_1_0 \
@@ -260,7 +262,7 @@ $(BUILD)/%.o: %.cc
ifneq ($(USE_SYSTEM_WX),Yes)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) `$(BUILD)/wx/wx-config --cxxflags` $< -c -o $@
else
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) `wx-config-3.0 --cxxflags` $< -c -o $@
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) `wx-config-gtk3 --cxxflags` $< -c -o $@
endif
$(BUILD)/%.o: %.cpp
@@ -268,7 +270,7 @@ $(BUILD)/%.o: %.cpp
ifneq ($(USE_SYSTEM_WX),Yes)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) `$(BUILD)/wx/wx-config --cxxflags` $< -c -o $@
else
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) `wx-config-3.0 --cxxflags` $< -c -o $@
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) `wx-config-gtk3 --cxxflags` $< -c -o $@
endif
$(BUILD)/scsi2sd-util6$(EXE): $(OBJ) $(WXOBJ) $(BUILD)/scsi2sd-util.o
|