diff --git a/KolibriOS/Examples/ColorButtons/ColorButtons.dpr b/Examples/ColorButtons/ColorButtons.dpr similarity index 100% rename from KolibriOS/Examples/ColorButtons/ColorButtons.dpr rename to Examples/ColorButtons/ColorButtons.dpr diff --git a/Examples/ColorButtons/build.bat b/Examples/ColorButtons/build.bat new file mode 100644 index 0000000..c0c3e4d --- /dev/null +++ b/Examples/ColorButtons/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0ColorButtons" \ No newline at end of file diff --git a/KolibriOS/Examples/DateTime/DateTime.dpr b/Examples/DateTime/DateTime.dpr similarity index 100% rename from KolibriOS/Examples/DateTime/DateTime.dpr rename to Examples/DateTime/DateTime.dpr diff --git a/Examples/DateTime/build.bat b/Examples/DateTime/build.bat new file mode 100644 index 0000000..1e3b167 --- /dev/null +++ b/Examples/DateTime/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0DateTime" \ No newline at end of file diff --git a/KolibriOS/Examples/DrawImage/DrawImage.dpr b/Examples/DrawImage/DrawImage.dpr similarity index 100% rename from KolibriOS/Examples/DrawImage/DrawImage.dpr rename to Examples/DrawImage/DrawImage.dpr diff --git a/KolibriOS/Examples/DrawImage/Lena.tga b/Examples/DrawImage/Lena.tga similarity index 100% rename from KolibriOS/Examples/DrawImage/Lena.tga rename to Examples/DrawImage/Lena.tga diff --git a/Examples/DrawImage/build.bat b/Examples/DrawImage/build.bat new file mode 100644 index 0000000..e720871 --- /dev/null +++ b/Examples/DrawImage/build.bat @@ -0,0 +1,3 @@ +@echo off +call "%~dp0..\..\Lib\build.bat" "%~dp0DrawImage" +copy "%~dp0*.tga" "%~dp0..\..\Bin" >nul \ No newline at end of file diff --git a/KolibriOS/Examples/DrawImageEx/DrawImageEx.dpr b/Examples/DrawImageEx/DrawImageEx.dpr similarity index 100% rename from KolibriOS/Examples/DrawImageEx/DrawImageEx.dpr rename to Examples/DrawImageEx/DrawImageEx.dpr diff --git a/KolibriOS/Examples/DrawImageEx/Flower(4bpp).bmp b/Examples/DrawImageEx/Flower(4bpp).bmp similarity index 100% rename from KolibriOS/Examples/DrawImageEx/Flower(4bpp).bmp rename to Examples/DrawImageEx/Flower(4bpp).bmp diff --git a/KolibriOS/Examples/DrawImageEx/House(24bpp).bmp b/Examples/DrawImageEx/House(24bpp).bmp similarity index 100% rename from KolibriOS/Examples/DrawImageEx/House(24bpp).bmp rename to Examples/DrawImageEx/House(24bpp).bmp diff --git a/KolibriOS/Examples/DrawImageEx/Mario(1bpp).bmp b/Examples/DrawImageEx/Mario(1bpp).bmp similarity index 100% rename from KolibriOS/Examples/DrawImageEx/Mario(1bpp).bmp rename to Examples/DrawImageEx/Mario(1bpp).bmp diff --git a/Examples/DrawImageEx/build.bat b/Examples/DrawImageEx/build.bat new file mode 100644 index 0000000..9e41b9d --- /dev/null +++ b/Examples/DrawImageEx/build.bat @@ -0,0 +1,3 @@ +@echo off +call "%~dp0..\..\Lib\build.bat" "%~dp0DrawImageEx" +copy "%~dp0*.bmp" "%~dp0..\..\Bin" >nul \ No newline at end of file diff --git a/KolibriOS/Examples/DrawText/DrawText.dpr b/Examples/DrawText/DrawText.dpr similarity index 100% rename from KolibriOS/Examples/DrawText/DrawText.dpr rename to Examples/DrawText/DrawText.dpr diff --git a/Examples/DrawText/build.bat b/Examples/DrawText/build.bat new file mode 100644 index 0000000..5be6609 --- /dev/null +++ b/Examples/DrawText/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0DrawText" \ No newline at end of file diff --git a/KolibriOS/Examples/Examples.bpg b/Examples/Examples.bpg similarity index 100% rename from KolibriOS/Examples/Examples.bpg rename to Examples/Examples.bpg diff --git a/KolibriOS/Examples/GetCurrentDir/GetCurrentDir.dpr b/Examples/GetCurrentDir/GetCurrentDir.dpr similarity index 100% rename from KolibriOS/Examples/GetCurrentDir/GetCurrentDir.dpr rename to Examples/GetCurrentDir/GetCurrentDir.dpr diff --git a/Examples/GetCurrentDir/build.bat b/Examples/GetCurrentDir/build.bat new file mode 100644 index 0000000..60590e5 --- /dev/null +++ b/Examples/GetCurrentDir/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0GetCurrentDir" \ No newline at end of file diff --git a/KolibriOS/Examples/GetPixel/GetPixel.dpr b/Examples/GetPixel/GetPixel.dpr similarity index 100% rename from KolibriOS/Examples/GetPixel/GetPixel.dpr rename to Examples/GetPixel/GetPixel.dpr diff --git a/Examples/GetPixel/build.bat b/Examples/GetPixel/build.bat new file mode 100644 index 0000000..b55c8d9 --- /dev/null +++ b/Examples/GetPixel/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0GetPixel" \ No newline at end of file diff --git a/KolibriOS/Examples/GetPointOwner/GetPointOwner.dpr b/Examples/GetPointOwner/GetPointOwner.dpr similarity index 100% rename from KolibriOS/Examples/GetPointOwner/GetPointOwner.dpr rename to Examples/GetPointOwner/GetPointOwner.dpr diff --git a/Examples/GetPointOwner/build.bat b/Examples/GetPointOwner/build.bat new file mode 100644 index 0000000..09bde88 --- /dev/null +++ b/Examples/GetPointOwner/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0GetPointOwner" \ No newline at end of file diff --git a/KolibriOS/Examples/Hello/Hello.dpr b/Examples/Hello/Hello.dpr similarity index 100% rename from KolibriOS/Examples/Hello/Hello.dpr rename to Examples/Hello/Hello.dpr diff --git a/Examples/Hello/build.bat b/Examples/Hello/build.bat new file mode 100644 index 0000000..4cd7f03 --- /dev/null +++ b/Examples/Hello/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0Hello" \ No newline at end of file diff --git a/KolibriOS/Examples/LoadFile/LoadFile.dpr b/Examples/LoadFile/LoadFile.dpr similarity index 100% rename from KolibriOS/Examples/LoadFile/LoadFile.dpr rename to Examples/LoadFile/LoadFile.dpr diff --git a/Examples/LoadFile/build.bat b/Examples/LoadFile/build.bat new file mode 100644 index 0000000..e240b9a --- /dev/null +++ b/Examples/LoadFile/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0LoadFile" \ No newline at end of file diff --git a/KolibriOS/Examples/ReadFolder/ReadFolder.dpr b/Examples/ReadFolder/ReadFolder.dpr similarity index 100% rename from KolibriOS/Examples/ReadFolder/ReadFolder.dpr rename to Examples/ReadFolder/ReadFolder.dpr diff --git a/Examples/ReadFolder/build.bat b/Examples/ReadFolder/build.bat new file mode 100644 index 0000000..57fb7ed --- /dev/null +++ b/Examples/ReadFolder/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0ReadFolder" \ No newline at end of file diff --git a/KolibriOS/Examples/Screenshot/Screenshot.dpr b/Examples/Screenshot/Screenshot.dpr similarity index 100% rename from KolibriOS/Examples/Screenshot/Screenshot.dpr rename to Examples/Screenshot/Screenshot.dpr diff --git a/Examples/Screenshot/build.bat b/Examples/Screenshot/build.bat new file mode 100644 index 0000000..53087e1 --- /dev/null +++ b/Examples/Screenshot/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0Screenshot" \ No newline at end of file diff --git a/KolibriOS/Examples/SetCursor/SetCursor.dpr b/Examples/SetCursor/SetCursor.dpr similarity index 100% rename from KolibriOS/Examples/SetCursor/SetCursor.dpr rename to Examples/SetCursor/SetCursor.dpr diff --git a/KolibriOS/Examples/SetCursor/arrow.bmp b/Examples/SetCursor/arrow.bmp similarity index 100% rename from KolibriOS/Examples/SetCursor/arrow.bmp rename to Examples/SetCursor/arrow.bmp diff --git a/Examples/SetCursor/build.bat b/Examples/SetCursor/build.bat new file mode 100644 index 0000000..a2aaf89 --- /dev/null +++ b/Examples/SetCursor/build.bat @@ -0,0 +1,3 @@ +@echo off +call "%~dp0..\..\Lib\build.bat" "%~dp0SetCursor" +copy "%~dp0*.bmp" "%~dp0..\..\Bin" >nul \ No newline at end of file diff --git a/KolibriOS/Examples/SetCursor/point.bmp b/Examples/SetCursor/point.bmp similarity index 100% rename from KolibriOS/Examples/SetCursor/point.bmp rename to Examples/SetCursor/point.bmp diff --git a/KolibriOS/Examples/SetCursor/wait.bmp b/Examples/SetCursor/wait.bmp similarity index 100% rename from KolibriOS/Examples/SetCursor/wait.bmp rename to Examples/SetCursor/wait.bmp diff --git a/KolibriOS/Examples/SetPixel/SetPixel.dpr b/Examples/SetPixel/SetPixel.dpr similarity index 100% rename from KolibriOS/Examples/SetPixel/SetPixel.dpr rename to Examples/SetPixel/SetPixel.dpr diff --git a/Examples/SetPixel/build.bat b/Examples/SetPixel/build.bat new file mode 100644 index 0000000..1fe909a --- /dev/null +++ b/Examples/SetPixel/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0SetPixel" \ No newline at end of file diff --git a/KolibriOS/Examples/SetWindowPos/SetWindowPos.dpr b/Examples/SetWindowPos/SetWindowPos.dpr similarity index 100% rename from KolibriOS/Examples/SetWindowPos/SetWindowPos.dpr rename to Examples/SetWindowPos/SetWindowPos.dpr diff --git a/Examples/SetWindowPos/build.bat b/Examples/SetWindowPos/build.bat new file mode 100644 index 0000000..2b50bee --- /dev/null +++ b/Examples/SetWindowPos/build.bat @@ -0,0 +1 @@ +@call "%~dp0..\..\Lib\build.bat" "%~dp0SetWindowPos" \ No newline at end of file diff --git a/KolibriOS/Examples/ColorButtons/build.bat b/KolibriOS/Examples/ColorButtons/build.bat deleted file mode 100644 index 27b6800..0000000 --- a/KolibriOS/Examples/ColorButtons/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0ColorButtons" \ No newline at end of file diff --git a/KolibriOS/Examples/DateTime/build.bat b/KolibriOS/Examples/DateTime/build.bat deleted file mode 100644 index 641635a..0000000 --- a/KolibriOS/Examples/DateTime/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0DateTime" \ No newline at end of file diff --git a/KolibriOS/Examples/DrawImage/build.bat b/KolibriOS/Examples/DrawImage/build.bat deleted file mode 100644 index 105178b..0000000 --- a/KolibriOS/Examples/DrawImage/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -call "%~dp0..\build.bat" "%~dp0DrawImage" -copy "%~dp0*.tga" "%~dp0..\..\..\Bin" \ No newline at end of file diff --git a/KolibriOS/Examples/DrawImageEx/build.bat b/KolibriOS/Examples/DrawImageEx/build.bat deleted file mode 100644 index 3ce4d63..0000000 --- a/KolibriOS/Examples/DrawImageEx/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -call "%~dp0..\build.bat" "%~dp0DrawImageEx" -copy "%~dp0*.bmp" "%~dp0..\..\..\Bin" \ No newline at end of file diff --git a/KolibriOS/Examples/DrawText/build.bat b/KolibriOS/Examples/DrawText/build.bat deleted file mode 100644 index e1b73f0..0000000 --- a/KolibriOS/Examples/DrawText/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0DrawText" \ No newline at end of file diff --git a/KolibriOS/Examples/GetCurrentDir/build.bat b/KolibriOS/Examples/GetCurrentDir/build.bat deleted file mode 100644 index 6328dbe..0000000 --- a/KolibriOS/Examples/GetCurrentDir/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0GetCurrentDir" \ No newline at end of file diff --git a/KolibriOS/Examples/GetPixel/build.bat b/KolibriOS/Examples/GetPixel/build.bat deleted file mode 100644 index 4a6a38e..0000000 --- a/KolibriOS/Examples/GetPixel/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0GetPixel" \ No newline at end of file diff --git a/KolibriOS/Examples/GetPointOwner/build.bat b/KolibriOS/Examples/GetPointOwner/build.bat deleted file mode 100644 index b4c4c30..0000000 --- a/KolibriOS/Examples/GetPointOwner/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0GetPointOwner" \ No newline at end of file diff --git a/KolibriOS/Examples/Hello/build.bat b/KolibriOS/Examples/Hello/build.bat deleted file mode 100644 index b2b7dc6..0000000 --- a/KolibriOS/Examples/Hello/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0Hello" \ No newline at end of file diff --git a/KolibriOS/Examples/LoadFile/build.bat b/KolibriOS/Examples/LoadFile/build.bat deleted file mode 100644 index 2dcbaa3..0000000 --- a/KolibriOS/Examples/LoadFile/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0LoadFile" \ No newline at end of file diff --git a/KolibriOS/Examples/ReadFolder/build.bat b/KolibriOS/Examples/ReadFolder/build.bat deleted file mode 100644 index 33f4829..0000000 --- a/KolibriOS/Examples/ReadFolder/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0ReadFolder" \ No newline at end of file diff --git a/KolibriOS/Examples/Screenshot/build.bat b/KolibriOS/Examples/Screenshot/build.bat deleted file mode 100644 index 65ff628..0000000 --- a/KolibriOS/Examples/Screenshot/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0Screenshot" \ No newline at end of file diff --git a/KolibriOS/Examples/SetCursor/build.bat b/KolibriOS/Examples/SetCursor/build.bat deleted file mode 100644 index 2e23013..0000000 --- a/KolibriOS/Examples/SetCursor/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -call "%~dp0..\build.bat" "%~dp0SetCursor" -copy "%~dp0*.bmp" "%~dp0..\..\..\Bin" \ No newline at end of file diff --git a/KolibriOS/Examples/SetPixel/build.bat b/KolibriOS/Examples/SetPixel/build.bat deleted file mode 100644 index 0ac7c85..0000000 --- a/KolibriOS/Examples/SetPixel/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0SetPixel" \ No newline at end of file diff --git a/KolibriOS/Examples/SetWindowPos/build.bat b/KolibriOS/Examples/SetWindowPos/build.bat deleted file mode 100644 index b82bea3..0000000 --- a/KolibriOS/Examples/SetWindowPos/build.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0..\build.bat" "%~dp0SetWindowPos" \ No newline at end of file diff --git a/KolibriOS/KolibriOS.pas b/Lib/KolibriOS.pas similarity index 100% rename from KolibriOS/KolibriOS.pas rename to Lib/KolibriOS.pas diff --git a/KolibriOS/Examples/build.bat b/Lib/build.bat similarity index 60% rename from KolibriOS/Examples/build.bat rename to Lib/build.bat index 328d240..781545c 100644 --- a/KolibriOS/Examples/build.bat +++ b/Lib/build.bat @@ -7,10 +7,10 @@ if "%Source%"=="" ( goto exit ) -set Bin=%~dp0..\..\Bin +set Bin=%~dp0..\Bin set Options=-b -$C- -$I- -$T+ set Target=%Bin%\%~n1 -set Units=%~dp0..\..\RTL;%~dp0.. +set Units=%~dp0..\RTL;%~dp0..\Lib if not exist "%Bin%" mkdir "%Bin%" if exist "%Source%.cfg" del "%Source%.cfg" @@ -18,13 +18,13 @@ if exist "%Source%.cfg" del "%Source%.cfg" dcc32 "%Source%.dpr" -e"%Bin%" %Options% -u"%Units%" if errorlevel 1 goto exit -"%~dp0..\..\pet" -nologo -strip -trunc -dropsect .idata,.rsrc -rebase 0 -osver 0.7 -ls -into "%Target%.exe" +"%~dp0..\pet" -nologo -strip -trunc -dropsect .idata,.rsrc -rebase 0 -osver 0.7 -ls -into "%Target%.exe" if errorlevel 1 goto exit -"%~dp0..\..\exe2kos" "%Target%.exe" "%Target%" +"%~dp0..\exe2kos" "%Target%.exe" "%Target%" if errorlevel 1 goto exit del "%Target%.exe" -%~dp0..\..\kpack "%Target%" +%~dp0..\kpack "%Target%" :exit \ No newline at end of file diff --git a/build-all.bat b/build-all.bat index 532cb1b..0fdd947 100644 --- a/build-all.bat +++ b/build-all.bat @@ -3,6 +3,6 @@ call %~dp0build-RTL.bat if errorlevel 1 goto exit -call %~dp0build-apps.bat +call %~dp0build-examples.bat :exit \ No newline at end of file diff --git a/build-apps.bat b/build-apps.bat deleted file mode 100644 index 20832fc..0000000 --- a/build-apps.bat +++ /dev/null @@ -1,47 +0,0 @@ -@echo off - -call %~dp0KolibriOS\Examples\ColorButtons\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\DateTime\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\DrawImage\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\DrawImageEx\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\DrawText\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\GetCurrentDir\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\GetPixel\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\GetPointOwner\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\Hello\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\LoadFile\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\ReadFolder\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\Screenshot\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\SetCursor\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\SetPixel\build.bat -if errorlevel 1 goto exit - -call %~dp0KolibriOS\Examples\SetWindowPos\build.bat - -:exit \ No newline at end of file diff --git a/build-examples.bat b/build-examples.bat new file mode 100644 index 0000000..1479a1e --- /dev/null +++ b/build-examples.bat @@ -0,0 +1,47 @@ +@echo off + +call %~dp0Examples\ColorButtons\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\DateTime\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\DrawImage\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\DrawImageEx\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\DrawText\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\GetCurrentDir\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\GetPixel\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\GetPointOwner\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\Hello\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\LoadFile\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\ReadFolder\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\Screenshot\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\SetCursor\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\SetPixel\build.bat +if errorlevel 1 goto exit + +call %~dp0Examples\SetWindowPos\build.bat + +:exit \ No newline at end of file diff --git a/KolibriOS/license.md b/license.md similarity index 100% rename from KolibriOS/license.md rename to license.md