Removed C++11 dependencies, and compile Windows binaries staically with mingw.

diff --git a/software/bootloaderhost/Firmware.hh b/software/bootloaderhost/Firmware.hh
index 4b325d240a7368f5d3cff9542e8829bf60dad18d..ab497009b1ca6604e4007bc1c6689014b8043896 100644 (file)
--- a/software/bootloaderhost/Firmware.hh
+++ b/software/bootloaderhost/Firmware.hh
@@ -18,7 +18,11 @@
 #ifndef Firmware_HH
 #define Firmware_HH
 
+#if __cplusplus >= 201103L
 #include <cstdint>
+#else
+#include <stdint.h>
+#endif
 #include <string>
 
 namespace SCSI2SD

diff --git a/software/bootloaderhost/Makefile b/software/bootloaderhost/Makefile
index 6868b2b8467d3424e3236741470f72ed1e248556..83a482f92beda13f772b203df32b5640336a0fd5 100644 (file)
--- a/software/bootloaderhost/Makefile
+++ b/software/bootloaderhost/Makefile
@@ -2,12 +2,12 @@ VPATH=cybootloaderutils
 
 CPPFLAGS = -I cybootloaderutils -I hidapi/hidapi
 CFLAGS += -Wall -Wno-pointer-sign -O2
-CXXFLAGS += -Wall -std=c++11 -O2
+CXXFLAGS += -Wall -O2
 
 TARGET ?= $(shell uname -s)
 ifeq ($(TARGET),Win32)
        VPATH += hidapi/windows
-       LDFLAGS += -mconsole -mwindows -lsetupapi
+       LDFLAGS += -static -mconsole -mwindows -lsetupapi
        BUILD = build/windows/32bit
        CC=i686-w64-mingw32-gcc
        CXX=i686-w64-mingw32-g++
@@ -15,7 +15,7 @@ ifeq ($(TARGET),Win32)
 endif
 ifeq ($(TARGET),Win64)
        VPATH += hidapi/windows
-       LDFLAGS += -mconsole -mwindows -lsetupapi
+       LDFLAGS += -static -mconsole -mwindows -lsetupapi
        BUILD = build/windows/64bit
        CC=x86_64-w64-mingw32-gcc
        CXX=x86_64-w64-mingw32-g++

diff --git a/software/bootloaderhost/SCSI2SD_Bootloader.cc b/software/bootloaderhost/SCSI2SD_Bootloader.cc
index 793b5a8151992d8f8cdb3972183f4b67dc252a49..d70df3b2453b132521416138a9aab640cfc00072 100644 (file)
--- a/software/bootloaderhost/SCSI2SD_Bootloader.cc
+++ b/software/bootloaderhost/SCSI2SD_Bootloader.cc
@@ -17,7 +17,6 @@
 
 #include "SCSI2SD_Bootloader.hh"
 
-#include <cstdint>
 #include <iostream>
 #include <sstream>
 #include <stdexcept>

diff --git a/software/bootloaderhost/SCSI2SD_Bootloader.hh b/software/bootloaderhost/SCSI2SD_Bootloader.hh
index 581a1ca591658b2cc02b449bf486c43df8e63967..80b8f13f81e8ea04acde1e82afcf4720e523e8b7 100644 (file)
--- a/software/bootloaderhost/SCSI2SD_Bootloader.hh
+++ b/software/bootloaderhost/SCSI2SD_Bootloader.hh
@@ -20,7 +20,11 @@
 
 #include "hidapi.h"
 
+#if __cplusplus >= 201103L
 #include <cstdint>
+#else
+#include <stdint.h>
+#endif
 #include <string>
 
 namespace SCSI2SD

diff --git a/software/bootloaderhost/SCSI2SD_HID.hh b/software/bootloaderhost/SCSI2SD_HID.hh
index 1b5705895c591ea2e85a1f4b1cef481f8d57caa4..ee1565fb03d134cd958e03f7c15ab43f0c765ca0 100644 (file)
--- a/software/bootloaderhost/SCSI2SD_HID.hh
+++ b/software/bootloaderhost/SCSI2SD_HID.hh
@@ -20,7 +20,12 @@
 
 #include "hidapi.h"
 
+#if __cplusplus >= 201103L
 #include <cstdint>
+#else
+#include <stdint.h>
+#endif
+
 #include <string>
 
 namespace SCSI2SD

diff --git a/software/bootloaderhost/main.cc b/software/bootloaderhost/main.cc
index 8c8772e17cbec263e9c4254617194af3cc534111..0a11b03f9af2d9597bed587cf4c15c42c9f9eece 100644 (file)
--- a/software/bootloaderhost/main.cc
+++ b/software/bootloaderhost/main.cc
@@ -19,13 +19,22 @@
 #include "SCSI2SD_Bootloader.hh"
 #include "Firmware.hh"
 
+#if __cplusplus >= 201103L
 #include <cstdint>
