diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-02-22 20:00:19 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-02-22 20:00:19 +0000 |
| commit | 6f0c5cd76865347537e902650492e6e78599bcea (patch) | |
| tree | 9d0031b2ef4f6e5586e837163031cc7e19476372 | |
| parent | cf208c50a2b52d0dd5a79567aeef4738c6082137 (diff) | |
| download | rockbox-6f0c5cd76865347537e902650492e6e78599bcea.zip rockbox-6f0c5cd76865347537e902650492e6e78599bcea.tar.gz rockbox-6f0c5cd76865347537e902650492e6e78599bcea.tar.bz2 rockbox-6f0c5cd76865347537e902650492e6e78599bcea.tar.xz | |
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
| -rw-r--r-- | apps/plugins/Makefile | 4 | ||||
| -rwxr-xr-x | tools/configure | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index ef506a9..2676fa7 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 c56f28e..4ebe39c 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" \ -<<EOF + -e "s,@UNAME@,${uname},g" \ +<<EOF ## Automaticly generated. http://www.rockbox.org/ export ROOTDIR=@ROOTDIR@ @@ -612,6 +613,7 @@ export SIMDIR=\$(ROOTDIR)/uisimulator/\$(SIMVER) export LDOPTS=@LDOPTS@ export GCCVER=@GCCVER@ export GCCNUM=@GCCNUM@ +export UNAME=@UNAME@ .PHONY: all clean tags zip |