Bindings regen script updated.

The Bindings.cpp / .h files are no longer stored in the git repo.
JoeClacks · Dec 21, 2013 · abd1ca4 · abd1ca4
1 parent 7565026
commit abd1ca4
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/Bindings/AllToLua.bat b/src/Bindings/AllToLua.bat
@@ -1,27 +1,22 @@
 
 :: AllToLua.bat
-
 :: This scripts updates the automatically-generates Lua bindings in Bindings.cpp / Bindings.h
+:: When called without any parameters, it will pause for a keypress at the end
+:: Call with any parameter to disable the wait (for buildserver use)
 
 
 
 
 
-:: 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
 
 
 
 
-:: Regenerate the files:
-"tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
-
+: Wait for keypress, if no param given:
+if %ALLTOLUA_WAIT%N == N pause
 
 
 
 
-if %ALLTOLUA_WAIT%N == N pause