v6.0BETA1 release

diff --git a/doc/SCSI2SD_QuickStartGuide.odt b/doc/SCSI2SD_QuickStartGuide.odt
index 5c278a0f59de76e939567850b2a9117f456b887b..61b1bba2ebd5497379380f716828464d3b3010ee 100644 (file)
Binary files a/doc/SCSI2SD_QuickStartGuide.odt and b/doc/SCSI2SD_QuickStartGuide.odt differ

diff --git a/src/scsi2sd-util6/Makefile b/src/scsi2sd-util6/Makefile
index dabd5500c31b13efcb43ccb4b13631fe00e8fa3b..3cd88aa06be114119952da7387164ad0eba2fcb2 100755 (executable)
--- a/src/scsi2sd-util6/Makefile
+++ b/src/scsi2sd-util6/Makefile
@@ -69,6 +69,7 @@ ifeq ($(TARGET),Win64)
 endif
 ifeq ($(TARGET),Linux)
        VPATH += hidapi/linux
+       CPPFLAGS += -DHAS_LIBUSB
        LDFLAGS += -ludev -lexpat -lusb-1.0
        BUILD := $(PWD)/build/linux
 endif
@@ -82,7 +83,7 @@ ifeq ($(TARGET),Darwin)
        BUILD := $(PWD)/build/mac
 all: $(BUILD)/scsi2sd-util6.dmg
 
-$(BUILD)/scsi2sd-util6.dmg: $(BUILD)/scsi2sd-util6 $(BUILD)/scsi2sd-monitor
+$(BUILD)/scsi2sd-util6.dmg: $(BUILD)/scsi2sd-util6
        mkdir -p $(dir $@)/dmg
        cp $(BUILD)/scsi2sd-util6 $(dir $@)/dmg
        chmod a+rx $(dir $@)/dmg/*
@@ -179,10 +180,6 @@ $(BUILD)/scsi2sd-util6$(EXE): $(OBJ) $(BUILD)/scsi2sd-util.o
        mkdir -p $(dir $@)
        $(CXX) $(CXXFLAGS) $^ $(LDFLAGS_WX) $(LDFLAGS) -o $@
 
-$(BUILD)/scsi2sd-monitor$(EXE): $(OBJ) $(BUILD)/scsi2sd-monitor.o
-       mkdir -p $(dir $@)
-       $(CXX) $(CXXFLAGS) $^ $(LDFLAGS_WX) $(LDFLAGS) -o $@
-
 clean:
        rm $(BUILD)/scsi2sd-util6$(EXE) $(OBJ) $(BUILD)/libzipper/buildstamp
 
@@ -198,7 +195,7 @@ dist:
                ../SCSI2SD/src/hidpacket.c ../../include/hidpacket.h ../../include/scsi2sd.h \
               libzipper-1.0.4 Makefile \
                SCSI2SD_Bootloader.cc SCSI2SD_Bootloader.hh SCSI2SD_HID.cc SCSI2SD_HID.hh \
-              scsi2sd-monitor.cc scsi2sd-util.cc TargetPanel.cc TargetPanel.hh \
+              scsi2sd-util.cc TargetPanel.cc TargetPanel.hh \
               BoardPanel.cc BoardPanel.hh \
               $(NAME)-$(VERSION)
        tar jcvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)

diff --git a/src/scsi2sd-util6/scsi2sd-util.cc b/src/scsi2sd-util6/scsi2sd-util.cc
index 2fbbfdb8c0c12c236cd798636df6c2edd5fbcd66..8f1d23f46d91d9ed080db319dff5b212283c5db9 100644 (file)
--- a/src/scsi2sd-util6/scsi2sd-util.cc
+++ b/src/scsi2sd-util6/scsi2sd-util.cc
@@ -58,7 +58,9 @@ using std::shared_ptr;
 using std::tr1::shared_ptr;
 #endif
 
+#ifdef HAS_LIBUSB
 #include <libusb-1.0/libusb.h>
+#endif
 
 using namespace SCSI2SD;
 
@@ -110,6 +112,7 @@ void ProgressUpdate(unsigned char arrayId, unsigned short rowNum)
 namespace
 {
 bool hasDFUdevice() {
+#ifdef HAS_LIBUSB
        bool found = false;
 
        libusb_device **list;
@@ -130,6 +133,9 @@ bool hasDFUdevice() {
        libusb_free_device_list(list, 1);
 
        return found;
+#else
+       return false;
+#endif
 }
 
 
@@ -565,7 +571,11 @@ private:
 
                std::string cmd = ss.str();
                int result = system(cmd.c_str());
+#ifdef WIN32
+               if (result != 0)
+#else
                if (WEXITSTATUS(result) != 0)
+#endif
                {
                        wxMessageBox(
                                "Update failed",
@@ -930,7 +940,9 @@ class App : public wxApp
 public:
        virtual bool OnInit()
        {
+#ifdef HAS_LIBUSB
                libusb_init(NULL);
+#endif
                AppFrame* frame = new AppFrame();
                frame->Show(true);
                SetTopWindow(frame);