projects / SCSI2SD-V6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Makefile updates for command-line test util
[SCSI2SD-V6.git] / src / scsi2sd-util6 / Makefile
diff --git a/src/scsi2sd-util6/Makefile b/src/scsi2sd-util6/Makefile
index 9bc3b7776002ca00ad1b05918cfefa7623915669..45796205ce443d18910813145ed5c64e8aebf6ec 100755 (executable)
--- a/src/scsi2sd-util6/Makefile
+++ b/src/scsi2sd-util6/Makefile
@@ -1,4 +1,4 @@
-VPATH=../firmware dfu-programmer/src
+VPATH=../firmware TerminalWx/src TerminalWx/src/taTelnet TerminalWx/src/GTerm
 
 VERSION=6.0
 NAME=scsi2sd-util6
@@ -14,7 +14,7 @@ ifeq ($(USE_SYSTEM_LIBUSB), Yes)
 CPPFLAGS_LIBUSB=$(shell pkg-config libusb-1.0 --cflags)
 LDFLAGS_LIBUSB=$(shell pkg-config libusb-1.0 --libs)
 else
-CPPFLAGS_LIBUSB=-I libusb-1.0.9/libusb
+CPPFLAGS_LIBUSB=-I $(PWD)/libusb-1.0.20/libusb
 LDFLAGS_LIBUSB=-L $(BUILD)/libusb/libusb/.libs -lusb-1.0
 endif
 
@@ -42,15 +42,15 @@ else
 LDFLAGS_WX=$(shell $(BUILD)/wx/wx-config --libs)
 endif
 
-CPPFLAGS = $(CPPFLAGS_HIDAPI) -I. -I ../../include -Idfu-programmer/src \
+CPPFLAGS = $(CPPFLAGS_HIDAPI) -I. -I ../../include -ITerminalWx/src \
        -Ilibzipper-1.0.4 \
        $(CPPFLAGS_ZLIB) \
        $(CPPFLAGS_LIBUSB) \
        -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) \
@@ -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
-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
 
@@ -75,6 +76,7 @@ ifeq ($(TARGET),Win32)
        EXE=.exe
        WX_CONFIG+=--host=i686-w64-mingw32
        LIBUSB_CONFIG+=--host=i686-w64-mingw32 --disable-shared
+       DFU-UTIL_CONFIG+=--host=i686-w64-mingw32
 endif
 ifeq ($(TARGET),Win64)
        VPATH += hidapi/windows
@@ -86,12 +88,16 @@ ifeq ($(TARGET),Win64)
        EXE=.exe
        WX_CONFIG+=--host=x86_64-w64-mingw32
        LIBUSB_CONFIG+=--host=x86_64-w64-mingw32 --disable-shared
+       DFU-UTIL_CONFIG+=--host=x86_64-w64-mingw32
 endif
 ifeq ($(TARGET),Linux)
        VPATH += hidapi/linux
        LDFLAGS += -ludev -lexpat -lusb-1.0
        BUILD := $(PWD)/build/linux
        LIBUSB_CONFIG+=--disable-shared
+       LDFLAGS_LIBUSB+= -ludev -lpthread
+all: $(BUILD)/scsi2sd-test
+
 endif
 ifeq ($(TARGET),Darwin)
        # Should match OSX
@@ -101,14 +107,17 @@ ifeq ($(TARGET),Darwin)
        CXX=clang++ -stdlib=libc++ -mmacosx-version-min=10.7
        WX_CONFIG += --with-macosx-version-min=10.7
        LIBUSB_CONFIG += --with-macosx-version-min=10.7 --disable-shared
+       LDFLAGS_LIBUSB += -lobjc
+       DFU-UTIL_CONFIG += --with-macosx-version-min=10.7 --disable-shared
        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
