len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: fix compilation in cygwin

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13892 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2007-07-14 16:54:54 +00:00
parent 74ad216ad3
commit 703429604e
6 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rbutil/Makefile
View file

@ -9,11 +9,25 @@
# Unix-style Makefile for rbutil # Unix-style Makefile for rbutil
#detect cygwin
ifneq ($(strip $(shell gcc -v 2>&1 | grep "cygwin")),)
__CYGWIN__ := 1
endif
CXX=$(shell $(PREFIX)wx-config --version=2.8 --cxx) CXX=$(shell $(PREFIX)wx-config --version=2.8 --cxx)
INC = `$(PREFIX)wx-config --version=2.8 --cxxflags` INC = `$(PREFIX)wx-config --version=2.8 --cxxflags`
LIBS = `$(PREFIX)wx-config --version=2.8 --libs` LIBS = `$(PREFIX)wx-config --version=2.8 --libs`
CFLAGS = -Wall -Wundef -DRBUTIL -D_LARGEFILE64_SOURCE CFLAGS= -Wall -Wundef -DRBUTIL -D_LARGEFILE64_SOURCE
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 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
ifdef __CYGWIN__
OBJS+=ipodpatcher/ipodio-win32.o sansapatcher/sansaio-win32.o
CFLAGS+= -mno-cygwin -mwindows
else
OBJS+=ipodpatcher/ipodio-posix.o sansapatcher/sansaio-posix.o
endif
EXTRAOBJS = $(wildcard icons/*.o) EXTRAOBJS = $(wildcard icons/*.o)
SILENT = @ SILENT = @
@ -34,7 +48,7 @@ endif
.PHONY: all .PHONY: all
all: icons rbutil$(EXT) all: icons rbutil$(EXT)
.cpp.o : .cpp.o :
$(SILENT) echo CXX $< $(SILENT) echo CXX $<
$(SILENT) $(CXX) $(CFLAGS) $(INC) -c -o $@ $< $(SILENT) $(CXX) $(CFLAGS) $(INC) -c -o $@ $<
@ -46,7 +60,7 @@ all: icons rbutil$(EXT)
rbutil-rc.o: rbutil-rc.rc rbutil-rc.o: rbutil-rc.rc
$(WINDRES) -O coff -F pe-i386 -o $@ $< $(WINDRES) -O coff -F pe-i386 -o $@ $<
rbutil$(EXT): $(OBJS) rbutil$(EXT): $(OBJS)
$(SILENT) echo CXX $< $(SILENT) echo CXX $<
$(SILENT) $(CXX) -o $@ $(OBJS) $(EXTRAOBJS) $(LIBS) $(SILENT) $(CXX) -o $@ $(OBJS) $(EXTRAOBJS) $(LIBS)

4
rbutil/bootloaders.cpp
View file

@ -19,11 +19,7 @@
****************************************************************************/ ****************************************************************************/
#include "bootloaders.h" #include "bootloaders.h"
#include "irivertools.h"
#include "md5sum.h"
#include "rbutil.h"
#include "installlog.h"
int verbose =0; int verbose =0;

5
rbutil/bootloaders.h
View file

@ -24,6 +24,11 @@
#define BOOTLOADERS_H_INCLUDED #define BOOTLOADERS_H_INCLUDED
#include <wx/string.h> #include <wx/string.h>
#include "irivertools.h"
#include "md5sum.h"
#include "rbutil.h"
#include "installlog.h"
extern "C" { extern "C" {
// Ipodpatcher // Ipodpatcher

1
rbutil/irivertools.cpp
View file

@ -19,7 +19,6 @@
****************************************************************************/ ****************************************************************************/
#include "irivertools.h" #include "irivertools.h"
#include "md5sum.h"
const unsigned char munge[] = { const unsigned char munge[] = {

1
rbutil/irivertools.h
View file

@ -24,6 +24,7 @@
#include "rbutil.h" #include "rbutil.h"
#include "installlog.h" #include "installlog.h"
#include "md5sum.h"
#define ESTF_SIZE 32 #define ESTF_SIZE 32

1
rbutil/rbutil.cpp
View file

@ -349,6 +349,7 @@ int UnzipFile(wxString src, wxString destdir, bool isInstall)
{ {
buf = wxT("Can't open file ") + in_str + wxT(" for writing"); buf = wxT("Can't open file ") + in_str + wxT(" for writing");
delete out; delete out;
delete progress;
return 100; return 100;
} else if (isInstall) } else if (isInstall)
{ {