Lots of bug fixing, and 4.7 merges

[SCSI2SD-V6.git] / src / scsi2sd-util6 / Makefile

diff --git a/src/scsi2sd-util6/Makefile b/src/scsi2sd-util6/Makefile
index c350c7a..42e1d9b 100755 (executable)
--- a/src/scsi2sd-util6/Makefile
+++ b/src/scsi2sd-util6/Makefile
@@ -49,8 +49,8 @@ CPPFLAGS = $(CPPFLAGS_HIDAPI) -I. -I ../../include -ITerminalWx/src \
        -DHAVE_LIBUSB_1_0 \
 
 
        -DHAVE_LIBUSB_1_0 \
 
 

-CFLAGS += -Wall -Wno-pointer-sign -O2 -g
-CXXFLAGS += -Wall -O2 -g -std=c++0x
+CFLAGS += -Wall -Wno-pointer-sign -O2 -g -fPIC
+CXXFLAGS += -Wall -O2 -g -std=c++0x -fPIC

 
 LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper \
        $(LDFLAGS_ZLIB) \
 
 LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper \
        $(LDFLAGS_ZLIB) \


@@ -60,7 +60,8 @@ LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper \
 
 # wxWidgets 3.0.2 uses broken Webkit headers under OSX Yosemeti
 # liblzma not available on OSX 10.7
 
 # wxWidgets 3.0.2 uses broken Webkit headers under OSX Yosemeti
 # liblzma not available on OSX 10.7

-WX_CONFIG=--disable-webkit --disable-webviewwebkit  \
+# --disable-mediactrl for missing Quicktime.h on Mac OSX Sierra
+WX_CONFIG=--disable-webkit --disable-webviewwebkit  --disable-mediactrl \

        --without-libtiff --without-libjbig --without-liblzma --without-opengl \
        --enable-monolithic --enable-stl --disable-shared
 
        --without-libtiff --without-libjbig --without-liblzma --without-opengl \
        --enable-monolithic --enable-stl --disable-shared
 


@@ -109,11 +110,12 @@ ifeq ($(TARGET),Darwin)
        BUILD := $(PWD)/build/mac
 all: $(BUILD)/scsi2sd-util6.dmg
 
        BUILD := $(PWD)/build/mac
 all: $(BUILD)/scsi2sd-util6.dmg
 

-$(BUILD)/scsi2sd-util6.dmg: $(BUILD)/scsi2sd-util6
+$(BUILD)/scsi2sd-util6.dmg: $(BUILD)/scsi2sd-util6 $(BUILD)/dfu-util/buildstamp
+       rm -rf $(dir $@)/dmg $@

        mkdir -p $(dir $@)/dmg
        mkdir -p $(dir $@)/dmg

-       cp $(BUILD)/scsi2sd-util6 $(dir $@)/dmg
+       cp $(BUILD)/scsi2sd-util6 $(BUILD)/dfu-util/src/dfu-util $(dir $@)/dmg

        chmod a+rx $(dir $@)/dmg/*
        chmod a+rx $(dir $@)/dmg/*

-       hdiutil create -srcfolder $(dir $@)/dmg $@
+       hdiutil create -volname scsi2sd-util6 -srcfolder $(dir $@)/dmg $@

 endif
 
 export CC CXX
 endif
 
 export CC CXX