From c8978c9db9061d1191bcf51eb7916ce6c93b0d20 Mon Sep 17 00:00:00 2001 From: mazze Date: Sun, 29 Jan 2012 09:49:54 +0000 Subject: [PATCH] Merging in v11.21 git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@43763 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/classes/zune/betterstring/ChangeLog | 28 +++++++- .../zune/betterstring/doc/MCC_BetterString.readme | 6 +- .../classes/zune/betterstring/include/mccinit.c | 84 +++++++++++----------- .../zune/betterstring/include/mui/NBitmap_mcc.h | 0 workbench/classes/zune/betterstring/mcc/Makefile | 4 +- .../classes/zune/betterstring/mcc/Makefile.dep | 74 +++++++++---------- .../classes/zune/betterstring/mcc/PrintString.c | 10 +-- .../zune/betterstring/mcc/hotkeystring/Makefile | 4 +- .../betterstring/mcc/hotkeystring/Makefile.dep | 63 ++++++++-------- .../zune/betterstring/mcc/hotkeystring/vastubs.c | 0 .../zune/betterstring/mcc/hotkeystring/version.h | 6 +- workbench/classes/zune/betterstring/mcc/vastubs.c | 0 workbench/classes/zune/betterstring/mcc/version.h | 6 +- workbench/classes/zune/betterstring/mcp/Makefile | 4 +- .../classes/zune/betterstring/mcp/Makefile.dep | 29 ++++---- .../classes/zune/betterstring/mcp/locale/danish.ct | 0 .../classes/zune/betterstring/mcp/locale/french.ct | 0 workbench/classes/zune/betterstring/mcp/vastubs.c | 0 workbench/classes/zune/betterstring/mcp/version.h | 6 +- .../classes/zune/betterstring/tools/bumprev.sh | 0 .../classes/zune/betterstring/tools/mkrelease.sh | 4 +- 21 files changed, 182 insertions(+), 146 deletions(-) mode change 100644 => 100755 workbench/classes/zune/betterstring/include/mui/NBitmap_mcc.h rewrite workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile.dep (67%) mode change 100644 => 100755 workbench/classes/zune/betterstring/mcc/hotkeystring/vastubs.c mode change 100644 => 100755 workbench/classes/zune/betterstring/mcc/vastubs.c mode change 100644 => 100755 workbench/classes/zune/betterstring/mcp/locale/danish.ct mode change 100644 => 100755 workbench/classes/zune/betterstring/mcp/locale/french.ct mode change 100644 => 100755 workbench/classes/zune/betterstring/mcp/vastubs.c mode change 100644 => 100755 workbench/classes/zune/betterstring/tools/bumprev.sh mode change 100644 => 100755 workbench/classes/zune/betterstring/tools/mkrelease.sh diff --git a/workbench/classes/zune/betterstring/ChangeLog b/workbench/classes/zune/betterstring/ChangeLog index 4249b3371b..42d40e5dbb 100644 --- a/workbench/classes/zune/betterstring/ChangeLog +++ b/workbench/classes/zune/betterstring/ChangeLog @@ -2,8 +2,32 @@ MUI BetterString MCC class - ChangeLog -------------------------------------- -$Id: ChangeLog 283 2010-09-23 18:04:10Z damato $ -$URL: https://bstring-mcc.svn.sourceforge.net/svnroot/bstring-mcc/releases/11.20/ChangeLog $ +$Id: ChangeLog 290 2011-11-26 13:14:52Z damato $ +$URL: https://bstring-mcc.svn.sourceforge.net/svnroot/bstring-mcc/releases/11.21/ChangeLog $ + +#### v11.21 RELEASE ########################################################### + +2011-11-26 Jens Langner + + * misc: final 11.21 release preparations + +2011-09-12 Thore Böckelmann + + * mcc/PrintString.c: fixed the slightly wrong background drawing when + gradients are being used. + +2011-01-04 Thore Böckelmann + + * all/Makefile: fixed the dependency generation to respect the system specific + object file path. + +2010-10-05 Thore Böckelmann + + * include/mccinit.c: make sure that removing the library during LibClose() + really operates on the correct base. Calling LibExpunge() on MorphOS is + wrong, since that takes no parameter but expects the base to be in A6. We + work around this by using an additional function which gets called from + LibClose() and LibExpunge() with the correct base pointer. #### v11.20 RELEASE ########################################################### diff --git a/workbench/classes/zune/betterstring/doc/MCC_BetterString.readme b/workbench/classes/zune/betterstring/doc/MCC_BetterString.readme index de48d51cb5..f7089c95a9 100755 --- a/workbench/classes/zune/betterstring/doc/MCC_BetterString.readme +++ b/workbench/classes/zune/betterstring/doc/MCC_BetterString.readme @@ -1,9 +1,9 @@ -Short: BetterString custom class for MUI, V11.20 +Short: BetterString custom class for MUI, V11.21 Author: BetterString.mcc Open Source Team Uploader: Jens Langner Type: dev/mui -Version: 11.20 -Replaces: dev/mui/mcc_betterstring-11.19.lha +Version: 11.21 +Replaces: dev/mui/mcc_betterstring-11.20.lha Requires: AmigaOS 3.0+ or MorphOS, MUI 3.8+, 68020+/PPC604e+ Architecture: ppc-amigaos >= 4.0.0; m68k-amigaos >= 3.0; ppc-morphos >= 1.4.2; i386-aros; ppc-aros; x86_64-aros diff --git a/workbench/classes/zune/betterstring/include/mccinit.c b/workbench/classes/zune/betterstring/include/mccinit.c index a5bc3fcd2d..f04e38fc23 100644 --- a/workbench/classes/zune/betterstring/include/mccinit.c +++ b/workbench/classes/zune/betterstring/include/mccinit.c @@ -1,7 +1,7 @@ /******************************************************************************* Name: mccinit.c - Versionstring: $VER: mccinit.c 1.23 (07.09.2010) + Versionstring: $VER: mccinit.c 1.24 (05.10.2010) Author: Jens Langner Distribution: PD (public domain) Description: library init file for easy generation of a MUI @@ -61,6 +61,12 @@ 1.22 03.09.2010 : the library semaphore is now correctly cleared ahead of the InitSemaphore() call. 1.23 07.09.2010 : added missing #include for memset(). + 1.24 05.10.2010 : make sure that removing the library during LibClose() really + operates on the correct base. Calling LibExpunge() on MorphOS + is wrong, since that takes no parameter but expects the base + to be in A6. We work around this by using an additional + function which gets called from LibClose() and LibExpunge() + with the correct base pointer. About: @@ -1025,10 +1031,44 @@ STATIC struct LibraryHeader * LIBFUNC LibInit(REG(d0, struct LibraryHeader *base FreeMem((STRPTR)(LIB)-(LIB)->lib_NegSize, (ULONG)((LIB)->lib_NegSize+(LIB)->lib_PosSize)) #endif +STATIC BPTR LibDelete(struct LibraryHeader *base) +{ +#if defined(__amigaos4__) + struct ExecIFace *IExec = (struct ExecIFace *)(*(struct ExecBase **)4)->MainInterface; +#endif + BPTR rc; + + // remove the library base from exec's lib list in advance + Remove((struct Node *)base); + + // protect mccLibExpunge() + ObtainSemaphore(&base->lh_Semaphore); + + // make sure we have enough stack here + callMccFunction(mccLibExpunge, base); + + // unprotect + ReleaseSemaphore(&base->lh_Semaphore); + + #if defined(__amigaos4__) && defined(__NEWLIB__) + if(NewlibBase) + { + DROPINTERFACE(INewlib); + CloseLibrary(NewlibBase); + NewlibBase = NULL; + } + #endif + + // make sure the system deletes the library as well. + rc = base->lh_Segment; + DeleteLibrary(&base->lh_Library); + + return rc; +} + #if defined(__amigaos4__) STATIC BPTR LibExpunge(struct LibraryManagerInterface *Self) { - struct ExecIFace *IExec = (struct ExecIFace *)(*(struct ExecBase **)4)->MainInterface; struct LibraryHeader *base = (struct LibraryHeader *)Self->Data.LibBase; #elif defined(__MORPHOS__) STATIC BPTR LibExpunge(void) @@ -1058,30 +1098,7 @@ STATIC BPTR LIBFUNC LibExpunge(REG(a6, struct LibraryHeader *base)) } else { - // remove the library base from exec's lib list in advance - Remove((struct Node *)base); - - // protect mccLibExpunge() - ObtainSemaphore(&base->lh_Semaphore); - - // make sure we have enough stack here - callMccFunction(mccLibExpunge, base); - - // unprotect - ReleaseSemaphore(&base->lh_Semaphore); - - #if defined(__amigaos4__) && defined(__NEWLIB__) - if(NewlibBase) - { - DROPINTERFACE(INewlib); - CloseLibrary(NewlibBase); - NewlibBase = NULL; - } - #endif - - // make sure the system deletes the library as well. - rc = base->lh_Segment; - DeleteLibrary(&base->lh_Library); + rc = LibDelete(base); } return(rc); @@ -1221,20 +1238,7 @@ STATIC BPTR LIBFUNC LibClose(REG(a6, struct LibraryHeader *base)) // expunge the library base right now if(base->lh_Library.lib_Flags & LIBF_DELEXP) { - #if defined(__amigaos4__) - rc = LibExpunge(Self); - #elif defined(__MORPHOS__) - rc = LibExpunge(); - #elif defined(__AROS__) - rc = AROS_LC1(BPTR, LibExpunge, - AROS_LCA(struct LibraryHeader *, base, D0), - struct LibraryHeader *, base, 3, __MCC_ - ); - #else - rc = LibExpunge(base); - #endif - - return rc; + rc = LibDelete(base); } } diff --git a/workbench/classes/zune/betterstring/include/mui/NBitmap_mcc.h b/workbench/classes/zune/betterstring/include/mui/NBitmap_mcc.h old mode 100644 new mode 100755 diff --git a/workbench/classes/zune/betterstring/mcc/Makefile b/workbench/classes/zune/betterstring/mcc/Makefile index 91c2b2b09b..731073d5a7 100644 --- a/workbench/classes/zune/betterstring/mcc/Makefile +++ b/workbench/classes/zune/betterstring/mcc/Makefile @@ -107,6 +107,7 @@ RM = delete force RMDIR = delete force all MKDIR = makedir CHMOD = protect FLAGS=rwed +SED = sed CP = copy CC = gcc STRIP = strip @@ -447,8 +448,9 @@ help: depend: @echo " MK $(DEPFILE)" @echo "# AUTOGENERATED! DO NOT EDIT!!!" >$(DEPFILE) - @$(CC) -MM $(CFLAGS) $(patsubst %.o,%.c, $(LOBJS)) $(patsubst %.o,%.c, $(COBJS)) $(patsubst %.o,%.c, $(TOBJS)) >>$(DEPFILE) + @$(CC) -MM -MG $(CFLAGS) $(wildcard *.c) >>$(DEPFILE) @echo "# AUTOGENERATED! DO NOT EDIT!!!" >>$(DEPFILE) + @$(SED) -i 's,^\(.*\)\.o:,$$\(OBJDIR\)/\1.o:,g' $(DEPFILE) # include dependencies file -include $(DEPFILE) diff --git a/workbench/classes/zune/betterstring/mcc/Makefile.dep b/workbench/classes/zune/betterstring/mcc/Makefile.dep index c7d254cd52..7f1ca6e828 100644 --- a/workbench/classes/zune/betterstring/mcc/Makefile.dep +++ b/workbench/classes/zune/betterstring/mcc/Makefile.dep @@ -1,61 +1,61 @@ # AUTOGENERATED! DO NOT EDIT!!! -library.o: library.c private.h ../include/libraries/mui.h \ +$(OBJDIR)/AllocBitMap.o: AllocBitMap.c ../include/SDI_compiler.h +$(OBJDIR)/AllocFunctions.o: AllocFunctions.c private.h ../include/libraries/mui.h \ ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - BetterString_mcc.h Debug.h version.h ../include/mccinit.c \ + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/BetterString-Test.o: BetterString-Test.c ../include/libraries/mui.h \ ../include/proto/muimaster.h ../include/interfaces/muimaster.h \ - ../include/inline4/muimaster.h -AllocBitMap.o: AllocBitMap.c ../include/SDI_compiler.h -AllocFunctions.o: AllocFunctions.c private.h ../include/libraries/mui.h \ - ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ - ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - BetterString_mcc.h Debug.h -ClipboardServer.o: ClipboardServer.c private.h ../include/libraries/mui.h \ + ../include/inline4/muimaster.h private.h ../include/muiextra.h \ + ../include/mcc_common.h ../include/SDI_compiler.h ../include/SDI_hook.h \ + ../include/SDI_lib.h ../include/SDI_stdarg.h \ + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/ClipboardServer.o: ClipboardServer.c private.h ../include/libraries/mui.h \ ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - BetterString_mcc.h Debug.h -Dispatcher.o: Dispatcher.c ../include/proto/muimaster.h \ + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/Debug.o: Debug.c ../include/SDI_compiler.h Debug.h version.h +$(OBJDIR)/Dispatcher.o: Dispatcher.c ../include/proto/muimaster.h \ ../include/libraries/mui.h ../include/interfaces/muimaster.h \ - ../include/inline4/muimaster.h BetterString_mcc.h private.h \ - ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ - ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - Debug.h -FileNameCompl.o: FileNameCompl.c BetterString_mcc.h private.h \ - ../include/libraries/mui.h ../include/muiextra.h \ + ../include/inline4/muimaster.h private.h ../include/muiextra.h \ ../include/mcc_common.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_lib.h ../include/SDI_stdarg.h Debug.h -GetSetAttrs.o: GetSetAttrs.c ../include/proto/muimaster.h \ - ../include/libraries/mui.h ../include/interfaces/muimaster.h \ - ../include/inline4/muimaster.h BetterString_mcc.h private.h \ + ../include/SDI_lib.h ../include/SDI_stdarg.h \ + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/FileNameCompl.o: FileNameCompl.c private.h ../include/libraries/mui.h \ ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - Debug.h version.h -HandleInput.o: HandleInput.c ../include/proto/muimaster.h \ + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/GetSetAttrs.o: GetSetAttrs.c ../include/proto/muimaster.h \ + ../include/libraries/mui.h ../include/interfaces/muimaster.h \ + ../include/inline4/muimaster.h private.h ../include/muiextra.h \ + ../include/mcc_common.h ../include/SDI_compiler.h ../include/SDI_hook.h \ + ../include/SDI_lib.h ../include/SDI_stdarg.h \ + ../include/mui/BetterString_mcc.h Debug.h version.h +$(OBJDIR)/HandleInput.o: HandleInput.c ../include/proto/muimaster.h \ ../include/libraries/mui.h ../include/interfaces/muimaster.h \ ../include/inline4/muimaster.h private.h ../include/muiextra.h \ ../include/mcc_common.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_lib.h ../include/SDI_stdarg.h BetterString_mcc.h Debug.h \ - ../include/SDI_stdarg.h -InitConfig.o: InitConfig.c ../include/proto/muimaster.h \ + ../include/SDI_lib.h ../include/SDI_stdarg.h \ + ../include/mui/BetterString_mcc.h Debug.h ../include/SDI_stdarg.h +$(OBJDIR)/InitConfig.o: InitConfig.c ../include/proto/muimaster.h \ ../include/libraries/mui.h ../include/interfaces/muimaster.h \ ../include/inline4/muimaster.h ../mcp/BetterString_mcp.h private.h \ ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - BetterString_mcc.h Debug.h -Pointer.o: Pointer.c private.h ../include/libraries/mui.h \ + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/library.o: library.c private.h ../include/libraries/mui.h \ ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - BetterString_mcc.h Debug.h -PrintString.o: PrintString.c private.h ../include/libraries/mui.h \ + ../include/mui/BetterString_mcc.h Debug.h version.h \ + ../include/mccinit.c ../include/proto/muimaster.h \ + ../include/interfaces/muimaster.h ../include/inline4/muimaster.h +$(OBJDIR)/Pointer.o: Pointer.c private.h ../include/libraries/mui.h \ ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - BetterString_mcc.h Debug.h -Debug.o: Debug.c ../include/SDI_compiler.h Debug.h version.h -vastubs.o: vastubs.c -BetterString-Test.o: BetterString-Test.c ../include/libraries/mui.h \ - ../include/proto/muimaster.h ../include/interfaces/muimaster.h \ - ../include/inline4/muimaster.h BetterString_mcc.h private.h \ + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/PrintString.o: PrintString.c private.h ../include/libraries/mui.h \ ../include/muiextra.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - Debug.h + ../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/vastubs.o: vastubs.c # AUTOGENERATED! DO NOT EDIT!!! diff --git a/workbench/classes/zune/betterstring/mcc/PrintString.c b/workbench/classes/zune/betterstring/mcc/PrintString.c index 972083d81a..23ebf7e3d5 100644 --- a/workbench/classes/zune/betterstring/mcc/PrintString.c +++ b/workbench/classes/zune/betterstring/mcc/PrintString.c @@ -39,7 +39,7 @@ VOID PrintString(struct IClass *cl, Object *obj) struct TextFont *font = data->Font ? data->Font : ad->mad_Font; struct TextExtent tExtend; STRPTR contents; - WORD x=10, y=0, width, height; + WORD width, height; WORD crsr_x=0, crsr_width=0, crsr_color=0; WORD dst_x, dst_y, length, offset = 0, StrLength; STRPTR text; @@ -137,7 +137,7 @@ VOID PrintString(struct IClass *cl, Object *obj) } muiRenderInfo(obj)->mri_RastPort = rport; - DoMethod(obj, MUIM_DrawBackground, x, y, width, height, dst_x, dst_y, 0L); + DoMethod(obj, MUIM_DrawBackground, 0, 0, _mwidth(obj), _mheight(obj), 0, 0, 0L); muiRenderInfo(obj)->mri_RastPort = oldrport; length = TextFit(rport, text, StrLength, &tExtend, NULL, 1, width, font->tf_YSize); @@ -169,7 +169,7 @@ VOID PrintString(struct IClass *cl, Object *obj) { crsr_width = width-crsr_x; } - RectFill(rport, x+offset+crsr_x, y, x+offset+crsr_x+crsr_width-1, y+font->tf_YSize-1); + RectFill(rport, offset+crsr_x, 0, offset+crsr_x+crsr_width-1, font->tf_YSize-1); } if(length) @@ -177,7 +177,7 @@ VOID PrintString(struct IClass *cl, Object *obj) UWORD newlength; LONG textcolor= isFlagSet(data->Flags, FLG_Active) ? data->ActiveText : data->InactiveText; - Move(rport, x+offset, y+font->tf_Baseline); + Move(rport, offset, font->tf_Baseline); if(BlockEnabled && textcolor != (LONG)data->MarkedTextColor) { @@ -212,7 +212,7 @@ VOID PrintString(struct IClass *cl, Object *obj) if(fake_contents != NULL) SharedPoolFree(fake_contents); - BltBitMapRastPort(data->rport.BitMap, x, y, muiRenderInfo(obj)->mri_RastPort, dst_x, dst_y, width, height, 0xc0); + BltBitMapRastPort(data->rport.BitMap, 0, 0, muiRenderInfo(obj)->mri_RastPort, dst_x, dst_y, width, height, 0xc0); if(isFlagSet(data->Flags, FLG_Ghosted)) { diff --git a/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile b/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile index a816404961..142f7b1b81 100644 --- a/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile +++ b/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile @@ -107,6 +107,7 @@ RM = delete force RMDIR = delete force all MKDIR = makedir CHMOD = protect FLAGS=rwed +SED = sed CP = copy CC = gcc STRIP = strip @@ -415,8 +416,9 @@ help: depend: @echo " MK $(DEPFILE)" @echo "# AUTOGENERATED! DO NOT EDIT!!!" >$(DEPFILE) - @$(CC) -MM $(CFLAGS) $(patsubst %.o,%.c, $(LOBJS)) $(patsubst %.o,%.c, $(COBJS)) $(patsubst %.o,%.c, $(TOBJS)) >>$(DEPFILE) + @$(CC) -MM -MG $(CFLAGS) $(wildcard *.c) >>$(DEPFILE) @echo "# AUTOGENERATED! DO NOT EDIT!!!" >>$(DEPFILE) + @$(SED) -i 's,^\(.*\)\.o:,$$\(OBJDIR\)/\1.o:,g' $(DEPFILE) # include dependencies file -include $(DEPFILE) diff --git a/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile.dep b/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile.dep dissimilarity index 67% index 47830c8d68..eb9bcfdf1f 100644 --- a/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile.dep +++ b/workbench/classes/zune/betterstring/mcc/hotkeystring/Makefile.dep @@ -1,31 +1,32 @@ -# AUTOGENERATED! DO NOT EDIT!!! -library.o: library.c private.h ../../include/libraries/mui.h \ - ../../include/muiextra.h ../../include/mcc_common.h \ - ../../include/SDI_compiler.h ../../include/SDI_hook.h \ - ../../include/SDI_lib.h ../../include/SDI_stdarg.h HotkeyString_mcc.h \ - ../BetterString_mcc.h Debug.h version.h ../../include/mccinit.c \ - ../../include/proto/muimaster.h ../../include/interfaces/muimaster.h \ - ../../include/inline4/muimaster.h -Dispatcher.o: Dispatcher.c ../../include/proto/muimaster.h \ - ../../include/libraries/mui.h ../../include/interfaces/muimaster.h \ - ../../include/inline4/muimaster.h HotkeyString_mcc.h private.h \ - ../../include/muiextra.h ../../include/mcc_common.h \ - ../../include/SDI_compiler.h ../../include/SDI_hook.h \ - ../../include/SDI_lib.h ../../include/SDI_stdarg.h \ - ../BetterString_mcc.h Debug.h version.h -HandleInput.o: HandleInput.c ../../include/libraries/mui.h \ - ../../include/newmouse.h private.h ../../include/muiextra.h \ - ../../include/mcc_common.h ../../include/SDI_compiler.h \ - ../../include/SDI_hook.h ../../include/SDI_lib.h \ - ../../include/SDI_stdarg.h HotkeyString_mcc.h ../BetterString_mcc.h \ - Debug.h -Debug.o: Debug.c ../../include/SDI_compiler.h Debug.h version.h -vastubs.o: vastubs.c -HotkeyString-Test.o: HotkeyString-Test.c ../../include/libraries/mui.h \ - ../../include/proto/muimaster.h ../../include/interfaces/muimaster.h \ - ../../include/inline4/muimaster.h HotkeyString_mcc.h private.h \ - ../../include/muiextra.h ../../include/mcc_common.h \ - ../../include/SDI_compiler.h ../../include/SDI_hook.h \ - ../../include/SDI_lib.h ../../include/SDI_stdarg.h \ - ../BetterString_mcc.h Debug.h -# AUTOGENERATED! DO NOT EDIT!!! +# AUTOGENERATED! DO NOT EDIT!!! +$(OBJDIR)/Debug.o: Debug.c ../../include/SDI_compiler.h Debug.h version.h +$(OBJDIR)/Dispatcher.o: Dispatcher.c ../../include/proto/muimaster.h \ + ../../include/libraries/mui.h ../../include/interfaces/muimaster.h \ + ../../include/inline4/muimaster.h private.h ../../include/muiextra.h \ + ../../include/mcc_common.h ../../include/SDI_compiler.h \ + ../../include/SDI_hook.h ../../include/SDI_lib.h \ + ../../include/SDI_stdarg.h ../../include/mui/HotkeyString_mcc.h \ + ../../include/mui/BetterString_mcc.h Debug.h version.h +$(OBJDIR)/HandleInput.o: HandleInput.c ../../include/libraries/mui.h \ + ../../include/newmouse.h private.h ../../include/muiextra.h \ + ../../include/mcc_common.h ../../include/SDI_compiler.h \ + ../../include/SDI_hook.h ../../include/SDI_lib.h \ + ../../include/SDI_stdarg.h ../../include/mui/HotkeyString_mcc.h \ + ../../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/HotkeyString-Test.o: HotkeyString-Test.c ../../include/libraries/mui.h \ + ../../include/proto/muimaster.h ../../include/interfaces/muimaster.h \ + ../../include/inline4/muimaster.h private.h ../../include/muiextra.h \ + ../../include/mcc_common.h ../../include/SDI_compiler.h \ + ../../include/SDI_hook.h ../../include/SDI_lib.h \ + ../../include/SDI_stdarg.h ../../include/mui/HotkeyString_mcc.h \ + ../../include/mui/BetterString_mcc.h Debug.h +$(OBJDIR)/library.o: library.c private.h ../../include/libraries/mui.h \ + ../../include/muiextra.h ../../include/mcc_common.h \ + ../../include/SDI_compiler.h ../../include/SDI_hook.h \ + ../../include/SDI_lib.h ../../include/SDI_stdarg.h \ + ../../include/mui/HotkeyString_mcc.h \ + ../../include/mui/BetterString_mcc.h Debug.h version.h \ + ../../include/mccinit.c ../../include/proto/muimaster.h \ + ../../include/interfaces/muimaster.h ../../include/inline4/muimaster.h +$(OBJDIR)/vastubs.o: vastubs.c +# AUTOGENERATED! DO NOT EDIT!!! diff --git a/workbench/classes/zune/betterstring/mcc/hotkeystring/vastubs.c b/workbench/classes/zune/betterstring/mcc/hotkeystring/vastubs.c old mode 100644 new mode 100755 diff --git a/workbench/classes/zune/betterstring/mcc/hotkeystring/version.h b/workbench/classes/zune/betterstring/mcc/hotkeystring/version.h index cb7700338b..455aef90f6 100644 --- a/workbench/classes/zune/betterstring/mcc/hotkeystring/version.h +++ b/workbench/classes/zune/betterstring/mcc/hotkeystring/version.h @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 12 -#define LIB_REVISION 16 -#define LIB_DATE "23.09.2010" -#define LIB_COPYRIGHT "Copyright (C) 2005-2010 BetterString.mcc Open Source Team" +#define LIB_REVISION 17 +#define LIB_DATE "26.11.2011" +#define LIB_COPYRIGHT "Copyright (C) 2005-2011 BetterString.mcc Open Source Team" // set the LIB_REV_STRING #define LIB_REV_STRING STR(LIB_VERSION) "." STR(LIB_REVISION) diff --git a/workbench/classes/zune/betterstring/mcc/vastubs.c b/workbench/classes/zune/betterstring/mcc/vastubs.c old mode 100644 new mode 100755 diff --git a/workbench/classes/zune/betterstring/mcc/version.h b/workbench/classes/zune/betterstring/mcc/version.h index d8bbd905a3..008b9b52b6 100644 --- a/workbench/classes/zune/betterstring/mcc/version.h +++ b/workbench/classes/zune/betterstring/mcc/version.h @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 11 -#define LIB_REVISION 20 -#define LIB_DATE "23.09.2010" -#define LIB_COPYRIGHT "Copyright (C) 2005-2010 BetterString.mcc Open Source Team" +#define LIB_REVISION 21 +#define LIB_DATE "26.11.2011" +#define LIB_COPYRIGHT "Copyright (C) 2005-2011 BetterString.mcc Open Source Team" // set the LIB_REV_STRING #define LIB_REV_STRING STR(LIB_VERSION) "." STR(LIB_REVISION) diff --git a/workbench/classes/zune/betterstring/mcp/Makefile b/workbench/classes/zune/betterstring/mcp/Makefile index cfd51b8f8d..5e3c36258e 100644 --- a/workbench/classes/zune/betterstring/mcp/Makefile +++ b/workbench/classes/zune/betterstring/mcp/Makefile @@ -107,6 +107,7 @@ RM = delete force RMDIR = delete force all MKDIR = makedir CHMOD = protect FLAGS=rwed +SED = sed CP = copy CC = gcc STRIP = strip @@ -449,8 +450,9 @@ help: depend: @echo " MK $(DEPFILE)" @echo "# AUTOGENERATED! DO NOT EDIT!!!" >$(DEPFILE) - @$(CC) -MM $(CFLAGS) $(patsubst %.o,%.c, $(LOBJS)) $(patsubst %.o,%.c, $(COBJS)) $(patsubst %.o,%.c, $(TOBJS)) >>$(DEPFILE) + @$(CC) -MM -MG $(CFLAGS) $(wildcard *.c) >>$(DEPFILE) @echo "# AUTOGENERATED! DO NOT EDIT!!!" >>$(DEPFILE) + @$(SED) -i 's,^\(.*\)\.o:,$$\(OBJDIR\)/\1.o:,g' $(DEPFILE) # include dependencies file -include $(DEPFILE) diff --git a/workbench/classes/zune/betterstring/mcp/Makefile.dep b/workbench/classes/zune/betterstring/mcp/Makefile.dep index a388ae68bc..502adb44bb 100644 --- a/workbench/classes/zune/betterstring/mcp/Makefile.dep +++ b/workbench/classes/zune/betterstring/mcp/Makefile.dep @@ -1,28 +1,29 @@ # AUTOGENERATED! DO NOT EDIT!!! -library.o: library.c private.h BetterString_mcp.h \ - ../include/libraries/mui.h Debug.h ../include/mcc_common.h \ - ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ - ../include/SDI_stdarg.h version.h locale.h icon.bh ../include/mccinit.c \ - ../include/proto/muimaster.h ../include/interfaces/muimaster.h \ - ../include/inline4/muimaster.h -locale.o: locale.c ../include/SDI_compiler.h -CreatePrefsGroup.o: CreatePrefsGroup.c ../include/proto/muimaster.h \ +$(OBJDIR)/CreatePrefsGroup.o: CreatePrefsGroup.c ../include/proto/muimaster.h \ ../include/libraries/mui.h ../include/interfaces/muimaster.h \ - ../include/inline4/muimaster.h ../mcc/BetterString_mcc.h locale.h \ - private.h BetterString_mcp.h Debug.h ../include/mcc_common.h \ + ../include/inline4/muimaster.h ../include/mui/BetterString_mcc.h \ + locale.h private.h BetterString_mcp.h Debug.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/muiextra.h version.h -Dispatcher.o: Dispatcher.c ../include/proto/muimaster.h \ +$(OBJDIR)/Debug.o: Debug.c ../include/SDI_compiler.h Debug.h version.h +$(OBJDIR)/Dispatcher.o: Dispatcher.c ../include/proto/muimaster.h \ ../include/libraries/mui.h ../include/interfaces/muimaster.h \ ../include/inline4/muimaster.h private.h BetterString_mcp.h Debug.h \ ../include/mcc_common.h ../include/SDI_compiler.h ../include/SDI_hook.h \ ../include/SDI_lib.h ../include/SDI_stdarg.h ../include/muiextra.h -Debug.o: Debug.c ../include/SDI_compiler.h Debug.h version.h -vastubs.o: vastubs.c -Preference.o: Preference.c ../include/libraries/mui.h \ +$(OBJDIR)/icon.o: icon.c +$(OBJDIR)/library.o: library.c ../include/proto/muimaster.h \ + ../include/libraries/mui.h ../include/interfaces/muimaster.h \ + ../include/inline4/muimaster.h private.h BetterString_mcp.h Debug.h \ + ../include/mcc_common.h ../include/SDI_compiler.h ../include/SDI_hook.h \ + ../include/SDI_lib.h ../include/SDI_stdarg.h version.h locale.h icon.h \ + ../include/mui/NBitmap_mcc.h ../include/mccinit.c +$(OBJDIR)/locale.o: locale.c ../include/SDI_compiler.h +$(OBJDIR)/Preference.o: Preference.c ../include/libraries/mui.h \ ../include/proto/muimaster.h ../include/interfaces/muimaster.h \ ../include/inline4/muimaster.h BetterString_mcp.h locale.h private.h \ Debug.h ../include/mcc_common.h ../include/SDI_compiler.h \ ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ ../include/SDI_hook.h +$(OBJDIR)/vastubs.o: vastubs.c # AUTOGENERATED! DO NOT EDIT!!! diff --git a/workbench/classes/zune/betterstring/mcp/locale/danish.ct b/workbench/classes/zune/betterstring/mcp/locale/danish.ct old mode 100644 new mode 100755 diff --git a/workbench/classes/zune/betterstring/mcp/locale/french.ct b/workbench/classes/zune/betterstring/mcp/locale/french.ct old mode 100644 new mode 100755 diff --git a/workbench/classes/zune/betterstring/mcp/vastubs.c b/workbench/classes/zune/betterstring/mcp/vastubs.c old mode 100644 new mode 100755 diff --git a/workbench/classes/zune/betterstring/mcp/version.h b/workbench/classes/zune/betterstring/mcp/version.h index d8bbd905a3..008b9b52b6 100644 --- a/workbench/classes/zune/betterstring/mcp/version.h +++ b/workbench/classes/zune/betterstring/mcp/version.h @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 11 -#define LIB_REVISION 20 -#define LIB_DATE "23.09.2010" -#define LIB_COPYRIGHT "Copyright (C) 2005-2010 BetterString.mcc Open Source Team" +#define LIB_REVISION 21 +#define LIB_DATE "26.11.2011" +#define LIB_COPYRIGHT "Copyright (C) 2005-2011 BetterString.mcc Open Source Team" // set the LIB_REV_STRING #define LIB_REV_STRING STR(LIB_VERSION) "." STR(LIB_REVISION) diff --git a/workbench/classes/zune/betterstring/tools/bumprev.sh b/workbench/classes/zune/betterstring/tools/bumprev.sh old mode 100644 new mode 100755 diff --git a/workbench/classes/zune/betterstring/tools/mkrelease.sh b/workbench/classes/zune/betterstring/tools/mkrelease.sh old mode 100644 new mode 100755 index d051f81cf4..83590132fb --- a/workbench/classes/zune/betterstring/tools/mkrelease.sh +++ b/workbench/classes/zune/betterstring/tools/mkrelease.sh @@ -18,7 +18,7 @@ # # BetterString class Support Site: http://www.sf.net/projects/bstring-mcc/ # -# $Id: mkrelease.sh 272 2010-08-31 19:22:23Z damato $ +# $Id$ # ############################################################################ @@ -78,4 +78,4 @@ releaserev=`grep "#define LIB_REVISION" mcc/version.h | awk '{ print $3 }'` echo " MK MCC_BetterString-$releasever.$releaserev.lha" find release -nowarn -name ".svn" -exec rm -rf {} \; 2>/dev/null cd release -lha -aq ../MCC_BetterString-$releasever.$releaserev.lha * +lha -ao5q ../MCC_BetterString-$releasever.$releaserev.lha * -- 2.11.4.GIT