Skip to content

Commit b8671be

Browse files
sadiuksadiuk
committed
Merge branch 'baw' of github.com:Devsh-Graphics-Programming/Nabla into baw
2 parents 38cf18b + 5f8b442 commit b8671be

File tree

13 files changed

+130
-85
lines changed

13 files changed

+130
-85
lines changed

‎3rdparty/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ if(DEFINED ENV{VULKAN_SDK})
6060
endif()
6161
add_subdirectory(volk volk EXCLUDE_FROM_ALL)
6262

63-
target_include_directories(volk PUBLIC "$ENV{VULKAN_SDK}/include")
64-
target_include_directories(volk_headers INTERFACE "$ENV{VULKAN_SDK}/include")
63+
target_include_directories(volk PUBLIC "$ENV{VULKAN_SDK}/Include")
64+
target_include_directories(volk_headers INTERFACE "$ENV{VULKAN_SDK}/Include")
6565
endif()
6666

6767
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ cmake_policy(SET CMP0072 OLD) #not yet, would need to get pointers to all OpenGL
88
set(OpenGL_GL_PREFERENCE LEGACY)
99
#cmake_policy(SET CMP )
1010

11+
set(NBL_BUILD_ANDROID OFF)
12+
1113
include(ExternalProject)
1214
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
1315

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Contact ***[@devshgraphicsprogramming](https://github.com/devshgraphicsprogrammi
176176

177177
- **[CMake](https://cmake.org/download/)**
178178
- **[MSVC](https://visualstudio.microsoft.com/pl/downloads/)** or **[GCC](https://sourceforge.net/projects/mingw-w64/)**
179-
- **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home)**
179+
- **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home)**, at least **1.2.198.1** version ***without* any components** installed
180180
- **[Perl 5.28 executable version](https://www.perl.org/get.html)**
181181
- **[NASM](https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D)**
182182
- **[Python 3.8](https://www.python.org/downloads/release/python-380/)** or later

‎cmake/common.cmake

Lines changed: 74 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -362,70 +362,88 @@ macro(nbl_android_create_apk _TARGET)
362362
WORKING_DIRECTORY ${NBL_GEN_DIRECTORY}/$<CONFIG>
363363
COMMAND ${ANDROID_JAVA_BIN}/keytool -genkey -keystore ${KEYSTORE_FILE} -storepass android -alias ${KEY_ENTRY_ALIAS} -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=, S=, C="
364364
)
365-
set(D8_SCRIPT "${ANDROID_BUILD_TOOLS}/d8.bat")
366-
if(NOT EXISTS ${D8_SCRIPT})
367-
set(DEX_COMMAND ${ANDROID_BUILD_TOOLS}/d8 ./obj/eu/devsh/${TARGET_NAME}/Loader.class --output ./bin/)
368-
else()
369-
set(DEX_COMMAND ${D8_SCRIPT} --output ./bin/ ./obj/eu/devsh/${TARGET_NAME}/*.class)
370-
endif()
371-
#message(FATAL_ERROR "ANDROID_BUILD_TOOLS: ${ANDROID_BUILD_TOOLS}")
372-
#message(FATAL_ERROR "ANDROID_ANDROID_JAR_LOCATION: ${ANDROID_ANDROID_JAR_LOCATION}")
373-
#set(ANDROID_JAVA_RT_JAR "C:/Program Files (x86)/Java/jre1.8.0_301/lib/rt.jar")
374-
#message(FATAL_ERROR "ANDROID_JAR: ${ANDROID_JAR}")
365+
366+
if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
367+
set(D8_SCRIPT "${ANDROID_BUILD_TOOLS}/d8.bat")
368+
369+
if(EXISTS ${D8_SCRIPT})
370+
set(DEX_COMMAND ${D8_SCRIPT} --output ./bin/ ./obj/eu/devsh/${TARGET_NAME}/*.class)
371+
else()
372+
message(FATAL_ERROR "ANDROID_BUILD_TOOLS path doesn't contain D8 (DEX) bat file!")
373+
endif()
374+
else()
375+
set(D8_SCRIPT "${ANDROID_BUILD_TOOLS}/d8")
376+
377+
if(EXISTS ${D8_SCRIPT})
378+
set(DEX_COMMAND ${D8_SCRIPT} ./obj/eu/devsh/${TARGET_NAME}/Loader.class --output ./bin/)
379+
else()
380+
message(FATAL_ERROR "ANDROID_BUILD_TOOLS path doesn't contain D8 (DEX) script file!")
381+
endif()
382+
endif()
383+
384+
set(NBL_APK_LIBRARY_DIR libs/lib/x86_64)
385+
set(NBL_APK_OBJ_DIR obj)
386+
set(NBL_APK_BIN_DIR bin)
387+
set(NBL_APK_ASSETS_DIR assets)
375388

376389
if(EXISTS ${ASSET_SOURCE_DIR})
377390
add_custom_command(
378-
OUTPUT ${APK_FILE}
379-
DEPENDS ${_TARGET}
380-
DEPENDS ${NBL_ANDROID_MANIFEST_FILE}
381-
DEPENDS ${NBL_ANDROID_LOADER_JAVA}
382-
DEPENDS ${KEYSTORE_FILE}
383-
DEPENDS ${NBL_ROOT_PATH}/android/Loader.java
384-
WORKING_DIRECTORY ${NBL_GEN_DIRECTORY}/$<CONFIG>
385-
COMMENT "Creating ${APK_FILE_NAME} ..."
386-
COMMAND ${CMAKE_COMMAND} -E make_directory libs/lib/x86_64
387-
COMMAND ${CMAKE_COMMAND} -E make_directory obj
388-
COMMAND ${CMAKE_COMMAND} -E make_directory bin
389-
COMMAND ${CMAKE_COMMAND} -E make_directory assets
390-
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${_TARGET}> libs/lib/x86_64/$<TARGET_FILE_NAME:${_TARGET}>
391-
COMMAND ${CMAKE_COMMAND} -E copy_directory ${ASSET_SOURCE_DIR} assets
392-
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -m -J src -M AndroidManifest.xml -I ${ANDROID_JAR}
393-
COMMAND ${ANDROID_JAVA_BIN}/javac -d ./obj -source 1.7 -target 1.7 -bootclasspath ${ANDROID_JAVA_RT_JAR} -classpath "${ANDROID_JAR}" -sourcepath src ${NBL_ANDROID_LOADER_JAVA}
394-
COMMAND ${DEX_COMMAND}
395-
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -M AndroidManifest.xml -A assets -I ${ANDROID_JAR} -F ${TARGET_NAME}-unaligned.apk bin libs
396-
COMMAND ${ANDROID_BUILD_TOOLS}/zipalign -f 4 ${TARGET_NAME}-unaligned.apk ${APK_FILE_NAME}
397-
COMMAND ${ANDROID_BUILD_TOOLS}/apksigner sign --ks ${KEYSTORE_FILE} --ks-pass pass:android --key-pass pass:android --ks-key-alias ${KEY_ENTRY_ALIAS} ${APK_FILE_NAME}
398-
COMMAND ${CMAKE_COMMAND} -E copy ${APK_FILE_NAME} ${APK_FILE}
399-
COMMAND ${CMAKE_COMMAND} -E rm -rf assets
400-
VERBATIM
401-
)
391+
OUTPUT ${APK_FILE}
392+
DEPENDS ${_TARGET}
393+
DEPENDS ${NBL_ANDROID_MANIFEST_FILE}
394+
DEPENDS ${NBL_ANDROID_LOADER_JAVA}
395+
DEPENDS ${KEYSTORE_FILE}
396+
DEPENDS ${NBL_ROOT_PATH}/android/Loader.java
397+
COMMAND ${CMAKE_COMMAND} -E make_directory ${NBL_APK_LIBRARY_DIR}
398+
COMMAND ${CMAKE_COMMAND} -E make_directory ${NBL_APK_OBJ_DIR}
399+
COMMAND ${CMAKE_COMMAND} -E make_directory ${NBL_APK_BIN_DIR}
400+
COMMAND ${CMAKE_COMMAND} -E make_directory ${NBL_APK_ASSETS_DIR}
401+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${_TARGET}> libs/lib/x86_64/$<TARGET_FILE_NAME:${_TARGET}>
402+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tbb> libs/lib/x86_64/$<TARGET_FILE_NAME:tbb>
403+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tbbmalloc> libs/lib/x86_64/$<TARGET_FILE_NAME:tbbmalloc>
404+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tbbmalloc_proxy> libs/lib/x86_64/$<TARGET_FILE_NAME:tbbmalloc_proxy>
405+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${ASSET_SOURCE_DIR} ${NBL_APK_ASSETS_DIR}
406+
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -m -J src -M AndroidManifest.xml -I ${ANDROID_JAR}
407+
COMMAND ${ANDROID_JAVA_BIN}/javac -d ./obj -source 1.7 -target 1.7 -bootclasspath ${ANDROID_JAVA_RT_JAR} -classpath "${ANDROID_JAR}" -sourcepath src ${NBL_ANDROID_LOADER_JAVA}
408+
COMMAND ${DEX_COMMAND}
409+
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -M AndroidManifest.xml -A ${NBL_APK_ASSETS_DIR} -I ${ANDROID_JAR} -F ${TARGET_NAME}-unaligned.apk bin libs
410+
COMMAND ${ANDROID_BUILD_TOOLS}/zipalign -f 4 ${TARGET_NAME}-unaligned.apk ${APK_FILE_NAME}
411+
COMMAND ${ANDROID_BUILD_TOOLS}/apksigner sign --ks ${KEYSTORE_FILE} --ks-pass pass:android --key-pass pass:android --ks-key-alias ${KEY_ENTRY_ALIAS} ${APK_FILE_NAME}
412+
COMMAND ${CMAKE_COMMAND} -E copy ${APK_FILE_NAME} ${APK_FILE}
413+
COMMAND ${CMAKE_COMMAND} -E rm -rf ${NBL_APK_ASSETS_DIR}
414+
WORKING_DIRECTORY ${NBL_GEN_DIRECTORY}/$<CONFIG>
415+
COMMENT "Creating ${APK_FILE_NAME}..."
416+
VERBATIM
417+
)
402418
else()
403419
add_custom_command(
404-
OUTPUT ${APK_FILE}
405-
DEPENDS ${_TARGET}
406-
DEPENDS ${NBL_ANDROID_MANIFEST_FILE}
407-
DEPENDS ${NBL_ANDROID_LOADER_JAVA}
408-
DEPENDS ${KEYSTORE_FILE}
409-
DEPENDS ${NBL_ROOT_PATH}/android/Loader.java
410-
WORKING_DIRECTORY ${NBL_GEN_DIRECTORY}/$<CONFIG>
411-
COMMENT "Creating ${APK_FILE_NAME} ..."
412-
COMMAND ${CMAKE_COMMAND} -E make_directory libs/lib/x86_64
413-
COMMAND ${CMAKE_COMMAND} -E make_directory obj
414-
COMMAND ${CMAKE_COMMAND} -E make_directory bin
415-
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${_TARGET}> libs/lib/x86_64/$<TARGET_FILE_NAME:${_TARGET}>
416-
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -m -J src -M AndroidManifest.xml -I ${ANDROID_JAR}
417-
COMMAND ${ANDROID_JAVA_BIN}/javac -d ./obj -source 1.7 -target 1.7 -bootclasspath ${ANDROID_JAVA_RT_JAR} -classpath "${ANDROID_JAR}" -sourcepath src ${NBL_ANDROID_LOADER_JAVA}
418-
COMMAND ${DEX_COMMAND}
419-
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -M AndroidManifest.xml -I ${ANDROID_JAR} -F ${TARGET_NAME}-unaligned.apk bin libs
420-
COMMAND ${ANDROID_BUILD_TOOLS}/zipalign -f 4 ${TARGET_NAME}-unaligned.apk ${APK_FILE_NAME}
421-
COMMAND ${ANDROID_BUILD_TOOLS}/apksigner sign --ks ${KEYSTORE_FILE} --ks-pass pass:android --key-pass pass:android --ks-key-alias ${KEY_ENTRY_ALIAS} ${APK_FILE_NAME}
422-
COMMAND ${CMAKE_COMMAND} -E copy ${APK_FILE_NAME} ${APK_FILE}
423-
VERBATIM
424-
)
420+
OUTPUT ${APK_FILE}
421+
DEPENDS ${_TARGET}
422+
DEPENDS ${NBL_ANDROID_MANIFEST_FILE}
423+
DEPENDS ${NBL_ANDROID_LOADER_JAVA}
424+
DEPENDS ${KEYSTORE_FILE}
425+
DEPENDS ${NBL_ROOT_PATH}/android/Loader.java
426+
COMMAND ${CMAKE_COMMAND} -E make_directory ${NBL_APK_LIBRARY_DIR}
427+
COMMAND ${CMAKE_COMMAND} -E make_directory ${NBL_APK_OBJ_DIR}
428+
COMMAND ${CMAKE_COMMAND} -E make_directory ${NBL_APK_BIN_DIR}
429+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${_TARGET}> libs/lib/x86_64/$<TARGET_FILE_NAME:${_TARGET}>
430+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tbb> libs/lib/x86_64/$<TARGET_FILE_NAME:tbb>
431+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tbbmalloc> libs/lib/x86_64/$<TARGET_FILE_NAME:tbbmalloc>
432+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tbbmalloc_proxy> libs/lib/x86_64/$<TARGET_FILE_NAME:tbbmalloc_proxy>
433+
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -m -J src -M AndroidManifest.xml -I ${ANDROID_JAR}
434+
COMMAND ${ANDROID_JAVA_BIN}/javac -d ./obj -source 1.7 -target 1.7 -bootclasspath ${ANDROID_JAVA_RT_JAR} -classpath "${ANDROID_JAR}" -sourcepath src ${NBL_ANDROID_LOADER_JAVA}
435+
COMMAND ${DEX_COMMAND}
436+
COMMAND ${ANDROID_BUILD_TOOLS}/aapt package -f -M AndroidManifest.xml -I ${ANDROID_JAR} -F ${TARGET_NAME}-unaligned.apk bin libs
437+
COMMAND ${ANDROID_BUILD_TOOLS}/zipalign -f 4 ${TARGET_NAME}-unaligned.apk ${APK_FILE_NAME}
438+
COMMAND ${ANDROID_BUILD_TOOLS}/apksigner sign --ks ${KEYSTORE_FILE} --ks-pass pass:android --key-pass pass:android --ks-key-alias ${KEY_ENTRY_ALIAS} ${APK_FILE_NAME}
439+
COMMAND ${CMAKE_COMMAND} -E copy ${APK_FILE_NAME} ${APK_FILE}
440+
WORKING_DIRECTORY ${NBL_GEN_DIRECTORY}/$<CONFIG>
441+
COMMENT "Creating ${APK_FILE_NAME}..."
442+
VERBATIM
443+
)
425444
endif()
426445
endmacro()
427446

428-
429447
function(nbl_android_create_media_storage_apk)
430448
set(TARGET_NAME android_media_storage)
431449
string(MAKE_C_IDENTIFIER ${TARGET_NAME} TARGET_NAME_IDENTIFIER)

‎cmake/toolchains/android/build.cmake

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
set(NBL_BUILD_ANDROID OFF)
1615
if(DEFINED CMAKE_TOOLCHAIN_FILE)
1716
if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
1817
cmake_path(GET CMAKE_TOOLCHAIN_FILE FILENAME _NBL_CMAKE_TOOLCHAIN_FILENAME_)
@@ -88,13 +87,6 @@ if(NBL_BUILD_ANDROID)
8887
message(FATAL_ERROR "Current host OS for Android cross-compiling isn't allowed!")
8988
endif()
9089

91-
# TODO - remove those bellow in future
92-
set(_NBL_COMPILE_WITH_OPEN_EXR_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) # TODO - check it out
93-
set(_NBL_COMPILE_WITH_BAW_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) # TODO - remove when BAW-v4 is done
94-
set(_NBL_COMPILE_WITH_BAW_WRITER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) # TODO - remove when BAW-v4 is done
95-
set(_NBL_COMPILE_WITH_OBJ_LOADER_ ON CACHE BOOL "Off for Android purposes at the moment" FORCE)
96-
set(NBL_BUILD_MITSUBA_LOADER OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) # TODO - compile/linker errors
97-
9890
find_package(Java 1.8)
9991

10092
if(DEFINED Java_JAVA_EXECUTABLE)
@@ -104,7 +96,7 @@ if(NBL_BUILD_ANDROID)
10496
endif()
10597

10698
string(LENGTH ${Java_JAVA_EXECUTABLE} Java_JAVA_EXECUTABLE_LENGTH)
107-
if(MSVC)
99+
if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
108100
set(Java_JAVA_EXE_BIN_LENGTH 13)
109101
else()
110102
set(Java_JAVA_EXE_BIN_LENGTH 9)
@@ -159,11 +151,8 @@ if(NBL_BUILD_ANDROID)
159151
unset(__buildTools)
160152
endif()
161153
set(ANDROID_BUILD_TOOLS "${ANDROID_SDK_ROOT_PATH}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}")
162-
if(MSVC)
163-
set(ANDROID_JAVA_BIN "${JAVA_HOME}")
164-
else()
154+
165155
set(ANDROID_JAVA_BIN "${JAVA_HOME}/bin")
166-
endif()
167156
set(ANDROID_JAVA_RT_JAR "${JAVA_HOME}/jre/lib/rt.jar")
168157

169158
set(ANDROID_APK_TARGET_ID "" CACHE STRING "The Target ID to build the APK for like 'android-99', use <android list targets> to choose another one.")

‎examples_tests/43.SumAndCDFFilters/main.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
6868

6969
public:
7070

71-
void setSystem(core::smart_refctd_ptr<nbl::system::ISystem>&& system) override
71+
void setSystem(core::smart_refctd_ptr<nbl::system::ISystem>&& _system) override
7272
{
73-
system = std::move(system);
73+
system = std::move(_system);
7474
}
7575

7676
NON_GRAPHICAL_APP_CONSTRUCTOR(SumAndCDFFilterSampleApp);
@@ -249,9 +249,9 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
249249
viewParams.subresourceRange.levelCount = cpuImage->getCreationParameters().mipLevels;
250250

251251
auto cpuImageView = ICPUImageView::create(std::move(viewParams));
252-
assert(cpuImageView.get(), "The imageView didn't pass creation validation!");
252+
assert(cpuImageView.get()); // The imageView didn't pass creation validation!
253253

254-
auto writeSATandGetItsOutputName = [&]() -> std::string
254+
auto writeSATandGetItsOutputName = [&]() -> std::string //! Writes asset and returns file name without full path
255255
{
256256
std::string outputFileName;
257257

@@ -326,10 +326,11 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
326326

327327
{
328328
const std::string satFileName = writeSATandGetItsOutputName();
329+
const auto satFilePath = localOutputCWD / satFileName;
329330
const std::string convolutedSatFileName = "CONVOLUTED_" + satFileName;
330331
const auto convolutedSatFilePath = localOutputCWD / convolutedSatFileName;
331332

332-
auto bundle = assetManager->getAsset(satFileName, loadParams);
333+
auto bundle = assetManager->getAsset(satFilePath.string(), loadParams);
333334
#ifdef IMAGE_VIEW
334335
auto cpuImageViewFetched = core::smart_refctd_ptr_static_cast<asset::ICPUImageView>(bundle.getContents().begin()[0]);
335336
auto cpuImage = getDisConvolutedImage(cpuImageViewFetched->getCreationParameters().image);
@@ -342,7 +343,7 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
342343
viewParams.components = {};
343344

344345
auto cpuImageView = ICPUImageView::create(std::move(viewParams));
345-
assert(cpuImageView.get(), "The imageView didn't pass creation validation!");
346+
assert(cpuImageView.get()); // The imageView didn't pass creation validation!
346347

347348
asset::IAssetWriter::SAssetWriteParams wparams(cpuImageView.get());
348349
assetManager->writeAsset(convolutedSatFilePath.string(), wparams);

‎examples_tests/common/CommonAPI.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,12 @@ class CommonAPI
395395
#ifdef _NBL_PLATFORM_WINDOWS_
396396
return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemWin32>(std::move(caller));
397397
#elif defined(_NBL_PLATFORM_ANDROID_)
398+
#if 0
398399
return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(std::move(caller));
399-
#else
400-
return nullptr;
401400
#endif
401+
#endif
402+
return nullptr;
403+
402404
}
403405

404406
// Used to help with queue selection

‎include/nbl/system/CSystemAndroid.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ namespace nbl::system
2626
m_cachedArchiveFiles.insert(APKResourcesPath, std::move(archive));
2727

2828
}
29+
SystemInfo getSystemInfo() const override
30+
{
31+
assert(false); // TODO
32+
return SystemInfo();
33+
}
2934
};
3035
}
3136
#endif

‎include/nbl/ui/CGraphicalApplicationAndroid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace nbl::ui
4949
system::path sharedInputCWD = system::path(app->activity->externalDataPath).parent_path().parent_path() / "eu.devsh.mediaunpackingonandroid/files/media";
5050
system::path APKResourcesPath = "asset"; // an archive alias to recognize this path as an apk resource
5151
system::path sharedOutputCWD = system::path(app->activity->externalDataPath).parent_path().parent_path();
52-
system::path privateOutputCWD = system::path(app->activity->internalDataPath);
52+
system::path privateOutputCWD = system::path(app->activity->externalDataPath);
5353

5454
if constexpr (std::is_base_of_v<nbl::ui::CGraphicalApplicationAndroid, android_app_class>)
5555
{

‎src/nbl/CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@ option(_NBL_COMPILE_WITH_GLI_WRITER_ "Compile with GLI Writer" ON)
121121
option(_NBL_COMPILE_WITH_GLTF_LOADER_ "Compile with GLTF Loader" ON)
122122
option(_NBL_COMPILE_WITH_GLTF_WRITER_ "Compile with GLTF Writer" ON)
123123

124+
if(NBL_BUILD_ANDROID)
125+
set(_NBL_COMPILE_WITH_BAW_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) # TODO - remove when BAW-v4 is done
126+
set(_NBL_COMPILE_WITH_BAW_WRITER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) # TODO - remove when BAW-v4 is done
127+
set(_NBL_COMPILE_WITH_OBJ_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)
128+
set(_NBL_COMPILE_WITH_MTL_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)
129+
set(NBL_BUILD_MITSUBA_LOADER OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) # TODO - compile/linker errors
130+
endif()
131+
124132
nbl_get_conf_dir(NABLA_CONF_DIR_DEBUG Debug)
125133
nbl_get_conf_dir(NABLA_CONF_DIR_RELEASE Release)
126134
if(NBL_EMBED_BUILTIN_RESOURCES)
@@ -477,7 +485,7 @@ macro(nbl_target_link_spirv_tools _trgt)
477485
target_link_libraries(${_trgt} INTERFACE
478486
SPIRV SPIRV-Tools SPIRV-Tools-opt
479487
)
480-
target_include_directories(${_trgt} PUBLIC
488+
target_include_directories(${_trgt} PUBLIC BEFORE
481489
${THIRD_PARTY_SOURCE_DIR}/SPIRV-Tools/include
482490
)
483491
endmacro()

0 commit comments

Comments
 (0)