Skip to content

Commit 4a2c0ec

Browse files
committed
Fix wasm64 build
1 parent 51f6b3f commit 4a2c0ec

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

extensions/scripting/lua-bindings/manual/LuaBasicConversions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ bool luaval_to_rect(lua_State* L, int lo, Rect* outValue, const char* funcName)
666666
return ok;
667667
}
668668

669-
bool luaval_to_Color32(lua_State* L, int lo, Color32* outValue, const char* funcName)
669+
bool luaval_to_color32(lua_State* L, int lo, Color32* outValue, const char* funcName)
670670
{
671671
if (NULL == L || NULL == outValue)
672672
return false;
@@ -2367,7 +2367,7 @@ void rect_to_luaval(lua_State* L, const Rect& rt)
23672367
lua_rawset(L, -3); /* table[key] = value, L: table */
23682368
}
23692369

2370-
void Color32_to_luaval(lua_State* L, const Color32& color)
2370+
void color32_to_luaval(lua_State* L, const Color32& color)
23712371
{
23722372
if (NULL == L)
23732373
return;

extensions/scripting/lua-bindings/manual/LuaBasicConversions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ extern AX_LUA_DLL bool luaval_to_color3b(lua_State* L, int lo, Color3B* outValue
295295
* @param funcName the name of calling function, it is used for error output in the debug model.
296296
* @return Return true if the value at the given acceptable index of stack is a table, otherwise return false.
297297
*/
298-
extern bool luaval_to_Color32(lua_State* L, int lo, Color32* outValue, const char* funcName = "");
298+
extern bool luaval_to_color32(lua_State* L, int lo, Color32* outValue, const char* funcName = "");
299299

300300
/**
301301
* Get a ax::Color object value from the given acceptable index of stack.
@@ -949,7 +949,7 @@ extern AX_LUA_DLL void color3b_to_luaval(lua_State* L, const Color3B& cc);
949949
* @param L the current lua_State.
950950
* @param cc a ax::Color32 object.
951951
*/
952-
extern void Color32_to_luaval(lua_State* L, const Color32& cc);
952+
extern void color32_to_luaval(lua_State* L, const Color32& cc);
953953

954954
/**
955955
* Push a table converted from a ax::Color object into the Lua stack.

tools/cmdline/axmol

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#!/bin/bash -l
22

3-
AXMOL_CONSOLE_BIN_DIRECTORY=$(dirname "$0")
4-
AXMOL_CONSOLE_BIN_DIRECTORY=$(cd "$AXMOL_CONSOLE_BIN_DIRECTORY" && pwd -P)
5-
3+
SCRIPT_ROOT=$(dirname "$0")
4+
SCRIPT_ROOT=$(cd "$SCRIPT_ROOT" && pwd -P)
65
if hash pwsh 2>/dev/null; then
76
POWERSHELL=pwsh
87
else
98
echo "PowerShell 7+ required."
109
exit 1
1110
fi
12-
13-
$POWERSHELL "$AXMOL_CONSOLE_BIN_DIRECTORY/axmol.ps1" "$@"
11+
$POWERSHELL "$SCRIPT_ROOT/axmol.ps1" "$@"

0 commit comments

Comments
 (0)