From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- app/lzo/asm/i386/src_nasm/asminit.def | 99 ----------------------------------- 1 file changed, 99 deletions(-) delete mode 100644 app/lzo/asm/i386/src_nasm/asminit.def (limited to 'app/lzo/asm/i386/src_nasm/asminit.def') diff --git a/app/lzo/asm/i386/src_nasm/asminit.def b/app/lzo/asm/i386/src_nasm/asminit.def deleted file mode 100644 index 0ccdb8d7..00000000 --- a/app/lzo/asm/i386/src_nasm/asminit.def +++ /dev/null @@ -1,99 +0,0 @@ -; asminit.def -- -; -; This file is part of the LZO real-time data compression library. -; -; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer -; All Rights Reserved. -; -; The LZO library is free software; you can redistribute it and/or -; modify it under the terms of the GNU General Public License as -; published by the Free Software Foundation; either version 2 of -; the License, or (at your option) any later version. -; -; The LZO library is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU General Public License for more details. -; -; You should have received a copy of the GNU General Public License -; along with the LZO library; see the file COPYING. -; If not, write to the Free Software Foundation, Inc., -; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -; -; Markus F.X.J. Oberhumer -; -; http://www.oberhumer.com/opensource/lzo/ -; - -bits 32 -%ifndef __OUTPUT_FORMAT__ -%error "__OUTPUT_FORMAT__ is not defined" -%endif -%ifidni __OUTPUT_FORMAT__,elf -%undef __OUTPUT_FORMAT__ -%define __OUTPUT_FORMAT__ elf32 -%endif -%ifidni __OUTPUT_FORMAT__,macho -%undef __OUTPUT_FORMAT__ -%define __OUTPUT_FORMAT__ macho32 -%endif -%ifidni __OUTPUT_FORMAT__,win -%undef __OUTPUT_FORMAT__ -%define __OUTPUT_FORMAT__ win32 -%endif -%ifdef __YASM_MAJOR__ -%ifidni __OUTPUT_FORMAT__,x64 -%undef __OUTPUT_FORMAT__ -%define __OUTPUT_FORMAT__ win64 -%endif -%endif - -%ifidni __OUTPUT_FORMAT__,macho32 -%define NAME1(x) _ %+ x -%elifidni __OUTPUT_FORMAT__,macho64 -%define NAME1(x) _ %+ x -%else -%define NAME1(x) _ %+ x -%define NAME2(x) x -%endif - -%ifidni __OUTPUT_FORMAT__,elf32 -%define globalf(x) global x:function (x %+ _end - x) -%define globalf_end(x) x %+ _end: -%elifidni __OUTPUT_FORMAT__,elf64 -%define globalf(x) global x:function (x %+ _end - x) -%define globalf_end(x) x %+ _end: -%else -%define globalf(x) global x -%define globalf_end(x) -%endif - -%ifidni __OUTPUT_FORMAT__,elf32 -section .note.GNU-stack noalloc noexec nowrite progbits -%elifidni __OUTPUT_FORMAT__,elf64 -section .note.GNU-stack noalloc noexec nowrite progbits -%endif -%ifidni __OUTPUT_FORMAT__,obj -%if __BITS__==16 -segment _TEXT class=CODE public use16 -%else -segment _TEXT class=CODE public use32 flat -%endif -%else -section .text -%endif -%ifidni __OUTPUT_FORMAT__,elf32 -align 64 -%elifidni __OUTPUT_FORMAT__,elf64 -align 64 -%elifidni __OUTPUT_FORMAT__,macho32 -align 64 -%elifidni __OUTPUT_FORMAT__,macho64 -align 64 -%elifidni __OUTPUT_FORMAT__,win32 -align 64 -%elifidni __OUTPUT_FORMAT__,win64 -align 64 -%else -align 16 -%endif -- cgit v1.2.3