From 3e575edbda17ff2103cedfb3479d147aa30d5e9f Mon Sep 17 00:00:00 2001 From: Joe Ludwig Date: Mon, 7 Sep 2020 09:36:19 -0700 Subject: [PATCH] Renamed avrenderer.exe to aardvarkxr.exe Including a bunch of associated references. --- build.js | 8 +-- src/avrenderer/CMakeLists.txt | 52 +++++++++---------- ...r.exe.manifest => aardvarkxr.exe.manifest} | 0 src/avrenderer/registerapp.bat | 2 +- src/avrenderer/unregisterapp.bat | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) rename src/avrenderer/{avrenderer.exe.manifest => aardvarkxr.exe.manifest} (100%) diff --git a/build.js b/build.js index 4d9dc98c..986d4727 100644 --- a/build.js +++ b/build.js @@ -193,7 +193,7 @@ async function copyRelease() let outDir = path.resolve( __dirname, subDir ); - let inDir = path.resolve( bldDir, "avrenderer/Release" ); + let inDir = path.resolve( bldDir, "aardvarkxr/Release" ); copyDir( inDir, outDir ); copyDir( dataDir, path.resolve( outDir, "data" ) ); @@ -331,7 +331,7 @@ ${ files.map( ( fname) => fileCmd( fname, buildDir ) ).join('\n') } ExecWait 'netsh advfirewall firewall add rule name=AardvarkServer dir=in action=allow program="$INSTDIR\\data\\server\\bin\\node.exe" enable=yes profile=public,private' # Register the install with Aardvark -ExecWait '$INSTDIR\\avrenderer.exe register' +ExecWait '$INSTDIR\\aardvarkxr.exe register' # define uninstaller name WriteUninstaller $INSTDIR\\uninstaller.exe @@ -346,7 +346,7 @@ SectionEnd Section "Uninstall" # Unregister the install with Aardvark -ExecWait '$INSTDIR\\avrenderer.exe unregister' +ExecWait '$INSTDIR\\aardvarkxr.exe unregister' # Remove firewall rule ExecWait 'netsh advfirewall firewall delete rule name=AardvarkServer' @@ -401,7 +401,7 @@ async function signExes() let buildDir = path.resolve( __dirname, subDir ); - await signFile( buildDir + "\\avrenderer.exe" ); + await signFile( buildDir + "\\aardvarkxr.exe" ); await signFile( buildDir + "\\crashpad_handler.exe" ); } diff --git a/src/avrenderer/CMakeLists.txt b/src/avrenderer/CMakeLists.txt index fba669c6..dbb9d2e3 100644 --- a/src/avrenderer/CMakeLists.txt +++ b/src/avrenderer/CMakeLists.txt @@ -1,12 +1,12 @@ find_package(Vulkan) -SET(EXAMPLE_NAME "avrenderer") +SET(EXAMPLE_NAME "aardvarkxr.exe") file(GLOB SHADERS "${AV_DATA}/shaders/*.vert" "${AV_DATA}/shaders/*.frag" "${AV_DATA}/shaders/*.comp" "${AV_DATA}/shaders/*.geom" "${AV_DATA}/shaders/*.tesc" "${AV_DATA}/shaders/*.tese") source_group("Shaders" FILES ${SHADERS}) SET( AARDVARK_VERSION "0.0.1234" CACHE STRING "Version string" ) -add_executable(avrenderer +add_executable(aardvarkxr aardvark_renderer.cpp aardvark_renderer.h avrenderer_main.cpp @@ -34,17 +34,17 @@ add_executable(avrenderer ${SHADERS} ) -target_link_libraries(avrenderer ${Vulkan_LIBRARY} ${WINLIBS}) -target_link_libraries( avrenderer aardvark ) -target_link_libraries( avrenderer tools ) -target_link_libraries( avrenderer sentry ) -target_link_libraries( avrenderer ${OpenVR_LIB_DIR}/openvr_api.lib ) -target_link_libraries( avrenderer DXGI.lib ) - -target_include_directories( avrenderer PUBLIC ${AV_SRC_THIRDPARTY} ) -target_include_directories( avrenderer PRIVATE ${OpenVR_INCLUDE_DIR} ) -target_link_libraries( avrenderer gltfpbr_base) -target_compile_definitions(avrenderer PRIVATE +target_link_libraries(aardvarkxr ${Vulkan_LIBRARY} ${WINLIBS}) +target_link_libraries( aardvarkxr aardvark ) +target_link_libraries( aardvarkxr tools ) +target_link_libraries( aardvarkxr sentry ) +target_link_libraries( aardvarkxr ${OpenVR_LIB_DIR}/openvr_api.lib ) +target_link_libraries( aardvarkxr DXGI.lib ) + +target_include_directories( aardvarkxr PUBLIC ${AV_SRC_THIRDPARTY} ) +target_include_directories( aardvarkxr PRIVATE ${OpenVR_INCLUDE_DIR} ) +target_link_libraries( aardvarkxr gltfpbr_base) +target_compile_definitions(aardvarkxr PRIVATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING @@ -52,33 +52,33 @@ target_compile_definitions(avrenderer PRIVATE AARDVARK_VERSION="${AARDVARK_VERSION}" ) -target_link_directories( avrenderer PRIVATE ${CEF_BINARY_DIR} ) +target_link_directories( aardvarkxr PRIVATE ${CEF_BINARY_DIR} ) if(RESOURCE_INSTALL_DIR) - install(TARGETS avrenderer DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS aardvarkxr DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() # configure_file( ${OpenVR_BIN_DIR}/openvr_api.dll ${CMAKE_CURRENT_BINARY_DIR}/openvr_api.dll COPYONLY ) -add_custom_command(TARGET avrenderer POST_BUILD +add_custom_command(TARGET aardvarkxr POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${OpenVR_BIN_DIR}/openvr_api.dll" "${CMAKE_CURRENT_BINARY_DIR}/$/" ) #message ( "in " ${CMAKE_BINARY_DIR}/thirdparty/sentry-native/crashpad_build/handler/$ ) #message ( "out " "${CMAKE_CURRENT_BINARY_DIR}/$/" ) -add_custom_command(TARGET avrenderer POST_BUILD +add_custom_command(TARGET aardvarkxr POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CMAKE_BINARY_DIR}/thirdparty/sentry-native/crashpad_build/handler/$/crashpad_handler.exe" "${CMAKE_CURRENT_BINARY_DIR}/$/" ) -add_custom_command(TARGET avrenderer POST_BUILD +add_custom_command(TARGET aardvarkxr POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/registerapp.bat" "${CMAKE_CURRENT_BINARY_DIR}/$/" ) -add_custom_command(TARGET avrenderer POST_BUILD +add_custom_command(TARGET aardvarkxr POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/unregisterapp.bat" "${CMAKE_CURRENT_BINARY_DIR}/$/" ) -target_link_libraries( avrenderer Dwmapi.lib ) +target_link_libraries( aardvarkxr Dwmapi.lib ) set( CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$/") @@ -88,9 +88,9 @@ set( CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$/") if(OS_WINDOWS) # Executable target. - set( CEF_TARGET avrenderer ) + set( CEF_TARGET aardvarkxr ) SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET}) - target_link_libraries(avrenderer libcef libcef_dll_wrapper ${CEF_STANDARD_LIBS}) + target_link_libraries(aardvarkxr libcef libcef_dll_wrapper ${CEF_STANDARD_LIBS}) if(USE_SANDBOX) # Logical target used to link the cef_sandbox library. @@ -106,7 +106,7 @@ if(OS_WINDOWS) COPY_FILES("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "${CEF_TARGET_OUT_DIR}") endif() -target_include_directories( avrenderer PRIVATE ${TinyProcessLibrary_INCLUDE_DIR} ) -target_link_directories( avrenderer PRIVATE ${TinyProcessLibrary_LIB_DIR} ) -target_link_libraries( avrenderer tiny-process-library ) -target_link_libraries( avrenderer D3D11 ) +target_include_directories( aardvarkxr PRIVATE ${TinyProcessLibrary_INCLUDE_DIR} ) +target_link_directories( aardvarkxr PRIVATE ${TinyProcessLibrary_LIB_DIR} ) +target_link_libraries( aardvarkxr tiny-process-library ) +target_link_libraries( aardvarkxr D3D11 ) diff --git a/src/avrenderer/avrenderer.exe.manifest b/src/avrenderer/aardvarkxr.exe.manifest similarity index 100% rename from src/avrenderer/avrenderer.exe.manifest rename to src/avrenderer/aardvarkxr.exe.manifest diff --git a/src/avrenderer/registerapp.bat b/src/avrenderer/registerapp.bat index 21941b03..3b76f0b3 100644 --- a/src/avrenderer/registerapp.bat +++ b/src/avrenderer/registerapp.bat @@ -1,2 +1,2 @@ -avrenderer.exe register +aardvarkxr.exe register diff --git a/src/avrenderer/unregisterapp.bat b/src/avrenderer/unregisterapp.bat index bce2709d..ff00c7e5 100644 --- a/src/avrenderer/unregisterapp.bat +++ b/src/avrenderer/unregisterapp.bat @@ -1,2 +1,2 @@ -avrenderer.exe unregister +aardvarkxr.exe unregister