scsi2sd-util crash on exit fix (again)

[SCSI2SD-V6.git] / software / scsi2sd-util / Makefile

diff --git a/software/scsi2sd-util/Makefile b/software/scsi2sd-util/Makefile
index f5ccdbf..d84529c 100755 (executable)
--- a/software/scsi2sd-util/Makefile
+++ b/software/scsi2sd-util/Makefile
@@ -8,7 +8,9 @@ LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper -L$(BUILD)/zlib -lz
 LIBZIPPER_CONFIG = --disable-shared LDFLAGS="-L../zlib" CPPFLAGS="-I../zlib"
 
 # wxWidgets 3.0.2 uses broken Webkit headers under OSX Yosemeti
+# liblzma not available on OSX 10.7
 WX_CONFIG=--disable-webkit --disable-webviewwebkit  \
+       --without-libtiff --without-libjbig --without-liblzma --without-opengl \
        --enable-monolithic --enable-stl --disable-shared
 
 TARGET ?= $(shell uname -s)
@@ -34,13 +36,13 @@ ifeq ($(TARGET),Win64)
 endif
 ifeq ($(TARGET),Linux)
        VPATH += hidapi/linux
-       LDFLAGS += -ludev
+       LDFLAGS += -ludev -lexpat
        BUILD = build/linux
 endif
 ifeq ($(TARGET),Darwin)
        # Should match OSX
        VPATH += hidapi-mac
-       LDFLAGS += -framework IOKit -framework CoreFoundation
+       LDFLAGS += -framework IOKit -framework CoreFoundation -lexpat
        CC=clang -mmacosx-version-min=10.7
        CXX=clang++ -stdlib=libc++ -mmacosx-version-min=10.7
        WX_CONFIG += --with-macosx-version-min=10.7
@@ -49,7 +51,7 @@ endif
 
 export CC CXX
 
-all:  $(BUILD)/scsi2sd-util$(EXE)
+all:  $(BUILD)/scsi2sd-util$(EXE) $(BUILD)/scsi2sd-monitor$(EXE)
 
 CYAPI = \
        $(BUILD)/cybtldr_api2.o \
@@ -64,7 +66,6 @@ HIDAPI = \
 
 OBJ = \
        $(CYAPI) $(HIDAPI) \
-       $(BUILD)/scsi2sd-util.o \
        $(BUILD)/ConfigUtil.o \
        $(BUILD)/Firmware.o \
        $(BUILD)/TargetPanel.o \
@@ -72,8 +73,14 @@ OBJ = \
        $(BUILD)/SCSI2SD_HID.o \
        $(BUILD)/hidpacket.o \
 
+EXEOBJ = \
+       $(BUILD)/scsi2sd-util.o \
+       $(BUILD)/scsi2sd-monitor.o \
+
+
 
 $(OBJ): $(BUILD)/zlib/buildstamp
+$(EXEOBJ): $(BUILD)/zlib/buildstamp
 $(BUILD)/zlib/buildstamp:
        mkdir -p $(dir $@)
        ( \
@@ -85,6 +92,7 @@ $(BUILD)/zlib/buildstamp:
        touch $@
 
 $(OBJ): $(BUILD)/wx.buildstamp
+$(EXEOBJ): $(BUILD)/wx.buildstamp
 $(BUILD)/wx.buildstamp: $(BUILD)/zlib/buildstamp
        mkdir -p $(dir $@)
        ( \
@@ -95,6 +103,7 @@ $(BUILD)/wx.buildstamp: $(BUILD)/zlib/buildstamp
        touch $@
 
 $(OBJ): $(BUILD)/libzipper/buildstamp
+$(EXEOBJ): $(BUILD)/libzipper/buildstamp
 $(BUILD)/libzipper/buildstamp: $(BUILD)/zlib/buildstamp
        mkdir -p $(dir $@)
        ( \
@@ -112,7 +121,11 @@ $(BUILD)/%.o: %.cc
        mkdir -p $(dir $@)
        $(CXX) $(CPPFLAGS) $(CXXFLAGS) `$(BUILD)/wx-config --cxxflags` $< -c -o $@
 
-$(BUILD)/scsi2sd-util$(EXE): $(OBJ)
+$(BUILD)/scsi2sd-util$(EXE): $(OBJ) $(BUILD)/scsi2sd-util.o
+       mkdir -p $(dir $@)
+       $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) `$(BUILD)/wx-config --libs` -o $@
+
+$(BUILD)/scsi2sd-monitor$(EXE): $(OBJ) $(BUILD)/scsi2sd-monitor.o
        mkdir -p $(dir $@)
        $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) `$(BUILD)/wx-config --libs` -o $@