Skip to content

Commit

Permalink
vcs: merge branch 'master' into packaging/fix-source-1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
larpon committed Nov 18, 2023
2 parents 7f4dc05 + ec7b232 commit b8d523f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions android/ndk/compiler_flags.v
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ const (
ndk_supported_cpp_features = ['rtti', 'exceptions', 'no-rtti', 'no-exceptions']
)

[params]
@[params]
pub struct FlagConfig {
pub:
pic bool = true // TODO
debug bool = true // false = release
platform_level int = 21
arch string [required]
arch string @[required]
neon bool
arm_mode string = 'thumb' // or 'arm'
lang CompilerLanguageType = .c
Expand All @@ -29,7 +29,7 @@ pub:

pub struct FlagGen {
pub:
ndk_version string [required]
ndk_version string @[required]
}

pub struct FlagResult {
Expand Down
6 changes: 3 additions & 3 deletions android/ndk/ndk.v
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ fn min_version_supported_by_vab() string {
}

// host_arch returns the host architecture string for the platform which `vab` was compiled on.
[inline]
@[inline]
pub fn host_arch() string {
$if linux {
return 'linux-x86_64'
Expand All @@ -224,7 +224,7 @@ pub fn host_arch() string {

// arch_to_instruction_set maps `arch` to an instruction set
// Example: assert ndk.arch_to_instruction_set('x86') == 'i686'
[inline]
@[inline]
pub fn arch_to_instruction_set(arch string) string {
return match arch {
'armeabi-v7a' { 'armv7a' }
Expand All @@ -237,7 +237,7 @@ pub fn arch_to_instruction_set(arch string) string {

// bin_path returns the absolute path to the host architecture's `bin` directory.
// As an example: `/path/to/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin`.
[inline]
@[inline]
pub fn bin_path(ndk_version string) string {
return os.join_path(root_version(ndk_version), 'toolchains', 'llvm', 'prebuilt', host_arch(),
'bin')
Expand Down
2 changes: 1 addition & 1 deletion android/screenshot.v
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import vab.util as vabutil
import vab.android.env
import vab.android.util

[params]
@[params]
pub struct SimpleScreenshotOptions {
pub:
verbosity int
Expand Down

0 comments on commit b8d523f

Please sign in to comment.