+#include <memory>
+using std::shared_ptr;
+#else
+#include <stdint.h>
+#include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
+
 #include <iomanip>
 #include <iostream>
-#include <memory>
 #include <sstream>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 using namespace SCSI2SD;
@@ -84,8 +93,8 @@ int main(int argc, char* argv[])
        }
 
        // Enumerate and print the HID devices on the system
-       std::shared_ptr<Bootloader> bootloader(Bootloader::Open());
-       std::shared_ptr<HID> hid(HID::Open());
+       shared_ptr<Bootloader> bootloader(Bootloader::Open());
+       shared_ptr<HID> hid(HID::Open());
 
        if (hid)
        {

diff --git a/software/scsi2sd-config/Makefile b/software/scsi2sd-config/Makefile
index b75e7cc72b632164464fdf89a5486054d90c3cfd..9433699d1e29cb7b5663855c10bd3631938bfff4 100644 (file)
--- a/software/scsi2sd-config/Makefile
+++ b/software/scsi2sd-config/Makefile
@@ -1,13 +1,13 @@
 
 CPPFLAGS = -I ../bootloaderhost/hidapi/hidapi -I ../bootloaderhost
 CFLAGS += -Wall -Wno-pointer-sign -O2
-CXXFLAGS += -Wall -std=c++11 -O2
+CXXFLAGS += -Wall -O2
 VPATH += ../bootloaderhost
 
 TARGET ?= $(shell uname -s)
 ifeq ($(TARGET),Win32)
        VPATH += hidapi/windows
-       LDFLAGS += -mconsole -mwindows -lsetupapi -lws2_32
+       LDFLAGS += -static -mconsole -mwindows -lsetupapi -lws2_32
        BUILD = build/windows/32bit
        CC=i686-w64-mingw32-gcc
        CXX=i686-w64-mingw32-g++
@@ -15,7 +15,7 @@ ifeq ($(TARGET),Win32)
 endif
 ifeq ($(TARGET),Win64)
        VPATH += hidapi/windows
-       LDFLAGS += -mconsole -mwindows -lsetupapi -lws2_32
+       LDFLAGS += -static -mconsole -mwindows -lsetupapi -lws2_32
        BUILD = build/windows/64bit
        CC=x86_64-w64-mingw32-gcc
        CXX=x86_64-w64-mingw32-g++

diff --git a/software/scsi2sd-config/scsi2sd-config.cc b/software/scsi2sd-config/scsi2sd-config.cc
index 6e2d167fa7daee6ce4066079c9140c44fcbb5733..eca98c605350ae3f975375433d8fd297a3289d24 100644 (file)
--- a/software/scsi2sd-config/scsi2sd-config.cc
+++ b/software/scsi2sd-config/scsi2sd-config.cc
@@ -17,9 +17,16 @@
 
 #include "SCSI2SD_HID.hh"
 
+#if __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
+#include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
+
 #include <iomanip>
 #include <iostream>
-#include <memory>
 #include <sstream>
 
 // Request extended stdio format macros.
@@ -188,7 +195,7 @@ int main(int argc, char* argv[])
                HID::PRODUCT_ID);
 
        // Enumerate and print the HID devices on the system
-       std::shared_ptr<HID> scsi2sdHID(HID::Open());
+       shared_ptr<HID> scsi2sdHID(HID::Open());
 
        if (!scsi2sdHID)
        {

diff --git a/software/scsi2sd-debug/Makefile b/software/scsi2sd-debug/Makefile
index 34f7c3b8e1b96a204f5a9d1e4694b9ef98f105bf..c68e105f7f4a4789a02e4bcaff62ef8e3117e293 100644 (file)
--- a/software/scsi2sd-debug/Makefile
+++ b/software/scsi2sd-debug/Makefile
@@ -1,13 +1,13 @@
 
 CPPFLAGS = -I ../bootloaderhost/hidapi/hidapi -I ../bootloaderhost
 CFLAGS += -Wall -Wno-pointer-sign -O2
-CXXFLAGS += -Wall -std=c++11 -O2
+CXXFLAGS += -Wall -O2
 VPATH += ../bootloaderhost
 
 TARGET ?= $(shell uname -s)
 ifeq ($(TARGET),Win32)
        VPATH += hidapi/windows
-       LDFLAGS += -mconsole -mwindows -lsetupapi -lws2_32
+       LDFLAGS += -static -mconsole -mwindows -lsetupapi -lws2_32
        BUILD = build/windows/32bit
        CC=i686-w64-mingw32-gcc
        CXX=i686-w64-mingw32-g++
@@ -15,7 +15,7 @@ ifeq ($(TARGET),Win32)
 endif
 ifeq ($(TARGET),Win64)
        VPATH += hidapi/windows
-       LDFLAGS += -mconsole -mwindows -lsetupapi -lws2_32
+       LDFLAGS += -static -mconsole -mwindows -lsetupapi -lws2_32
        BUILD = build/windows/64bit
        CC=x86_64-w64-mingw32-gcc
        CXX=x86_64-w64-mingw32-g++