diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3380e1e..8eab90d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,27 +1,9 @@ { "tasks": [ - { - "type": "shell", - "label": "Rebuild", - "command": "-C ${workspaceFolder} rebuild", - "group": { - "kind": "build", - "isDefault": true - }, - "detail": "Rebuild this lib", - "problemMatcher": [ - "$gcc" - ], - "options": { - "shell": { - "executable": "make", - } - } - }, { "type": "shell", "label": "Build", - "command": "-C ${workspaceFolder} build", + "command": "-C ${workspaceFolder} all", "group": { "kind": "build", "isDefault": false @@ -35,24 +17,6 @@ "executable": "make", } } - }, - { - "type": "shell", - "label": "Debug Build", - "command": "-C ${workspaceFolder} \"MYCFLAGS=-DNDEBUG\" build", - "group": { - "kind": "build", - "isDefault": false - }, - "detail": "Debug build this lib", - "problemMatcher": [ - "$gcc" - ], - "options": { - "shell": { - "executable": "make", - } - } } ], "version": "2.0.0" diff --git a/Makefile b/Makefile index c03819c..f5efb44 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,10 @@ LD=kos32-ld STRIP=kos32-strip OBJCOPY=kos32-objcopy -KOLIBRIOS_REPO=../../kolibrios +KOLIBRIOS_REPO=../kolibrios C_LAYER_DIR=$(KOLIBRIOS_REPO)/contrib/C_Layer -LUA_DIR=../../lua-kolibrios +LUA_DIR=../lua-kolibrios SQLITE3_DIR=$(SDK_DIR)/sources/sqlite3 SDK_DIR=$(KOLIBRIOS_REPO)/contrib/sdk @@ -66,7 +66,7 @@ test: $(T) $(LUAEXE) test.lua $(LUAEXE) tests-sqlite3.lua -$(T): $(OBJS) $() +$(T): $(OBJS) $(LUALIB) $(CC) $(SHFLAGS) $(SOFLAGS) -o $@ $(OBJS) $(LIBS) install: $(T) $(OBJS) $(SQLITE3_DIR)/libsqlite3.dll.a @@ -96,3 +96,5 @@ $(MYLIB).o: lsqlite3.c extras/extension-functions.o: extras/extension-functions.c $(SQLITE3_DIR)/libsqlite3.dll.a: $(MAKE) -C $(SQLITE3_DIR) libsqlite3.dll.a +$(LUALIB): + $(MAKE) -C $(LUAINC) lua54.dll diff --git a/test/test.sh b/test/test.sh new file mode 100644 index 0000000..be281b4 --- /dev/null +++ b/test/test.sh @@ -0,0 +1,13 @@ +#SHS + +/kolibrios/lua test.lua +/kolibrios/lua test-dyld.lua +/kolibrios/lua tests-sqlite3.lua +/kolibrios/lua ../examples/aggregate.lua +/kolibrios/lua ../examples/function.lua +/kolibrios/lua ../examples/order.lua +/kolibrios/lua ../examples/simple.lua +/kolibrios/lua ../examples/smart.lua +/kolibrios/lua ../examples/statement.lua +/kolibrios/lua ../examples/tracing.lua +/kolibrios/lua ../examples/update_hook.lua