diff --git a/examples/apps/.gitignore b/examples/apps/.gitignore new file mode 100644 index 000000000..179173a99 --- /dev/null +++ b/examples/apps/.gitignore @@ -0,0 +1,3 @@ +*/bin +*/units +*/exe \ No newline at end of file diff --git a/examples/apps/charpalette/charpalette.pas b/examples/apps/charpalette/charpalette.lpr similarity index 100% rename from examples/apps/charpalette/charpalette.pas rename to examples/apps/charpalette/charpalette.lpr diff --git a/examples/apps/charpalette/extrafpc.cfg b/examples/apps/charpalette/extrafpc.cfg new file mode 100644 index 000000000..3df56e7e7 --- /dev/null +++ b/examples/apps/charpalette/extrafpc.cfg @@ -0,0 +1,10 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Fi. +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/apps/compileall.bat b/examples/apps/compileall.bat new file mode 100644 index 000000000..62ca507a9 --- /dev/null +++ b/examples/apps/compileall.bat @@ -0,0 +1,12 @@ +@ECHO OFF + +SET FPC=fpc + +FOR /D %%D IN (*) DO ( + Pushd %%D + ECHO doing %%D in %%D.lpr + If NOT EXIST bin MKDIR bin + %FPC% "@extrafpc.cfg" %%D.lpr + ECHO ############################################################################### + Popd +) \ No newline at end of file diff --git a/examples/apps/compileall.sh b/examples/apps/compileall.sh index 1fed112dc..47b245b4e 100755 --- a/examples/apps/compileall.sh +++ b/examples/apps/compileall.sh @@ -7,9 +7,9 @@ do LPRNAME=`basename $PROJECT .lpr` echo Doing $LPRNAME in $DIR cd $DIR - if [ ! -d units ]; then - echo 'Missing units dir' - mkdir units + if [ ! -d bin ]; then + echo 'Missing bin dir' + mkdir bin fi $FPC @extrafpc.cfg $PROJECT; cd .. diff --git a/examples/apps/debugserver/fpgDebugServer.lpi b/examples/apps/debugserver/debugserver.lpi similarity index 100% rename from examples/apps/debugserver/fpgDebugServer.lpi rename to examples/apps/debugserver/debugserver.lpi diff --git a/examples/apps/debugserver/fpgDebugServer.lpr b/examples/apps/debugserver/debugserver.lpr similarity index 100% rename from examples/apps/debugserver/fpgDebugServer.lpr rename to examples/apps/debugserver/debugserver.lpr diff --git a/examples/apps/debugserver/extrafpc.cfg b/examples/apps/debugserver/extrafpc.cfg index 49dd2ec78..3df56e7e7 100644 --- a/examples/apps/debugserver/extrafpc.cfg +++ b/examples/apps/debugserver/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Fi. -Xs diff --git a/examples/apps/docedit/docedit.lpi b/examples/apps/docedit/docedit.lpi index 3e06fdd7a..a0d5987b4 100644 --- a/examples/apps/docedit/docedit.lpi +++ b/examples/apps/docedit/docedit.lpi @@ -76,7 +76,7 @@ - + diff --git a/examples/apps/docedit/extrafpc.cfg b/examples/apps/docedit/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/apps/docedit/extrafpc.cfg +++ b/examples/apps/docedit/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/apps/globe/extrafpc.cfg b/examples/apps/globe/extrafpc.cfg index 49dd2ec78..3df56e7e7 100644 --- a/examples/apps/globe/extrafpc.cfg +++ b/examples/apps/globe/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Fi. -Xs diff --git a/examples/apps/globe/units/placeholder.txt b/examples/apps/globe/units/placeholder.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/examples/apps/guitestrunner/extrafpc.cfg b/examples/apps/guitestrunner/extrafpc.cfg new file mode 100644 index 000000000..2af09365e --- /dev/null +++ b/examples/apps/guitestrunner/extrafpc.cfg @@ -0,0 +1,11 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Fi. +-Fiimages +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/apps/fpcunit/fpg_guitestrunner.pas b/examples/apps/guitestrunner/fpg_guitestrunner.pas similarity index 100% rename from examples/apps/fpcunit/fpg_guitestrunner.pas rename to examples/apps/guitestrunner/fpg_guitestrunner.pas diff --git a/examples/apps/fpcunit/guitestrunner_fpgui.lpk b/examples/apps/guitestrunner/guitestrunner.lpk similarity index 92% rename from examples/apps/fpcunit/guitestrunner_fpgui.lpk rename to examples/apps/guitestrunner/guitestrunner.lpk index 0973a798b..0f8de2400 100644 --- a/examples/apps/fpcunit/guitestrunner_fpgui.lpk +++ b/examples/apps/guitestrunner/guitestrunner.lpk @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/examples/apps/fpcunit/guitestrunner_fpgui.pas b/examples/apps/guitestrunner/guitestrunner.lpr similarity index 87% rename from examples/apps/fpcunit/guitestrunner_fpgui.pas rename to examples/apps/guitestrunner/guitestrunner.lpr index 81ad2d21a..b44f5dab5 100644 --- a/examples/apps/fpcunit/guitestrunner_fpgui.pas +++ b/examples/apps/guitestrunner/guitestrunner.lpr @@ -2,7 +2,7 @@ This source is only used to compile and install the package. } -unit guitestrunner_fpgui; +unit guitestrunner; interface diff --git a/examples/apps/fpcunit/images/bug.bmp b/examples/apps/guitestrunner/images/bug.bmp similarity index 100% rename from examples/apps/fpcunit/images/bug.bmp rename to examples/apps/guitestrunner/images/bug.bmp diff --git a/examples/apps/fpcunit/images/circle_fuchsia.bmp b/examples/apps/guitestrunner/images/circle_fuchsia.bmp similarity index 100% rename from examples/apps/fpcunit/images/circle_fuchsia.bmp rename to examples/apps/guitestrunner/images/circle_fuchsia.bmp diff --git a/examples/apps/fpcunit/images/circle_green.bmp b/examples/apps/guitestrunner/images/circle_green.bmp similarity index 100% rename from examples/apps/fpcunit/images/circle_green.bmp rename to examples/apps/guitestrunner/images/circle_green.bmp diff --git a/examples/apps/fpcunit/images/circle_grey.bmp b/examples/apps/guitestrunner/images/circle_grey.bmp similarity index 100% rename from examples/apps/fpcunit/images/circle_grey.bmp rename to examples/apps/guitestrunner/images/circle_grey.bmp diff --git a/examples/apps/fpcunit/images/circle_red.bmp b/examples/apps/guitestrunner/images/circle_red.bmp similarity index 100% rename from examples/apps/fpcunit/images/circle_red.bmp rename to examples/apps/guitestrunner/images/circle_red.bmp diff --git a/examples/apps/fpcunit/images/error.bmp b/examples/apps/guitestrunner/images/error.bmp similarity index 100% rename from examples/apps/fpcunit/images/error.bmp rename to examples/apps/guitestrunner/images/error.bmp diff --git a/examples/apps/fpcunit/images/information.bmp b/examples/apps/guitestrunner/images/information.bmp similarity index 100% rename from examples/apps/fpcunit/images/information.bmp rename to examples/apps/guitestrunner/images/information.bmp diff --git a/examples/apps/fpcunit/images/treeimages.inc b/examples/apps/guitestrunner/images/treeimages.inc similarity index 100% rename from examples/apps/fpcunit/images/treeimages.inc rename to examples/apps/guitestrunner/images/treeimages.inc diff --git a/examples/apps/fpcunit/images/xtao_16.bmp b/examples/apps/guitestrunner/images/xtao_16.bmp similarity index 100% rename from examples/apps/fpcunit/images/xtao_16.bmp rename to examples/apps/guitestrunner/images/xtao_16.bmp diff --git a/examples/apps/hexviewer/extrafpc.cfg b/examples/apps/hexviewer/extrafpc.cfg new file mode 100644 index 000000000..3df56e7e7 --- /dev/null +++ b/examples/apps/hexviewer/extrafpc.cfg @@ -0,0 +1,10 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Fi. +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/apps/hexviewer/hexview.lpi b/examples/apps/hexviewer/hexviewer.lpi similarity index 100% rename from examples/apps/hexviewer/hexview.lpi rename to examples/apps/hexviewer/hexviewer.lpi diff --git a/examples/apps/hexviewer/hexview.lpr b/examples/apps/hexviewer/hexviewer.lpr similarity index 100% rename from examples/apps/hexviewer/hexview.lpr rename to examples/apps/hexviewer/hexviewer.lpr diff --git a/examples/apps/charpalette/units/.gitignore b/examples/apps/ide/src/bin/i386-freebsd/.gitignore similarity index 100% rename from examples/apps/charpalette/units/.gitignore rename to examples/apps/ide/src/bin/i386-freebsd/.gitignore diff --git a/examples/apps/ide/src/units/i386-freebsd/.gitignore b/examples/apps/ide/src/bin/i386-linux/.gitignore similarity index 100% rename from examples/apps/ide/src/units/i386-freebsd/.gitignore rename to examples/apps/ide/src/bin/i386-linux/.gitignore diff --git a/examples/apps/ide/src/units/i386-linux/.gitignore b/examples/apps/ide/src/bin/i386-win32/.gitignore similarity index 100% rename from examples/apps/ide/src/units/i386-linux/.gitignore rename to examples/apps/ide/src/bin/i386-win32/.gitignore diff --git a/examples/apps/ide/src/units/i386-win32/.gitignore b/examples/apps/ide/src/bin/x86_64-freebsd/.gitignore similarity index 100% rename from examples/apps/ide/src/units/i386-win32/.gitignore rename to examples/apps/ide/src/bin/x86_64-freebsd/.gitignore diff --git a/examples/apps/ide/src/units/x86_64-freebsd/.gitignore b/examples/apps/ide/src/bin/x86_64-linux/.gitignore similarity index 100% rename from examples/apps/ide/src/units/x86_64-freebsd/.gitignore rename to examples/apps/ide/src/bin/x86_64-linux/.gitignore diff --git a/examples/apps/ide/src/units/x86_64-linux/.gitignore b/examples/apps/ide/src/bin/x86_64-win64/.gitignore similarity index 100% rename from examples/apps/ide/src/units/x86_64-linux/.gitignore rename to examples/apps/ide/src/bin/x86_64-win64/.gitignore diff --git a/examples/apps/ide/src/extrafpc.cfg b/examples/apps/ide/src/extrafpc.cfg index 7d50b94c7..93b13dd39 100644 --- a/examples/apps/ide/src/extrafpc.cfg +++ b/examples/apps/ide/src/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits/$fpctarget +-FEbin/$fpctarget -Fu../../../../lib/$fpctarget -Fi. #ifdef mswindows diff --git a/examples/apps/ide/src/maximus.lpi b/examples/apps/ide/src/maximus.lpi index 67b42ba78..d72eab248 100644 --- a/examples/apps/ide/src/maximus.lpi +++ b/examples/apps/ide/src/maximus.lpi @@ -131,7 +131,7 @@ - + diff --git a/examples/apps/nanoedit/extrafpc.cfg b/examples/apps/nanoedit/extrafpc.cfg index 8fdb5d9b7..c363ae1f4 100644 --- a/examples/apps/nanoedit/extrafpc.cfg +++ b/examples/apps/nanoedit/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Fu../ide/src/ -Xs diff --git a/examples/apps/nanoedit/nanoedit.lpi b/examples/apps/nanoedit/nanoedit.lpi index 730c6798d..968212809 100644 --- a/examples/apps/nanoedit/nanoedit.lpi +++ b/examples/apps/nanoedit/nanoedit.lpi @@ -72,7 +72,7 @@ - + diff --git a/examples/corelib/.gitignore b/examples/corelib/.gitignore new file mode 100644 index 000000000..179173a99 --- /dev/null +++ b/examples/corelib/.gitignore @@ -0,0 +1,3 @@ +*/bin +*/units +*/exe \ No newline at end of file diff --git a/examples/corelib/aggcanvas/agg_canvas_test.lpi b/examples/corelib/aggcanvas/aggcanvas.lpi similarity index 89% rename from examples/corelib/aggcanvas/agg_canvas_test.lpi rename to examples/corelib/aggcanvas/aggcanvas.lpi index f02ac5dff..0bfcc096f 100644 --- a/examples/corelib/aggcanvas/agg_canvas_test.lpi +++ b/examples/corelib/aggcanvas/aggcanvas.lpi @@ -10,7 +10,7 @@ - + <Title Value="aggcanvas"/> </General> <VersionInfo> <StringTable ProductVersion=""/> @@ -36,19 +36,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="agg_canvas_test.lpr"/> + <Filename Value="aggcanvas.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="agg_canvas_test"/> + <UnitName Value="aggcanvas"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="agg_canvas_test"/> + <Filename Value="aggcanvas"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/corelib/aggcanvas/agg_canvas_test.lpr b/examples/corelib/aggcanvas/aggcanvas.lpr similarity index 99% rename from examples/corelib/aggcanvas/agg_canvas_test.lpr rename to examples/corelib/aggcanvas/aggcanvas.lpr index a3bde27ff..450c3ff07 100644 --- a/examples/corelib/aggcanvas/agg_canvas_test.lpr +++ b/examples/corelib/aggcanvas/aggcanvas.lpr @@ -20,7 +20,7 @@ the AggCanvas compiler define enabled. } -program agg_canvas_test; +program aggcanvas; {$mode objfpc}{$H+} diff --git a/examples/corelib/aggcanvas/extrafpc.cfg b/examples/corelib/aggcanvas/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/corelib/aggcanvas/extrafpc.cfg +++ b/examples/corelib/aggcanvas/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/corelib/canvastest/button.bmp b/examples/corelib/canvas/button.bmp similarity index 100% rename from examples/corelib/canvastest/button.bmp rename to examples/corelib/canvas/button.bmp diff --git a/examples/corelib/canvastest/fpgcanvas.lpi b/examples/corelib/canvas/canvas.lpi similarity index 97% rename from examples/corelib/canvastest/fpgcanvas.lpi rename to examples/corelib/canvas/canvas.lpi index 5516e8848..1104e2d57 100644 --- a/examples/corelib/canvastest/fpgcanvas.lpi +++ b/examples/corelib/canvas/canvas.lpi @@ -52,8 +52,7 @@ <LinkSmart Value="True"/> </Linking> <Other> - <CustomOptions Value="-FUunits -"/> + <CustomOptions Value="-FEbin"/> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions> diff --git a/examples/corelib/canvastest/fpgcanvas.lpr b/examples/corelib/canvas/canvas.lpr similarity index 100% rename from examples/corelib/canvastest/fpgcanvas.lpr rename to examples/corelib/canvas/canvas.lpr diff --git a/examples/corelib/canvastest/extrafpc.cfg b/examples/corelib/canvas/extrafpc.cfg similarity index 88% rename from examples/corelib/canvastest/extrafpc.cfg rename to examples/corelib/canvas/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/corelib/canvastest/extrafpc.cfg +++ b/examples/corelib/canvas/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/corelib/canvastest/gears2.bmp b/examples/corelib/canvas/gears2.bmp similarity index 100% rename from examples/corelib/canvastest/gears2.bmp rename to examples/corelib/canvas/gears2.bmp diff --git a/examples/corelib/canvastest/linux_screenshot.png b/examples/corelib/canvas/linux_screenshot.png similarity index 100% rename from examples/corelib/canvastest/linux_screenshot.png rename to examples/corelib/canvas/linux_screenshot.png diff --git a/examples/corelib/canvastest/windows_screenshot.png b/examples/corelib/canvas/windows_screenshot.png similarity index 100% rename from examples/corelib/canvastest/windows_screenshot.png rename to examples/corelib/canvas/windows_screenshot.png diff --git a/examples/corelib/canvastest/units/.gitignore b/examples/corelib/canvastest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/corelib/canvastest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/corelib/compileall.bat b/examples/corelib/compileall.bat new file mode 100644 index 000000000..62ca507a9 --- /dev/null +++ b/examples/corelib/compileall.bat @@ -0,0 +1,12 @@ +@ECHO OFF + +SET FPC=fpc + +FOR /D %%D IN (*) DO ( + Pushd %%D + ECHO doing %%D in %%D.lpr + If NOT EXIST bin MKDIR bin + %FPC% "@extrafpc.cfg" %%D.lpr + ECHO ############################################################################### + Popd +) \ No newline at end of file diff --git a/examples/corelib/compileall.sh b/examples/corelib/compileall.sh index 1fed112dc..47b245b4e 100755 --- a/examples/corelib/compileall.sh +++ b/examples/corelib/compileall.sh @@ -7,9 +7,9 @@ do LPRNAME=`basename $PROJECT .lpr` echo Doing $LPRNAME in $DIR cd $DIR - if [ ! -d units ]; then - echo 'Missing units dir' - mkdir units + if [ ! -d bin ]; then + echo 'Missing bin dir' + mkdir bin fi $FPC @extrafpc.cfg $PROJECT; cd .. diff --git a/examples/corelib/eventtest/eventtest.lpi b/examples/corelib/event/event.lpi similarity index 97% rename from examples/corelib/eventtest/eventtest.lpi rename to examples/corelib/event/event.lpi index b982410c1..722e255f4 100644 --- a/examples/corelib/eventtest/eventtest.lpi +++ b/examples/corelib/event/event.lpi @@ -51,8 +51,7 @@ <LinkSmart Value="True"/> </Linking> <Other> - <CustomOptions Value="-FUunits -"/> + <CustomOptions Value="-FEbin"/> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions> diff --git a/examples/corelib/eventtest/eventtest.lpr b/examples/corelib/event/event.lpr similarity index 100% rename from examples/corelib/eventtest/eventtest.lpr rename to examples/corelib/event/event.lpr diff --git a/examples/corelib/eventtest/eventtest.prj b/examples/corelib/event/event.prj similarity index 100% rename from examples/corelib/eventtest/eventtest.prj rename to examples/corelib/event/event.prj diff --git a/examples/corelib/eventtest/extrafpc.cfg b/examples/corelib/event/extrafpc.cfg similarity index 88% rename from examples/corelib/eventtest/extrafpc.cfg rename to examples/corelib/event/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/corelib/eventtest/extrafpc.cfg +++ b/examples/corelib/event/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/corelib/eventtest/units/.gitignore b/examples/corelib/eventtest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/corelib/eventtest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/corelib/helloworld/extrafpc.cfg b/examples/corelib/helloworld/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/corelib/helloworld/extrafpc.cfg +++ b/examples/corelib/helloworld/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/corelib/helloworld/helloworld.lpi b/examples/corelib/helloworld/helloworld.lpi index 1b678005f..6a29af330 100644 --- a/examples/corelib/helloworld/helloworld.lpi +++ b/examples/corelib/helloworld/helloworld.lpi @@ -42,7 +42,7 @@ <CompilerOptions> <Version Value="8"/> <Other> - <CustomOptions Value="-FUunits"/> + <CustomOptions Value="-FEbin"/> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions> diff --git a/examples/corelib/helloworld/helloworld.pas b/examples/corelib/helloworld/helloworld.lpr similarity index 100% rename from examples/corelib/helloworld/helloworld.pas rename to examples/corelib/helloworld/helloworld.lpr diff --git a/examples/corelib/helloworld/units/.gitignore b/examples/corelib/helloworld/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/corelib/helloworld/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/.gitignore b/examples/gui/.gitignore new file mode 100644 index 000000000..179173a99 --- /dev/null +++ b/examples/gui/.gitignore @@ -0,0 +1,3 @@ +*/bin +*/units +*/exe \ No newline at end of file diff --git a/examples/gui/alignment/aligntest.lpi b/examples/gui/alignment/alignment.lpi similarity index 92% rename from examples/gui/alignment/aligntest.lpi rename to examples/gui/alignment/alignment.lpi index 2062f69a5..b39044c51 100644 --- a/examples/gui/alignment/aligntest.lpi +++ b/examples/gui/alignment/alignment.lpi @@ -34,7 +34,7 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="aligntest.lpr"/> + <Filename Value="alignement.lpr"/> <IsPartOfProject Value="True"/> </Unit0> </Units> @@ -42,12 +42,12 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="aligntest"/> + <Filename Value="alignement"/> </Target> <SearchPaths> <IncludeFiles Value="../src"/> <OtherUnitFiles Value="../src"/> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/alignment/aligntest.lpr b/examples/gui/alignment/alignment.lpr similarity index 99% rename from examples/gui/alignment/aligntest.lpr rename to examples/gui/alignment/alignment.lpr index efa423798..1787ca836 100644 --- a/examples/gui/alignment/aligntest.lpr +++ b/examples/gui/alignment/alignment.lpr @@ -1,4 +1,4 @@ -program aligntest; +program alignement; {$mode objfpc}{$H+} diff --git a/examples/gui/alignment/extrafpc.cfg b/examples/gui/alignment/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/alignment/extrafpc.cfg +++ b/examples/gui/alignment/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/alignment/units/.gitignore b/examples/gui/alignment/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/alignment/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/alignment_resize/alignment_resize.lpi b/examples/gui/alignment_resize/alignment_resize.lpi index 4bf13dfdd..c4688f4b9 100644 --- a/examples/gui/alignment_resize/alignment_resize.lpi +++ b/examples/gui/alignment_resize/alignment_resize.lpi @@ -49,7 +49,7 @@ <Filename Value="alignment_resize"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/alignment_resize/extrafpc.cfg b/examples/gui/alignment_resize/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/alignment_resize/extrafpc.cfg +++ b/examples/gui/alignment_resize/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/alignment_resize/units/.gitignore b/examples/gui/alignment_resize/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/alignment_resize/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/animation/anim_test.lpi b/examples/gui/animation/animation.lpi similarity index 90% rename from examples/gui/animation/anim_test.lpi rename to examples/gui/animation/animation.lpi index 4db5823a6..b28b56455 100644 --- a/examples/gui/animation/anim_test.lpi +++ b/examples/gui/animation/animation.lpi @@ -35,19 +35,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="anim_test.lpr"/> + <Filename Value="animation.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="anim_test"/> + <UnitName Value="animation"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="anim_test"/> + <Filename Value="animation"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/animation/anim_test.lpr b/examples/gui/animation/animation.lpr similarity index 99% rename from examples/gui/animation/anim_test.lpr rename to examples/gui/animation/animation.lpr index b7baef3b2..6b00b3bd3 100644 --- a/examples/gui/animation/anim_test.lpr +++ b/examples/gui/animation/animation.lpr @@ -1,4 +1,4 @@ -program anim_test; +program animation; {$mode objfpc}{$H+} diff --git a/examples/gui/animation/extrafpc.cfg b/examples/gui/animation/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/animation/extrafpc.cfg +++ b/examples/gui/animation/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/animation/units/.gitignore b/examples/gui/animation/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/animation/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/gridtest/gridtest.lpi b/examples/gui/bevel/bevel.lpi similarity index 90% rename from examples/gui/gridtest/gridtest.lpi rename to examples/gui/bevel/bevel.lpi index a02b06970..00e6c8548 100644 --- a/examples/gui/gridtest/gridtest.lpi +++ b/examples/gui/bevel/bevel.lpi @@ -34,19 +34,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="gridtest.lpr"/> + <Filename Value="bevel.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="gridtest"/> + <UnitName Value="bevel"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="gridtest"/> + <Filename Value="bevel"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/bevel/beveltest.lpr b/examples/gui/bevel/bevel.lpr similarity index 99% rename from examples/gui/bevel/beveltest.lpr rename to examples/gui/bevel/bevel.lpr index 4fae96c24..16f91f5b8 100644 --- a/examples/gui/bevel/beveltest.lpr +++ b/examples/gui/bevel/bevel.lpr @@ -1,4 +1,4 @@ -program beveltest; +program bevel; {$mode objfpc}{$H+} diff --git a/examples/gui/bevel/extrafpc.cfg b/examples/gui/bevel/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/bevel/extrafpc.cfg +++ b/examples/gui/bevel/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/bevel/units/.gitignore b/examples/gui/bevel/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/bevel/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/calendar/calendartest.lpi b/examples/gui/calendar/calendar.lpi similarity index 90% rename from examples/gui/calendar/calendartest.lpi rename to examples/gui/calendar/calendar.lpi index ccc474ab6..2306ffab9 100644 --- a/examples/gui/calendar/calendartest.lpi +++ b/examples/gui/calendar/calendar.lpi @@ -34,19 +34,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="calendartest.lpr"/> + <Filename Value="calendar.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="calendartest"/> + <UnitName Value="calendar"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="calendartest"/> + <Filename Value="calendar"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/calendar/calendartest.lpr b/examples/gui/calendar/calendar.lpr similarity index 99% rename from examples/gui/calendar/calendartest.lpr rename to examples/gui/calendar/calendar.lpr index 5de312f29..ff6d8313c 100644 --- a/examples/gui/calendar/calendartest.lpr +++ b/examples/gui/calendar/calendar.lpr @@ -1,4 +1,4 @@ -program calendartest; +program calendar; {$mode objfpc}{$H+} diff --git a/examples/gui/calendar/extrafpc.cfg b/examples/gui/calendar/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/calendar/extrafpc.cfg +++ b/examples/gui/calendar/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/calendar/units/.gitignore b/examples/gui/calendar/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/calendar/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/colorlistbox/colorlistboxtest.lpi b/examples/gui/colorlistbox/colorlistbox.lpi similarity index 88% rename from examples/gui/colorlistbox/colorlistboxtest.lpi rename to examples/gui/colorlistbox/colorlistbox.lpi index 04703732a..8b5177581 100644 --- a/examples/gui/colorlistbox/colorlistboxtest.lpi +++ b/examples/gui/colorlistbox/colorlistbox.lpi @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <Title Value="colorlistboxtest"/> + <Title Value="colorlistbox"/> </General> <VersionInfo> <StringTable ProductVersion=""/> @@ -36,9 +36,9 @@ </RequiredPackages> <Units Count="2"> <Unit0> - <Filename Value="colorlistboxtest.lpr"/> + <Filename Value="colorlistbox.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="colorlistboxtest"/> + <UnitName Value="colorlistbox"/> </Unit0> <Unit1> <Filename Value="frmMain.pas"/> @@ -50,10 +50,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="colorlistboxtest"/> + <Filename Value="colorlistbox"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/colorlistbox/colorlistboxtest.lpr b/examples/gui/colorlistbox/colorlistbox.lpr similarity index 92% rename from examples/gui/colorlistbox/colorlistboxtest.lpr rename to examples/gui/colorlistbox/colorlistbox.lpr index 28bcc1832..8f3566691 100644 --- a/examples/gui/colorlistbox/colorlistboxtest.lpr +++ b/examples/gui/colorlistbox/colorlistbox.lpr @@ -1,4 +1,4 @@ -program colorlistboxtest; +program colorlistbox; {$mode objfpc}{$H+} diff --git a/examples/gui/colorlistbox/extrafpc.cfg b/examples/gui/colorlistbox/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/colorlistbox/extrafpc.cfg +++ b/examples/gui/colorlistbox/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/colorlistbox/units/.gitignore b/examples/gui/colorlistbox/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/colorlistbox/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/colorwheel/colorwheel_test.lpi b/examples/gui/colorwheel/colorwheel.lpi similarity index 91% rename from examples/gui/colorwheel/colorwheel_test.lpi rename to examples/gui/colorwheel/colorwheel.lpi index a0be0fc2a..0b34ae557 100644 --- a/examples/gui/colorwheel/colorwheel_test.lpi +++ b/examples/gui/colorwheel/colorwheel.lpi @@ -8,7 +8,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <Title Value="colorwheel_test"/> + <Title Value="colorwheel"/> <UseAppBundle Value="False"/> </General> <VersionInfo> @@ -36,7 +36,7 @@ </RequiredPackages> <Units Count="2"> <Unit0> - <Filename Value="colorwheel_test.lpr"/> + <Filename Value="colorwheel.lpr"/> <IsPartOfProject Value="True"/> </Unit0> <Unit1> @@ -49,11 +49,11 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="colorwheel_test"/> + <Filename Value="colorwheel"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/colorwheel/colorwheel_test.lpr b/examples/gui/colorwheel/colorwheel.lpr similarity index 93% rename from examples/gui/colorwheel/colorwheel_test.lpr rename to examples/gui/colorwheel/colorwheel.lpr index 230ca0790..9af6215fa 100644 --- a/examples/gui/colorwheel/colorwheel_test.lpr +++ b/examples/gui/colorwheel/colorwheel.lpr @@ -1,4 +1,4 @@ -program colorwheel_test; +program colorwheel; {$mode objfpc}{$H+} diff --git a/examples/gui/colorwheel/extrafpc.cfg b/examples/gui/colorwheel/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/colorwheel/extrafpc.cfg +++ b/examples/gui/colorwheel/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/colorwheel/units/.gitignore b/examples/gui/colorwheel/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/colorwheel/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/combobox/comboboxtest.lpi b/examples/gui/combobox/combobox.lpi similarity index 87% rename from examples/gui/combobox/comboboxtest.lpi rename to examples/gui/combobox/combobox.lpi index 2163619a5..ee762e29d 100644 --- a/examples/gui/combobox/comboboxtest.lpi +++ b/examples/gui/combobox/combobox.lpi @@ -35,9 +35,9 @@ </RequiredPackages> <Units Count="3"> <Unit0> - <Filename Value="comboboxtest.lpr"/> + <Filename Value="combobox.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="comboboxtest"/> + <UnitName Value="combobox"/> </Unit0> <Unit1> <Filename Value="frm_main.pas"/> @@ -45,7 +45,7 @@ <UnitName Value="frm_main"/> </Unit1> <Unit2> - <Filename Value="../common/randomdata.pas"/> + <Filename Value="common/randomdata.pas"/> <IsPartOfProject Value="True"/> <UnitName Value="RandomData"/> </Unit2> @@ -54,11 +54,11 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="comboboxtest"/> + <Filename Value="combobox"/> </Target> <SearchPaths> - <OtherUnitFiles Value="../common"/> - <UnitOutputDirectory Value="units"/> + <OtherUnitFiles Value="common/"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/led_matrix_display/led_demo.pas b/examples/gui/combobox/combobox.lpr similarity index 94% rename from examples/gui/led_matrix_display/led_demo.pas rename to examples/gui/combobox/combobox.lpr index d23936d44..a66d38f00 100644 --- a/examples/gui/led_matrix_display/led_demo.pas +++ b/examples/gui/combobox/combobox.lpr @@ -1,4 +1,4 @@ -program led_demo; +program combobox; {$mode objfpc}{$H+} @@ -8,7 +8,6 @@ {$ENDIF}{$ENDIF} Classes, fpg_main, frm_main; - procedure MainProc; var frm: TMainForm; @@ -27,3 +26,4 @@ procedure MainProc; MainProc; end. + diff --git a/examples/gui/common/randomdata.pas b/examples/gui/combobox/common/RandomData.pas similarity index 100% rename from examples/gui/common/randomdata.pas rename to examples/gui/combobox/common/RandomData.pas diff --git a/examples/gui/combobox/extrafpc.cfg b/examples/gui/combobox/extrafpc.cfg index 89eafa997..59fd93bbc 100644 --- a/examples/gui/combobox/extrafpc.cfg +++ b/examples/gui/combobox/extrafpc.cfg @@ -1,6 +1,6 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget --Fu../common/ +-Fucommon/ -Xs -XX -CX diff --git a/examples/gui/combobox/units/.gitignore b/examples/gui/combobox/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/combobox/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/command_interface/test.lpi b/examples/gui/command_interface/command_interface.lpi similarity index 90% rename from examples/gui/command_interface/test.lpi rename to examples/gui/command_interface/command_interface.lpi index cf714b529..0942cf7e5 100644 --- a/examples/gui/command_interface/test.lpi +++ b/examples/gui/command_interface/command_interface.lpi @@ -34,9 +34,9 @@ </RequiredPackages> <Units Count="3"> <Unit0> - <Filename Value="test.lpr"/> + <Filename Value="command_interface.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="test"/> + <UnitName Value="command_interface"/> </Unit0> <Unit1> <Filename Value="frm_main.pas"/> @@ -53,10 +53,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="command_interface_test"/> + <Filename Value="command_interface"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/command_interface/test.lpr b/examples/gui/command_interface/command_interface.lpr similarity index 92% rename from examples/gui/command_interface/test.lpr rename to examples/gui/command_interface/command_interface.lpr index f10500022..3683a2244 100644 --- a/examples/gui/command_interface/test.lpr +++ b/examples/gui/command_interface/command_interface.lpr @@ -1,4 +1,4 @@ -program test; +program command_interface; {$mode objfpc}{$H+} diff --git a/examples/gui/command_interface/extrafpc.cfg b/examples/gui/command_interface/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/command_interface/extrafpc.cfg +++ b/examples/gui/command_interface/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/command_interface/units/.gitignore b/examples/gui/command_interface/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/command_interface/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/compileall.bat b/examples/gui/compileall.bat new file mode 100644 index 000000000..62ca507a9 --- /dev/null +++ b/examples/gui/compileall.bat @@ -0,0 +1,12 @@ +@ECHO OFF + +SET FPC=fpc + +FOR /D %%D IN (*) DO ( + Pushd %%D + ECHO doing %%D in %%D.lpr + If NOT EXIST bin MKDIR bin + %FPC% "@extrafpc.cfg" %%D.lpr + ECHO ############################################################################### + Popd +) \ No newline at end of file diff --git a/examples/gui/compileall.sh b/examples/gui/compileall.sh index 1fed112dc..47b245b4e 100755 --- a/examples/gui/compileall.sh +++ b/examples/gui/compileall.sh @@ -7,9 +7,9 @@ do LPRNAME=`basename $PROJECT .lpr` echo Doing $LPRNAME in $DIR cd $DIR - if [ ! -d units ]; then - echo 'Missing units dir' - mkdir units + if [ ! -d bin ]; then + echo 'Missing bin dir' + mkdir bin fi $FPC @extrafpc.cfg $PROJECT; cd .. diff --git a/examples/gui/customstyles/customstyles.lpi b/examples/gui/customstyles/customstyles.lpi index 76ddd8055..e46070092 100644 --- a/examples/gui/customstyles/customstyles.lpi +++ b/examples/gui/customstyles/customstyles.lpi @@ -51,10 +51,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="customstyles_test"/> + <Filename Value="customstyles"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/customstyles/extrafpc.cfg b/examples/gui/customstyles/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/customstyles/extrafpc.cfg +++ b/examples/gui/customstyles/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/customstyles/units/.gitignore b/examples/gui/customstyles/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/customstyles/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/customwindow/custom_window.lpi b/examples/gui/customwindow/customwindow.lpi similarity index 100% rename from examples/gui/customwindow/custom_window.lpi rename to examples/gui/customwindow/customwindow.lpi diff --git a/examples/gui/customwindow/custom_window.lpr b/examples/gui/customwindow/customwindow.lpr similarity index 100% rename from examples/gui/customwindow/custom_window.lpr rename to examples/gui/customwindow/customwindow.lpr diff --git a/examples/gui/customwindow/extrafpc.cfg b/examples/gui/customwindow/extrafpc.cfg index 89eafa997..0c87de65b 100644 --- a/examples/gui/customwindow/extrafpc.cfg +++ b/examples/gui/customwindow/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Fu../common/ -Xs diff --git a/examples/gui/customwindow/units/.gitignore b/examples/gui/customwindow/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/customwindow/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/dbtest/dbtest.lpi b/examples/gui/dbtest/dbtest.lpi index b9934e9ee..cac8951aa 100644 --- a/examples/gui/dbtest/dbtest.lpi +++ b/examples/gui/dbtest/dbtest.lpi @@ -53,7 +53,7 @@ <Filename Value="dbtest"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/dbtest/extrafpc.cfg b/examples/gui/dbtest/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/dbtest/extrafpc.cfg +++ b/examples/gui/dbtest/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/dbtest/test.dbf b/examples/gui/dbtest/test.dbf index 0c50b2da0..0d49a3bb9 100644 Binary files a/examples/gui/dbtest/test.dbf and b/examples/gui/dbtest/test.dbf differ diff --git a/examples/gui/dbtest/units/.gitignore b/examples/gui/dbtest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/dbtest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/drag_n_drop/dndexample.lpi b/examples/gui/drag_n_drop/drag_n_drop.lpi similarity index 100% rename from examples/gui/drag_n_drop/dndexample.lpi rename to examples/gui/drag_n_drop/drag_n_drop.lpi diff --git a/examples/gui/drag_n_drop/dndexample.lpr b/examples/gui/drag_n_drop/drag_n_drop.lpr similarity index 100% rename from examples/gui/drag_n_drop/dndexample.lpr rename to examples/gui/drag_n_drop/drag_n_drop.lpr diff --git a/examples/gui/drag_n_drop/extrafpc.cfg b/examples/gui/drag_n_drop/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/drag_n_drop/extrafpc.cfg +++ b/examples/gui/drag_n_drop/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/drag_n_drop/units/placeholder.txt b/examples/gui/drag_n_drop/units/placeholder.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/examples/gui/edits/edittest.lpi b/examples/gui/edits/edits.lpi similarity index 90% rename from examples/gui/edits/edittest.lpi rename to examples/gui/edits/edits.lpi index be69faf92..c1e864cec 100644 --- a/examples/gui/edits/edittest.lpi +++ b/examples/gui/edits/edits.lpi @@ -35,19 +35,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="edittest.lpr"/> + <Filename Value="edits.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="edittest"/> + <UnitName Value="edits"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="edittest"/> + <Filename Value="edits"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/edits/edittest.lpr b/examples/gui/edits/edits.lpr similarity index 99% rename from examples/gui/edits/edittest.lpr rename to examples/gui/edits/edits.lpr index 411c4466e..194d4028e 100644 --- a/examples/gui/edits/edittest.lpr +++ b/examples/gui/edits/edits.lpr @@ -1,4 +1,4 @@ -program edittest; +program edits; {$mode objfpc}{$H+} diff --git a/examples/gui/edits/extrafpc.cfg b/examples/gui/edits/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/edits/extrafpc.cfg +++ b/examples/gui/edits/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/edits/units/.gitignore b/examples/gui/edits/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/edits/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/gridtest/extrafpc.cfg b/examples/gui/edits_extrahint/extrafpc.cfg similarity index 81% rename from examples/gui/gridtest/extrafpc.cfg rename to examples/gui/edits_extrahint/extrafpc.cfg index 775d592f4..aa46735a3 100644 --- a/examples/gui/gridtest/extrafpc.cfg +++ b/examples/gui/edits_extrahint/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/embedded_form/demo1.lpi b/examples/gui/embedded_form/embedded_form.lpi similarity index 95% rename from examples/gui/embedded_form/demo1.lpi rename to examples/gui/embedded_form/embedded_form.lpi index de9bb9a38..8495faf67 100644 --- a/examples/gui/embedded_form/demo1.lpi +++ b/examples/gui/embedded_form/embedded_form.lpi @@ -54,11 +54,11 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="embedded_form_test"/> + <Filename Value="embedded_form"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/embedded_form/demo1.lpr b/examples/gui/embedded_form/embedded_form.lpr similarity index 93% rename from examples/gui/embedded_form/demo1.lpr rename to examples/gui/embedded_form/embedded_form.lpr index c006d5301..928cc3db4 100644 --- a/examples/gui/embedded_form/demo1.lpr +++ b/examples/gui/embedded_form/embedded_form.lpr @@ -1,4 +1,4 @@ -program demo1; +program embedded_form; {$mode objfpc}{$H+} diff --git a/examples/gui/embedded_form/extrafpc.cfg b/examples/gui/embedded_form/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/embedded_form/extrafpc.cfg +++ b/examples/gui/embedded_form/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/embedded_form/units/.gitignore b/examples/gui/embedded_form/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/embedded_form/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/filedialog/extrafpc.cfg b/examples/gui/filedialog/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/filedialog/extrafpc.cfg +++ b/examples/gui/filedialog/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/filedialog/filedialog.lpi b/examples/gui/filedialog/filedialog.lpi index f6efbd835..9d51fe8fe 100644 --- a/examples/gui/filedialog/filedialog.lpi +++ b/examples/gui/filedialog/filedialog.lpi @@ -45,7 +45,7 @@ <Filename Value="filedialog"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> @@ -53,7 +53,7 @@ </SyntaxOptions> </Parsing> <Other> - <CustomOptions Value="-FUunits"/> + <CustomOptions Value="-FEbin"/> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions> diff --git a/examples/gui/filedialog/units/.gitignore b/examples/gui/filedialog/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/filedialog/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/filegrid/extrafpc.cfg b/examples/gui/filegrid/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/filegrid/extrafpc.cfg +++ b/examples/gui/filegrid/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/filegrid/filegrid.lpi b/examples/gui/filegrid/filegrid.lpi index 74fb0d207..362f40377 100644 --- a/examples/gui/filegrid/filegrid.lpi +++ b/examples/gui/filegrid/filegrid.lpi @@ -46,7 +46,7 @@ <Filename Value="filegrid"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/filegrid/units/.gitignore b/examples/gui/filegrid/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/filegrid/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/fontselect/extrafpc.cfg b/examples/gui/fontselect/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/fontselect/extrafpc.cfg +++ b/examples/gui/fontselect/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/fontselect/fontselect.lpi b/examples/gui/fontselect/fontselect.lpi index b952003a9..518acc5ae 100644 --- a/examples/gui/fontselect/fontselect.lpi +++ b/examples/gui/fontselect/fontselect.lpi @@ -45,7 +45,7 @@ <Filename Value="fontselect"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/fontselect/units/.gitignore b/examples/gui/fontselect/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/fontselect/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/gauges/extrafpc.cfg b/examples/gui/gauges/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/gauges/extrafpc.cfg +++ b/examples/gui/gauges/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/gauges/gaugetest.lpi b/examples/gui/gauges/gauges.lpi similarity index 92% rename from examples/gui/gauges/gaugetest.lpi rename to examples/gui/gauges/gauges.lpi index 899f99cdc..53f0b09c5 100644 --- a/examples/gui/gauges/gaugetest.lpi +++ b/examples/gui/gauges/gauges.lpi @@ -34,7 +34,7 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="gaugetest.lpr"/> + <Filename Value="gauges.lpr"/> <IsPartOfProject Value="True"/> </Unit0> </Units> @@ -42,10 +42,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="gaugetest"/> + <Filename Value="gauges"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/gauges/gaugetest.lpr b/examples/gui/gauges/gauges.lpr similarity index 99% rename from examples/gui/gauges/gaugetest.lpr rename to examples/gui/gauges/gauges.lpr index d5ef47ab0..4d1e04acd 100644 --- a/examples/gui/gauges/gaugetest.lpr +++ b/examples/gui/gauges/gauges.lpr @@ -1,4 +1,4 @@ -program gaugetest; +program gauges; {$mode objfpc}{$H+} diff --git a/examples/gui/gauges/units/.gitignore b/examples/gui/gauges/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/gauges/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/grid/extrafpc.cfg b/examples/gui/grid/extrafpc.cfg new file mode 100644 index 000000000..aa46735a3 --- /dev/null +++ b/examples/gui/grid/extrafpc.cfg @@ -0,0 +1,5 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX diff --git a/examples/gui/timertest/timertest.lpi b/examples/gui/grid/grid.lpi similarity index 90% rename from examples/gui/timertest/timertest.lpi rename to examples/gui/grid/grid.lpi index c9494ac44..86109c422 100644 --- a/examples/gui/timertest/timertest.lpi +++ b/examples/gui/grid/grid.lpi @@ -34,19 +34,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="timertest.lpr"/> + <Filename Value="grid.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="timertest"/> + <UnitName Value="grid"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="timertest"/> + <Filename Value="grid"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/gridtest/gridtest.lpr b/examples/gui/grid/grid.lpr similarity index 99% rename from examples/gui/gridtest/gridtest.lpr rename to examples/gui/grid/grid.lpr index 4b53f260e..1e1f5c79e 100644 --- a/examples/gui/gridtest/gridtest.lpr +++ b/examples/gui/grid/grid.lpr @@ -1,4 +1,4 @@ -program gridtest; +program grid; {$mode objfpc}{$H+} diff --git a/examples/gui/gridediting/extrafpc.cfg b/examples/gui/gridediting/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/gridediting/extrafpc.cfg +++ b/examples/gui/gridediting/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/gridediting/gridediting.lpi b/examples/gui/gridediting/gridediting.lpi index dba84086d..9ff851500 100644 --- a/examples/gui/gridediting/gridediting.lpi +++ b/examples/gui/gridediting/gridediting.lpi @@ -55,7 +55,7 @@ </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Other> <CompilerMessages> diff --git a/examples/gui/gridediting/units/placeholder.txt b/examples/gui/gridediting/units/placeholder.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/examples/gui/gridtest/units/.gitignore b/examples/gui/gridtest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/gridtest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/helloworld/extrafpc.cfg b/examples/gui/helloworld/extrafpc.cfg new file mode 100644 index 000000000..aa46735a3 --- /dev/null +++ b/examples/gui/helloworld/extrafpc.cfg @@ -0,0 +1,5 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX diff --git a/examples/gui/hintwindow/extrafpc.cfg b/examples/gui/hintwindow/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/hintwindow/extrafpc.cfg +++ b/examples/gui/hintwindow/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/hintwindow/hintwindow.lpi b/examples/gui/hintwindow/hintwindow.lpi new file mode 100644 index 000000000..4c8a27526 --- /dev/null +++ b/examples/gui/hintwindow/hintwindow.lpi @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<CONFIG> + <ProjectOptions> + <Version Value="9"/> + <General> + <Flags> + <SaveOnlyProjectUnits Value="True"/> + <LRSInOutputDirectory Value="False"/> + </Flags> + <SessionStorage Value="InProjectDir"/> + <MainUnit Value="0"/> + <Title Value="hintwindow"/> + </General> + <VersionInfo> + <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)"/> + <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> + </PublishOptions> + <RunParams> + <local> + <FormatVersion Value="1"/> + <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + </local> + </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="fpgui_toolkit"/> + </Item1> + </RequiredPackages> + <Units Count="1"> + <Unit0> + <Filename Value="hintwindow.lpr"/> + <IsPartOfProject Value="True"/> + <UnitName Value="hintwindow"/> + </Unit0> + </Units> + </ProjectOptions> + <CompilerOptions> + <Version Value="11"/> + <Target> + <Filename Value="hintwindow"/> + </Target> + <SearchPaths> + <UnitOutputDirectory Value="bin"/> + </SearchPaths> + <Parsing> + <SyntaxOptions> + <UseAnsiStrings Value="False"/> + </SyntaxOptions> + </Parsing> + <Other> + <CompilerPath Value="$(CompPath)"/> + </Other> + </CompilerOptions> +</CONFIG> diff --git a/examples/gui/hintwindow/hintwindowtest.lpr b/examples/gui/hintwindow/hintwindow.lpr similarity index 99% rename from examples/gui/hintwindow/hintwindowtest.lpr rename to examples/gui/hintwindow/hintwindow.lpr index ba0a5463e..c4f2a3e9b 100644 --- a/examples/gui/hintwindow/hintwindowtest.lpr +++ b/examples/gui/hintwindow/hintwindow.lpr @@ -1,4 +1,4 @@ -program hintwindowtest; +program hintwindow; {$mode objfpc}{$H+} diff --git a/examples/gui/hintwindow/hintwindowtest.lpi b/examples/gui/hintwindow/hintwindowtest.lpi deleted file mode 100644 index ecb49472d..000000000 --- a/examples/gui/hintwindow/hintwindowtest.lpi +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<CONFIG> - <ProjectOptions> - <Version Value="9"/> - <General> - <Flags> - <SaveOnlyProjectUnits Value="True"/> - <LRSInOutputDirectory Value="False"/> - </Flags> - <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> - <Title Value="hintwindowtest"/> - </General> - <VersionInfo> - <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)"/> - <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> - </PublishOptions> - <RunParams> - <local> - <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> - </local> - </RunParams> - <RequiredPackages Count="1"> - <Item1> - <PackageName Value="fpgui_toolkit"/> - </Item1> - </RequiredPackages> - <Units Count="1"> - <Unit0> - <Filename Value="hintwindowtest.lpr"/> - <IsPartOfProject Value="True"/> - <UnitName Value="hintwindowtest"/> - </Unit0> - </Units> - </ProjectOptions> - <CompilerOptions> - <Version Value="11"/> - <Target> - <Filename Value="hintwindowtest"/> - </Target> - <SearchPaths> - <UnitOutputDirectory Value="units"/> - </SearchPaths> - <Parsing> - <SyntaxOptions> - <UseAnsiStrings Value="False"/> - </SyntaxOptions> - </Parsing> - <Other> - <CompilerPath Value="$(CompPath)"/> - </Other> - </CompilerOptions> -</CONFIG> diff --git a/examples/gui/hintwindow/units/.gitignore b/examples/gui/hintwindow/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/hintwindow/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/imgtest_jpeg/extrafpc.cfg b/examples/gui/img/extrafpc.cfg similarity index 88% rename from examples/gui/imgtest_jpeg/extrafpc.cfg rename to examples/gui/img/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/imgtest_jpeg/extrafpc.cfg +++ b/examples/gui/img/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/imgtest/bitmaptest.lpi b/examples/gui/img/img.lpi similarity index 89% rename from examples/gui/imgtest/bitmaptest.lpi rename to examples/gui/img/img.lpi index f10675d49..a4bbb8d01 100644 --- a/examples/gui/imgtest/bitmaptest.lpi +++ b/examples/gui/img/img.lpi @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <Title Value="bitmaptest"/> + <Title Value="img"/> </General> <VersionInfo> <StringTable ProductVersion=""/> @@ -35,21 +35,21 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="bitmaptest.lpr"/> + <Filename Value="img.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="bitmaptest"/> + <UnitName Value="img"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="bitmaptest"/> + <Filename Value="img"/> </Target> <SearchPaths> <IncludeFiles Value="../source"/> <OtherUnitFiles Value="../source;../source/x11;../gui"/> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/imgtest/bitmaptest.lpr b/examples/gui/img/img.lpr similarity index 98% rename from examples/gui/imgtest/bitmaptest.lpr rename to examples/gui/img/img.lpr index 898b7c614..b9101a063 100644 --- a/examples/gui/imgtest/bitmaptest.lpr +++ b/examples/gui/img/img.lpr @@ -2,7 +2,7 @@ This demo shows how you can manipulate the data of a TfpgImage directly. } -program bitmaptest; +program img; {$mode objfpc}{$H+} diff --git a/examples/gui/imgtest/extrafpc.cfg b/examples/gui/img_jpeg/extrafpc.cfg similarity index 88% rename from examples/gui/imgtest/extrafpc.cfg rename to examples/gui/img_jpeg/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/imgtest/extrafpc.cfg +++ b/examples/gui/img_jpeg/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/imgtest_jpeg/jpeg.lpi b/examples/gui/img_jpeg/img_jpeg.lpi similarity index 96% rename from examples/gui/imgtest_jpeg/jpeg.lpi rename to examples/gui/img_jpeg/img_jpeg.lpi index bd592bfe7..1f7ec4d6a 100644 --- a/examples/gui/imgtest_jpeg/jpeg.lpi +++ b/examples/gui/img_jpeg/img_jpeg.lpi @@ -53,11 +53,11 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="jpegtest"/> + <Filename Value="img_jpeg"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Other> <CompilerPath Value="$(CompPath)"/> diff --git a/examples/gui/imgtest_jpeg/jpeg.lpr b/examples/gui/img_jpeg/img_jpeg.lpr similarity index 100% rename from examples/gui/imgtest_jpeg/jpeg.lpr rename to examples/gui/img_jpeg/img_jpeg.lpr diff --git a/examples/gui/imgtest_jpeg/main.pas b/examples/gui/img_jpeg/main.pas similarity index 100% rename from examples/gui/imgtest_jpeg/main.pas rename to examples/gui/img_jpeg/main.pas diff --git a/examples/gui/imgtest_jpeg/poppy.jpg b/examples/gui/img_jpeg/poppy.jpg similarity index 100% rename from examples/gui/imgtest_jpeg/poppy.jpg rename to examples/gui/img_jpeg/poppy.jpg diff --git a/examples/gui/imgtest_jpeg/poppygray.jpg b/examples/gui/img_jpeg/poppygray.jpg similarity index 100% rename from examples/gui/imgtest_jpeg/poppygray.jpg rename to examples/gui/img_jpeg/poppygray.jpg diff --git a/examples/gui/imgtest_jpeg/poppyprogressif.jpg b/examples/gui/img_jpeg/poppyprogressif.jpg similarity index 100% rename from examples/gui/imgtest_jpeg/poppyprogressif.jpg rename to examples/gui/img_jpeg/poppyprogressif.jpg diff --git a/examples/gui/imgtest/units/.gitignore b/examples/gui/imgtest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/imgtest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/imgtest_jpeg/units/.gitignore b/examples/gui/imgtest_jpeg/units/.gitignore deleted file mode 100644 index f59ec20aa..000000000 --- a/examples/gui/imgtest_jpeg/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/examples/gui/led_matrix_display/extrafpc.cfg b/examples/gui/led_matrix_display/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/led_matrix_display/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/led_matrix_display/led_matrix_display.lpi b/examples/gui/led_matrix_display/led_matrix_display.lpi new file mode 100644 index 000000000..18c0e8cf6 --- /dev/null +++ b/examples/gui/led_matrix_display/led_matrix_display.lpi @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<CONFIG> + <ProjectOptions> + <Version Value="9"/> + <General> + <Flags> + <SaveOnlyProjectUnits Value="True"/> + <MainUnitHasCreateFormStatements Value="False"/> + <MainUnitHasTitleStatement Value="False"/> + </Flags> + <SessionStorage Value="InProjectDir"/> + <MainUnit Value="0"/> + <UseAppBundle Value="False"/> + <ResourceType Value="res"/> + </General> + <VersionInfo> + <Language Value=""/> + <CharSet Value=""/> + <StringTable ProductVersion=""/> + </VersionInfo> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> + </BuildModes> + <PublishOptions> + <Version Value="2"/> + <IgnoreBinaries Value="False"/> + <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> + <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> + </PublishOptions> + <RunParams> + <local> + <FormatVersion Value="1"/> + <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + </local> + </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="fpgui_toolkit"/> + </Item1> + </RequiredPackages> + <Units Count="2"> + <Unit0> + <Filename Value="led_matrix_display.lpr"/> + <IsPartOfProject Value="True"/> + </Unit0> + <Unit1> + <Filename Value="frm_main.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="main"/> + </Unit1> + </Units> + </ProjectOptions> + <CompilerOptions> + <Version Value="11"/> + <Target> + <Filename Value="led_matrix_display"/> + </Target> + <SearchPaths> + <IncludeFiles Value="$(ProjOutDir)"/> + <UnitOutputDirectory Value="bin"/> + </SearchPaths> + <Other> + <CompilerPath Value="$(CompPath)"/> + </Other> + </CompilerOptions> + <Debugging> + <Exceptions Count="1"> + <Item1> + <Name Value="EDatabaseError"/> + </Item1> + </Exceptions> + </Debugging> +</CONFIG> diff --git a/examples/gui/combobox/comboboxtest.lpr b/examples/gui/led_matrix_display/led_matrix_display.lpr similarity index 92% rename from examples/gui/combobox/comboboxtest.lpr rename to examples/gui/led_matrix_display/led_matrix_display.lpr index 32765338d..27f6c31ea 100644 --- a/examples/gui/combobox/comboboxtest.lpr +++ b/examples/gui/led_matrix_display/led_matrix_display.lpr @@ -1,4 +1,4 @@ -program comboboxtest; +program led_matrix_display; {$mode objfpc}{$H+} @@ -8,6 +8,7 @@ {$ENDIF}{$ENDIF} Classes, fpg_main, frm_main; + procedure MainProc; var frm: TMainForm; @@ -26,4 +27,3 @@ procedure MainProc; MainProc; end. - diff --git a/examples/gui/led_matrix_display/units/.gitignore b/examples/gui/led_matrix_display/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/led_matrix_display/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/listbox/extrafpc.cfg b/examples/gui/listbox/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/listbox/extrafpc.cfg +++ b/examples/gui/listbox/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/listbox/listboxtest.lpi b/examples/gui/listbox/listbox.lpi similarity index 91% rename from examples/gui/listbox/listboxtest.lpi rename to examples/gui/listbox/listbox.lpi index 17170ebf3..8b97994d9 100644 --- a/examples/gui/listbox/listboxtest.lpi +++ b/examples/gui/listbox/listbox.lpi @@ -35,9 +35,9 @@ </RequiredPackages> <Units Count="2"> <Unit0> - <Filename Value="listboxtest.lpr"/> + <Filename Value="listbox.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="listboxtest"/> + <UnitName Value="listbox"/> </Unit0> <Unit1> <Filename Value="frm_main.pas"/> @@ -49,10 +49,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="listboxtest"/> + <Filename Value="listbox"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/listbox/listboxtest.lpr b/examples/gui/listbox/listbox.lpr similarity index 94% rename from examples/gui/listbox/listboxtest.lpr rename to examples/gui/listbox/listbox.lpr index 9353a07c5..0885d89e1 100644 --- a/examples/gui/listbox/listboxtest.lpr +++ b/examples/gui/listbox/listbox.lpr @@ -1,4 +1,4 @@ -program listboxtest; +program listbox; {$mode objfpc}{$H+} diff --git a/examples/gui/listbox/units/.gitignore b/examples/gui/listbox/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/listbox/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/listview/extrafpc.cfg b/examples/gui/listview/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/listview/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/listviewtest/listviewtest.lpi b/examples/gui/listview/listview.lpi similarity index 91% rename from examples/gui/listviewtest/listviewtest.lpi rename to examples/gui/listview/listview.lpi index 595a53539..ccb14b2d8 100644 --- a/examples/gui/listviewtest/listviewtest.lpi +++ b/examples/gui/listview/listview.lpi @@ -34,7 +34,7 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="listviewtest.lpr"/> + <Filename Value="listview.lpr"/> <IsPartOfProject Value="True"/> </Unit0> </Units> @@ -42,10 +42,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="listviewtest"/> + <Filename Value="listview"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/listviewtest/listviewtest.lpr b/examples/gui/listview/listview.lpr similarity index 99% rename from examples/gui/listviewtest/listviewtest.lpr rename to examples/gui/listview/listview.lpr index 4343e4c31..b97e798e9 100644 --- a/examples/gui/listviewtest/listviewtest.lpr +++ b/examples/gui/listview/listview.lpr @@ -1,4 +1,4 @@ -program listviewtest; +program listview; {$mode objfpc}{$H+} diff --git a/examples/gui/listviewtest/extrafpc.cfg b/examples/gui/listviewtest/extrafpc.cfg deleted file mode 100644 index 7c0fe0a08..000000000 --- a/examples/gui/listviewtest/extrafpc.cfg +++ /dev/null @@ -1,9 +0,0 @@ --FUunits --Fu../../../lib/$fpctarget --Xs --XX --CX -#ifdef mswindows --WG -#endif - diff --git a/examples/gui/listviewtest/units/.gitignore b/examples/gui/listviewtest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/listviewtest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/memo/extrafpc.cfg b/examples/gui/memo/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/memo/extrafpc.cfg +++ b/examples/gui/memo/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/memo/memotest.lpi b/examples/gui/memo/memo.lpi similarity index 91% rename from examples/gui/memo/memotest.lpi rename to examples/gui/memo/memo.lpi index 63af46899..5b93c0710 100644 --- a/examples/gui/memo/memotest.lpi +++ b/examples/gui/memo/memo.lpi @@ -34,7 +34,7 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="memotest.lpr"/> + <Filename Value="memo.lpr"/> <IsPartOfProject Value="True"/> </Unit0> </Units> @@ -42,10 +42,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="memotest"/> + <Filename Value="memo"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/memo/memotest.lpr b/examples/gui/memo/memo.lpr similarity index 98% rename from examples/gui/memo/memotest.lpr rename to examples/gui/memo/memo.lpr index d38a4f956..d508555ce 100644 --- a/examples/gui/memo/memotest.lpr +++ b/examples/gui/memo/memo.lpr @@ -1,4 +1,4 @@ -program memotest; +program memo; {$mode objfpc}{$H+} diff --git a/examples/gui/memo/units/.gitignore b/examples/gui/memo/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/memo/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/menu/extrafpc.cfg b/examples/gui/menu/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/menu/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/menutest/menutest.lpi b/examples/gui/menu/menu.lpi similarity index 91% rename from examples/gui/menutest/menutest.lpi rename to examples/gui/menu/menu.lpi index 579cbc7c7..dc9006236 100644 --- a/examples/gui/menutest/menutest.lpi +++ b/examples/gui/menu/menu.lpi @@ -34,19 +34,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="menutest.lpr"/> + <Filename Value="menu.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="menutest"/> + <UnitName Value="menu"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="menutest"/> + <Filename Value="menu"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/menutest/menutest.lpr b/examples/gui/menu/menu.lpr similarity index 99% rename from examples/gui/menutest/menutest.lpr rename to examples/gui/menu/menu.lpr index 586a43872..5177b88ec 100644 --- a/examples/gui/menutest/menutest.lpr +++ b/examples/gui/menu/menu.lpr @@ -1,4 +1,4 @@ -program menutest; +program menu; {$mode objfpc}{$H+} diff --git a/examples/gui/menutest/extrafpc.cfg b/examples/gui/menutest/extrafpc.cfg deleted file mode 100644 index 7c0fe0a08..000000000 --- a/examples/gui/menutest/extrafpc.cfg +++ /dev/null @@ -1,9 +0,0 @@ --FUunits --Fu../../../lib/$fpctarget --Xs --XX --CX -#ifdef mswindows --WG -#endif - diff --git a/examples/gui/menutest/units/.gitignore b/examples/gui/menutest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/menutest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/modalforms/extrafpc.cfg b/examples/gui/modalforms/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/modalforms/extrafpc.cfg +++ b/examples/gui/modalforms/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/modalforms/modalforms.lpi b/examples/gui/modalforms/modalforms.lpi index 0b8855898..ae161a066 100644 --- a/examples/gui/modalforms/modalforms.lpi +++ b/examples/gui/modalforms/modalforms.lpi @@ -42,10 +42,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="modalformstests"/> + <Filename Value="modalforms"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> @@ -53,7 +53,7 @@ </SyntaxOptions> </Parsing> <Other> - <CustomOptions Value="-FUunits"/> + <CustomOptions Value="-FEbin"/> </Other> </CompilerOptions> </CONFIG> diff --git a/examples/gui/modalforms/units/.gitignore b/examples/gui/modalforms/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/modalforms/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/mousecursor/extrafpc.cfg b/examples/gui/mousecursor/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/mousecursor/extrafpc.cfg +++ b/examples/gui/mousecursor/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/mousecursor/cursordemo.lpi b/examples/gui/mousecursor/mousecursor.lpi similarity index 98% rename from examples/gui/mousecursor/cursordemo.lpi rename to examples/gui/mousecursor/mousecursor.lpi index d3e71ef7e..268fec24c 100644 --- a/examples/gui/mousecursor/cursordemo.lpi +++ b/examples/gui/mousecursor/mousecursor.lpi @@ -52,7 +52,7 @@ </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Linking> <Options> diff --git a/examples/gui/mousecursor/cursordemo.lpr b/examples/gui/mousecursor/mousecursor.lpr similarity index 100% rename from examples/gui/mousecursor/cursordemo.lpr rename to examples/gui/mousecursor/mousecursor.lpr diff --git a/examples/gui/mousecursor/units/.gitignore b/examples/gui/mousecursor/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/mousecursor/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/panel/extrafpc.cfg b/examples/gui/panel/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/panel/extrafpc.cfg +++ b/examples/gui/panel/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/panel/panel_test.lpi b/examples/gui/panel/panel.lpi similarity index 93% rename from examples/gui/panel/panel_test.lpi rename to examples/gui/panel/panel.lpi index dc519cb00..a73403cd2 100644 --- a/examples/gui/panel/panel_test.lpi +++ b/examples/gui/panel/panel.lpi @@ -35,7 +35,7 @@ </RequiredPackages> <Units Count="2"> <Unit0> - <Filename Value="panel_test.lpr"/> + <Filename Value="panel.lpr"/> <IsPartOfProject Value="True"/> </Unit0> <Unit1> @@ -48,10 +48,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="panel_test"/> + <Filename Value="panel"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/panel/panel_test.lpr b/examples/gui/panel/panel.lpr similarity index 100% rename from examples/gui/panel/panel_test.lpr rename to examples/gui/panel/panel.lpr diff --git a/examples/gui/panel/units/.gitignore b/examples/gui/panel/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/panel/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/reporting/extrafpc.cfg b/examples/gui/reporting/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/reporting/extrafpc.cfg +++ b/examples/gui/reporting/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/reporting/pdf_demo.lpi b/examples/gui/reporting/reporting.lpi similarity index 100% rename from examples/gui/reporting/pdf_demo.lpi rename to examples/gui/reporting/reporting.lpi diff --git a/examples/gui/reporting/pdf_demo.lpr b/examples/gui/reporting/reporting.lpr similarity index 100% rename from examples/gui/reporting/pdf_demo.lpr rename to examples/gui/reporting/reporting.lpr diff --git a/examples/gui/reporting/units/.gitignore b/examples/gui/reporting/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/reporting/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/scrollbigframe/extrafpc.cfg b/examples/gui/scrollbigframe/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/scrollbigframe/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/scrollframe/bigframe_test.lpi b/examples/gui/scrollbigframe/scrollbigframe.lpi similarity index 92% rename from examples/gui/scrollframe/bigframe_test.lpi rename to examples/gui/scrollbigframe/scrollbigframe.lpi index ee242841f..32e9f0f80 100644 --- a/examples/gui/scrollframe/bigframe_test.lpi +++ b/examples/gui/scrollbigframe/scrollbigframe.lpi @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <Title Value="bigframe_test"/> + <Title Value="scrollbigframe"/> <UseAppBundle Value="False"/> <ResourceType Value="res"/> </General> @@ -40,16 +40,16 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="bigframe_test.lpr"/> + <Filename Value="scrollbigframe.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="bigframe_test"/> + <UnitName Value="scrollbigframe"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="bigframe_test"/> + <Filename Value="scrollbigframe"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/examples/gui/scrollframe/bigframe_test.lpr b/examples/gui/scrollbigframe/scrollbigframe.lpr similarity index 99% rename from examples/gui/scrollframe/bigframe_test.lpr rename to examples/gui/scrollbigframe/scrollbigframe.lpr index 5309e965b..708579c9d 100644 --- a/examples/gui/scrollframe/bigframe_test.lpr +++ b/examples/gui/scrollbigframe/scrollbigframe.lpr @@ -1,4 +1,4 @@ -program bigframe_test; +program scrollbigframe; {$mode objfpc}{$H+} diff --git a/examples/gui/scrollframe/extrafpc.cfg b/examples/gui/scrollframe/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/scrollframe/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/scrollframe/frame_test.lpi b/examples/gui/scrollframe/scrollframe.lpi similarity index 92% rename from examples/gui/scrollframe/frame_test.lpi rename to examples/gui/scrollframe/scrollframe.lpi index ab3bd77f8..173d188fa 100644 --- a/examples/gui/scrollframe/frame_test.lpi +++ b/examples/gui/scrollframe/scrollframe.lpi @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <Title Value="frame_test"/> + <Title Value="scrollframe"/> <UseAppBundle Value="False"/> <ResourceType Value="res"/> </General> @@ -40,16 +40,16 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="frame_test.lpr"/> + <Filename Value="scrollframe.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="frame_test"/> + <UnitName Value="scrollframe"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="frame_test"/> + <Filename Value="scrollframe"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/examples/gui/scrollframe/frame_test.lpr b/examples/gui/scrollframe/scrollframe.lpr similarity index 99% rename from examples/gui/scrollframe/frame_test.lpr rename to examples/gui/scrollframe/scrollframe.lpr index 252f8a07b..3151ca548 100644 --- a/examples/gui/scrollframe/frame_test.lpr +++ b/examples/gui/scrollframe/scrollframe.lpr @@ -1,4 +1,4 @@ -program frame_test; +program scrollframe; {$mode objfpc}{$H+} diff --git a/examples/gui/splashscreen/extrafpc.cfg b/examples/gui/splashscreen/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/splashscreen/extrafpc.cfg +++ b/examples/gui/splashscreen/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/splashscreen/test.lpi b/examples/gui/splashscreen/splashscreen.lpi similarity index 95% rename from examples/gui/splashscreen/test.lpi rename to examples/gui/splashscreen/splashscreen.lpi index d00a979be..4ecb605b1 100644 --- a/examples/gui/splashscreen/test.lpi +++ b/examples/gui/splashscreen/splashscreen.lpi @@ -34,7 +34,7 @@ </RequiredPackages> <Units Count="4"> <Unit0> - <Filename Value="test.lpr"/> + <Filename Value="splashscreen.lpr"/> <IsPartOfProject Value="True"/> </Unit0> <Unit1> @@ -57,7 +57,7 @@ <Filename Value="splashscreen"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/splashscreen/test.lpr b/examples/gui/splashscreen/splashscreen.lpr similarity index 96% rename from examples/gui/splashscreen/test.lpr rename to examples/gui/splashscreen/splashscreen.lpr index 296caa4f8..c0b9803b8 100644 --- a/examples/gui/splashscreen/test.lpr +++ b/examples/gui/splashscreen/splashscreen.lpr @@ -1,4 +1,4 @@ -program test; +program splashscreen; {$mode objfpc}{$H+} diff --git a/examples/gui/splashscreen/units/.gitignore b/examples/gui/splashscreen/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/splashscreen/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/splitter/extrafpc.cfg b/examples/gui/splitter/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/splitter/extrafpc.cfg +++ b/examples/gui/splitter/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/splitter/splitter_test.lpi b/examples/gui/splitter/splitter.lpi similarity index 91% rename from examples/gui/splitter/splitter_test.lpi rename to examples/gui/splitter/splitter.lpi index 6f2b669f0..95cbce8fc 100644 --- a/examples/gui/splitter/splitter_test.lpi +++ b/examples/gui/splitter/splitter.lpi @@ -34,19 +34,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="splitter_test.lpr"/> + <Filename Value="splitter.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="splitter_test"/> + <UnitName Value="splitter"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="splitter_test"/> + <Filename Value="splitter"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/splitter/splitter_test.lpr b/examples/gui/splitter/splitter.lpr similarity index 99% rename from examples/gui/splitter/splitter_test.lpr rename to examples/gui/splitter/splitter.lpr index 524862041..036cf436a 100644 --- a/examples/gui/splitter/splitter_test.lpr +++ b/examples/gui/splitter/splitter.lpr @@ -1,4 +1,4 @@ -program splitter_test; +program splitter; {$mode objfpc}{$H+} diff --git a/examples/gui/splitter/units/.gitignore b/examples/gui/splitter/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/splitter/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/sprites/extrafpc.cfg b/examples/gui/sprites/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/sprites/extrafpc.cfg +++ b/examples/gui/sprites/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/sprites/spritedemo.lpi b/examples/gui/sprites/sprites.lpi similarity index 97% rename from examples/gui/sprites/spritedemo.lpi rename to examples/gui/sprites/sprites.lpi index 6b3939108..5b68bf75f 100644 --- a/examples/gui/sprites/spritedemo.lpi +++ b/examples/gui/sprites/sprites.lpi @@ -47,7 +47,7 @@ <Filename Value="spritedemo"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/sprites/spritedemo.lpr b/examples/gui/sprites/sprites.lpr similarity index 100% rename from examples/gui/sprites/spritedemo.lpr rename to examples/gui/sprites/sprites.lpr diff --git a/examples/gui/sprites/units/.gitignore b/examples/gui/sprites/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/sprites/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/stdimages/extrafpc.cfg b/examples/gui/stdimages/extrafpc.cfg index 7c0fe0a08..9e3ca936d 100644 --- a/examples/gui/stdimages/extrafpc.cfg +++ b/examples/gui/stdimages/extrafpc.cfg @@ -1,4 +1,4 @@ --FUunits +-FEbin/ -Fu../../../lib/$fpctarget -Xs -XX diff --git a/examples/gui/stdimages/stdimglist.lpi b/examples/gui/stdimages/stdimages.lpi similarity index 97% rename from examples/gui/stdimages/stdimglist.lpi rename to examples/gui/stdimages/stdimages.lpi index e9d1ba25a..2f20d15c0 100644 --- a/examples/gui/stdimages/stdimglist.lpi +++ b/examples/gui/stdimages/stdimages.lpi @@ -45,7 +45,7 @@ <Filename Value="stdimglist"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/stdimages/stdimglist.lpr b/examples/gui/stdimages/stdimages.lpr similarity index 100% rename from examples/gui/stdimages/stdimglist.lpr rename to examples/gui/stdimages/stdimages.lpr diff --git a/examples/gui/stdimages/units/.gitignore b/examples/gui/stdimages/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/stdimages/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/tab/extrafpc.cfg b/examples/gui/tab/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/tab/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/tabtest/tabtest.lpi b/examples/gui/tab/tab.lpi similarity index 91% rename from examples/gui/tabtest/tabtest.lpi rename to examples/gui/tab/tab.lpi index a3e5d6f74..9060fed25 100644 --- a/examples/gui/tabtest/tabtest.lpi +++ b/examples/gui/tab/tab.lpi @@ -34,19 +34,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="tabtest.lpr"/> + <Filename Value="tab.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="tabtest"/> + <UnitName Value="tab"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="tabtest"/> + <Filename Value="tab"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/tabtest/tabtest.lpr b/examples/gui/tab/tab.lpr similarity index 99% rename from examples/gui/tabtest/tabtest.lpr rename to examples/gui/tab/tab.lpr index cee8a13ae..93ec8b0cc 100644 --- a/examples/gui/tabtest/tabtest.lpr +++ b/examples/gui/tab/tab.lpr @@ -1,4 +1,4 @@ -program tabtest; +program tab; {$mode objfpc}{$H+} diff --git a/examples/gui/tabtest/extrafpc.cfg b/examples/gui/tabtest/extrafpc.cfg deleted file mode 100644 index 7c0fe0a08..000000000 --- a/examples/gui/tabtest/extrafpc.cfg +++ /dev/null @@ -1,9 +0,0 @@ --FUunits --Fu../../../lib/$fpctarget --Xs --XX --CX -#ifdef mswindows --WG -#endif - diff --git a/examples/gui/tabtest/units/.gitignore b/examples/gui/tabtest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/tabtest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/timer/extrafpc.cfg b/examples/gui/timer/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/timer/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/bevel/beveltest.lpi b/examples/gui/timer/timer.lpi similarity index 90% rename from examples/gui/bevel/beveltest.lpi rename to examples/gui/timer/timer.lpi index 36486204b..66a52a830 100644 --- a/examples/gui/bevel/beveltest.lpi +++ b/examples/gui/timer/timer.lpi @@ -34,19 +34,19 @@ </RequiredPackages> <Units Count="1"> <Unit0> - <Filename Value="beveltest.lpr"/> + <Filename Value="timer.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="beveltest"/> + <UnitName Value="timer"/> </Unit0> </Units> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="beveltest"/> + <Filename Value="timer"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/timertest/timertest.lpr b/examples/gui/timer/timer.lpr similarity index 99% rename from examples/gui/timertest/timertest.lpr rename to examples/gui/timer/timer.lpr index ab7c4fa67..79d93b672 100644 --- a/examples/gui/timertest/timertest.lpr +++ b/examples/gui/timer/timer.lpr @@ -1,4 +1,4 @@ -program timertest; +program timer; {$mode objfpc}{$H+} diff --git a/examples/gui/timertest/extrafpc.cfg b/examples/gui/timertest/extrafpc.cfg deleted file mode 100644 index 7c0fe0a08..000000000 --- a/examples/gui/timertest/extrafpc.cfg +++ /dev/null @@ -1,9 +0,0 @@ --FUunits --Fu../../../lib/$fpctarget --Xs --XX --CX -#ifdef mswindows --WG -#endif - diff --git a/examples/gui/timertest/units/.gitignore b/examples/gui/timertest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/timertest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/togglebox/extrafpc.cfg b/examples/gui/togglebox/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/togglebox/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/togglebox/ToggleBoxTest.lpi b/examples/gui/togglebox/togglebox.lpi similarity index 94% rename from examples/gui/togglebox/ToggleBoxTest.lpi rename to examples/gui/togglebox/togglebox.lpi index 327b42587..5f4326404 100644 --- a/examples/gui/togglebox/ToggleBoxTest.lpi +++ b/examples/gui/togglebox/togglebox.lpi @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <Title Value="ToggleBoxTest"/> + <Title Value="togglebox"/> <UseAppBundle Value="False"/> <ResourceType Value="res"/> </General> @@ -38,7 +38,7 @@ </RequiredPackages> <Units Count="2"> <Unit0> - <Filename Value="ToggleBoxTest.lpr"/> + <Filename Value="togglebox.lpr"/> <IsPartOfProject Value="True"/> </Unit0> <Unit1> @@ -51,7 +51,7 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="ToggleBoxTest"/> + <Filename Value="togglebox"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/examples/gui/togglebox/ToggleBoxTest.lpr b/examples/gui/togglebox/togglebox.lpr similarity index 93% rename from examples/gui/togglebox/ToggleBoxTest.lpr rename to examples/gui/togglebox/togglebox.lpr index 8866f9c57..5a1ad639b 100644 --- a/examples/gui/togglebox/ToggleBoxTest.lpr +++ b/examples/gui/togglebox/togglebox.lpr @@ -1,4 +1,4 @@ -program ToggleBoxTest; +program togglebox; {$mode objfpc}{$H+} diff --git a/examples/gui/treeview/extrafpc.cfg b/examples/gui/treeview/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/treeview/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/treeviewtest/stateimages.pas b/examples/gui/treeview/stateimages.pas similarity index 100% rename from examples/gui/treeviewtest/stateimages.pas rename to examples/gui/treeview/stateimages.pas diff --git a/examples/gui/treeviewtest/treeviewtest.lpi b/examples/gui/treeview/treeview.lpi similarity index 91% rename from examples/gui/treeviewtest/treeviewtest.lpi rename to examples/gui/treeview/treeview.lpi index 8f925b0dd..6f4cd3ad6 100644 --- a/examples/gui/treeviewtest/treeviewtest.lpi +++ b/examples/gui/treeview/treeview.lpi @@ -34,9 +34,9 @@ </RequiredPackages> <Units Count="2"> <Unit0> - <Filename Value="treeviewtest.lpr"/> + <Filename Value="treeview.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="treeviewtest"/> + <UnitName Value="treeview"/> </Unit0> <Unit1> <Filename Value="stateimages.pas"/> @@ -48,10 +48,10 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="treeviewtest"/> + <Filename Value="treeview"/> </Target> <SearchPaths> - <UnitOutputDirectory Value="units"/> + <UnitOutputDirectory Value="bin"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/examples/gui/treeviewtest/treeviewtest.lpr b/examples/gui/treeview/treeview.lpr similarity index 99% rename from examples/gui/treeviewtest/treeviewtest.lpr rename to examples/gui/treeview/treeview.lpr index 53dbe982c..0e90528b6 100644 --- a/examples/gui/treeviewtest/treeviewtest.lpr +++ b/examples/gui/treeview/treeview.lpr @@ -1,4 +1,4 @@ -program treeviewtest; +program treeview; {$mode objfpc}{$H+} diff --git a/examples/gui/treeviewtest/extrafpc.cfg b/examples/gui/treeviewtest/extrafpc.cfg deleted file mode 100644 index 7c0fe0a08..000000000 --- a/examples/gui/treeviewtest/extrafpc.cfg +++ /dev/null @@ -1,9 +0,0 @@ --FUunits --Fu../../../lib/$fpctarget --Xs --XX --CX -#ifdef mswindows --WG -#endif - diff --git a/examples/gui/treeviewtest/units/.gitignore b/examples/gui/treeviewtest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/treeviewtest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/video_vlc/extrafpc.cfg b/examples/gui/video_vlc/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/video_vlc/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/video_vlc/testfpguivlc.lpi b/examples/gui/video_vlc/video_vlc.lpi similarity index 95% rename from examples/gui/video_vlc/testfpguivlc.lpi rename to examples/gui/video_vlc/video_vlc.lpi index 5a13551b7..42490cd08 100644 --- a/examples/gui/video_vlc/testfpguivlc.lpi +++ b/examples/gui/video_vlc/video_vlc.lpi @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <Title Value="testfpguivlc"/> + <Title Value="video_vlc"/> <UseAppBundle Value="False"/> <ResourceType Value="res"/> </General> @@ -40,7 +40,7 @@ </RequiredPackages> <Units Count="5"> <Unit0> - <Filename Value="testfpguivlc.lpr"/> + <Filename Value="video_vlc.lpr"/> <IsPartOfProject Value="True"/> </Unit0> <Unit1> @@ -68,7 +68,7 @@ <CompilerOptions> <Version Value="11"/> <Target> - <Filename Value="testfpguivlc"/> + <Filename Value="video_vlc"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/examples/gui/video_vlc/testfpguivlc.lpr b/examples/gui/video_vlc/video_vlc.lpr similarity index 95% rename from examples/gui/video_vlc/testfpguivlc.lpr rename to examples/gui/video_vlc/video_vlc.lpr index 3846a69cd..a27cef2d1 100644 --- a/examples/gui/video_vlc/testfpguivlc.lpr +++ b/examples/gui/video_vlc/video_vlc.lpr @@ -1,4 +1,4 @@ -program testfpguivlc; +program video_vlc; {$mode objfpc}{$H+} diff --git a/examples/gui/wuline/extrafpc.cfg b/examples/gui/wuline/extrafpc.cfg new file mode 100644 index 000000000..9e3ca936d --- /dev/null +++ b/examples/gui/wuline/extrafpc.cfg @@ -0,0 +1,9 @@ +-FEbin/ +-Fu../../../lib/$fpctarget +-Xs +-XX +-CX +#ifdef mswindows +-WG +#endif + diff --git a/examples/gui/wuline/wuline.lpi b/examples/gui/wuline/wuline.lpi new file mode 100644 index 000000000..336717e18 --- /dev/null +++ b/examples/gui/wuline/wuline.lpi @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<CONFIG> + <ProjectOptions> + <Version Value="9"/> + <General> + <Flags> + <SaveOnlyProjectUnits Value="True"/> + <LRSInOutputDirectory Value="False"/> + </Flags> + <SessionStorage Value="InProjectDir"/> + <MainUnit Value="0"/> + </General> + <VersionInfo> + <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)"/> + <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> + </PublishOptions> + <RunParams> + <local> + <FormatVersion Value="1"/> + <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + </local> + </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="fpgui_toolkit"/> + </Item1> + </RequiredPackages> + <Units Count="1"> + <Unit0> + <Filename Value="wuline.lpr"/> + <IsPartOfProject Value="True"/> + <UnitName Value="wuline"/> + </Unit0> + </Units> + </ProjectOptions> + <CompilerOptions> + <Version Value="11"/> + <Target> + <Filename Value="wuline"/> + </Target> + <SearchPaths> + <UnitOutputDirectory Value="bin"/> + </SearchPaths> + <Parsing> + <SyntaxOptions> + <UseAnsiStrings Value="False"/> + </SyntaxOptions> + </Parsing> + <Other> + <CompilerPath Value="$(CompPath)"/> + </Other> + </CompilerOptions> +</CONFIG> diff --git a/examples/gui/wulinetest/wuline_test.lpr b/examples/gui/wuline/wuline.lpr similarity index 99% rename from examples/gui/wulinetest/wuline_test.lpr rename to examples/gui/wuline/wuline.lpr index a726d8438..95aa27c88 100644 --- a/examples/gui/wulinetest/wuline_test.lpr +++ b/examples/gui/wuline/wuline.lpr @@ -1,4 +1,4 @@ -program wuline_test; +program wulinetest; {$mode objfpc}{$H+} diff --git a/examples/gui/wulinetest/extrafpc.cfg b/examples/gui/wulinetest/extrafpc.cfg deleted file mode 100644 index 7c0fe0a08..000000000 --- a/examples/gui/wulinetest/extrafpc.cfg +++ /dev/null @@ -1,9 +0,0 @@ --FUunits --Fu../../../lib/$fpctarget --Xs --XX --CX -#ifdef mswindows --WG -#endif - diff --git a/examples/gui/wulinetest/units/.gitignore b/examples/gui/wulinetest/units/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/examples/gui/wulinetest/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/examples/gui/wulinetest/wuline_test.lpi b/examples/gui/wulinetest/wuline_test.lpi deleted file mode 100644 index 55fd38646..000000000 --- a/examples/gui/wulinetest/wuline_test.lpi +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<CONFIG> - <ProjectOptions> - <Version Value="9"/> - <General> - <Flags> - <SaveOnlyProjectUnits Value="True"/> - <LRSInOutputDirectory Value="False"/> - </Flags> - <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> - </General> - <VersionInfo> - <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)"/> - <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> - </PublishOptions> - <RunParams> - <local> - <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> - </local> - </RunParams> - <RequiredPackages Count="1"> - <Item1> - <PackageName Value="fpgui_toolkit"/> - </Item1> - </RequiredPackages> - <Units Count="1"> - <Unit0> - <Filename Value="wuline_test.lpr"/> - <IsPartOfProject Value="True"/> - <UnitName Value="wuline_test"/> - </Unit0> - </Units> - </ProjectOptions> - <CompilerOptions> - <Version Value="11"/> - <Target> - <Filename Value="wulinetest"/> - </Target> - <SearchPaths> - <UnitOutputDirectory Value="units"/> - </SearchPaths> - <Parsing> - <SyntaxOptions> - <UseAnsiStrings Value="False"/> - </SyntaxOptions> - </Parsing> - <Other> - <CompilerPath Value="$(CompPath)"/> - </Other> - </CompilerOptions> -</CONFIG> diff --git a/examples/readme.txt b/examples/readme.txt index 05331e24a..cf1225621 100644 --- a/examples/readme.txt +++ b/examples/readme.txt @@ -1,9 +1,8 @@ - Compiling the fpGUI Demos + Compiling the fpGUI Demos - - Compiling any of the examples from the Command Line - =================================================== + Compiling any of the examples from the Command Line +=============================================================================== You need to compile the fpGUI toolkit first as mentioned in the README.txt file located in the <fpgui>/docs/ directory. @@ -11,18 +10,37 @@ README.txt file located in the <fpgui>/docs/ directory. I'll assume the fpc executable path has been setup so you can execute 'fpc' from any directory. Every project in the 'examples' directory has its own extrafpc.cfg file. You only need to specify that config file and the -project's main unit to compile it. +project's main unit to compile it. The executable is written in the 'bin' +sub-directory of the project. If this sub-directory doesn't exist, create it before. The format is as follows: + fpc @extrafpc.cfg <project main unit> Example: + fpc @extrafpc.cfg docedit.lpr or fpc @extrafpc.cfg helloworld.pas - ======================================================= +You can also compile all examples with compileall.bat (for Windows cmd) +or compileall.sh script (for bash). For example: + + $ cd fpgui/examples/gui + $ ./compileall.sh + +or + + > cd fpgui/examples/gui + > compileall.bat + +NB: + - The compilation of gui/video_vlc example will fail if you have not compiled + fpgui with the third party vlc and fpg_vlc units. + - apps/gui is not supported by compileall.(sh|bat) scripts. You have to compile + it by hand. +===============================================================================