Commit f8b92dd1 authored by Tom Barbalet's avatar Tom Barbalet

Cleanup toolkit

parent 4457cab1
Pipeline #121679184 failed with stages
in 1 minute and 1 second
{
"configurations": [
{
"name": "macOS",
"includePath": ["${workspaceFolder}/**"],
"defines": [],
"macFrameworkPath": ["/System/Library/Frameworks", "/Library/Frameworks"],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"cppStandard": "c++17",
"intelliSenseMode": "${default}"
}
],
"version": 4
}
{
"version": "0.2.0",
"configurations": [
{
"name": "(lldb) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/helloworld.out",
"args": [],
"stopAtEntry": true,
"cwd": "${workspaceFolder}",
"environment": [],
"externalConsole": true,
"MIMode": "lldb",
"logging": {
"trace": true,
"traceResponse": true,
"engineLogging": true
}
}
]
}
\ No newline at end of file
{
"version": "2.0.0",
"tasks": [
{
"label": "Build with Clang",
"type": "shell",
"command": "clang++",
"args": [
"-std=c++17",
"-stdlib=libc++",
"helloworld.cpp",
"-o",
"helloworld.out",
"--debug"
],
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
\ No newline at end of file
......@@ -41,7 +41,7 @@
#define CONSOLE_ONLY
#define GUI_COMMAND_LINE_HYBRID
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "../sim/sim.h"
#include "../script/script.h"
#include "../universe/universe.h"
......
......@@ -36,7 +36,7 @@
#ifndef SIMULATEDAPE_ENTITY_H
#define SIMULATEDAPE_ENTITY_H
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "../script/script.h"
#include "../sim/sim.h"
#include "../universe/universe.h"
......
......@@ -35,7 +35,7 @@
#include <math.h>
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "entity.h"
#define MAX_SKELETON_DIAGRAM_POINTS 200000
......
......@@ -35,15 +35,15 @@
#ifndef _WIN32
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../toolkit/toolkit.h"
#include "../toolkit/shared.h"
#include "../script/script.h"
#include "../sim/sim.h"
#else
#include "..\apetoolkit\toolkit.h"
#include "..\apetoolkit\shared.h"
#include "..\toolkit\toolkit.h"
#include "..\toolkit\shared.h"
#include "..\script\script.h"
#include "..\sim\sim.h"
......
......@@ -39,7 +39,7 @@
#ifndef _WIN32
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "../script/script.h"
#include "../sim/sim.h"
......
......@@ -42,11 +42,11 @@
#ifndef _WIN32
#include "../apetoolkit/shared.h"
#include "../toolkit/shared.h"
#else
#include "..\apetoolkit\shared.h"
#include "..\toolkit\shared.h"
#endif
......
......@@ -33,11 +33,11 @@
****************************************************************/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "../script/script.h"
#include "../sim/sim.h"
#include "../universe/universe.h"
#include "../apetoolkit/shared.h"
#include "../toolkit/shared.h"
#import "ASDefaults.h"
......
......@@ -55,7 +55,7 @@
#include <sys/time.h>
#endif
#include "apetoolkit/toolkit.h"
#include "toolkit/toolkit.h"
#include "sim/sim.h"
#include "script/script.h"
#include "universe/universe.h"
......
......@@ -53,8 +53,8 @@ ASMacCG.h
#endif
#endif
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../toolkit/toolkit.h"
#include "../toolkit/shared.h"
@interface ASMacCG : NSView
......
......@@ -36,15 +36,15 @@
#ifndef _WIN32
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../toolkit/toolkit.h"
#include "../toolkit/shared.h"
#include "../script/script.h"
#include "../sim/sim.h"
#else
#include "..\apetoolkit\toolkit.h"
#include "..\apetoolkit\shared.h"
#include "..\toolkit\toolkit.h"
#include "..\toolkit\shared.h"
#include "..\script\script.h"
#include "..\sim\sim.h"
......
......@@ -40,7 +40,7 @@
more care must be taken in optimizing the interpret code.
*/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "script.h"
......
......@@ -37,7 +37,7 @@
* \brief This parses ApeScript and produces the ApeScript byte-code.
*/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "script.h"
......
......@@ -33,7 +33,7 @@
****************************************************************/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "sim.h"
......
......@@ -33,7 +33,7 @@
****************************************************************/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "sim.h"
......
......@@ -33,7 +33,7 @@
****************************************************************/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "sim.h"
......
......@@ -35,7 +35,7 @@
#ifndef _WIN32
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "../script/script.h"
#else
......
......@@ -36,8 +36,8 @@
#include <stdio.h>
#include <time.h>
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../toolkit/toolkit.h"
#include "../toolkit/shared.h"
#include "../script/script.h"
#include "../sim/sim.h"
#include "../entity/entity.h"
......
......@@ -36,7 +36,7 @@
/* this doesn't currently work, it is included here for unit
testing in the future */
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include <stdio.h>
#include <time.h>
......
......@@ -36,7 +36,7 @@
/* this doesn't currently work, it is included here for unit
testing in the future */
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include <stdio.h>
......
......@@ -33,7 +33,7 @@
****************************************************************/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include <stdio.h>
......
......@@ -33,7 +33,7 @@
****************************************************************/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include <stdio.h>
......
......@@ -33,7 +33,7 @@
****************************************************************/
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include <stdio.h>
......
......@@ -36,7 +36,7 @@
#include <stdio.h>
#include <time.h>
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "../script/script.h"
#include "../sim/sim.h"
#include "../entity/entity.h"
......
......@@ -36,7 +36,7 @@
#include <stdio.h>
#include <time.h>
#include "../apetoolkit/toolkit.h"
#include "../toolkit/toolkit.h"
#include "../script/script.h"
#include "../sim/sim.h"
#include "../entity/entity.h"
......
......@@ -46,7 +46,7 @@ else
COMMANDLINEE=-DCOMMAND_LINE_EXPLICIT
fi
gcc ${CFLAGS} ${COMMANDLINEE} -c ../apetoolkit/*.c -lz -lm -lpthread -w
gcc ${CFLAGS} ${COMMANDLINEE} -c ../toolkit/*.c -lz -lm -lpthread -w
gcc ${CFLAGS} ${COMMANDLINEE} -c test_math.c -o test_math.o -lz -lm -lpthread -w
......
......@@ -36,8 +36,8 @@
#define CONSOLE_REQUIRED
#define CONSOLE_ONLY
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../toolkit/toolkit.h"
#include "../toolkit/shared.h"
#include "../script/script.h"
#include "../sim/sim.h"
#include "../universe/universe.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment