Skip to content

Commit 817ebf6

Browse files
author
Greg Williamson
committed
add script to update deps; update deps; refactor makefiles; allow building og gtest and libpng
1 parent 5dc4852 commit 817ebf6

File tree

3,839 files changed

+771730
-282450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,839 files changed

+771730
-282450
lines changed

‎enigma/Android.mk‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
ENIGMA_ROOT := $(call my-dir)/../../
1+
ENIGMA_ROOT := $(shell realpath $$PWD/../../)
22
ENIGMA_SHELL := $(ENIGMA_ROOT)/ENIGMAsystem/SHELL
33
EXTERNAL := $(ENIGMA_ROOT)/android/external
44
WORKDIR := /tmp/ENIGMA
55

6-
include $(EXTERNAL)/SDL2/Android.mk
6+
include $(WORKDIR)/build.makefiles
7+
78
include $(CLEAR_VARS)
89

910
LOCAL_MODULE := enigma
1011

11-
LOCAL_C_INCLUDES := $(ENIGMA_SHELL) $(ENIGMA_SHELL)/Graphics_Systems/OpenGLES/wrappers $(EXTERNAL)/hacks $(EXTERNAL)/libepoxy/include/
12-
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
12+
IGNORE_WARNINGS := -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-dollar-in-identifier-extension
1313

14-
LOCAL_C_INCLUDES += $(ENIGMA_ROOT)/shared $(ENIGMA_SHELL)/Bridges/OpenGLES/ $(EXTERNAL)/SDL2/include/ $(EXTERNAL)/glad/gles2/include $(EXTERNAL)/glm $(ENIGMA_SHELL)/Platforms/SDL/fileio /tmp/ENIGMA
15-
LOCAL_CFLAGS := -DDEBUG_MODE -DENIGMA_PLATFORM_SDL
16-
LOCAL_CPPFLAGS := -stdlib=libc++ -std=c++17
14+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
15+
LOCAL_CFLAGS := $(shell cat $(WORKDIR)/build.cflags) $(IGNORE_WARNINGS)
16+
LOCAL_CPPFLAGS := -stdlib=libc++ -I$(EXTERNAL)/hacks $(shell cat $(WORKDIR)/build.cxxflags | sed "s#-I\\([^/]\\)#-I$(ENIGMA_SHELL)/\\1#g") $(IGNORE_WARNINGS)
1717

18-
LOCAL_SRC_FILES := $(addprefix $(ENIGMA_SHELL)/, $(shell cat $(WORKDIR)/sources.list))
18+
LOCAL_SRC_FILES := $(shell for i in $(shell cat $(WORKDIR)/sources.list); do echo $$i | sed "s#\\(^[^/]\\)#$(ENIGMA_SHELL)/\\1#g"; done | xargs echo)
1919

20-
LOCAL_SHARED_LIBRARIES := SDL2
21-
LOCAL_LDLIBS := -lGLESv2 -llog -lz
20+
LOCAL_SHARED_LIBRARIES := $(shell cat $(WORKDIR)/build.libs)
21+
LOCAL_LDLIBS := $(shell cat $(WORKDIR)/build.ldlibs) -llog -lz
2222
include $(BUILD_SHARED_LIBRARY)

‎enigma/null/ndk-build/abi_configuration_2d18586m.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"allAbis": [
3+
"armeabi-v7a",
4+
"arm64-v8a",
5+
"x86",
6+
"x86_64"
7+
],
8+
"validAbis": [
9+
"ARMEABI_V7A",
10+
"ARM64_V8A",
11+
"X86",
12+
"X86_64"
13+
]
14+
}

‎enigma/null/ndk-build/abi_configuration_2d18586m.log‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎enigma/null/ndk-build/abi_configuration_2d18586m_key.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"ndkHandlerSupportedAbis": [
3+
"ARMEABI_V7A",
4+
"ARM64_V8A",
5+
"X86",
6+
"X86_64"
7+
],
8+
"ndkHandlerDefaultAbis": [
9+
"ARMEABI_V7A",
10+
"ARM64_V8A",
11+
"X86",
12+
"X86_64"
13+
],
14+
"externalNativeBuildAbiFilters": [
15+
"x86_64",
16+
"x86",
17+
"armeabi-v7a",
18+
"arm64-v8a"
19+
],
20+
"ndkConfigAbiFilters": [],
21+
"splitsFilterAbis": [],
22+
"ideBuildOnlyTargetAbi": true
23+
}

