Macintosh-HW/SCSI2SD
1
0
Fork 0
mirror of https://github.com/fhgwright/SCSI2SD.git synced 2024-06-10 14:29:28 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael McMaster 2014-07-17 15:49:51 +10:00
parent 53fb77e7ad
commit 70a3b594c2
9 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
software/bootloaderhost/Firmware.hh
View File

@ -18,7 +18,11 @@
#ifndef Firmware_HH
#define Firmware_HH
#if __cplusplus >= 201103L
#include <cstdint>
#else
#include <stdint.h>
#endif
#include <string>
namespace SCSI2SD

6
software/bootloaderhost/Makefile
View File

@ -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++

1
software/bootloaderhost/SCSI2SD_Bootloader.cc
View File

@ -17,7 +17,6 @@
#include "SCSI2SD_Bootloader.hh"
#include <cstdint>
#include <iostream>
#include <sstream>
#include <stdexcept>

4
software/bootloaderhost/SCSI2SD_Bootloader.hh
View File

@ -20,7 +20,11 @@
#include "hidapi.h"
#if __cplusplus >= 201103L
#include <cstdint>
#else
#include <stdint.h>
#endif
#include <string>
namespace SCSI2SD

5
software/bootloaderhost/SCSI2SD_HID.hh
View File

@ -20,7 +20,12 @@
#include "hidapi.h"
#if __cplusplus >= 201103L
#include <cstdint>
#else
#include <stdint.h>
#endif
#include <string>
namespace SCSI2SD

15
software/bootloaderhost/main.cc
View File

@ -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)
{

6
software/scsi2sd-config/Makefile
View File

@ -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++

11
software/scsi2sd-config/scsi2sd-config.cc
View File

@ -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)
{

6
software/scsi2sd-debug/Makefile
View File

@ -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++