Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": "0.2.0",
"configurations": [

{
"name": "Bridge Command (vsdbg)",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/Debug/BridgeCommand-bc.exe",
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Scenario Editor (vsdbg)",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/Debug/BridgeCommand-ed.exe",
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Settings Editor (vsdbg)",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/Debug/BridgeCommand-ini.exe",
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Map Controller (vsdbg)",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/Debug/BridgeCommand-mc.exe",
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Multiplayer Hub (vsdbg)",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/Debug/BridgeCommand-mh.exe",
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Repeater (vsdbg)",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/Debug/BridgeCommand-rp.exe",
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Launcher (vsdbg)",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/Debug/BridgeCommand.exe",
"cwd": "${workspaceFolder}/bin"
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cmake.sourceDirectory": "${workspaceFolder}/src"
}
44 changes: 40 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,33 @@ if (APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
endif (APPLE)

if (WIN32)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")

add_subdirectory(libs/asio)
add_subdirectory(libs/serial)
include_directories("libs/enet-1.3.14/include")
include_directories(libs/libsndfile/include)
include_directories(libs/portaudio/include)
include_directories(libs/Irrlicht/irrlicht-svn/include)
include_directories(libs/OpenXR/OpenXR-SDK-main/include/openxr)

LINK_DIRECTORIES(libs/libsndfile/lib)
LINK_DIRECTORIES(libs/portaudio/lib)
LINK_DIRECTORIES(libs/enet-1.3.14)
LINK_DIRECTORIES(libs/Irrlicht/irrlicht-svn/lib/Win64-visualstudio)
LINK_DIRECTORIES(libs/OpenXR/OpenXR-SDK-main/build/win64/src/loader/Release)
LINK_DIRECTORIES(libs/OpenXR/OpenXR-SDK-main/build/win64/src/loader/Debug)
else (WIN32)
add_subdirectory(libs/asio)
add_subdirectory(libs/enet-1.3.14)
add_subdirectory(libs/Irrlicht)
add_subdirectory(libs/serial)

include_directories("libs/enet-1.3.14/include")
endif (WIN32)

add_definitions(-DWITH_SOUND)
# add_definitions(-DWITH_PROFILING)
if (NOT APPLE)
Expand All @@ -36,9 +57,9 @@ add_subdirectory(repeater)

set(CMAKE_THREAD_PREFER_PTHREAD ON)
find_package(Threads REQUIRED)
if (NOT APPLE)
if (NOT APPLE AND NOT WIN32)
find_package(OpenXR REQUIRED)
endif(NOT APPLE)
endif(NOT APPLE AND NOT WIN32)

set(BC_SOURCES
iprof.cpp
Expand Down Expand Up @@ -127,7 +148,22 @@ if (APPLE)
"-framework AudioToolbox"
"-framework CoreAudio"
)
else (APPLE)
elseif (WIN32)
target_link_libraries(bridgecommand-bc PRIVATE
bc-asio
enet64
bc-serial
irrlicht
Threads::Threads
sndfile
portaudio_x64
winmm
ws2_32
debug openxr_loaderd
optimized openxr_loader
opengl32
)
else ()
target_link_libraries(bridgecommand-bc PRIVATE
bc-asio
enet
Expand All @@ -140,4 +176,4 @@ else (APPLE)
GL
OpenXR::openxr_loader
)
endif (APPLE)
endif ()
12 changes: 12 additions & 0 deletions src/controller/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,22 @@ add_executable(bridgecommand-mc
set(CMAKE_THREAD_PREFER_PTHREAD ON)
find_package(Threads REQUIRED)

if (WIN32)
target_link_libraries(bridgecommand-mc
bc-asio
enet64
irrlicht
bc-aisparser
Threads::Threads
winmm
ws2_32
)
else ()
target_link_libraries(bridgecommand-mc
bc-asio
enet
bc-irrlicht
bc-aisparser
Threads::Threads
)
endif ()
7 changes: 6 additions & 1 deletion src/editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ add_executable(bridgecommand-ed
StartupEventReceiver.cpp
)


if (WIN32)
target_link_libraries(bridgecommand-ed
irrlicht
)
else ()
target_link_libraries(bridgecommand-ed
bc-irrlicht
)
endif ()
6 changes: 6 additions & 0 deletions src/iniEditor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ add_executable(bridgecommand-ini
../Utilities.cpp
)

if (WIN32)
target_link_libraries(bridgecommand-ini
irrlicht
)
else ()
target_link_libraries(bridgecommand-ini
bc-irrlicht
)
endif ()
6 changes: 6 additions & 0 deletions src/launcher/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ add_executable(bridgecommand
../Utilities.cpp
)

if (WIN32)
target_link_libraries(bridgecommand
irrlicht
)
else ()
target_link_libraries(bridgecommand
bc-irrlicht
)
endif ()
Binary file not shown.
10 changes: 10 additions & 0 deletions src/multiplayerHub/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@ add_executable(bridgecommand-mh
EventReceiver.cpp
)

if (WIN32)
target_link_libraries(bridgecommand-mh
enet64
irrlicht
winmm
ws2_32
)
else ()
target_link_libraries(bridgecommand-mh
enet
bc-irrlicht
)
endif ()

12 changes: 12 additions & 0 deletions src/repeater/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,21 @@ add_executable(bridgecommand-rp
set(CMAKE_THREAD_PREFER_PTHREAD ON)
find_package(Threads REQUIRED)

if (WIN32)
target_link_libraries(bridgecommand-rp
bc-asio
enet64
irrlicht
Threads::Threads
winmm
ws2_32
)
else ()
target_link_libraries(bridgecommand-rp
bc-asio
enet
bc-irrlicht
Threads::Threads
)
endif ()

Loading