‎enigma/null/ndk-build/ndkBuild/debug/x86/android_gradle_build.json‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
{
2+
"buildFiles": [
3+
"/home/greg/enigma-dev/android/enigma/Android.mk",
4+
"/home/greg/enigma-dev/android/enigma/Application.mk"
5+
],
6+
"cleanCommandsComponents": [
7+
[
8+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
9+
"NDK_PROJECT_PATH\u003dnull",
10+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
11+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
12+
"APP_ABI\u003dx86",
13+
"NDK_ALL_ABIS\u003dx86",
14+
"NDK_DEBUG\u003d1",
15+
"APP_PLATFORM\u003dandroid-19",
16+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
17+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
18+
"APP_PLATFORM\u003dandroid-19",
19+
"clean"
20+
]
21+
],
22+
"buildTargetsCommandComponents": [
23+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
24+
"NDK_PROJECT_PATH\u003dnull",
25+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
26+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
27+
"APP_ABI\u003dx86",
28+
"NDK_ALL_ABIS\u003dx86",
29+
"NDK_DEBUG\u003d1",
30+
"APP_PLATFORM\u003dandroid-19",
31+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
32+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
33+
"APP_PLATFORM\u003dandroid-19",
34+
"{LIST_OF_TARGETS_TO_BUILD}"
35+
],
36+
"libraries": {
37+
"SDL2-debug-x86": {
38+
"buildCommandComponents": [
39+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
40+
"NDK_PROJECT_PATH\u003dnull",
41+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
42+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
43+
"APP_ABI\u003dx86",
44+
"NDK_ALL_ABIS\u003dx86",
45+
"NDK_DEBUG\u003d1",
46+
"APP_PLATFORM\u003dandroid-19",
47+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
48+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
49+
"APP_PLATFORM\u003dandroid-19",
50+
"/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libSDL2.so"
51+
],
52+
"toolchain": "toolchain-x86",
53+
"abi": "x86",
54+
"artifactName": "SDL2",
55+
"output": "/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libSDL2.so"
56+
},
57+
"hidapi-debug-x86": {
58+
"buildCommandComponents": [
59+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
60+
"NDK_PROJECT_PATH\u003dnull",
61+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
62+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
63+
"APP_ABI\u003dx86",
64+
"NDK_ALL_ABIS\u003dx86",
65+
"NDK_DEBUG\u003d1",
66+
"APP_PLATFORM\u003dandroid-19",
67+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
68+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
69+
"APP_PLATFORM\u003dandroid-19",
70+
"/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libhidapi.so"
71+
],
72+
"toolchain": "toolchain-x86",
73+
"abi": "x86",
74+
"artifactName": "hidapi",
75+
"output": "/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libhidapi.so"
76+
},
77+
"enigma-debug-x86": {
78+
"buildCommandComponents": [
79+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
80+
"NDK_PROJECT_PATH\u003dnull",
81+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
82+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
83+
"APP_ABI\u003dx86",
84+
"NDK_ALL_ABIS\u003dx86",
85+
"NDK_DEBUG\u003d1",
86+
"APP_PLATFORM\u003dandroid-19",
87+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
88+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
89+
"APP_PLATFORM\u003dandroid-19",
90+
"/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libenigma.so"
91+
],
92+
"toolchain": "toolchain-x86",
93+
"abi": "x86",
94+
"artifactName": "enigma",
95+
"output": "/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libenigma.so"
96+
}
97+
},
98+
"toolchains": {
99+
"toolchain-x86": {
100+
"cCompilerExecutable": "/opt/android-sdk/ndk/22.0.6917172/toolchains/llvm/prebuilt/linux-x86_64/bin/clang",
101+
"cppCompilerExecutable": "/opt/android-sdk/ndk/22.0.6917172/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++"
102+
}
103+
},
104+
"cFileExtensions": [
105+
"c"
106+
],
107+
"cppFileExtensions": [
108+
"cpp"
109+
]
110+
}

