Skip to content

Commit

Permalink
Renamed avrenderer.exe to aardvarkxr.exe
Browse files Browse the repository at this point in the history
Including a bunch of associated references.
  • Loading branch information
JoeLudwig committed Sep 7, 2020
1 parent ca8a2fe commit 3e575ed
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
8 changes: 4 additions & 4 deletions build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" ) );

Expand Down Expand Up @@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -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" );
}

Expand Down
52 changes: 26 additions & 26 deletions src/avrenderer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -34,51 +34,51 @@ 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
NOMINMAX
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}/$<CONFIG>/"
)

#message ( "in " ${CMAKE_BINARY_DIR}/thirdparty/sentry-native/crashpad_build/handler/$<CONFIG> )
#message ( "out " "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/" )
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/$<CONFIG>/crashpad_handler.exe"
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/"
)

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}/$<CONFIG>/"
)
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}/$<CONFIG>/"
)

target_link_libraries( avrenderer Dwmapi.lib )
target_link_libraries( aardvarkxr Dwmapi.lib )

set( CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/")

Expand All @@ -88,9 +88,9 @@ set( CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/")

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.
Expand All @@ -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 )
File renamed without changes.
2 changes: 1 addition & 1 deletion src/avrenderer/registerapp.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
avrenderer.exe register
aardvarkxr.exe register

2 changes: 1 addition & 1 deletion src/avrenderer/unregisterapp.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
avrenderer.exe unregister
aardvarkxr.exe unregister

0 comments on commit 3e575ed

Please sign in to comment.