Skip to content

Commit 93190f3

Browse files
committed
fix build
1 parent 1903e64 commit 93190f3

File tree

5 files changed

+13
-27
lines changed

5 files changed

+13
-27
lines changed
Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,21 @@
1-
# Sets the minimum version of CMake required to build your native library.
2-
# This ensures that a certain set of CMake features is available to
3-
# your build.
4-
51
cmake_minimum_required(VERSION 3.4.1)
62

7-
# Specifies a library name, specifies whether the library is STATIC or
8-
# SHARED, and provides relative paths to the source code. You can
9-
# define multiple libraries by adding multiple add_library() commands,
10-
# and CMake builds them for you. When you build your app, Gradle
11-
# automatically packages shared libraries with your APK.
12-
133
set(name svgdom)
4+
project(${name})
145

15-
file(GLOB_RECURSE srcs "../../src/*.cpp")
6+
file(GLOB_RECURSE srcs "../../../src/*.cpp")
167

178
include (${ANDROID_GRADLE_NATIVE_BUNDLE_PLUGIN_MK})
189

1910
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
2011

2112
add_library(
22-
# Specifies the name of the library.
23-
${name}
24-
25-
# Sets the library as a shared library.
26-
STATIC
27-
28-
# Provides a relative path to your source file(s).
29-
${srcs}
30-
)
13+
${name}
14+
STATIC
15+
${srcs}
16+
)
3117

3218
target_link_libraries(
33-
${name}
34-
android log ${ANDROID_GRADLE_NATIVE_MODULES}
35-
)
19+
${name}
20+
android log ${ANDROID_GRADLE_NATIVE_MODULES}
21+
)

build/android/svgdom/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
}
2020

2121
nativeBundleExport {
22-
headerDir = "${project.projectDir}/../../src/"
22+
headerDir = "${project.projectDir}/../../../src/"
2323
bundleStatic = true
2424
includeHeaderFilter.add("**/*.hpp")
2525
}

build/archlinux/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ noextract=()
3939
md5sums=()
4040
validpgpkeys=()
4141

42-
rootDir=$(pwd)/.. # project root directory
42+
rootDir=$(pwd)/../.. # project root directory
4343

4444
prepare() {
4545
cd "$rootDir"

build/msys2/PKGBUILD.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ noextract=()
5858
md5sums=()
5959
validpgpkeys=()
6060

61-
rootDir=$(pwd)/.. # project root directory
61+
rootDir=$(pwd)/../.. # project root directory
6262

6363
prepare() {
6464
cd "$rootDir"

tool-configs

0 commit comments

Comments
 (0)