kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now passing standard assets bundle path to test executable

Browse Source
This commit is contained in:
Kearwood Gilbert
2020-04-01 22:02:22 -07:00
parent 280de9b6da
commit 8901ac041a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/smoke/hello_cube/CMakeLists.txt
View File

@@ -6,6 +6,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
if (WIN32)
add_executable(kraken_cube WIN32 main_win.cpp hello_cube.cpp)
add_compile_definitions(UNICODE)
set_property(TARGET kraken_cube PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "${STANDARD_ASSET_BUNDLE}")
else(WIN32)
add_executable(kraken_cube main_macos.mm hello_cube.cpp)
set(CMAKE_CXX_COMPILER "clang++")
@@ -16,6 +17,8 @@ target_include_directories(kraken_cube PRIVATE ${CMAKE_SOURCE_DIR}/hydra/include
TARGET_LINK_LIBRARIES( kraken_cube kraken ${EXTRA_LIBS} )
# configure_file(${STANDARD_ASSET_BUNDLE} ${CMAKE_BINARY_DIR}/output/bin COPYONLY)
set_target_properties( kraken_cube PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/output/bin
RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/output/bin

2
tests/smoke/hello_cube/main_win.cpp
View File

@@ -36,7 +36,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
KrLoadResourceInfo load_resource_info = {};
load_resource_info.sType = KR_STRUCTURE_TYPE_LOAD_RESOURCE;
load_resource_info.resourceHandle = 1;
load_resource_info.pResourcePath = "kraken_standard_assets.krbundle";
load_resource_info.pResourcePath = lpCmdLine; // "kraken_standard_assets.krbundle";
res = KrLoadResource(&load_resource_info);
if (res != KR_SUCCESS) {
//printf("Failed to load resource: %s\n", arg);