diff --git a/.gitignore b/.gitignore index 8a030c4..ede31ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ lib/ bin/ debug/ +inc/utsTextSuiteVersion.inc *.so *.lps *.exe diff --git a/.gitmodules b/.gitmodules index 3a0982b..ae24a49 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "TextSuite"] - path = TextSuite - url = ../textsuite.git -[submodule "Utils"] - path = Utils - url = ../utils.git -[submodule "OpenGlCore"] - path = OpenGlCore - url = ../lazopenglcore.git +[submodule "src/TextSuite"] + path = src/TextSuite + url = b3rgmann@git.bergmann89.de:opengl/TextSuite.git +[submodule "src/OpenGLCore"] + path = src/OpenGLCore + url = b3rgmann@git.bergmann89.de:opengl/OpenGLCore.git +[submodule "src/Utils"] + path = src/Utils + url = b3rgmann@git.bergmann89.de:freepascal/utils.git diff --git a/OpenGlCore b/OpenGlCore deleted file mode 160000 index f3387a1..0000000 --- a/OpenGlCore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3387a1344abac9b32dad078fe0aa083fa6cea14 diff --git a/TextSuite b/TextSuite deleted file mode 160000 index d9d1f10..0000000 --- a/TextSuite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d9d1f100f3636836555e5a1aa0987b98d02c001f diff --git a/Utils b/Utils deleted file mode 160000 index 2e95929..0000000 --- a/Utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2e95929d4ef5ada8ac42e840a7e247c98b257581 diff --git a/build_release.sh b/build_release.sh index c594358..cf2e43b 100755 --- a/build_release.sh +++ b/build_release.sh @@ -13,6 +13,10 @@ INC_MAJOR=false INC_MINOR=false INC_BUGFIX=false +if [ -z "$FIRST_VERSION" ]; then + FIRST_VERSION="0.0.0.0" +fi + function log() { echo "$@" >&2 @@ -92,7 +96,7 @@ function addGitTag() log "create git version tag" CURRENT=$(getLastVersion) if [ $? -ne 0 ]; then - CURRENT="0.0.0.0" + CURRENT="$FIRST_VERSION" INC_VERSION=false fi local tmp="v$CURRENT" @@ -119,6 +123,10 @@ function addGitTag() cleaupAndExit 100 fi TAGNAME=$tmp + HASH="$(git rev-parse HEAD)" + +printf "const Version = 'v$NEWVERSION $HASH';" > inc/utsTextSuiteVersion.inc + return 0 } @@ -127,6 +135,7 @@ function BuildConfig() CONFIG=$1 POSTFIX=$2 FILEEXT=$3 + DBGEXT=".dbg" printf "\n== build project $CONFIG ==\n" lazbuild --build-mode=$CONFIG --build-all --verbose $SCRIPTDIR/libTextSuite.lpi @@ -143,13 +152,20 @@ function BuildConfig() ZIPPATH="$SCRIPTDIR/$TAGNAME/libTextSuite-$POSTFIX.zip" fi BINNAME="libTextSuite-$POSTFIX$FILEEXT" + DBGNAME="libTextSuite-$POSTFIX$DBGEXT" if [ ! -f $BINNAME ]; then echo "file not found: $EXENAME" cleaupAndExit 2 fi + cp "$BINNAME" "$DBGNAME" || { log "unable to copy binary to *.dbg"; cleaupAndExit 3; } + objcopy --only-keep-debug "$DBGNAME" || { log "unable to strip $DBGNAME"; cleaupAndExit 3; } + objcopy --strip-debug --strip-unneeded "$BINNAME" || { log "unable to copy binary to $BINNAME"; cleaupAndExit 3; } + objcopy --add-gnu-debuglink "$DBGNAME" "$BINNAME" || { log "unable to create debug link"; cleaupAndExit 3; } + mkdir -p $BINDIR mv "$BINNAME" "$BINDIR/" || { log "unable to copy linked binary"; cleaupAndExit 3; } + mv "$DBGNAME" "$BINDIR/" || { log "unable to copy linked debug infos"; cleaupAndExit 3; } # use this to copy data folder instead of data archive: cp -R --preserve=links data $BINDIR || { log "unable to copy data folder"; cleaupAndExit 4; } cp -r "$HEADER_DIR" "$BINDIR" || { log "unable to copy header files"; cleaupAndExit 4; } cp -r "$DOCU_DIR" "$BINDIR/docu" || { log "unable to copy documentation files"; cleaupAndExit 5; } diff --git a/header/examples/fpc/example.lpi b/header/examples/fpc/example.lpi index e4e502e..23ffc49 100644 --- a/header/examples/fpc/example.lpi +++ b/header/examples/fpc/example.lpi @@ -1,7 +1,7 @@ - + @@ -9,14 +9,10 @@ <ResourceType Value="res"/> <UseXPManifest Value="True"/> - <Icon Value="0"/> </General> <i18n> <EnableI18N LFM="False"/> </i18n> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="1"> <Item1 Name="Default" Default="True"/> </BuildModes> @@ -44,12 +40,10 @@ <ComponentName Value="MainForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - <UnitName Value="uMainForm"/> </Unit1> <Unit2> <Filename Value="..\..\ulibTextSuite.pas"/> <IsPartOfProject Value="True"/> - <UnitName Value="ulibTextSuite"/> </Unit2> </Units> </ProjectOptions> @@ -61,7 +55,7 @@ </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="..\..\..\OpenGlCore;..\.."/> + <OtherUnitFiles Value="..\..\..\src\OpenGLCore;..\.."/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Linking> diff --git a/header/examples/fpc/uMainForm.lfm b/header/examples/fpc/uMainForm.lfm index f89464c..4af82d5 100644 --- a/header/examples/fpc/uMainForm.lfm +++ b/header/examples/fpc/uMainForm.lfm @@ -1,7 +1,7 @@ object MainForm: TMainForm - Left = 485 + Left = 876 Height = 500 - Top = 255 + Top = 270 Width = 640 Caption = 'libTextSuite' OnCreate = FormCreate @@ -9,5 +9,5 @@ object MainForm: TMainForm OnPaint = FormPaint OnResize = FormResize Position = poScreenCenter - LCLVersion = '1.3' + LCLVersion = '1.9.0.0' end diff --git a/utsTextSuite.inc b/inc/utsTextSuite.inc similarity index 100% rename from utsTextSuite.inc rename to inc/utsTextSuite.inc diff --git a/libTextSuite.lpi b/libTextSuite.lpi index 41a1e0f..797d5cf 100644 --- a/libTextSuite.lpi +++ b/libTextSuite.lpi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="9"/> + <Version Value="10"/> <PathDelim Value="\"/> <General> <Flags> @@ -17,9 +17,6 @@ <i18n> <EnableI18N LFM="False"/> </i18n> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="9"> <Item1 Name="Default" Default="True"/> <Item2 Name="Win64Debug"> @@ -30,8 +27,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Parsing> @@ -64,6 +61,10 @@ <CompilerMessages> <IgnoredMessages idx5024="True"/> </CompilerMessages> + <CustomOptions Value="-dDEBUG"/> + <OtherDefines Count="1"> + <Define0 Value="DEBUG"/> + </OtherDefines> </Other> </CompilerOptions> </Item2> @@ -75,8 +76,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> @@ -89,9 +90,6 @@ </Optimizations> </CodeGeneration> <Linking> - <Debugging> - <UseExternalDbgSyms Value="True"/> - </Debugging> <LinkSmart Value="True"/> <Options> <ExecutableType Value="Library"/> @@ -112,8 +110,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Parsing> @@ -146,6 +144,10 @@ <CompilerMessages> <IgnoredMessages idx5024="True"/> </CompilerMessages> + <CustomOptions Value="-dDEBUG"/> + <OtherDefines Count="1"> + <Define0 Value="DEBUG"/> + </OtherDefines> </Other> </CompilerOptions> </Item4> @@ -157,8 +159,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> @@ -171,9 +173,6 @@ </Optimizations> </CodeGeneration> <Linking> - <Debugging> - <UseExternalDbgSyms Value="True"/> - </Debugging> <LinkSmart Value="True"/> <Options> <ExecutableType Value="Library"/> @@ -194,8 +193,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Parsing> @@ -228,6 +227,10 @@ <CompilerMessages> <IgnoredMessages idx5024="True"/> </CompilerMessages> + <CustomOptions Value="-dDEBUG"/> + <OtherDefines Count="1"> + <Define0 Value="DEBUG"/> + </OtherDefines> </Other> </CompilerOptions> </Item6> @@ -239,8 +242,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> @@ -253,9 +256,6 @@ </Optimizations> </CodeGeneration> <Linking> - <Debugging> - <UseExternalDbgSyms Value="True"/> - </Debugging> <LinkSmart Value="True"/> <Options> <ExecutableType Value="Library"/> @@ -276,8 +276,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Parsing> @@ -310,6 +310,10 @@ <CompilerMessages> <IgnoredMessages idx5024="True"/> </CompilerMessages> + <CustomOptions Value="-dDEBUG"/> + <OtherDefines Count="1"> + <Define0 Value="DEBUG"/> + </OtherDefines> </Other> </CompilerOptions> </Item8> @@ -321,8 +325,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> @@ -335,9 +339,6 @@ </Optimizations> </CodeGeneration> <Linking> - <Debugging> - <UseExternalDbgSyms Value="True"/> - </Debugging> <LinkSmart Value="True"/> <Options> <ExecutableType Value="Library"/> @@ -365,47 +366,47 @@ <IsPartOfProject Value="True"/> </Unit0> <Unit1> - <Filename Value="ultsUtils.pas"/> + <Filename Value="src\ultsChar.pas"/> <IsPartOfProject Value="True"/> </Unit1> <Unit2> - <Filename Value="ultsTypes.pas"/> + <Filename Value="src\ultsContext.pas"/> <IsPartOfProject Value="True"/> </Unit2> <Unit3> - <Filename Value="ultsContext.pas"/> + <Filename Value="src\ultsFont.pas"/> <IsPartOfProject Value="True"/> </Unit3> <Unit4> - <Filename Value="ultsRenderer.pas"/> + <Filename Value="src\ultsFontCreator.pas"/> <IsPartOfProject Value="True"/> </Unit4> <Unit5> - <Filename Value="ultsTextBlock.pas"/> + <Filename Value="src\ultsGeneral.pas"/> <IsPartOfProject Value="True"/> </Unit5> <Unit6> - <Filename Value="ultsGeneral.pas"/> + <Filename Value="src\ultsImage.pas"/> <IsPartOfProject Value="True"/> </Unit6> <Unit7> - <Filename Value="ultsFont.pas"/> + <Filename Value="src\ultsPostProcessor.pas"/> <IsPartOfProject Value="True"/> </Unit7> <Unit8> - <Filename Value="ultsFontCreator.pas"/> + <Filename Value="src\ultsRenderer.pas"/> <IsPartOfProject Value="True"/> </Unit8> <Unit9> - <Filename Value="ultsImage.pas"/> + <Filename Value="src\ultsTextBlock.pas"/> <IsPartOfProject Value="True"/> </Unit9> <Unit10> - <Filename Value="ultsPostProcessor.pas"/> + <Filename Value="src\ultsTypes.pas"/> <IsPartOfProject Value="True"/> </Unit10> <Unit11> - <Filename Value="ultsChar.pas"/> + <Filename Value="src\ultsUtils.pas"/> <IsPartOfProject Value="True"/> </Unit11> </Units> @@ -417,8 +418,8 @@ <Filename Value="libTextSuite-$(TargetCPU)-$(TargetOS)"/> </Target> <SearchPaths> - <IncludeFiles Value="$(ProjOutDir)"/> - <OtherUnitFiles Value="TextSuite;Utils;OpenGlCore"/> + <IncludeFiles Value="$(ProjOutDir);inc"/> + <OtherUnitFiles Value="src;src\TextSuite;src\Utils;src\OpenGLCore"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> diff --git a/libTextSuite.lpr b/libTextSuite.lpr index 84eaa7a..40bafbe 100644 --- a/libTextSuite.lpr +++ b/libTextSuite.lpr @@ -4,8 +4,8 @@ library libTextSuite; uses Classes, SysUtils, - ultsContext, ultsRenderer, ultsTextBlock, ultsGeneral, ultsFont, ultsFontCreator, - ultsImage, ultsPostProcessor, ultsChar; + ultsChar, ultsFontCreator, ultsGeneral, ultsPostProcessor, ultsTextBlock, + ultsUtils, ultsContext, ultsFont, ultsImage, ultsRenderer, ultsTypes; exports ltsContextCreate, diff --git a/src/OpenGLCore b/src/OpenGLCore new file mode 160000 index 0000000..591218c --- /dev/null +++ b/src/OpenGLCore @@ -0,0 +1 @@ +Subproject commit 591218ce55b57e4e7921637c3f2465d4a833d7f0 diff --git a/src/TextSuite b/src/TextSuite new file mode 160000 index 0000000..c127e64 --- /dev/null +++ b/src/TextSuite @@ -0,0 +1 @@ +Subproject commit c127e64b205e4f3051ea2d703f8bd83782ff9ab2 diff --git a/src/Utils b/src/Utils new file mode 160000 index 0000000..fcd9a8f --- /dev/null +++ b/src/Utils @@ -0,0 +1 @@ +Subproject commit fcd9a8fa402ea659c3c30f850753be58c3369f21 diff --git a/ultsChar.pas b/src/ultsChar.pas similarity index 100% rename from ultsChar.pas rename to src/ultsChar.pas diff --git a/ultsContext.pas b/src/ultsContext.pas similarity index 97% rename from ultsContext.pas rename to src/ultsContext.pas index 1533635..3d7a866 100644 --- a/ultsContext.pas +++ b/src/ultsContext.pas @@ -13,7 +13,7 @@ type //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// TltsContext = class(TtsContext) public - procedure DelSlave(const aSlave: TtsRefManager); override; + function DelSlave(const aSlave: TtsRefManager): Boolean; override; end; function ltsContextCreate (): TltsContextHandle; stdcall; @@ -35,10 +35,10 @@ var //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //TltsContext/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -procedure TltsContext.DelSlave(const aSlave: TtsRefManager); +function TltsContext.DelSlave(const aSlave: TtsRefManager): Boolean; begin DelReference(aSlave); - inherited DelSlave(aSlave); + result := inherited DelSlave(aSlave); end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/ultsFont.pas b/src/ultsFont.pas similarity index 100% rename from ultsFont.pas rename to src/ultsFont.pas diff --git a/ultsFontCreator.pas b/src/ultsFontCreator.pas similarity index 94% rename from ultsFontCreator.pas rename to src/ultsFontCreator.pas index 687f29a..bc47256 100644 --- a/ultsFontCreator.pas +++ b/src/ultsFontCreator.pas @@ -28,31 +28,31 @@ type //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// TltsFontCreatorFreeType = class(TtsFontCreatorFreeType) public - procedure DelSlave(const aSlave: TtsRefManager); override; + function DelSlave(const aSlave: TtsRefManager): Boolean; override; end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// TltsFontCreatorGDI = class(TtsFontCreatorGDI) public - procedure DelSlave(const aSlave: TtsRefManager); override; + function DelSlave(const aSlave: TtsRefManager): Boolean; override; end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //TltsFontCreatorFreeType/////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -procedure TltsFontCreatorFreeType.DelSlave(const aSlave: TtsRefManager); +function TltsFontCreatorFreeType.DelSlave(const aSlave: TtsRefManager): Boolean; begin DelReference(aSlave); - inherited DelSlave(aSlave); + result := inherited DelSlave(aSlave); end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //TltsFontCreatorGDI//////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -procedure TltsFontCreatorGDI.DelSlave(const aSlave: TtsRefManager); +function TltsFontCreatorGDI.DelSlave(const aSlave: TtsRefManager): Boolean; begin DelReference(aSlave); - inherited DelSlave(aSlave); + result := inherited DelSlave(aSlave); end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/ultsGeneral.pas b/src/ultsGeneral.pas similarity index 82% rename from ultsGeneral.pas rename to src/ultsGeneral.pas index ed0db8e..10fbaec 100644 --- a/ultsGeneral.pas +++ b/src/ultsGeneral.pas @@ -9,6 +9,7 @@ uses ultsTypes; function ltsInitialize: TltsErrorCode; stdcall; +function ltsGetVersion: PAnsiChar; stdcall; function ltsGetLastErrorCode: TltsErrorCode; stdcall; function ltsGetLastErrorMsg: PAnsiChar; stdcall; function ltsFinalize: TltsErrorCode; stdcall; @@ -18,6 +19,12 @@ implementation uses ultsUtils; +{$IFDEF DEBUG} + const Version = 'DebugVersion'; +{$ELSE} + {$I utsTextSuiteVersion.inc} +{$ENDIF} + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //General/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -34,6 +41,12 @@ begin end; end; +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +function ltsGetVersion: PAnsiChar; stdcall; +begin + result := PAnsiChar(Version); +end; + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// function ltsGetLastErrorCode: TltsErrorCode; stdcall; begin diff --git a/ultsImage.pas b/src/ultsImage.pas similarity index 100% rename from ultsImage.pas rename to src/ultsImage.pas diff --git a/ultsPostProcessor.pas b/src/ultsPostProcessor.pas similarity index 100% rename from ultsPostProcessor.pas rename to src/ultsPostProcessor.pas diff --git a/ultsRenderer.pas b/src/ultsRenderer.pas similarity index 97% rename from ultsRenderer.pas rename to src/ultsRenderer.pas index 6117777..cc8de35 100644 --- a/ultsRenderer.pas +++ b/src/ultsRenderer.pas @@ -55,14 +55,14 @@ type //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// TltsRendererOpenGL = class(TtsRendererOpenGL) public - procedure DelSlave(const aSlave: TtsRefManager); override; + function DelSlave(const aSlave: TtsRefManager): Boolean; override; constructor Create(const aContext: TtsContext; const aFormat: TtsFormat); end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// TltsRendererOpenGLES = class(TtsRendererOpenGLES) public - procedure DelSlave(const aSlave: TtsRefManager); override; + function DelSlave(const aSlave: TtsRefManager): Boolean; override; constructor Create(const aContext: TtsContext; const aFormat: TtsFormat); end; @@ -93,10 +93,10 @@ type //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //TltsRendererOpenGL//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -procedure TltsRendererOpenGL.DelSlave(const aSlave: TtsRefManager); +function TltsRendererOpenGL.DelSlave(const aSlave: TtsRefManager): Boolean; begin DelReference(aSlave); - inherited DelSlave(aSlave); + result := inherited DelSlave(aSlave); end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -111,10 +111,10 @@ end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //TltsRendererOpenGLES////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -procedure TltsRendererOpenGLES.DelSlave(const aSlave: TtsRefManager); +function TltsRendererOpenGLES.DelSlave(const aSlave: TtsRefManager): Boolean; begin DelReference(aSlave); - inherited DelSlave(aSlave); + result := inherited DelSlave(aSlave); end; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/ultsTextBlock.pas b/src/ultsTextBlock.pas similarity index 100% rename from ultsTextBlock.pas rename to src/ultsTextBlock.pas diff --git a/ultsTypes.pas b/src/ultsTypes.pas similarity index 100% rename from ultsTypes.pas rename to src/ultsTypes.pas diff --git a/ultsUtils.pas b/src/ultsUtils.pas similarity index 100% rename from ultsUtils.pas rename to src/ultsUtils.pas