af645c62c9
Also fixed the AllToLua script not resolving conflicts.
28 lines
492 B
Batchfile
28 lines
492 B
Batchfile
|
|
:: AllToLua.bat
|
|
|
|
:: This scripts updates the automatically-generates Lua bindings in Bindings.cpp / Bindings.h
|
|
|
|
|
|
|
|
|
|
|
|
:: If there was a Git conflict, resolve it by resetting to HEAD; we're regenerating the files from scratch anyway
|
|
git checkout --ours Bindings.cpp
|
|
git add -u Bindings.cpp
|
|
git checkout --ours Bindings.h
|
|
git add -u Bindings.h
|
|
|
|
|
|
|
|
|
|
|
|
:: Regenerate the files:
|
|
"tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
|
|
|
|
|
|
|
|
|
|
|
|
if %ALLTOLUA_WAIT%N == N pause
|