aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libjin/Tools/CSV/CSV.cpp0
-rw-r--r--src/libjin/Tools/CSV/CSV.h1
-rw-r--r--src/libjin/Tools/Json/Json.cpp0
-rw-r--r--src/libjin/Tools/Json/Json.h1
-rw-r--r--src/libjin/Tools/XML/XML.cpp0
-rw-r--r--src/libjin/Tools/XML/XML.h1
-rw-r--r--src/libjin/modules.h9
-rw-r--r--src/lua/embed/boot.lua.h3
-rw-r--r--src/main.cpp6
9 files changed, 13 insertions, 8 deletions
diff --git a/src/libjin/Tools/CSV/CSV.cpp b/src/libjin/Tools/CSV/CSV.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/libjin/Tools/CSV/CSV.cpp
diff --git a/src/libjin/Tools/CSV/CSV.h b/src/libjin/Tools/CSV/CSV.h
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/src/libjin/Tools/CSV/CSV.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/src/libjin/Tools/Json/Json.cpp b/src/libjin/Tools/Json/Json.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/libjin/Tools/Json/Json.cpp
diff --git a/src/libjin/Tools/Json/Json.h b/src/libjin/Tools/Json/Json.h
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/src/libjin/Tools/Json/Json.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/src/libjin/Tools/XML/XML.cpp b/src/libjin/Tools/XML/XML.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/libjin/Tools/XML/XML.cpp
diff --git a/src/libjin/Tools/XML/XML.h b/src/libjin/Tools/XML/XML.h
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/src/libjin/Tools/XML/XML.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/src/libjin/modules.h b/src/libjin/modules.h
index c661d8c..454a2c2 100644
--- a/src/libjin/modules.h
+++ b/src/libjin/modules.h
@@ -21,17 +21,20 @@
#define JIN_MODULES_NET 1
-#define JIN_MODULES_PHYSICS 1
+#define JIN_MODULES_PHYSICS 0
#define JIN_PHYSICS_BOX2D 1
#define JIN_PHYSICS_NEWTON 1
#define JIN_MODULES_TILEMAP 1
#define JIN_MODULES_UI 1
-
-#define JIN_MODULES_TOOLS 1
+
+#define JIN_MODULES_TOOLS 0
#define JIN_TOOLS_COMPONENT 1
#define JIN_TOOLS_EVENTMSGCENTER 1
+#define JIN_TOOLS_XML 1
+#define JIN_TOOLS_CSV 1
+#define JIN_TOOLS_JSON 1
#define JIN_MODULES_THREAD 1
diff --git a/src/lua/embed/boot.lua.h b/src/lua/embed/boot.lua.h
index da1feac..ab241f1 100644
--- a/src/lua/embed/boot.lua.h
+++ b/src/lua/embed/boot.lua.h
@@ -65,6 +65,9 @@ function jin.core.run()
end
safecall(onEvent, e)
end
+ if not running() then
+ break
+ end
safecall(onUpdate, dt)
-- bind to default render buffer
unbind()
diff --git a/src/main.cpp b/src/main.cpp
index 505f48c..256f39d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,8 +12,6 @@
#include <Windows.h>
-#if !UNITTEST
-
int main(int argc, char* argv[])
{
// global lua state, all lua values are here
@@ -49,6 +47,4 @@ int main(int argc, char* argv[])
jin::lua::boot(L);
return 0;
-}
-
-#endif // unit test \ No newline at end of file
+} \ No newline at end of file