From 7bc154b43769f36e1148a0870858ed7ec1267d6b Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 30 Oct 2018 08:27:01 +0800 Subject: =?UTF-8?q?*=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/3rdparty/buildvm/buildvm.exe | Bin 62976 -> 62976 bytes src/3rdparty/minilua/minilua.exe | Bin 112640 -> 112640 bytes src/jin/main.cpp | 2 +- src/libjin/Graphics/je_image.cpp | 4 ++-- src/lua/modules/graphics/je_lua_graphics.cpp | 4 ++-- src/lua/modules/graphics/je_lua_texture.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/3rdparty/buildvm/buildvm.exe b/src/3rdparty/buildvm/buildvm.exe index 3f7515a..542418c 100644 Binary files a/src/3rdparty/buildvm/buildvm.exe and b/src/3rdparty/buildvm/buildvm.exe differ diff --git a/src/3rdparty/minilua/minilua.exe b/src/3rdparty/minilua/minilua.exe index f902b70..538cc53 100644 Binary files a/src/3rdparty/minilua/minilua.exe and b/src/3rdparty/minilua/minilua.exe differ diff --git a/src/jin/main.cpp b/src/jin/main.cpp index 029436d..d4f08a0 100644 --- a/src/jin/main.cpp +++ b/src/jin/main.cpp @@ -8,8 +8,8 @@ #include "libjin/jin.h" #include -using namespace JinEngine::Lua; using namespace JinEngine::Filesystem; +using namespace JinEngine::Lua; static void setParamters(lua_State* L, int argc, char* args[]) { diff --git a/src/libjin/Graphics/je_image.cpp b/src/libjin/Graphics/je_image.cpp index 171bba0..6baf16d 100644 --- a/src/libjin/Graphics/je_image.cpp +++ b/src/libjin/Graphics/je_image.cpp @@ -1,7 +1,7 @@ -#include "stb/stb_image.h" - #include "../filesystem/je_asset_database.h" +#include "stb/stb_image.h" + #include "je_image.h" namespace JinEngine diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index 7c417a5..90e4533 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -808,5 +808,5 @@ namespace JinEngine return 1; } - }// lua -}// jin \ No newline at end of file + } // namespace Lua +} // namespace JinEngine \ No newline at end of file diff --git a/src/lua/modules/graphics/je_lua_texture.cpp b/src/lua/modules/graphics/je_lua_texture.cpp index b9c58db..0ab79b5 100644 --- a/src/lua/modules/graphics/je_lua_texture.cpp +++ b/src/lua/modules/graphics/je_lua_texture.cpp @@ -61,5 +61,5 @@ namespace JinEngine return 0; } - }// lua -}// jin \ No newline at end of file + }// namespace Lua +}// namespace JinEngine \ No newline at end of file -- cgit v1.1-26-g67d0