diff options
-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 ef506a9c4a..2676fa7e8c 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -53,7 +53,7 @@ ifeq ($(SIMVER), x11) | |||
53 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(APPSDIR)/plugin.h | 53 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(APPSDIR)/plugin.h |
54 | @echo "LD $@" | 54 | @echo "LD $@" |
55 | @$(CC) $(CFLAGS) -shared $< -L$(OBJDIR) $(CODECLIBS) -lplugin -o $@ | 55 | @$(CC) $(CFLAGS) -shared $< -L$(OBJDIR) $(CODECLIBS) -lplugin -o $@ |
56 | ifeq ($(UNAME),CYGWIN) | 56 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
57 | # 'x' must be kept or you'll have "Win32 error 5" | 57 | # 'x' must be kept or you'll have "Win32 error 5" |
58 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 58 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
59 | # #define ERROR_ACCESS_DENIED 5L | 59 | # #define ERROR_ACCESS_DENIED 5L |
@@ -71,7 +71,7 @@ $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(APPSDIR)/plugin.h | |||
71 | @echo "DLL $@" | 71 | @echo "DLL $@" |
72 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< | 72 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
73 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(OBJDIR)/libplugin.a -o $@ | 73 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(OBJDIR)/libplugin.a -o $@ |
74 | ifeq ($(UNAME),CYGWIN) | 74 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
75 | # 'x' must be kept or you'll have "Win32 error 5" | 75 | # 'x' must be kept or you'll have "Win32 error 5" |
76 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 76 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
77 | # #define ERROR_ACCESS_DENIED 5L | 77 | # #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 \ | |||
573 | -e "s,@SIMVER@,${simver},g" \ | 573 | -e "s,@SIMVER@,${simver},g" \ |
574 | -e "s,@GCCVER@,${gccver},g" \ | 574 | -e "s,@GCCVER@,${gccver},g" \ |
575 | -e "s,@GCCNUM@,${gccnum},g" \ | 575 | -e "s,@GCCNUM@,${gccnum},g" \ |
576 | <<EOF | 576 | -e "s,@UNAME@,${uname},g" \ |
577 | <<EOF | ||
577 | ## Automaticly generated. http://www.rockbox.org/ | 578 | ## Automaticly generated. http://www.rockbox.org/ |
578 | 579 | ||
579 | export ROOTDIR=@ROOTDIR@ | 580 | export ROOTDIR=@ROOTDIR@ |
@@ -612,6 +613,7 @@ export SIMDIR=\$(ROOTDIR)/uisimulator/\$(SIMVER) | |||
612 | export LDOPTS=@LDOPTS@ | 613 | export LDOPTS=@LDOPTS@ |
613 | export GCCVER=@GCCVER@ | 614 | export GCCVER=@GCCVER@ |
614 | export GCCNUM=@GCCNUM@ | 615 | export GCCNUM=@GCCNUM@ |
616 | export UNAME=@UNAME@ | ||
615 | 617 | ||
616 | .PHONY: all clean tags zip | 618 | .PHONY: all clean tags zip |
617 | 619 | ||