diff options
| author | Andrew Haines <andrewd207@aol.com> | 2015-02-01 23:17:27 -0500 |
|---|---|---|
| committer | Andrew Haines <andrewd207@aol.com> | 2015-02-01 23:17:27 -0500 |
| commit | d351655a167dc6afe70ed659561ef8b3a4019305 (patch) | |
| tree | 3843e8f137929b13a74ba787ec6f9f5541fc2427 /examples/gui/splitter | |
| parent | c7fc66e330b4665843e195436e7e5095de5dbdfc (diff) | |
| parent | 0955cc8f881782e1565447f04a0afb774e1237aa (diff) | |
| download | fpGUI-d351655a167dc6afe70ed659561ef8b3a4019305.tar.xz | |
Merge branch 'develop' of https://github.com/graemeg/fpGUI into develop
Fixed xml conflicts of lpi's manually
Conflicts:
examples/gui/filedialog/filedialog.lpi
examples/gui/modalforms/modalforms.lpi
Diffstat (limited to 'examples/gui/splitter')
| -rw-r--r-- | examples/gui/splitter/splitter_test.lpi | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/examples/gui/splitter/splitter_test.lpi b/examples/gui/splitter/splitter_test.lpi index 431f5ffe..6f2b669f 100644 --- a/examples/gui/splitter/splitter_test.lpi +++ b/examples/gui/splitter/splitter_test.lpi @@ -1,20 +1,21 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> - <Version Value="6"/> + <Version Value="9"/> <General> <Flags> <SaveOnlyProjectUnits Value="True"/> + <LRSInOutputDirectory Value="False"/> </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> - <TargetFileExt Value=".exe"/> </General> <VersionInfo> - <ProjectVersion Value=""/> + <StringTable ProductVersion=""/> </VersionInfo> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> + </BuildModes> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -40,7 +41,18 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="8"/> + <Version Value="11"/> + <Target> + <Filename Value="splitter_test"/> + </Target> + <SearchPaths> + <UnitOutputDirectory Value="units"/> + </SearchPaths> + <Parsing> + <SyntaxOptions> + <UseAnsiStrings Value="False"/> + </SyntaxOptions> + </Parsing> <CodeGeneration> <SmartLinkUnit Value="True"/> <Checks> @@ -57,8 +69,6 @@ <LinkSmart Value="True"/> </Linking> <Other> - <CustomOptions Value="-FUunits -"/> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions> |