diff options
| author | ruki <[email protected]> | 2017-03-30 13:27:18 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-03-30 13:27:18 +0800 |
| commit | 9da72206d922fe81b6a12d413dc0909c26862063 (patch) | |
| tree | 014deb5a94dc58d33cc3cf1f1de02bc40a1fbaf4 /core/src | |
| parent | ec118cc66342ce8bcefdfd9df8af83ce3a22e1e0 (diff) | |
build luajit for windows
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/luajit/makefile | 3 | ||||
| -rw-r--r-- | core/src/luajit/src/autogen/windows/x86/lj_vm.obj | bin | 0 -> 24141 bytes | |||
| -rw-r--r-- | core/src/luajit/src/luaconf.h | 7 | ||||
| -rw-r--r-- | core/src/luajit/xmake.lua | 13 |
4 files changed, 17 insertions, 6 deletions
diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile index 4d17108e7..6a742dbea 100644 --- a/core/src/luajit/makefile +++ b/core/src/luajit/makefile @@ -84,9 +84,6 @@ endif luajit_INC_DIRS += \ src/autogen/$(PLAT)/$(ARCH) -# flags -#luajit_CXFLAGS += - # suffix include $(PRO_DIR)/suffix.mak diff --git a/core/src/luajit/src/autogen/windows/x86/lj_vm.obj b/core/src/luajit/src/autogen/windows/x86/lj_vm.obj Binary files differnew file mode 100644 index 000000000..8e7999911 --- /dev/null +++ b/core/src/luajit/src/autogen/windows/x86/lj_vm.obj diff --git a/core/src/luajit/src/luaconf.h b/core/src/luajit/src/luaconf.h index 84fa64187..fc9ca273f 100644 --- a/core/src/luajit/src/luaconf.h +++ b/core/src/luajit/src/luaconf.h @@ -128,6 +128,7 @@ #define LUA_INTFRM_T long /* Linkage of public API functions. */ +#if 0 #if defined(LUA_BUILD_AS_DLL) #if defined(LUA_CORE) || defined(LUA_LIB) #define LUA_API __declspec(dllexport) @@ -137,6 +138,12 @@ #else #define LUA_API extern #endif +#endif +#if defined(__cplusplus) +#define LUA_API extern "C" +#else +#define LUA_API extern +#endif #define LUALIB_API LUA_API diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua index d5590a771..1359b6d2d 100644 --- a/core/src/luajit/xmake.lua +++ b/core/src/luajit/xmake.lua @@ -7,6 +7,11 @@ target("luajit") -- set warning all and disable error set_warnings("all") + -- disable c99(/TP) for windows + if is_plat("windows") then + set_languages("c89") + end + -- set the object files directory set_objectdir("$(buildir)/.objs") @@ -19,9 +24,11 @@ target("luajit") -- add the common source files add_files("src/*.c|ljamalg.c|luajit.c") - if not is_plat("windows") then + if is_plat("windows") then + add_files("src/autogen/$(plat)/$(arch)/lj_vm.obj") + else add_files("src/autogen/$(plat)/$(arch)/*.s") end + + - -- disable jit compiler? --- add_defines("LUAJIT_DISABLE_JIT") |