Skip to content

Commit 271706d

Browse files
author
Marshall Lee Whittaker
committed
Cut down some of the codebase. Now compiles on android, but is untested as of right now. Going to bed... ZZZZzzzzz,,,,,,
1 parent fefc745 commit 271706d

File tree

10 files changed

+506
-5
lines changed

10 files changed

+506
-5
lines changed

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bin_PROGRAMS = ansvif
1414
endif
1515

1616
noinst_LIBRARIES = libgzstream.a
17-
libgzstream_a_SOURCES = include/gzstream/gzstream.h include/gzstream/gzstream.C
17+
libgzstream_a_SOURCES = include/gzstream/gzstream.h include/gzstream/gzstream.cpp
1818
ansvif_SOURCES = src/log.cpp src/bin2hex.cpp src/popen2.cpp src/main.cpp src/help.cpp src/match_fault.cpp src/sys_string.cpp src/man_read.cpp src/trash.cpp src/randomizer.cpp src/remove_chars.cpp src/to_int.cpp src/file_check.cpp src/reaper.cpp src/write_file.cpp src/templates.cpp include/gzstream/gzstream.h include/xmlwriter/xml_writer.hpp src/version.h
1919
if OS_IS_REDHAT
2020
ansvif_LDADD = -lgzstream -lcryptopp -lstdc++ -lpthread -lz -L.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ [email protected]
1414

1515
**Compile Dependancies:**
1616

17-
automake autoconf-archive zlib1g-dev libcrypto++ g++ gcc (and libgtk2.0-dev if you want GTK support)
17+
automake autoconf-archive zlib1g-dev g++ gcc (and libgtk2.0-dev if you want GTK support)
1818

1919
**Compliation:**
2020

android/Android.mk

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Copyright (C) 2009 The Android Open Source Project
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
#LOCAL_PATH := $(call my-dir)
16+
#LOCAL_PATH := $(call my-dir)
17+
#include $(CLEAR_VARS)
18+
19+
#LOCAL_ARM_NEON := true
20+
#LOCAL_SHARED_LIBRARIES := gzstream
21+
#LOCAL_MODULE := gzstream
22+
#LOCAL_SRC_FILES := include/gzstream/gzstream.cpp
23+
#LOCAL_C_INCLUDES += $(LOCAL_PATH)jni/include/gzstream
24+
#LOCAL_LDFLAGS := -fPIE -lz
25+
#LOCAL_CFLAGS := -fPIC
26+
#include $(BUILD_SHARED_LIBRARY)
27+
28+
LOCAL_PATH := $(call my-dir)
29+
30+
include $(CLEAR_VARS)
31+
LOCAL_MODULE := gzstream
32+
LOCAL_SRC_FILES := libgzstream.so
33+
include $(PREBUILT_SHARED_LIBRARY)
34+
35+
36+
include $(CLEAR_VARS)
37+
LOCAL_MODULE := ansvif
38+
LOCAL_ARM_NEON := true
39+
system_libs := stdc++ pthread z
40+
APP_ALLOW_MISSING_DEPS=false
41+
LOCAL_SHARED_LIBRARIES := gzstream
42+
LOCAL_SRC_FILES := src/log.cpp src/bin2hex.cpp src/popen2.cpp src/main.cpp src/help.cpp src/match_fault.cpp src/sys_string.cpp src/man_read.cpp src/trash.cpp src/randomizer.cpp src/remove_chars.cpp src/to_int.cpp src/file_check.cpp src/reaper.cpp src/write_file.cpp src/templates.cpp
43+
LOCAL_C_INCLUDES += $(LOCAL_PATH)jni/include/gzstream $(LOCAL_PATH)jni/include/xmlwriter $(LOCAL_PATH)jni/include
44+
LOCAL_CFLAGS := -std=gnu++11 -mfloat-abi=softfp -D__ANDROID__ -D__linux -fPIE
45+
LOCAL_CPP_FEATURES += exceptions rtti
46+
LOCAL_LDLIBS += -lstdc++
47+
LOCAL_LDFLAGS += -fPIE
48+
include $(BUILD_EXECUTABLE)
49+

android/Application.mk

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
APP_ABI := armeabi-v7a
2+
APP_STL := c++_shared
3+
APP_PLATFORM := android-17

android/libs/libc++_shared.so

642 KB
Binary file not shown.

android/libs/libgzstream.so

17.7 KB
Binary file not shown.
File renamed without changes.

0 commit comments

Comments
 (0)