kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Begin work on Module support

Browse Source
This commit is contained in:
Joshua Granick
2014-06-26 07:37:15 -07:00
parent edf34475e2
commit dd91d80b2e
7 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/Build.xml
View File

@@ -9,7 +9,7 @@
<set name="ios" value="1" if="iphone" />
<set name="LIME_CURL" value="1" />
<!-- <set name="LIME_NEKO" value="1" /> -->
<set name="LIME_NEKO" value="1" if="linux" />
<set name="LIME_OGG" value="1" />
<set name="LIME_OPENAL" value="1" />
<set name="LIME_OPENGL" value="1" />
@@ -58,7 +58,7 @@
<file name="src/ui/TouchEvent.cpp" />
<file name="src/ui/WindowEvent.cpp" />
<file name="src/utils/ByteArray.cpp" />
<file name="src/vm/Neko.cpp" if="LIME_NEKO" />
<file name="src/vm/NekoVM.cpp" if="LIME_NEKO" />
<compilerflag value="-DLIME_NEKO" if="LIME_NEKO" />
@@ -118,7 +118,6 @@
<lib name="-lgc" if="LIME_NEKO" />
<lib name="-lm" if="LIME_NEKO" />
<!-- <lib name="-Wl,--export-dynamic" if="LIME_NEKO" /> -->
</section>
@@ -139,7 +138,6 @@
<lib name="/opt/local/lib/libgc.a" if="LIME_NEKO" />
<lib name="-lm" if="LIME_NEKO" />
<lib name="-Wl,--export-dynamic" if="LIME_NEKO" />
</section>

6
project/include/vm/Neko.h → project/include/vm/NekoVM.h
View File

@@ -1,11 +1,11 @@
#ifndef LIME_VM_NEKO_H
#define LIME_VM_NEKO_H
#ifndef LIME_VM_NEKOVM_H
#define LIME_VM_NEKOVM_H
namespace lime {
class Neko {
class NekoVM {
public:

4
project/src/ExternalInterface.cpp
View File

@@ -19,7 +19,7 @@
#include <ui/TouchEvent.h>
#include <ui/Window.h>
#include <ui/WindowEvent.h>
#include <vm/Neko.h>
#include <vm/NekoVM.h>
namespace lime {
@@ -103,7 +103,7 @@ namespace lime {
value lime_neko_execute (value module) {
#ifdef LIME_NEKO
Neko::Execute (val_string (module));
NekoVM::Execute (val_string (module));
#endif
return alloc_null ();

4
project/src/vm/Neko.cpp → project/src/vm/NekoVM.cpp
View File

@@ -1,4 +1,4 @@
#include <vm/Neko.h>
#include <vm/NekoVM.h>
#include <stdio.h>
#include <neko_vm.h>
@@ -40,7 +40,7 @@ namespace lime {
}
void Neko::Execute (const char *modulePath) {
void NekoVM::Execute (const char *modulePath) {
neko_vm *vm;