From 6f0c5cd76865347537e902650492e6e78599bcea Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 22 Feb 2005 20:00:19 +0000 Subject: Proper check for cygwin build environment, avoids win32 error 5 when loading plugins git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6040 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/Makefile | 4 ++-- tools/configure | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index ef506a9c4a..2676fa7e8c 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -53,7 +53,7 @@ ifeq ($(SIMVER), x11) $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(APPSDIR)/plugin.h @echo "LD $@" @$(CC) $(CFLAGS) -shared $< -L$(OBJDIR) $(CODECLIBS) -lplugin -o $@ -ifeq ($(UNAME),CYGWIN) +ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 # #define ERROR_ACCESS_DENIED 5L @@ -71,7 +71,7 @@ $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(APPSDIR)/plugin.h @echo "DLL $@" @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(OBJDIR)/libplugin.a -o $@ -ifeq ($(UNAME),CYGWIN) +ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 # #define ERROR_ACCESS_DENIED 5L diff --git a/tools/configure b/tools/configure index c56f28edba..4ebe39c37a 100755 --- a/tools/configure +++ b/tools/configure @@ -573,7 +573,8 @@ sed > Makefile \ -e "s,@SIMVER@,${simver},g" \ -e "s,@GCCVER@,${gccver},g" \ -e "s,@GCCNUM@,${gccnum},g" \ -<