search

mrichards42 / xword

Cross-platform crossword solving
https://mrichards42.github.io/xword/
GNU General Public License v3.0
42 stars 13 forks source link

Upgrade wxLua #142

Closed mrichards42 closed 3 years ago

mrichards42 commented 3 years ago

Based on the latest wxlua commit: https://github.com/pkulchenko/wxlua/commit/c4875ef30a15ba87c45f03617199318431c01e26

Steps this took, for future reference:

  1. Blow away the lua/wxlua and lua/wxbind directories, except the following files:
    • wxbind/premake4.lua
    • wxbind/setup/wxluasetup_xword.h
    • wxlua/premake4.lua
  2. Copy from pkulchenko/wxlua
    • pkulchenko/wxlua/wxLua/art -> lua/wxlua/art
    • pkulchenko/wxlua/wxLua/modules/wxlua -> lua/wxlua/
    • pkulchenko/wxlua/wxLua/modules/wxbind -> lua/wxbind/
    • pkulchenko/wxlua/wxLua/bindings/genwxbind.lua -> src/xwordbind/
  3. Regenerate the xword bindings

Note this doesn't require any changes to the premake4.lua files, and while we're copying in CMakeLists and Makefiles, those are ignored since we're still using premake.

In other words:

rm -rf lua/wxlua
rm -rf lua/wxbind
cp -r ../wxlua/wxLua/modules/wxbind lua/
cp -r ../wxlua/wxLua/modules/wxlua lua/
cp -r ../wxlua/wxLua/art lua/wxlua/
cp ../wxlua/wxLua/bindings/genwxbind.lua src/xwordbind/
git restore lua/wxlua/premake4.lua
git restore lua/wxbind/premake4.lua
git restore lua/wxbind/setup/wxluasetup_xword.h
cd src/xwordbind && lua -e"rulesFilename='xword_rules.lua'" genwxbind.lua