-       cp $(BUILD)/scsi2sd-util6 $(dir $@)/dmg
+       cp $(BUILD)/scsi2sd-util6 $(BUILD)/dfu-util/src/dfu-util $(dir $@)/dmg
        chmod a+rx $(dir $@)/dmg/*
-       hdiutil create -srcfolder $(dir $@)/dmg $@
+       hdiutil create -volname scsi2sd-util6 -srcfolder $(dir $@)/dmg $@
 endif
 
 export CC CXX
@@ -121,17 +130,25 @@ HIDAPI = \
        $(BUILD)/hid.o
 endif
 
-
-OBJ = \
-       $(HIDAPI) \
+WXOBJ =\
        $(BUILD)/ConfigUtil.o \
        $(BUILD)/BoardPanel.o \
        $(BUILD)/TargetPanel.o \
+       $(BUILD)/terminalwx.o \
+       $(BUILD)/terminalinputevent.o \
+       $(BUILD)/wxterm.o \
+       $(BUILD)/gterm.o \
+       $(BUILD)/actions.o \
+       $(BUILD)/keytrans.o \
+       $(BUILD)/states.o \
+       $(BUILD)/utils.o \
+       $(BUILD)/vt52_states.o \
+
+OBJ = \
+       $(HIDAPI) \
        $(BUILD)/SCSI2SD_HID.o \
        $(BUILD)/hidpacket.o \
-
-#      $(BUILD)/Dfu.o \
-#      $(BUILD)/dfu.o \
+       $(BUILD)/Dfu.o \
 
 
 EXEOBJ = \
@@ -140,6 +157,7 @@ EXEOBJ = \
 
 ifneq ($(USE_SYSTEM_ZLIB),Yes)
 $(OBJ): $(BUILD)/zlib/buildstamp
+$(WXOBJ): $(BUILD)/zlib/buildstamp
 $(EXEOBJ): $(BUILD)/zlib/buildstamp
 $(BUILD)/zlib/buildstamp:
        mkdir -p $(dir $@)
@@ -154,19 +172,24 @@ endif
 
 ifneq ($(USE_SYSTEM_LIBUSB),Yes)
 $(OBJ): $(BUILD)/libusb/buildstamp
+$(WXOBJ): $(BUILD)/libusb/buildstamp
 $(EXEOBJ): $(BUILD)/libusb/buildstamp
 $(BUILD)/libusb/buildstamp:
        mkdir -p $(dir $@)
        ( \
                cd $(dir $@) && \
-               $(CURDIR)/libusb-1.0.9/configure $(LIBUSB_CONFIG) && \
+               $(CURDIR)/libusb-1.0.20/configure $(LIBUSB_CONFIG) && \
                $(MAKE) \
        ) && \
        touch $@
+else
+$(BUILD)/libusb/buildstamp:
+       mkdir -p $(dir $@)
+       touch $@
 endif
 
 ifneq ($(USE_SYSTEM_WX),Yes)
-$(OBJ): $(BUILD)/wx/buildstamp
+$(WXOBJ): $(BUILD)/wx/buildstamp
 $(EXEOBJ): $(BUILD)/wx/buildstamp
 ifneq ($(USE_SYSTEM_ZLIB),Yes)
 $(BUILD)/wx/buildstamp: $(BUILD)/zlib/buildstamp
@@ -187,6 +210,7 @@ LIBZIPPER_STATIC=-enable-static
 endif
 
 $(OBJ): $(BUILD)/libzipper/buildstamp
+$(WXOBJ): $(BUILD)/libzipper/buildstamp
 $(EXEOBJ): $(BUILD)/libzipper/buildstamp
 ifneq ($(USE_SYSTEM_ZLIB),Yes)
 $(BUILD)/libzipper/buildstamp: $(BUILD)/zlib/buildstamp
@@ -213,10 +237,32 @@ else
        $(CXX) $(CPPFLAGS) $(CXXFLAGS) `wx-config-3.0 --cxxflags` $< -c -o $@
 endif
 
-$(BUILD)/scsi2sd-util6$(EXE): $(OBJ) $(BUILD)/scsi2sd-util.o
+$(BUILD)/%.o: %.cpp
+       mkdir -p $(dir $@)
+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 $@
+endif
+
+$(BUILD)/scsi2sd-util6$(EXE): $(OBJ) $(WXOBJ) $(BUILD)/scsi2sd-util.o
        mkdir -p $(dir $@)
        $(CXX) $(CXXFLAGS) $^ $(LDFLAGS_WX) $(LDFLAGS) -o $@
 
+$(BUILD)/scsi2sd-test$(EXE): $(OBJ) $(BUILD)/scsi2sd-test.o
+       mkdir -p $(dir $@)
+       $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
+
+all: $(BUILD)/dfu-util/buildstamp
+$(BUILD)/dfu-util/buildstamp: $(BUILD)/libusb/buildstamp
+       mkdir -p $(dir $@)
+       ( \
+               cd $(dir $@) && \
+               $(CURDIR)/dfu-util/configure ${DFU-UTIL_CONFIG} CPPFLAGS="${CPPFLAGS_LIBUSB}" LDFLAGS="${LDFLAGS_LIBUSB} ${LDFLAGS}" && \
+               $(MAKE) \
+       ) && \
+       touch $@
+
 clean:
        rm $(BUILD)/scsi2sd-util6$(EXE) $(OBJ) $(BUILD)/libzipper/buildstamp
 
Unnamed repository; edit this file 'description' to name the repository.