Skip to content

Commit

Permalink
spaces to tab, add editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
azhirnov committed Apr 19, 2024
1 parent 6cb1a81 commit 45a1f3c
Show file tree
Hide file tree
Showing 1,924 changed files with 321,027 additions and 321,907 deletions.
16 changes: 16 additions & 0 deletions AE/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true


# Set default charset
[*]
charset = utf-8
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true
48 changes: 24 additions & 24 deletions AE/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ cmake_minimum_required( VERSION 3.10 FATAL_ERROR )

# CMAKE_BUILD_TYPE is not defined if used IDE
if (DEFINED CMAKE_BUILD_TYPE)
if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Develop") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Profile") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Release") )
# ok
else()
message( STATUS "override unsupported CMAKE_BUILD_TYPE '${CMAKE_BUILD_TYPE}' by 'Release', see CMAKE_CONFIGURATION_TYPES in 'compilers.cmake'" )
set( CMAKE_BUILD_TYPE "Release" CACHE INTERNAL "" FORCE )
endif()
if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Develop") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Profile") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Release") )
# ok
else()
message( STATUS "override unsupported CMAKE_BUILD_TYPE '${CMAKE_BUILD_TYPE}' by 'Release', see CMAKE_CONFIGURATION_TYPES in 'compilers.cmake'" )
set( CMAKE_BUILD_TYPE "Release" CACHE INTERNAL "" FORCE )
endif()
endif()

#----------------------------------------------------------

project( "AE"
VERSION 24.02.228 # year, month, version
LANGUAGES C CXX
DESCRIPTION "async game engine"
)
VERSION 24.02.228 # year, month, version
LANGUAGES C CXX
DESCRIPTION "async game engine"
)
if (APPLE)
enable_language(OBJC)
enable_language(OBJC)
endif()

message( STATUS "==========================================================================\n" )
Expand All @@ -39,9 +39,9 @@ message( STATUS "target processor: ${CMAKE_SYSTEM_PROCESSOR}" )
#----------------------------------------------------------

if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
set( AE_USE_PCH ON CACHE BOOL "use precompiled headers" )
set( AE_USE_PCH ON CACHE BOOL "use precompiled headers" )
else()
set( AE_USE_PCH OFF CACHE INTERNAL "" FORCE )
set( AE_USE_PCH OFF CACHE INTERNAL "" FORCE )
endif()
message( STATUS "Precompiled headers: ${AE_USE_PCH}" )

Expand All @@ -56,23 +56,23 @@ set( MAIN_BINARY_DIR "${CMAKE_BINARY_DIR}/bin" CACHE INTERNAL "" FO

# this settings breaks native debugger on android
if (NOT DEFINED ANDROID)
set( CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "installation directory" FORCE )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${MAIN_BINARY_DIR}" CACHE INTERNAL "" FORCE )
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${MAIN_BINARY_DIR}" CACHE INTERNAL "" FORCE )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${MAIN_BINARY_DIR}" CACHE INTERNAL "" FORCE )
set( CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "installation directory" FORCE )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${MAIN_BINARY_DIR}" CACHE INTERNAL "" FORCE )
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${MAIN_BINARY_DIR}" CACHE INTERNAL "" FORCE )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${MAIN_BINARY_DIR}" CACHE INTERNAL "" FORCE )
endif()

enable_testing()

#----------------------------------------------------------

