From 5fc5d37330d3535a0f421632694d1e7918fc22d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 11:38:09 +0200 Subject: Compiles correctly: app/build-native + gradle. --- app/lzo/B/win64/vc_dll.bat | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 app/lzo/B/win64/vc_dll.bat (limited to 'app/lzo/B/win64/vc_dll.bat') diff --git a/app/lzo/B/win64/vc_dll.bat b/app/lzo/B/win64/vc_dll.bat new file mode 100644 index 00000000..73bf6d3f --- /dev/null +++ b/app/lzo/B/win64/vc_dll.bat @@ -0,0 +1,42 @@ +@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer +@echo // +@echo // Windows 64-bit (AMD64 or Itanium) +@echo // Microsoft Visual C/C++ (DLL) +@echo // +@call b\prepare.bat +@if "%BECHO%"=="n" echo off + + +set CC=cl -nologo -MD +set CF=-O2 -GF -W3 -Wp64 %CFI% +set LF=%BLIB% + +%CC% %CF% -D__LZO_EXPORT1#__declspec(dllexport) -c @b\src.rsp +@if errorlevel 1 goto error +%CC% -LD -Fe%BDLL% @b\win64\vc.rsp /link /map /def:b\win64\vc_dll.def +@if errorlevel 1 goto error + +%CC% %CF% examples\dict.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\lzopack.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\precomp.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\precomp2.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\simple.c %LF% +@if errorlevel 1 goto error + +%CC% %CF% lzotest\lzotest.c %LF% +@if errorlevel 1 goto error + +%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c +@if errorlevel 1 goto error + + +@call b\done.bat +@goto end +:error +@echo ERROR during build! +:end +@call b\unset.bat -- cgit v1.2.3 From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 12:04:17 +0200 Subject: Rename app->bitmask_android This way, gradle commands generate apks correctly named. --- app/lzo/B/win64/vc_dll.bat | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 app/lzo/B/win64/vc_dll.bat (limited to 'app/lzo/B/win64/vc_dll.bat') diff --git a/app/lzo/B/win64/vc_dll.bat b/app/lzo/B/win64/vc_dll.bat deleted file mode 100644 index 73bf6d3f..00000000 --- a/app/lzo/B/win64/vc_dll.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer -@echo // -@echo // Windows 64-bit (AMD64 or Itanium) -@echo // Microsoft Visual C/C++ (DLL) -@echo // -@call b\prepare.bat -@if "%BECHO%"=="n" echo off - - -set CC=cl -nologo -MD -set CF=-O2 -GF -W3 -Wp64 %CFI% -set LF=%BLIB% - -%CC% %CF% -D__LZO_EXPORT1#__declspec(dllexport) -c @b\src.rsp -@if errorlevel 1 goto error -%CC% -LD -Fe%BDLL% @b\win64\vc.rsp /link /map /def:b\win64\vc_dll.def -@if errorlevel 1 goto error - -%CC% %CF% examples\dict.c %LF% -@if errorlevel 1 goto error -%CC% %CF% examples\lzopack.c %LF% -@if errorlevel 1 goto error -%CC% %CF% examples\precomp.c %LF% -@if errorlevel 1 goto error -%CC% %CF% examples\precomp2.c %LF% -@if errorlevel 1 goto error -%CC% %CF% examples\simple.c %LF% -@if errorlevel 1 goto error - -%CC% %CF% lzotest\lzotest.c %LF% -@if errorlevel 1 goto error - -%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c -@if errorlevel 1 goto error - - -@call b\done.bat -@goto end -:error -@echo ERROR during build! -:end -@call b\unset.bat -- cgit v1.2.3 From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 9 Apr 2014 16:03:55 +0200 Subject: Back to the standard "app" module. This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure I'll have to tweak the final apk name in build.gradle. --- app/lzo/B/win64/vc_dll.bat | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 app/lzo/B/win64/vc_dll.bat (limited to 'app/lzo/B/win64/vc_dll.bat') diff --git a/app/lzo/B/win64/vc_dll.bat b/app/lzo/B/win64/vc_dll.bat new file mode 100644 index 00000000..73bf6d3f --- /dev/null +++ b/app/lzo/B/win64/vc_dll.bat @@ -0,0 +1,42 @@ +@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer +@echo // +@echo // Windows 64-bit (AMD64 or Itanium) +@echo // Microsoft Visual C/C++ (DLL) +@echo // +@call b\prepare.bat +@if "%BECHO%"=="n" echo off + + +set CC=cl -nologo -MD +set CF=-O2 -GF -W3 -Wp64 %CFI% +set LF=%BLIB% + +%CC% %CF% -D__LZO_EXPORT1#__declspec(dllexport) -c @b\src.rsp +@if errorlevel 1 goto error +%CC% -LD -Fe%BDLL% @b\win64\vc.rsp /link /map /def:b\win64\vc_dll.def +@if errorlevel 1 goto error + +%CC% %CF% examples\dict.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\lzopack.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\precomp.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\precomp2.c %LF% +@if errorlevel 1 goto error +%CC% %CF% examples\simple.c %LF% +@if errorlevel 1 goto error + +%CC% %CF% lzotest\lzotest.c %LF% +@if errorlevel 1 goto error + +%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c +@if errorlevel 1 goto error + + +@call b\done.bat +@goto end +:error +@echo ERROR during build! +:end +@call b\unset.bat -- cgit v1.2.3