Explorar el Código

resource: move 32-bit luajit to linux32 and remove its mingw64 build

Daniele Bartolini hace 2 años
padre
commit
002ada52ef
Se han modificado 2 ficheros con 10 adiciones y 14 borrados
  1. 9 13
      makefile
  2. 1 1
      src/resource/lua_resource.cpp

+ 9 - 13
makefile

@@ -48,10 +48,10 @@ build/android-arm64/bin/libluajit.a:
 	cp -r 3rdparty/luajit/src/jit 3rdparty/luajit/src/libluajit.a build/android-arm64/bin
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C 3rdparty/luajit/src clean
 
-build/linux64/bin/luajit32:
+build/linux32/bin/luajit:
 	$(MAKE) -j$(MAKE_JOBS) -R -C 3rdparty/luajit/src CC="gcc -m32" CCOPT="-O2 -fomit-frame-pointer -msse2" TARGET_SYS=Linux BUILDMODE=static
-	mkdir -p build/linux64/bin
-	cp -r 3rdparty/luajit/src/luajit build/linux64/bin/luajit32
+	mkdir -p build/linux32/bin
+	cp -r 3rdparty/luajit/src/luajit build/linux32/bin/luajit
 	$(MAKE) -j$(MAKE_JOBS) -R -C 3rdparty/luajit/src clean
 
 build/linux64/bin/luajit:
@@ -60,12 +60,6 @@ build/linux64/bin/luajit:
 	cp -r 3rdparty/luajit/src/jit 3rdparty/luajit/src/luajit 3rdparty/luajit/src/libluajit.a build/linux64/bin
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C 3rdparty/luajit/src clean
 
-build/mingw64/bin/luajit32.exe:
-	$(MAKE) -j$(MAKE_JOBS) -R -C 3rdparty/luajit/src CC="$(MINGW)/bin/x86_64-w64-mingw32-gcc -m32" CCOPT="-O2 -fomit-frame-pointer -msse2" TARGET_SYS=Windows BUILDMODE=static
-	mkdir -p build/mingw64/bin
-	cp 3rdparty/luajit/src/luajit.exe build/mingw32/bin/luajit32
-	$(MAKE) -j$(MAKE_JOBS) -R -C 3rdparty/luajit/src clean
-
 build/mingw64/bin/luajit.exe:
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C 3rdparty/luajit/src CC="$(MINGW)/bin/x86_64-w64-mingw32-gcc -m64" CCOPT="-O2 -fomit-frame-pointer -msse2" TARGET_SYS=Windows BUILDMODE=static
 	-$(MKDIR) "build/mingw64/bin"
@@ -117,9 +111,9 @@ build/projects/linux:
 	$(GENIE) --file=3rdparty/bgfx/scripts/genie.lua --with-tools --gcc=linux-gcc gmake
 	$(GENIE) --file=3rdparty/bimg/scripts/genie.lua --with-tools --gcc=linux-gcc gmake
 	$(GENIE) --gfxapi=gl32 --with-tools --compiler=linux-gcc gmake
-linux-debug64: build/projects/linux build/linux64/bin/luajit build/linux64/bin/luajit32 build/linux64/bin/texturec build/linux64/bin/shaderc
+linux-debug64: build/projects/linux build/linux64/bin/luajit build/linux64/bin/texturec build/linux64/bin/shaderc
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C build/projects/linux crown config=debug64
-linux-development64: build/projects/linux build/linux64/bin/luajit build/linux64/bin/luajit32 build/linux64/bin/texturec build/linux64/bin/shaderc
+linux-development64: build/projects/linux build/linux64/bin/luajit build/linux64/bin/texturec build/linux64/bin/shaderc
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C build/projects/linux crown config=development64
 linux-release64: build/projects/linux build/linux64/bin/luajit
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C build/projects/linux crown config=release64
@@ -136,9 +130,9 @@ build/projects/mingw:
 	$(GENIE) --file=3rdparty/bgfx/scripts/genie.lua --with-tools --gcc=mingw-gcc gmake
 	$(GENIE) --file=3rdparty/bimg/scripts/genie.lua --with-tools --gcc=mingw-gcc gmake
 	$(GENIE) --gfxapi=d3d11 --with-tools --compiler=mingw-gcc gmake
-mingw-debug64: build/projects/mingw build/mingw64/bin/luajit.exe build/mingw64/bin/luajit32.exe build/mingw64/bin/texturec.exe build/mingw64/bin/shaderc.exe
+mingw-debug64: build/projects/mingw build/mingw64/bin/luajit.exe build/mingw64/bin/texturec.exe build/mingw64/bin/shaderc.exe
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C build/projects/mingw config=debug64
-mingw-development64: build/projects/mingw build/mingw64/bin/luajit.exe build/mingw64/bin/luajit32.exe build/mingw64/bin/texturec.exe build/mingw64/bin/shaderc.exe
+mingw-development64: build/projects/mingw build/mingw64/bin/luajit.exe build/mingw64/bin/texturec.exe build/mingw64/bin/shaderc.exe
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C build/projects/mingw config=development64
 mingw-release64: build/projects/mingw build/mingw64/bin/luajit.exe
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C build/projects/mingw config=release64
@@ -171,6 +165,8 @@ level-editor-linux-debug64:
 level-editor-linux-release64:
 	"$(MAKE)" -j$(MAKE_JOBS) -R -C build/projects/linux level-editor config=release64
 
+tools-linux-release32: build/linux32/bin/luajit
+
 tools-linux-debug64: linux-debug64 level-editor-linux-debug64
 tools-linux-release64: linux-development64 level-editor-linux-release64
 

+ 1 - 1
src/resource/lua_resource.cpp

@@ -105,7 +105,7 @@ namespace lua_resource_internal
 
 		const char *luajit = EXE_PATH("luajit");
 		if (opts._platform == Platform::ANDROID)
-			luajit = EXE_PATH("luajit32");
+			luajit = EXE_PATH("../../linux32/bin/luajit");
 
 		const char *argv[] =
 		{