Merge branch 'remove-dlls-from-repo' into fix-io.open-type-mismatch
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
.*
|
|
||||||
!.gitignore
|
!.gitignore
|
||||||
|
.*
|
||||||
|
build/
|
||||||
|
|||||||
Binary file not shown.
BIN
BlockLua.dll
BIN
BlockLua.dll
Binary file not shown.
11
compile.bat
11
compile.bat
@@ -5,10 +5,13 @@ set buildargs=-Wall -Werror -m32 -shared -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -
|
|||||||
|
|
||||||
echo on
|
echo on
|
||||||
|
|
||||||
g++ src/bllua4.cpp %buildargs% -o BlockLua.dll
|
set outdir=build
|
||||||
@rem g++ -DBLLUA_UNSAFE src/bllua4.cpp %buildargs% -o BlockLua-Unsafe.dll
|
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
|
@echo off
|
||||||
|
|
||||||
rem objdump -d BlockLua.dll > BlockLua.dll.dump.txt
|
rem objdump -d %outdir%\BlockLua.dll > %outdir%\BlockLua.dll.dump.txt
|
||||||
rem objdump -d BlockLua-Unsafe.dll > BlockLua-Unsafe.dll.dump.txt
|
rem objdump -d %outdir%\BlockLua-Unsafe.dll > %outdir%\BlockLua-Unsafe.dll.dump.txt
|
||||||
|
|||||||
@@ -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++"
|
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
|
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
|
set +x
|
||||||
|
|
||||||
# objdump -d BlockLua.dll > BlockLua.dll.dump.txt
|
# objdump -d "$outdir"/BlockLua.dll > "$outdir"/BlockLua.dll.dump.txt
|
||||||
# objdump -d BlockLua-Unsafe.dll > BlockLua-Unsafe.dll.dump.txt
|
# objdump -d "$outdir"/BlockLua-Unsafe.dll > "$outdir"/BlockLua-Unsafe.dll.dump.txt
|
||||||
|
|||||||
Reference in New Issue
Block a user