diff options
-rw-r--r-- | rbutil/Makefile | 22 | ||||
-rwxr-xr-x | rbutil/bootloaders.cpp | 4 | ||||
-rwxr-xr-x | rbutil/bootloaders.h | 5 | ||||
-rwxr-xr-x | rbutil/irivertools.cpp | 1 | ||||
-rwxr-xr-x | rbutil/irivertools.h | 1 | ||||
-rw-r--r-- | rbutil/rbutil.cpp | 1 |
6 files changed, 25 insertions, 9 deletions
diff --git a/rbutil/Makefile b/rbutil/Makefile index 824bd64155..9321ed8ed8 100644 --- a/rbutil/Makefile +++ b/rbutil/Makefile | |||
@@ -9,11 +9,25 @@ | |||
9 | 9 | ||
10 | # Unix-style Makefile for rbutil | 10 | # Unix-style Makefile for rbutil |
11 | 11 | ||
12 | #detect cygwin | ||
13 | ifneq ($(strip $(shell gcc -v 2>&1 | grep "cygwin")),) | ||
14 | __CYGWIN__ := 1 | ||
15 | endif | ||
16 | |||
12 | CXX=$(shell $(PREFIX)wx-config --version=2.8 --cxx) | 17 | CXX=$(shell $(PREFIX)wx-config --version=2.8 --cxx) |
13 | INC = `$(PREFIX)wx-config --version=2.8 --cxxflags` | 18 | INC = `$(PREFIX)wx-config --version=2.8 --cxxflags` |
14 | LIBS = `$(PREFIX)wx-config --version=2.8 --libs` | 19 | LIBS = `$(PREFIX)wx-config --version=2.8 --libs` |
15 | CFLAGS = -Wall -Wundef -DRBUTIL -D_LARGEFILE64_SOURCE | 20 | CFLAGS= -Wall -Wundef -DRBUTIL -D_LARGEFILE64_SOURCE |
16 | OBJS=rbutil.o rbutilApp.o rbutilFrm.o rbutilCtrls.o install_dialogs.o bootloaders.o installlog.o ipodpatcher/ipodpatcher.o ipodpatcher/ipodio-posix.o sansapatcher/sansapatcher.o sansapatcher/sansaio-posix.o irivertools.o md5sum.o autodetection.o | 21 | OBJS=rbutil.o rbutilApp.o rbutilFrm.o rbutilCtrls.o install_dialogs.o bootloaders.o installlog.o ipodpatcher/ipodpatcher.o sansapatcher/sansapatcher.o irivertools.o md5sum.o autodetection.o |
22 | |||
23 | ifdef __CYGWIN__ | ||
24 | OBJS+=ipodpatcher/ipodio-win32.o sansapatcher/sansaio-win32.o | ||
25 | CFLAGS+= -mno-cygwin -mwindows | ||
26 | else | ||
27 | OBJS+=ipodpatcher/ipodio-posix.o sansapatcher/sansaio-posix.o | ||
28 | endif | ||
29 | |||
30 | |||
17 | EXTRAOBJS = $(wildcard icons/*.o) | 31 | EXTRAOBJS = $(wildcard icons/*.o) |
18 | 32 | ||
19 | SILENT = @ | 33 | SILENT = @ |
@@ -34,7 +48,7 @@ endif | |||
34 | 48 | ||
35 | .PHONY: all | 49 | .PHONY: all |
36 | all: icons rbutil$(EXT) | 50 | all: icons rbutil$(EXT) |
37 | 51 | ||
38 | .cpp.o : | 52 | .cpp.o : |
39 | $(SILENT) echo CXX $< | 53 | $(SILENT) echo CXX $< |
40 | $(SILENT) $(CXX) $(CFLAGS) $(INC) -c -o $@ $< | 54 | $(SILENT) $(CXX) $(CFLAGS) $(INC) -c -o $@ $< |
@@ -46,7 +60,7 @@ all: icons rbutil$(EXT) | |||
46 | rbutil-rc.o: rbutil-rc.rc | 60 | rbutil-rc.o: rbutil-rc.rc |
47 | $(WINDRES) -O coff -F pe-i386 -o $@ $< | 61 | $(WINDRES) -O coff -F pe-i386 -o $@ $< |
48 | 62 | ||
49 | rbutil$(EXT): $(OBJS) | 63 | rbutil$(EXT): $(OBJS) |
50 | $(SILENT) echo CXX $< | 64 | $(SILENT) echo CXX $< |
51 | $(SILENT) $(CXX) -o $@ $(OBJS) $(EXTRAOBJS) $(LIBS) | 65 | $(SILENT) $(CXX) -o $@ $(OBJS) $(EXTRAOBJS) $(LIBS) |
52 | 66 | ||
diff --git a/rbutil/bootloaders.cpp b/rbutil/bootloaders.cpp index 56f936e4ff..4ac4828307 100755 --- a/rbutil/bootloaders.cpp +++ b/rbutil/bootloaders.cpp | |||
@@ -19,11 +19,7 @@ | |||
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | 20 | ||
21 | #include "bootloaders.h" | 21 | #include "bootloaders.h" |
22 | #include "irivertools.h" | ||
23 | #include "md5sum.h" | ||
24 | 22 | ||
25 | #include "rbutil.h" | ||
26 | #include "installlog.h" | ||
27 | 23 | ||
28 | 24 | ||
29 | int verbose =0; | 25 | int verbose =0; |
diff --git a/rbutil/bootloaders.h b/rbutil/bootloaders.h index ba751bd715..d5bda126cc 100755 --- a/rbutil/bootloaders.h +++ b/rbutil/bootloaders.h | |||
@@ -24,6 +24,11 @@ | |||
24 | #define BOOTLOADERS_H_INCLUDED | 24 | #define BOOTLOADERS_H_INCLUDED |
25 | 25 | ||
26 | #include <wx/string.h> | 26 | #include <wx/string.h> |
27 | #include "irivertools.h" | ||
28 | #include "md5sum.h" | ||
29 | |||
30 | #include "rbutil.h" | ||
31 | #include "installlog.h" | ||
27 | 32 | ||
28 | extern "C" { | 33 | extern "C" { |
29 | // Ipodpatcher | 34 | // Ipodpatcher |
diff --git a/rbutil/irivertools.cpp b/rbutil/irivertools.cpp index 1e6341923d..9b7cd5a4f3 100755 --- a/rbutil/irivertools.cpp +++ b/rbutil/irivertools.cpp | |||
@@ -19,7 +19,6 @@ | |||
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | 20 | ||
21 | #include "irivertools.h" | 21 | #include "irivertools.h" |
22 | #include "md5sum.h" | ||
23 | 22 | ||
24 | 23 | ||
25 | const unsigned char munge[] = { | 24 | const unsigned char munge[] = { |
diff --git a/rbutil/irivertools.h b/rbutil/irivertools.h index 9718f92d00..d646cf1d6c 100755 --- a/rbutil/irivertools.h +++ b/rbutil/irivertools.h | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include "rbutil.h" | 25 | #include "rbutil.h" |
26 | #include "installlog.h" | 26 | #include "installlog.h" |
27 | #include "md5sum.h" | ||
27 | 28 | ||
28 | #define ESTF_SIZE 32 | 29 | #define ESTF_SIZE 32 |
29 | 30 | ||
diff --git a/rbutil/rbutil.cpp b/rbutil/rbutil.cpp index a36d1a0b94..1528ccb2c5 100644 --- a/rbutil/rbutil.cpp +++ b/rbutil/rbutil.cpp | |||
@@ -349,6 +349,7 @@ int UnzipFile(wxString src, wxString destdir, bool isInstall) | |||
349 | { | 349 | { |
350 | buf = wxT("Can't open file ") + in_str + wxT(" for writing"); | 350 | buf = wxT("Can't open file ") + in_str + wxT(" for writing"); |
351 | delete out; | 351 | delete out; |
352 | delete progress; | ||
352 | return 100; | 353 | return 100; |
353 | } else if (isInstall) | 354 | } else if (isInstall) |
354 | { | 355 | { |