Merge branch 'develop' into 'master'

Develop

See merge request spexeah/asuro!2
This commit is contained in:
Kieron 2021-06-20 20:17:11 +00:00
commit c140fd7e57
4 changed files with 52 additions and 24 deletions

1
.gitignore vendored
View File

@ -9,5 +9,6 @@
/*.md5 /*.md5
/*.sh~ /*.sh~
/*.img /*.img
src/include/asuro.pas
.vscode/launch.json .vscode/launch.json
.vscode .vscode

20
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,20 @@
{
"configurations": [
{
"name":"Run",
"request": "launch",
"type": "coreclr",
"preLaunchTask": "Build",
"program": "VBoxSDL",
"args": [
"--comment",
"Asuro",
"--startvm",
"7d395c96-891c-4139-b77d-9b6b144b0b93"
],
"cwd": "${workspaceFolder}",
"console": "internalConsole",
"internalConsoleOptions": "neverOpen"
}
]
}

31
.vscode/tasks.json vendored Normal file
View File

@ -0,0 +1,31 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "2.0.0",
"tasks": [
{
"label": "Build",
"command": "docker-compose",
"args": [
"run",
"builder"
],
"type": "shell",
"problemMatcher": [],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Build (Builder)",
"command": "docker-compose",
"args": [
"build",
"builder"
],
"type": "shell"
}
]
}

View File

@ -1,24 +0,0 @@
unit asuro;
interface
const
VERSION = '1.1.0-a';
VERSION_MAJOR = '1';
VERSION_MINOR = '1';
VERSION_SUB = '0';
REVISION = '';
RELEASE = 'a';
LINE_COUNT = 33270;
FILE_COUNT = 106;
DRIVER_COUNT = 34;
FPC_VERSION = '2.6.4';
NASM_VERSION = '2.14.02';
MAKE_VERSION = '4.2.1';
COMPILE_DATE = '20/06/21';
COMPILE_TIME = '01:26:22';
CHECKSUM = '7f99140bf11cfd367c86bca3e44db0d9';
implementation
end.