diff --git a/.gitignore b/.gitignore index 9ea0f13..977d061 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -.* !.gitignore +.* +build/ diff --git a/BlockLua-Unsafe.dll b/BlockLua-Unsafe.dll deleted file mode 100644 index 3eb7dfe..0000000 Binary files a/BlockLua-Unsafe.dll and /dev/null differ diff --git a/BlockLua.dll b/BlockLua.dll deleted file mode 100644 index f6ff56d..0000000 Binary files a/BlockLua.dll and /dev/null differ diff --git a/compile.bat b/compile.bat index edee990..e514da8 100644 --- a/compile.bat +++ b/compile.bat @@ -5,10 +5,13 @@ set buildargs=-Wall -Werror -m32 -shared -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi - echo on -g++ src/bllua4.cpp %buildargs% -o BlockLua.dll -@rem g++ -DBLLUA_UNSAFE src/bllua4.cpp %buildargs% -o BlockLua-Unsafe.dll +set outdir=build +if not exist %outdir% mkdir %outdir% + +g++ src/bllua4.cpp %buildargs% -o %outdir%\BlockLua.dll +@rem g++ -DBLLUA_UNSAFE src/bllua4.cpp %buildargs% -o %outdir%\BlockLua-Unsafe.dll @echo off -rem objdump -d BlockLua.dll > BlockLua.dll.dump.txt -rem objdump -d BlockLua-Unsafe.dll > BlockLua-Unsafe.dll.dump.txt +rem objdump -d %outdir%\BlockLua.dll > %outdir%\BlockLua.dll.dump.txt +rem objdump -d %outdir%\BlockLua-Unsafe.dll > %outdir%\BlockLua-Unsafe.dll.dump.txt diff --git a/compile.sh b/compile.sh index 270ecf8..c29cfda 100644 --- a/compile.sh +++ b/compile.sh @@ -18,9 +18,12 @@ cd "$(dirname "$0")" buildargs="-Wall -Werror -m32 -shared -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 -static-libgcc -static-libstdc++" +outdir="build" +mkdir -p "$outdir" + set -x -/mingw32/bin/g++ src/bllua4.cpp $buildargs -o BlockLua.dll && /mingw32/bin/g++ -DBLLUA_UNSAFE src/bllua4.cpp $buildargs -o BlockLua-Unsafe.dll +/mingw32/bin/g++ src/bllua4.cpp $buildargs -o "$outdir"/BlockLua.dll && /mingw32/bin/g++ -DBLLUA_UNSAFE src/bllua4.cpp $buildargs -o "$outdir"/BlockLua-Unsafe.dll set +x -# objdump -d BlockLua.dll > BlockLua.dll.dump.txt -# objdump -d BlockLua-Unsafe.dll > BlockLua-Unsafe.dll.dump.txt +# objdump -d "$outdir"/BlockLua.dll > "$outdir"/BlockLua.dll.dump.txt +# objdump -d "$outdir"/BlockLua-Unsafe.dll > "$outdir"/BlockLua-Unsafe.dll.dump.txt