‎enigma/null/ndk-build/ndkBuild/debug/x86/android_gradle_build_mini.json‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"buildFiles": [
3+
"/home/greg/enigma-dev/android/enigma/Android.mk",
4+
"/home/greg/enigma-dev/android/enigma/Application.mk"
5+
],
6+
"cleanCommandsComponents": [
7+
[
8+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
9+
"NDK_PROJECT_PATH\u003dnull",
10+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
11+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
12+
"APP_ABI\u003dx86",
13+
"NDK_ALL_ABIS\u003dx86",
14+
"NDK_DEBUG\u003d1",
15+
"APP_PLATFORM\u003dandroid-19",
16+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
17+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
18+
"APP_PLATFORM\u003dandroid-19",
19+
"clean"
20+
]
21+
],
22+
"buildTargetsCommandComponents": [
23+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
24+
"NDK_PROJECT_PATH\u003dnull",
25+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
26+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
27+
"APP_ABI\u003dx86",
28+
"NDK_ALL_ABIS\u003dx86",
29+
"NDK_DEBUG\u003d1",
30+
"APP_PLATFORM\u003dandroid-19",
31+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
32+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
33+
"APP_PLATFORM\u003dandroid-19",
34+
"{LIST_OF_TARGETS_TO_BUILD}"
35+
],
36+
"libraries": {
37+
"SDL2-debug-x86": {
38+
"artifactName": "SDL2",
39+
"buildCommandComponents": [
40+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
41+
"NDK_PROJECT_PATH\u003dnull",
42+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
43+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
44+
"APP_ABI\u003dx86",
45+
"NDK_ALL_ABIS\u003dx86",
46+
"NDK_DEBUG\u003d1",
47+
"APP_PLATFORM\u003dandroid-19",
48+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
49+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
50+
"APP_PLATFORM\u003dandroid-19",
51+
"/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libSDL2.so"
52+
],
53+
"abi": "x86",
54+
"output": "/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libSDL2.so",
55+
"runtimeFiles": []
56+
},
57+
"hidapi-debug-x86": {
58+
"artifactName": "hidapi",
59+
"buildCommandComponents": [
60+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
61+
"NDK_PROJECT_PATH\u003dnull",
62+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
63+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
64+
"APP_ABI\u003dx86",
65+
"NDK_ALL_ABIS\u003dx86",
66+
"NDK_DEBUG\u003d1",
67+
"APP_PLATFORM\u003dandroid-19",
68+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
69+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
70+
"APP_PLATFORM\u003dandroid-19",
71+
"/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libhidapi.so"
72+
],
73+
"abi": "x86",
74+
"output": "/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libhidapi.so",
75+
"runtimeFiles": []
76+
},
77+
"enigma-debug-x86": {
78+
"artifactName": "enigma",
79+
"buildCommandComponents": [
80+
"/opt/android-sdk/ndk/22.0.6917172/ndk-build",
81+
"NDK_PROJECT_PATH\u003dnull",
82+
"APP_BUILD_SCRIPT\u003d/home/greg/enigma-dev/android/enigma/Android.mk",
83+
"NDK_APPLICATION_MK\u003d/home/greg/enigma-dev/android/enigma/Application.mk",
84+
"APP_ABI\u003dx86",
85+
"NDK_ALL_ABIS\u003dx86",
86+
"NDK_DEBUG\u003d1",
87+
"APP_PLATFORM\u003dandroid-19",
88+
"NDK_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj",
89+
"NDK_LIBS_OUT\u003d/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib",
90+
"APP_PLATFORM\u003dandroid-19",
91+
"/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libenigma.so"
92+
],
93+
"abi": "x86",
94+
"output": "/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj/local/x86/libenigma.so",
95+
"runtimeFiles": []
96+
}
97+
}
98+
}

‎enigma/null/ndk-build/ndkBuild/debug/x86/build_command.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Executable : /opt/android-sdk/ndk/22.0.6917172/ndk-build
2+
arguments :
3+
NDK_PROJECT_PATH=null
4+
APP_BUILD_SCRIPT=/home/greg/enigma-dev/android/enigma/Android.mk
5+
NDK_APPLICATION_MK=/home/greg/enigma-dev/android/enigma/Application.mk
6+
APP_ABI=x86
7+
NDK_ALL_ABIS=x86
8+
NDK_DEBUG=1
9+
APP_PLATFORM=android-19
10+
NDK_OUT=/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/obj
11+
NDK_LIBS_OUT=/home/greg/enigma-dev/android/enigma/null/android/enigma/intermediates/ndkBuild/debug/lib
12+
APP_PLATFORM=android-19
13+
APP_SHORT_COMMANDS=false
14+
LOCAL_SHORT_COMMANDS=false
15+
-B
16+
-n
17+
jvmArgs :
18+
19+
20+
Build command args: []
21+
Version: 1

‎enigma/null/ndk-build/ndkBuild/debug/x86/build_file_index.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/home/greg/enigma-dev/android/enigma/Android.mk
2+
/home/greg/enigma-dev/android/enigma/Application.mk

0 commit comments

Comments
 (0)