From: Michael McMaster Date: Thu, 17 Jul 2014 05:49:51 +0000 (+1000) Subject: Removed C++11 dependencies, and compile Windows binaries staically with mingw. X-Git-Tag: 3.5.1~1 X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=70a3b594c2c50ed35363e5c0d5473b8cd89bc3f0;p=SCSI2SD-V6.git Removed C++11 dependencies, and compile Windows binaries staically with mingw. --- diff --git a/software/bootloaderhost/Firmware.hh b/software/bootloaderhost/Firmware.hh index 4b325d24..ab497009 100644 --- a/software/bootloaderhost/Firmware.hh +++ b/software/bootloaderhost/Firmware.hh @@ -18,7 +18,11 @@ #ifndef Firmware_HH #define Firmware_HH +#if __cplusplus >= 201103L #include +#else +#include +#endif #include namespace SCSI2SD diff --git a/software/bootloaderhost/Makefile b/software/bootloaderhost/Makefile index 6868b2b8..83a482f9 100644 --- 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 793b5a81..d70df3b2 100644 --- a/software/bootloaderhost/SCSI2SD_Bootloader.cc +++ b/software/bootloaderhost/SCSI2SD_Bootloader.cc @@ -17,7 +17,6 @@ #include "SCSI2SD_Bootloader.hh" -#include #include #include #include diff --git a/software/bootloaderhost/SCSI2SD_Bootloader.hh b/software/bootloaderhost/SCSI2SD_Bootloader.hh index 581a1ca5..80b8f13f 100644 --- a/software/bootloaderhost/SCSI2SD_Bootloader.hh +++ b/software/bootloaderhost/SCSI2SD_Bootloader.hh @@ -20,7 +20,11 @@ #include "hidapi.h" +#if __cplusplus >= 201103L #include +#else +#include +#endif #include namespace SCSI2SD diff --git a/software/bootloaderhost/SCSI2SD_HID.hh b/software/bootloaderhost/SCSI2SD_HID.hh index 1b570589..ee1565fb 100644 --- a/software/bootloaderhost/SCSI2SD_HID.hh +++ b/software/bootloaderhost/SCSI2SD_HID.hh @@ -20,7 +20,12 @@ #include "hidapi.h" +#if __cplusplus >= 201103L #include +#else +#include +#endif + #include namespace SCSI2SD diff --git a/software/bootloaderhost/main.cc b/software/bootloaderhost/main.cc index 8c8772e1..0a11b03f 100644 --- 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 +#include +using std::shared_ptr; +#else +#include +#include +using std::tr1::shared_ptr; +#endif + #include #include -#include #include #include +#include #include 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::Open()); - std::shared_ptr hid(HID::Open()); + shared_ptr bootloader(Bootloader::Open()); + shared_ptr hid(HID::Open()); if (hid) { diff --git a/software/scsi2sd-config/Makefile b/software/scsi2sd-config/Makefile index b75e7cc7..9433699d 100644 --- 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 6e2d167f..eca98c60 100644 --- 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 +using std::shared_ptr; +#else +#include +using std::tr1::shared_ptr; +#endif + #include #include -#include #include // 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 scsi2sdHID(HID::Open()); + shared_ptr scsi2sdHID(HID::Open()); if (!scsi2sdHID) { diff --git a/software/scsi2sd-debug/Makefile b/software/scsi2sd-debug/Makefile index 34f7c3b8..c68e105f 100644 --- 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++