if (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
add_subdirectory( "web" )
add_subdirectory( "web" )

else()
add_subdirectory( "docs" )
add_subdirectory( "engine" )
add_subdirectory( "samples" )
add_subdirectory( "docs" )
add_subdirectory( "engine" )
add_subdirectory( "samples" )

endif()

Expand Down
112 changes: 56 additions & 56 deletions AE/android/demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
apply plugin: 'com.android.application'

android {
compileSdk 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

defaultConfig {
applicationId 'AE.Demo'
minSdkVersion 24 // 24+ for vulkan
targetSdkVersion 34

ndk {
abiFilters "arm64-v8a", "armeabi-v7a" //, "x86", "x86_64"
}
externalNativeBuild {
cmake {
arguments '-DANDROID_STL=c++_static', // see https://developer.android.com/ndk/guides/cpp-support#static_runtimes
'-DANDROID_ARM_NEON=ON',
'-DAE_ENABLE_VULKAN=ON'
}
}
}

buildTypes {
release {
//debuggable true // to enable logcat in release
minifyEnabled = false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}

ndkVersion "24.0.8215888"

externalNativeBuild {
cmake {
version '3.26.4'
path '../../CMakeLists.txt'
}
}
sourceSets {
main {
assets.srcDirs = ['../../../AE-Temp/samples/demo']
}
}
packagingOptions {
jniLibs {
excludes += ['lib/**/*.so']
pickFirsts += ['lib/**/libSampleDemo.so']
pickFirsts += ['lib/**/libc++_shared.so', 'lib/**/libVkLayer_khronos_validation.so']
}
}
namespace 'AE.demo'
compileSdk 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

defaultConfig {
applicationId 'AE.Demo'
minSdkVersion 24 // 24+ for vulkan
targetSdkVersion 34
ndk {
abiFilters "arm64-v8a", "armeabi-v7a" //, "x86", "x86_64"
}
externalNativeBuild {
cmake {
arguments '-DANDROID_STL=c++_static', // see https://developer.android.com/ndk/guides/cpp-support#static_runtimes
'-DANDROID_ARM_NEON=ON',
'-DAE_ENABLE_VULKAN=ON'
}
}
}
buildTypes {
release {
//debuggable true // to enable logcat in release
minifyEnabled = false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}

ndkVersion "24.0.8215888"

externalNativeBuild {
cmake {
version '3.26.4'
path '../../CMakeLists.txt'
}
}
sourceSets {
main {
assets.srcDirs = ['../../../AE-Temp/samples/demo']
}
}
packagingOptions {
jniLibs {
excludes += ['lib/**/*.so']
pickFirsts += ['lib/**/libSampleDemo.so']
pickFirsts += ['lib/**/libc++_shared.so', 'lib/**/libVkLayer_khronos_validation.so']
}
}
namespace 'AE.demo'
}

dependencies {
implementation project(path: ':engine')
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation project(path: ':engine')
implementation 'androidx.appcompat:appcompat:1.6.1'
}
72 changes: 36 additions & 36 deletions AE/android/demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,42 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- min Vulkan API version: 1.0.82 -->
<uses-feature android:name="android.hardware.vulkan.version" android:version="0x400052" android:required="false" />

<uses-permission android:name="android.permission.INTERNET" android:required="true" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:required="true" />

<!-- camera -->
<uses-feature android:name="android.hardware.camera" android:required="true" />
<uses-permission android:name="android.permission.CAMERA" android:required="true" />


<application
android:name=".DemoApplication"
android:label="AE Demo"
android:hardwareAccelerated="true"
android:isGame="true">

<activity
android:name=".DemoActivity"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:resizeableActivity="true"
android:screenOrientation="landscape"
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

<!-- for profiling -->
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
</intent-filter>
</activity>
<!-- min Vulkan API version: 1.0.82 -->
<uses-feature android:name="android.hardware.vulkan.version" android:version="0x400052" android:required="false" />

<uses-permission android:name="android.permission.INTERNET" android:required="true" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:required="true" />

<!-- camera -->
<uses-feature android:name="android.hardware.camera" android:required="true" />
<uses-permission android:name="android.permission.CAMERA" android:required="true" />


<application
android:name=".DemoApplication"
android:label="AE Demo"
android:hardwareAccelerated="true"
android:isGame="true">

<activity
android:name=".DemoActivity"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:resizeableActivity="true"
android:screenOrientation="landscape"
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<!-- for profiling -->
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
</intent-filter>
</activity>

</application>
</manifest>
Loading

0 comments on commit 45a1f3c

Please sign in to comment.