From e8f5f7b690b348f1dbbcdc44b3ee21702ff601e8 Mon Sep 17 00:00:00 2001 From: Nico <118665816+nschulux@users.noreply.github.com> Date: Mon, 23 Sep 2024 22:44:08 +0200 Subject: [PATCH 1/5] Calendar and Contacts Correction Calendar and Contacts updated Sourcefile and updated Translationfile. --- .../bbxensem/Trans/german/CALENDAR.000 | Bin 42392 -> 42472 bytes .../bbxensem/Trans/german/CONTACTS.000 | Bin 54216 -> 54344 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Tools/build/product/bbxensem/Trans/german/CALENDAR.000 b/Tools/build/product/bbxensem/Trans/german/CALENDAR.000 index f1826711578758bbc63327eeeb3fd06ca5886f74..7dbb16f6d14cae5992f8b55013ed7503e2170e3e 100644 GIT binary patch delta 8813 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 Rq9EOL2Mrk&G;g(o{{f*e3JL%K diff --git a/Tools/build/product/bbxensem/Trans/german/CONTACTS.000 b/Tools/build/product/bbxensem/Trans/german/CONTACTS.000 index d0da3747d8d0f0cff146a7d5263ca390c0ec45e4..bd173247a47dd25e5f16ddc95f2c434337e68010 100644 GIT binary patch delta 11494 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 ZR;fZ4lG=j-W=#DBczFOf)!y`~{%@<;#e@I= From 8c32f10f9ad3f4af2d53835d92037f6b8eceeb0c Mon Sep 17 00:00:00 2001 From: Falk Rehwagen Date: Fri, 27 Sep 2024 22:01:45 +0200 Subject: [PATCH 2/5] Improve TrueType init timing by moving header conversion to a later point in time once a font actually comes in use. #644 --- Driver/Font/TrueType/Adapter/ttadapter.h | 1 + Driver/Font/TrueType/Adapter/ttinit.c | 18 ++++++++++-------- Driver/Font/TrueType/Adapter/ttpath.c | 6 ++++++ Driver/Font/TrueType/Adapter/ttwidths.c | 6 +++++- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Driver/Font/TrueType/Adapter/ttadapter.h b/Driver/Font/TrueType/Adapter/ttadapter.h index b0c6cb6a6..683bc19e9 100644 --- a/Driver/Font/TrueType/Adapter/ttadapter.h +++ b/Driver/Font/TrueType/Adapter/ttadapter.h @@ -341,6 +341,7 @@ typedef struct typedef struct { + Boolean FH_initialized; word FH_h_height; //top of 'H' word FH_x_height; //top of 'x' word FH_ascender; //top of 'd' diff --git a/Driver/Font/TrueType/Adapter/ttinit.c b/Driver/Font/TrueType/Adapter/ttinit.c index f33280082..f4ff3cc22 100644 --- a/Driver/Font/TrueType/Adapter/ttinit.c +++ b/Driver/Font/TrueType/Adapter/ttinit.c @@ -57,7 +57,7 @@ static word getNameFromNameTable( char* name, TT_UShort nameIndex ); -static void ConvertHeader( TRUETYPE_VARS, FontHeader* fontHeader ); +void InitConvertHeader( TRUETYPE_VARS, FontHeader* fontHeader ); static char GetDefaultChar( TRUETYPE_VARS, char firstChar ); @@ -379,7 +379,7 @@ EC( ECCheckFileHandle( truetypeFile ) ); /* fill FontHeader */ fontHeader = LMemDerefHandles( fontInfoBlock, fontHeaderChunk ); - ConvertHeader( trueTypeVars, fontHeader ); + memset(fontHeader, 0, sizeof(FontHeader)); fontInfo->FI_outlineTab = sizeof( FontInfo ); fontInfo->FI_outlineEnd = sizeof( FontInfo ) + sizeof( OutlineDataEntry ); @@ -440,7 +440,7 @@ EC( ECCheckFileHandle( truetypeFile ) ); /* fill FontHeader */ fontHeader = LMemDerefHandles( fontInfoBlock, fontHeaderChunk ); - ConvertHeader( trueTypeVars, fontHeader ); + memset(fontHeader, 0, sizeof(FontHeader)); fontInfo = LMemDeref( ConstructOptr(fontInfoBlock, fontInfoChunk) ); fontInfo->FI_outlineEnd += sizeof( OutlineDataEntry ); @@ -819,7 +819,7 @@ static word getNameFromNameTable( TRUETYPE_VARS, char* name, TT_UShort nameID ) /******************************************************************** - * ConvertHeader + * InitConvertHeader ******************************************************************** * SYNOPSIS: Converts information from a TrueType font into a * FreeGEOS FontHeader. @@ -840,14 +840,16 @@ static word getNameFromNameTable( TRUETYPE_VARS, char* name, TT_UShort nameID ) * 21/01/23 JK Initial Revision *******************************************************************/ -static void ConvertHeader( TRUETYPE_VARS, FontHeader* fontHeader ) +void InitConvertHeader( TRUETYPE_VARS, FontHeader* fontHeader ) { TT_UShort charIndex; word geosChar; EC( ECCheckBounds( (void*)fontHeader ) ); - + + if(fontHeader->FH_initialized) return; + /* initialize min, max and avg values in fontHeader */ fontHeader->FH_minLSB = 9999; fontHeader->FH_maxBSB = -9999; @@ -863,7 +865,6 @@ EC( ECCheckBounds( (void*)fontHeader ) ); fontHeader->FH_defaultChar = GetDefaultChar( trueTypeVars, fontHeader->FH_firstChar ); fontHeader->FH_kernCount = GetKernCount( trueTypeVars ); - TT_New_Instance( FACE, &INSTANCE ); TT_New_Glyph( FACE, &GLYPH ); for ( geosChar = fontHeader->FH_firstChar; geosChar < fontHeader->FH_lastChar; ++geosChar ) @@ -931,7 +932,6 @@ EC( ECCheckBounds( (void*)fontHeader ) ); } TT_Done_Glyph( GLYPH ); - TT_Done_Instance( INSTANCE ); fontHeader->FH_avgwidth = FACE_PROPERTIES.os2->xAvgCharWidth; fontHeader->FH_maxwidth = FACE_PROPERTIES.horizontal->advance_Width_Max; @@ -947,6 +947,8 @@ EC( ECCheckBounds( (void*)fontHeader ) ); fontHeader->FH_strikePos = 3 * fontHeader->FH_x_height / 5; else fontHeader->FH_strikePos = 3 * fontHeader->FH_ascent / 5; + + fontHeader->FH_initialized = TRUE; } diff --git a/Driver/Font/TrueType/Adapter/ttpath.c b/Driver/Font/TrueType/Adapter/ttpath.c index e9e92ca95..99d1e8df6 100644 --- a/Driver/Font/TrueType/Adapter/ttpath.c +++ b/Driver/Font/TrueType/Adapter/ttpath.c @@ -95,6 +95,8 @@ static void CalcDriversTransformMatrix( TransformMatrix* transformMatrix, GStateHandle gstate, WindowHandle win ); +extern void InitConvertHeader( TRUETYPE_VARS, FontHeader* fontHeader ); + /******************************************************************** * TrueType_Gen_Path @@ -166,6 +168,8 @@ EC( ECCheckBounds( (void*)fontHeader ) ); if( TrueType_Lock_Face(trueTypeVars, trueTypeOutline) ) goto Fin; + InitConvertHeader(trueTypeVars, fontHeader); + TT_New_Glyph( FACE, &GLYPH ); /* get TT char index */ @@ -313,6 +317,8 @@ EC( ECCheckBounds( (void*)fontHeader ) ); if( TrueType_Lock_Face(trueTypeVars, trueTypeOutline) ) goto Fin; + InitConvertHeader(trueTypeVars, fontHeader); + /* get TT char index */ charIndex = TT_Char_Index( CHAR_MAP, GeosCharToUnicode( character ) ); if( charIndex == 0 ) diff --git a/Driver/Font/TrueType/Adapter/ttwidths.c b/Driver/Font/TrueType/Adapter/ttwidths.c index a28b84de8..1713ea60a 100644 --- a/Driver/Font/TrueType/Adapter/ttwidths.c +++ b/Driver/Font/TrueType/Adapter/ttwidths.c @@ -67,6 +67,8 @@ static void AdjustFontBuf( TransformMatrix* transMatrix, static Boolean IsRegionNeeded( TransformMatrix* transMatrix, FontBuf* fontBuf ); +extern void InitConvertHeader( TRUETYPE_VARS, FontHeader* fontHeader ); + #define ROUND_WWFIXED( value ) ( value & 0xffff ? ( value >> 16 ) + 1 : value >> 16 ) @@ -157,6 +159,8 @@ EC( ECCheckBounds( (void*)fontHeader ) ); if( TrueType_Lock_Face(trueTypeVars, trueTypeOutline) ) goto Fail; + InitConvertHeader( trueTypeVars, fontHeader ); + /* alloc Block for FontBuf, CharTableEntries, KernPairs and kerning values */ size = AllocFontBlock( sizeof( TransformMatrix ), fontHeader->FH_numChars, @@ -569,7 +573,7 @@ static word AllocFontBlock( word additionalSpace, if( *fontHandle == NullHandle ) { *fontHandle = MemAllocSetOwner( FONT_MAN_ID, MAX_FONTBUF_SIZE, - HF_SWAPABLE | HF_SHARABLE | HF_DISCARDABLE, + HF_SWAPABLE | HF_SHARABLE, HAF_NO_ERR | HAF_LOCK | HAF_ZERO_INIT ); EC( ECCheckMemHandle( *fontHandle ) ); HandleP( *fontHandle ); From c53d0ec92037cb09feb8ad6082d315cb9bc979b0 Mon Sep 17 00:00:00 2001 From: Falk Rehwagen Date: Sat, 28 Sep 2024 12:08:06 +0200 Subject: [PATCH 3/5] Fix make file for ImpGraph building. No FJPEG support so far. #655 --- CInclude/file.h | 76 ++-- .../Breadbox/ImpGraph/DBCS/dependencies.mk | 184 ++++++++++ Installed/Library/Breadbox/ImpGraph/Makefile | 76 ++-- .../Library/Breadbox/ImpGraph/dependencies.mk | 339 ++++++++++-------- .../Breadbox/ImpGraph/FJPEGDBCS/is_a_product | 0 Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc | 15 +- Library/Breadbox/ImpGraph/fjpeg/is_a_product | 0 7 files changed, 454 insertions(+), 236 deletions(-) create mode 100644 Installed/Library/Breadbox/ImpGraph/DBCS/dependencies.mk delete mode 100644 Library/Breadbox/ImpGraph/FJPEGDBCS/is_a_product delete mode 100644 Library/Breadbox/ImpGraph/fjpeg/is_a_product diff --git a/CInclude/file.h b/CInclude/file.h index 076be3b61..3237ff140 100644 --- a/CInclude/file.h +++ b/CInclude/file.h @@ -154,7 +154,7 @@ typedef struct { FileExtendedAttribute FEAD_attr; /* Attribute to get/set */ void *FEAD_value; /* Pointer to buffer/new value */ word FEAD_size; /* Size of buffer/new value */ - char *FEAD_name; /* Null-terminated ASCII name of + TCHAR *FEAD_name; /* Null-terminated ASCII name of * attribute if FEA_CUSTOM */ } FileExtAttrDesc; @@ -164,7 +164,7 @@ typedef struct { FileExtendedAttribute FEAD_attr; /* Attribute to get/set */ dword *FEAD_value; /* Pointer to buffer/new value */ word FEAD_size; /* Size of buffer/new value */ - char *FEAD_name; /* Null-terminated ASCII name of + TCHAR *FEAD_name; /* Null-terminated ASCII name of * attribute if FEA_CUSTOM */ } FileExtAttrDescLike; @@ -248,17 +248,17 @@ typedef WordFlags FileOpenAndReadFlags; /***/ extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ - _pascal FileCreateDir(const char *name); + _pascal FileCreateDir(const TCHAR *name); /***/ extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ - _pascal FileCreateDirWithNativeShortName(const char *name); + _pascal FileCreateDirWithNativeShortName(const TCHAR *name); /***/ extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ - _pascal FileDeleteDir(const char *name); + _pascal FileDeleteDir(const TCHAR *name); /***/ @@ -273,7 +273,7 @@ extern void /***/ extern DiskHandle /*XXX*/ - _pascal FileGetCurrentPath(char *buffer, word bufferSize); + _pascal FileGetCurrentPath(TCHAR *buffer, word bufferSize); /***/ @@ -299,15 +299,15 @@ extern void /***/ extern DiskHandle /* Sets value for ThreadGetError() */ /*XXX*/ - _pascal FileSetCurrentPath(DiskHandle disk, const char *path); + _pascal FileSetCurrentPath(DiskHandle disk, const TCHAR *path); extern DiskHandle /* Sets value for ThreadGetError() */ /*XXX*/ - _pascal FileSetCurrentPathRaw(DiskHandle disk, const char *path); + _pascal FileSetCurrentPathRaw(DiskHandle disk, const TCHAR *path); /***/ extern FileHandle /* Sets value for ThreadGetError() */ - _pascal FileOpen(const char *name, FileAccessFlags flags); + _pascal FileOpen(const TCHAR *name, FileAccessFlags flags); /***/ @@ -324,7 +324,7 @@ typedef WordFlags FileCreateFlags; #define FCF_ACCESS 0x00ff /* Filled with FileAccessFlags*/ extern FileHandle /* Sets value for ThreadGetError() */ - _pascal FileCreate(const char *name, FileCreateFlags flags, FileAttrs attributes); + _pascal FileCreate(const TCHAR *name, FileCreateFlags flags, FileAttrs attributes); /***/ @@ -341,7 +341,7 @@ extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ /***/ extern FileHandle /* Sets value for ThreadGetError() */ /*XXX*/ - _pascal FileCreateTempFile(const char *dir, + _pascal FileCreateTempFile(const TCHAR *dir, FileCreateFlags flags, FileAttrs attributes); /***/ @@ -352,7 +352,7 @@ extern word /* Returns error and sets value for ThreadGetError() */ /***/ extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ - _pascal FileRename(const char *oldName, const char *newame); + _pascal FileRename(const TCHAR *oldName, const TCHAR *newame); /***/ @@ -482,16 +482,16 @@ extern DiskHandle /* Sets value for ThreadGetError() */ /*XXX*/ /***/ extern FileAttrs /* Sets value for ThreadGetError() */ /*XXX*/ - _pascal FileGetAttributes(const char *path); + _pascal FileGetAttributes(const TCHAR *path); /***/ extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ - _pascal FileSetAttributes(const char *path, FileAttrs attr); + _pascal FileSetAttributes(const TCHAR *path, FileAttrs attr); /***/ extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ - _pascal FileGetPathExtAttributes(const char *path, FileExtendedAttribute attr, + _pascal FileGetPathExtAttributes(const TCHAR *path, FileExtendedAttribute attr, void *buffer, word bufSize); extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ @@ -502,7 +502,7 @@ extern MemHandle /* Sets value for ThreadGetError() */ /*XXX*/ _pascal FileGetHandleAllExtAttributes(FileHandle fh, word *numExtAttrs); extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ - _pascal FileSetPathExtAttributes(const char *path, FileExtendedAttribute attr, + _pascal FileSetPathExtAttributes(const TCHAR *path, FileExtendedAttribute attr, const void *buffer, word bufSize); extern word /* Returns error and sets value for ThreadGetError() */ /*XXX*/ @@ -563,34 +563,34 @@ extern void /***/ extern word /* Returns error and sets value for ThreadGetError() */ - _pascal FileCopy(const char *source, const char *dest, + _pascal FileCopy(const TCHAR *source, const TCHAR *dest, DiskHandle sourceDisk, DiskHandle destDisk); extern word /* Returns error and sets value for ThreadGetError() */ - _pascal FileCopyLocal(const char *source, const char *dest, + _pascal FileCopyLocal(const TCHAR *source, const TCHAR *dest, DiskHandle sourceDisk, DiskHandle destDisk); /***/ extern word /* Returns error and sets value for ThreadGetError() */ - _pascal FileMove(const char *source, const char *dest, + _pascal FileMove(const TCHAR *source, const TCHAR *dest, DiskHandle sourceDisk, DiskHandle destDisk); extern word /* Returns error and sets value for ThreadGetError() */ - _pascal FileMoveLocal(const char *source, const char *dest, + _pascal FileMoveLocal(const TCHAR *source, const TCHAR *dest, DiskHandle sourceDisk, DiskHandle destDisk); /***/ extern StandardPath /*XXX*/ - _pascal FileParseStandardPath(DiskHandle disk, const char **path); + _pascal FileParseStandardPath(DiskHandle disk, const TCHAR **path); /***/ extern DiskHandle /*XXX*/ - _pascal FileConstructFullPath(char **buffer, word bufSize, + _pascal FileConstructFullPath(TCHAR **buffer, word bufSize, DiskHandle disk, - const char *tail, + const TCHAR *tail, Boolean addDriveLetter); /***/ @@ -600,7 +600,7 @@ typedef WordFlags FileResolveStandardPathFlags; #define FRSPF_RETURN_FIRST_DIR 0x0001 extern DiskHandle /*XXX*/ - _pascal FileResolveStandardPath(char **buffer, word bufSize, const char *tail, + _pascal FileResolveStandardPath(TCHAR **buffer, word bufSize, const TCHAR *tail, FileResolveStandardPathFlags flags, FileAttrs *attrsPtr); /***/ @@ -614,42 +614,42 @@ typedef ByteEnum PathCompareType; extern PathCompareType /*XXX*/ - _pascal FileComparePaths(const char *path1, + _pascal FileComparePaths(const TCHAR *path1, DiskHandle disk1, - const char *path2, + const TCHAR *path2, DiskHandle disk2); extern word - _pascal FileCreateLink(const char *path, + _pascal FileCreateLink(const TCHAR *path, word targetDiskHandle, - const char *targetPath, + const TCHAR *targetPath, word targetAttrsFlag); extern DiskHandle - _pascal FileReadLink(const char *path, const char *targetPath); + _pascal FileReadLink(const TCHAR *path, const TCHAR *targetPath); extern DiskHandle - _pascal FileSetLinkExtraData(const char *path, - char *buffer, + _pascal FileSetLinkExtraData(const TCHAR *path, + TCHAR *buffer, word bufSize); extern DiskHandle - _pascal FileGetLinkExtraData(const char *path, - char *buffer, + _pascal FileGetLinkExtraData(const TCHAR *path, + TCHAR *buffer, word bufSize); extern DiskHandle - _pascal FileConstructActualPath(char **buffer, + _pascal FileConstructActualPath(TCHAR **buffer, word bufSize, DiskHandle disk, - const char _far *tail, + const TCHAR _far *tail, Boolean addDriveLetter); extern word /*XXX*/ - _pascal FileCopyPathExtAttributes(const char *sourcePath, + _pascal FileCopyPathExtAttributes(const TCHAR *sourcePath, DiskHandle sourceDisk, - const char *destPath, + const TCHAR *destPath, DiskHandle destDisk); extern MemHandle /*XXX*/ _pascal FileOpenAndRead(FileOpenAndReadFlags flags, - const char _far *filename, + const TCHAR _far *filename, FileHandle *fh); diff --git a/Installed/Library/Breadbox/ImpGraph/DBCS/dependencies.mk b/Installed/Library/Breadbox/ImpGraph/DBCS/dependencies.mk new file mode 100644 index 000000000..feb638da6 --- /dev/null +++ b/Installed/Library/Breadbox/ImpGraph/DBCS/dependencies.mk @@ -0,0 +1,184 @@ +DBCS/ASMIMP.obj \ +DBCS/ASMIMP.eobj: ASMIMP/asmimpManager.asm \ + stdapp.def geos.def geode.def resource.def ec.def lmem.def \ + object.def graphics.def fontID.def font.def color.def \ + gstring.def text.def char.def unicode.def heap.def ui.def \ + file.def vm.def win.def input.def hwr.def localize.def \ + sllang.def Objects/processC.def Objects/metaC.def \ + chunkarr.def geoworks.def gcnlist.def timedate.def \ + Objects/Text/tCommon.def stylesh.def iacp.def \ + Objects/uiInputC.def Objects/visC.def Objects/vCompC.def \ + Objects/vCntC.def Internal/vUtils.def Objects/genC.def \ + disk.def drive.def uDialog.def Objects/gInterC.def \ + token.def Objects/clipbrd.def Objects/gSysC.def \ + Objects/gProcC.def alb.def Objects/gFieldC.def \ + Objects/gScreenC.def Objects/gFSelC.def \ + Objects/gViewC.def Objects/gContC.def Objects/gCtrlC.def \ + Objects/gDocC.def Objects/gDocCtrl.def \ + Objects/gDocGrpC.def Objects/gEditCC.def \ + Objects/gViewCC.def Objects/gToolCC.def \ + Objects/gPageCC.def Objects/gPenICC.def \ + Objects/gGlyphC.def Objects/gTrigC.def \ + Objects/gBoolGC.def Objects/gItemGC.def \ + Objects/gDListC.def Objects/gItemC.def Objects/gBoolC.def \ + Objects/gDispC.def Objects/gDCtrlC.def Objects/gPrimC.def \ + Objects/gAppC.def Objects/gTextC.def Objects/gGadgetC.def \ + Objects/gValueC.def Objects/gToolGC.def \ + Internal/gUtils.def Objects/helpCC.def Objects/eMenuC.def \ + Objects/emomC.def Objects/emTrigC.def Internal/uProcC.def \ + product.def iimpgif.def bitmap.def hugearr.def impgif.asm \ + Internal/heapInt.def Internal/semInt.def sysstats.def +DBCS/impfjpeg.obj \ +DBCS/impfjpeg.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh IMPBMP/impjpeg.h htmldrv.h +DBCS/impfjpeg.obj \ +DBCS/impfjpeg.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h Ansi/stdio.h \ + Ansi/string.h Ansi/stdlib.h product.h IMPBMP/ibcommon.h \ + htmldrv.h math.h htmlfstr.h awatcher.h htmlprog.h \ + initfile.h +DBCS/impgifc.obj \ +DBCS/impgifc.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh Ansi/stdio.h IMPBMP/impgif.h \ + Ansi/string.h ec.h +DBCS/impgifc.obj \ +DBCS/impgifc.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h IMPBMP/ibcommon.h \ + product.h htmldrv.h math.h htmlfstr.h awatcher.h \ + htmlprog.h +DBCS/impjpeg.obj \ +DBCS/impjpeg.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh IMPBMP/impjpeg.h htmldrv.h +DBCS/impjpeg.obj \ +DBCS/impjpeg.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h Ansi/stdio.h jpeglib.h \ + product.h htmlprog.h jconfig.h jmorecfg.h Ansi/string.h \ + Ansi/stdlib.h IMPBMP/ibcommon.h htmldrv.h math.h \ + htmlfstr.h awatcher.h initfile.h +DBCS/awatcher.obj \ +DBCS/awatcher.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh +DBCS/awatcher.obj \ +DBCS/awatcher.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h awatcher.h +DBCS/impgraph.obj \ +DBCS/impgraph.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh STATBAR/statbar.goh impex.goh +DBCS/impgraph.obj \ +DBCS/impgraph.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h initfile.h htmldrv.h \ + product.h math.h htmlfstr.h awatcher.h htmlprog.h \ + IMPBMP/impgif.h IMPBMP/ibcommon.h IMPBMP/impjpeg.h \ + ieCommon.h xlatLib.h Ansi/string.h + +DBCS/impgraphEC.geo DBCS/impgraph.geo : geos.ldf ansic.ldf ijgjpeg.ldf \ No newline at end of file diff --git a/Installed/Library/Breadbox/ImpGraph/Makefile b/Installed/Library/Breadbox/ImpGraph/Makefile index 833fee679..5963a7833 100644 --- a/Installed/Library/Breadbox/ImpGraph/Makefile +++ b/Installed/Library/Breadbox/ImpGraph/Makefile @@ -1,35 +1,41 @@ -# -# THIS FILE HAS BEEN GENERATED AUTOMATICALLY. -# -# If you edit it, you will lose your changes, should it be regenerated. -# -GEODE = impgraph -ASMIMP = impgif.asm asmimpManager.asm iimpgif.def -MAIN = impgraph.goc awatcher.goc -IMPBMP = impjpeg.h impgif.h ibcommon.h impfjpeg.goc impgifc.goc\ - impjpeg.goc -UI_TO_RDFS = -OBJS = impgraph.obj awatcher.obj impfjpeg.obj impgifc.obj\ - impjpeg.obj -COMMON = -MODULES = ASMIMP -CMODULES = MAIN IMPBMP -SRCS = $(ASMIMP) $(MAIN) $(IMPBMP) $(COMMON) -LOBJS = -LIBOBJ = $(DEVEL_DIR)/Include/$(GEODE).ldf -LIBNAME = impgraph - -SYSMAKEFILE = geode.mk - -#include -#include - -#if exists(local.mk) -#include "local.mk" -#else -#include <$(SYSMAKEFILE)> -#endif - -#if exists($(DEPFILE)) -#include "$(DEPFILE)" -#endif +# +# THIS FILE HAS BEEN GENERATED AUTOMATICALLY. +# +# If you edit it, you will lose your changes, should it be regenerated. +# +GEODE = impgraph +ASMIMP = asmimpManager.asm impgif.asm iimpgif.def +IMPBMP = ibcommon.h impgif.h impjpeg.h impfjpeg.goc impgifc.goc\ + impjpeg.goc +MAIN = awatcher.goc impgraph.goc +UI_TO_RDFS = +OBJS = impfjpeg.obj impgifc.obj impjpeg.obj awatcher.obj\ + impgraph.obj +COMMON = +MODULES = ASMIMP +CMODULES = IMPBMP MAIN +SRCS = $(ASMIMP) $(IMPBMP) $(MAIN) $(COMMON) +LOBJS = +LIBOBJ = $(DEVEL_DIR)/Include/$(GEODE).ldf +LIBNAME = impgraph + +PRODUCTS = DBCS + +SYSMAKEFILE = geode.mk + +#include +#include + +#if exists(local.mk) +#include "local.mk" +#else +#include <$(SYSMAKEFILE)> +#endif + +#if exists($(DEPFILE)) +#include "$(DEPFILE)" +#endif + +#if exists(DBCS/$(DEPFILE)) +#include "DBCS/$(DEPFILE)" +#endif diff --git a/Installed/Library/Breadbox/ImpGraph/dependencies.mk b/Installed/Library/Breadbox/ImpGraph/dependencies.mk index 6c9012d7e..cedfdf55d 100644 --- a/Installed/Library/Breadbox/ImpGraph/dependencies.mk +++ b/Installed/Library/Breadbox/ImpGraph/dependencies.mk @@ -1,157 +1,184 @@ -ASMIMP.obj \ -ASMIMP.eobj: ASMIMP/asmimpManager.asm \ - stdapp.def geos.def geode.def resource.def ec.def lmem.def \ - object.def graphics.def fontID.def font.def color.def \ - gstring.def text.def char.def heap.def ui.def file.def \ - vm.def win.def input.def hwr.def localize.def sllang.def \ - Objects/processC.def Objects/metaC.def chunkarr.def \ - geoworks.def gcnlist.def timedate.def \ - Objects/Text/tCommon.def stylesh.def iacp.def \ - Objects/uiInputC.def Objects/visC.def Objects/vCompC.def \ - Objects/vCntC.def Internal/vUtils.def Objects/genC.def \ - disk.def drive.def uDialog.def Objects/gInterC.def \ - token.def Objects/clipbrd.def Objects/gSysC.def \ - Objects/gProcC.def alb.def Objects/gFieldC.def \ - Objects/gScreenC.def Objects/gFSelC.def \ - Objects/gViewC.def Objects/gContC.def Objects/gCtrlC.def \ - Objects/gDocC.def Objects/gDocCtrl.def \ - Objects/gDocGrpC.def Objects/gEditCC.def \ - Objects/gViewCC.def Objects/gToolCC.def \ - Objects/gPageCC.def Objects/gPenICC.def \ - Objects/gGlyphC.def Objects/gTrigC.def \ - Objects/gBoolGC.def Objects/gItemGC.def \ - Objects/gDListC.def Objects/gItemC.def Objects/gBoolC.def \ - Objects/gDispC.def Objects/gDCtrlC.def Objects/gPrimC.def \ - Objects/gAppC.def Objects/gTextC.def Objects/gGadgetC.def \ - Objects/gValueC.def Objects/gToolGC.def \ - Internal/gUtils.def Objects/helpCC.def Objects/eMenuC.def \ - Objects/emomC.def Objects/emTrigC.def Internal/uProcC.def \ - product.def iimpgif.def bitmap.def hugearr.def impgif.asm \ - Internal/heapInt.def Internal/semInt.def sysstats.def -impgraph.obj \ -impgraph.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ - Objects/inputC.goh Objects/clipbrd.goh \ - Objects/uiInputC.goh iacp.goh Objects/winC.goh \ - Objects/gProcC.goh alb.goh Objects/processC.goh \ - Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ - Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ - Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ - Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ - Objects/gCtrlC.goh gcnlist.goh spool.goh \ - Objects/gFSelC.goh Objects/gGlyphC.goh \ - Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ - Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ - Objects/gEditCC.goh Objects/gBoolGC.goh \ - Objects/gItemGC.goh Objects/gDListC.goh \ - Objects/gItemC.goh Objects/gBoolC.goh \ - Objects/gGadgetC.goh Objects/gToolCC.goh \ - Objects/gValueC.goh Objects/gToolGC.goh \ - Objects/helpCC.goh STATBAR/statbar.goh impex.goh -impgraph.obj \ -impgraph.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ - graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ - dbase.h localize.h Ansi/ctype.h timedate.h file.h \ - sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ - disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ - Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ - driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ - parallDr.h hugearr.h fileEnum.h initfile.h htmldrv.h \ - product.h math.h htmlfstr.h awatcher.h htmlprog.h \ - IMPBMP/impgif.h IMPBMP/ibcommon.h IMPBMP/impjpeg.h \ - ieCommon.h xlatLib.h Ansi/string.h -awatcher.obj \ -awatcher.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ - Objects/inputC.goh Objects/clipbrd.goh \ - Objects/uiInputC.goh iacp.goh Objects/winC.goh \ - Objects/gProcC.goh alb.goh Objects/processC.goh \ - Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ - Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ - Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ - Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ - Objects/gCtrlC.goh gcnlist.goh spool.goh \ - Objects/gFSelC.goh Objects/gGlyphC.goh \ - Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ - Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ - Objects/gEditCC.goh Objects/gBoolGC.goh \ - Objects/gItemGC.goh Objects/gDListC.goh \ - Objects/gItemC.goh Objects/gBoolC.goh \ - Objects/gGadgetC.goh Objects/gToolCC.goh \ - Objects/gValueC.goh Objects/gToolGC.goh \ - Objects/helpCC.goh -awatcher.obj \ -awatcher.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ - graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ - dbase.h localize.h Ansi/ctype.h timedate.h file.h \ - sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ - disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ - Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ - driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ - parallDr.h hugearr.h fileEnum.h awatcher.h -impfjpeg.obj \ -impfjpeg.eobj: -impfjpeg.obj \ -impfjpeg.eobj: impfjpeg.cpp -impgifc.obj \ -impgifc.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ - Objects/inputC.goh Objects/clipbrd.goh \ - Objects/uiInputC.goh iacp.goh Objects/winC.goh \ - Objects/gProcC.goh alb.goh Objects/processC.goh \ - Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ - Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ - Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ - Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ - Objects/gCtrlC.goh gcnlist.goh spool.goh \ - Objects/gFSelC.goh Objects/gGlyphC.goh \ - Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ - Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ - Objects/gEditCC.goh Objects/gBoolGC.goh \ - Objects/gItemGC.goh Objects/gDListC.goh \ - Objects/gItemC.goh Objects/gBoolC.goh \ - Objects/gGadgetC.goh Objects/gToolCC.goh \ - Objects/gValueC.goh Objects/gToolGC.goh \ - Objects/helpCC.goh Ansi/stdio.h IMPBMP/impgif.h \ - Ansi/string.h ec.h -impgifc.obj \ -impgifc.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ - graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ - dbase.h localize.h Ansi/ctype.h timedate.h file.h \ - sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ - disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ - Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ - driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ - parallDr.h hugearr.h fileEnum.h IMPBMP/ibcommon.h \ - product.h htmldrv.h math.h htmlfstr.h awatcher.h \ - htmlprog.h -impjpeg.obj \ -impjpeg.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ - Objects/inputC.goh Objects/clipbrd.goh \ - Objects/uiInputC.goh iacp.goh Objects/winC.goh \ - Objects/gProcC.goh alb.goh Objects/processC.goh \ - Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ - Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ - Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ - Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ - Objects/gCtrlC.goh gcnlist.goh spool.goh \ - Objects/gFSelC.goh Objects/gGlyphC.goh \ - Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ - Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ - Objects/gEditCC.goh Objects/gBoolGC.goh \ - Objects/gItemGC.goh Objects/gDListC.goh \ - Objects/gItemC.goh Objects/gBoolC.goh \ - Objects/gGadgetC.goh Objects/gToolCC.goh \ - Objects/gValueC.goh Objects/gToolGC.goh \ - Objects/helpCC.goh IMPBMP/impjpeg.h htmldrv.h -impjpeg.obj \ -impjpeg.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ - graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ - dbase.h localize.h Ansi/ctype.h timedate.h file.h \ - sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ - disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ - Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ - driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ - parallDr.h hugearr.h fileEnum.h Ansi/stdio.h jpeglib.h \ - product.h htmlprog.h jconfig.h jmorecfg.h Ansi/string.h \ - Ansi/stdlib.h IMPBMP/ibcommon.h htmldrv.h math.h \ - htmlfstr.h awatcher.h initfile.h - +ASMIMP.obj \ +ASMIMP.eobj: ASMIMP/asmimpManager.asm \ + stdapp.def geos.def geode.def resource.def ec.def lmem.def \ + object.def graphics.def fontID.def font.def color.def \ + gstring.def text.def char.def heap.def ui.def file.def \ + vm.def win.def input.def hwr.def localize.def sllang.def \ + Objects/processC.def Objects/metaC.def chunkarr.def \ + geoworks.def gcnlist.def timedate.def \ + Objects/Text/tCommon.def stylesh.def iacp.def \ + Objects/uiInputC.def Objects/visC.def Objects/vCompC.def \ + Objects/vCntC.def Internal/vUtils.def Objects/genC.def \ + disk.def drive.def uDialog.def Objects/gInterC.def \ + token.def Objects/clipbrd.def Objects/gSysC.def \ + Objects/gProcC.def alb.def Objects/gFieldC.def \ + Objects/gScreenC.def Objects/gFSelC.def \ + Objects/gViewC.def Objects/gContC.def Objects/gCtrlC.def \ + Objects/gDocC.def Objects/gDocCtrl.def \ + Objects/gDocGrpC.def Objects/gEditCC.def \ + Objects/gViewCC.def Objects/gToolCC.def \ + Objects/gPageCC.def Objects/gPenICC.def \ + Objects/gGlyphC.def Objects/gTrigC.def \ + Objects/gBoolGC.def Objects/gItemGC.def \ + Objects/gDListC.def Objects/gItemC.def Objects/gBoolC.def \ + Objects/gDispC.def Objects/gDCtrlC.def Objects/gPrimC.def \ + Objects/gAppC.def Objects/gTextC.def Objects/gGadgetC.def \ + Objects/gValueC.def Objects/gToolGC.def \ + Internal/gUtils.def Objects/helpCC.def Objects/eMenuC.def \ + Objects/emomC.def Objects/emTrigC.def Internal/uProcC.def \ + product.def iimpgif.def bitmap.def hugearr.def impgif.asm \ + Internal/heapInt.def Internal/semInt.def sysstats.def +impfjpeg.obj \ +impfjpeg.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh IMPBMP/impjpeg.h htmldrv.h +impfjpeg.obj \ +impfjpeg.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h Ansi/stdio.h \ + Ansi/string.h Ansi/stdlib.h product.h IMPBMP/ibcommon.h \ + htmldrv.h math.h htmlfstr.h awatcher.h htmlprog.h \ + initfile.h +impgifc.obj \ +impgifc.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh Ansi/stdio.h IMPBMP/impgif.h \ + Ansi/string.h ec.h +impgifc.obj \ +impgifc.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h IMPBMP/ibcommon.h \ + product.h htmldrv.h math.h htmlfstr.h awatcher.h \ + htmlprog.h +impjpeg.obj \ +impjpeg.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh IMPBMP/impjpeg.h htmldrv.h +impjpeg.obj \ +impjpeg.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h Ansi/stdio.h jpeglib.h \ + product.h htmlprog.h jconfig.h jmorecfg.h Ansi/string.h \ + Ansi/stdlib.h IMPBMP/ibcommon.h htmldrv.h math.h \ + htmlfstr.h awatcher.h initfile.h +awatcher.obj \ +awatcher.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh +awatcher.obj \ +awatcher.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h awatcher.h +impgraph.obj \ +impgraph.eobj: stdapp.goh object.goh ui.goh Objects/metaC.goh \ + Objects/inputC.goh Objects/clipbrd.goh \ + Objects/uiInputC.goh iacp.goh Objects/winC.goh \ + Objects/gProcC.goh alb.goh Objects/processC.goh \ + Objects/visC.goh Objects/vCompC.goh Objects/vCntC.goh \ + Objects/gAppC.goh Objects/genC.goh Objects/gInterC.goh \ + Objects/gPrimC.goh Objects/gDispC.goh Objects/gTrigC.goh \ + Objects/gViewC.goh Objects/gTextC.goh Objects/vTextC.goh \ + Objects/gCtrlC.goh gcnlist.goh spool.goh \ + Objects/gFSelC.goh Objects/gGlyphC.goh \ + Objects/gDocCtrl.goh Objects/gDocGrpC.goh \ + Objects/gDocC.goh Objects/gContC.goh Objects/gDCtrlC.goh \ + Objects/gEditCC.goh Objects/gBoolGC.goh \ + Objects/gItemGC.goh Objects/gDListC.goh \ + Objects/gItemC.goh Objects/gBoolC.goh \ + Objects/gGadgetC.goh Objects/gToolCC.goh \ + Objects/gValueC.goh Objects/gToolGC.goh \ + Objects/helpCC.goh STATBAR/statbar.goh impex.goh +impgraph.obj \ +impgraph.eobj: geos.h heap.h geode.h resource.h ec.h object.h lmem.h \ + graphics.h fontID.h font.h color.h gstring.h timer.h vm.h \ + dbase.h localize.h Ansi/ctype.h timedate.h file.h \ + sllang.h system.h geoworks.h chunkarr.h Objects/helpCC.h \ + disk.h drive.h input.h char.h hwr.h win.h uDialog.h \ + Objects/gInterC.h Objects/Text/tCommon.h stylesh.h \ + driver.h thread.h print.h Internal/spoolInt.h serialDr.h \ + parallDr.h hugearr.h fileEnum.h initfile.h htmldrv.h \ + product.h math.h htmlfstr.h awatcher.h htmlprog.h \ + IMPBMP/impgif.h IMPBMP/ibcommon.h IMPBMP/impjpeg.h \ + ieCommon.h xlatLib.h Ansi/string.h + impgraphEC.geo impgraph.geo : geos.ldf ansic.ldf ijgjpeg.ldf \ No newline at end of file diff --git a/Library/Breadbox/ImpGraph/FJPEGDBCS/is_a_product b/Library/Breadbox/ImpGraph/FJPEGDBCS/is_a_product deleted file mode 100644 index e69de29bb..000000000 diff --git a/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc b/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc index 4fcd9323a..71bfca467 100644 --- a/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc +++ b/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc @@ -1,16 +1,17 @@ -@ifdef PRODUCT_FJPEG @include -#include -#include <..\..\fjpeg\fjpeg.h> +#include #include -#include -#include -@include "impbmp\impjpeg.h" +#include +#include +@include "IMPBMP/impjpeg.h" #include @include -#include "impbmp\ibcommon.h" +#include "IMPBMP/ibcommon.h" + +@ifdef PRODUCT_FJPEG +#include <../../fjpeg/fjpeg.h> static void ConvertLine(byte *dest, byte *src, word size) { diff --git a/Library/Breadbox/ImpGraph/fjpeg/is_a_product b/Library/Breadbox/ImpGraph/fjpeg/is_a_product deleted file mode 100644 index e69de29bb..000000000 From 6a20aea75525097c5fba27a50d8f99ea9ecf046e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20Ke=C3=9Fler?= Date: Sat, 28 Sep 2024 16:15:43 +0200 Subject: [PATCH 4/5] Change Link for Slack to Discord --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 546781854..61719ce03 100644 --- a/README.md +++ b/README.md @@ -81,4 +81,4 @@ PC/GEOS comes with extensive technical documentation that describes tools, progr You can find a browseable, searchable version of the documentation here: https://bluewaysw.github.io/pcgeos/ ## -We are on https://bluewaysw.slack.com/ for more efficient collaboration. Please register at https://blog.bluewaysw.de for MyGEOS and use the Slack section and receive access to our developer community. Welcome! +We are on https://discord.com/ for more efficient collaboration. Please register at https://discord.gg/qtMqgZXhf9 for blueway.Softworks or use an existing discor-account to get access to our developer community. Welcome! From 5a69c0dfc253b03c770eb9e527b80891b4fce712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20Ke=C3=9Fler?= Date: Sat, 28 Sep 2024 16:21:55 +0200 Subject: [PATCH 5/5] Typing Error fixed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 61719ce03..b20bfe098 100644 --- a/README.md +++ b/README.md @@ -81,4 +81,4 @@ PC/GEOS comes with extensive technical documentation that describes tools, progr You can find a browseable, searchable version of the documentation here: https://bluewaysw.github.io/pcgeos/ ## -We are on https://discord.com/ for more efficient collaboration. Please register at https://discord.gg/qtMqgZXhf9 for blueway.Softworks or use an existing discor-account to get access to our developer community. Welcome! +We are on https://discord.com/ for more efficient collaboration. Please register at https://discord.gg/qtMqgZXhf9 for blueway.Softworks or use an existing discord-account to get access to our developer community. Welcome!