Skip to content

Commit

Permalink
Merge pull request #31 from aws-lumberyard-dev/cgalvan/gitflow_230501…
Browse files Browse the repository at this point in the history
…_o3de-netsoaktest

Merged `stabilization/2305` into `main`
  • Loading branch information
AMZN-alexpete authored May 3, 2023
2 parents 19bcf79 + 115a487 commit 5beaffa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions Gem/Code/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ ly_add_target(
# if enabled, NetSoakTest is used by all kinds of applications
ly_create_alias(NAME NetSoakTest.Clients NAMESPACE Gem TARGETS Gem::NetSoakTest)
ly_create_alias(NAME NetSoakTest.Servers NAMESPACE Gem TARGETS Gem::NetSoakTest)
ly_create_alias(NAME NetSoakTest.Unified NAMESPACE Gem TARGETS Gem::NetSoakTest)

################################################################################
# Gem dependencies
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ Cloning into 'o3de-netsoaktest'...
> C:/Path/To/o3de/scripts/o3de.bat register -p C:/Path/To/o3de-netsoaktest

# example configure command
> cmake -S C:/Path/To/o3de-netsoaktest -b C:/Path/To/o3de-netsoaktest/build -G "Visual Studio 16 2019" -DLY_3RDPARTY_PATH="C:/3rdparty"
> cmake -S C:/Path/To/o3de-netsoaktest -B C:/Path/To/o3de-netsoaktest/build/windows_vs2019 -G "Visual Studio 16" -DLY_3RDPARTY_PATH="C:/3rdParty"

# example build command
> cmake --build C:/Path/To/o3de-netsoaktest/build --target Editor NetSoakTest.ServerLauncher --configure profile -- /m /nologo
> cmake --build C:/Path/To/o3de-netsoaktest/build/windows_vs2019 --target Editor NetSoakTest.ServerLauncher --config profile -- /m /nologo
```

##### Linux
Expand All @@ -62,7 +62,7 @@ Cloning into 'o3de-netsoaktest'...
> /path/to/o3de/scripts/o3de.sh register -p /path/to/o3de-netsoaktest

# example configure command
> cmake -S /pathto/o3de-netsoaktest -b /path/to/o3de-netsoaktest/build -G "Ninja Multi-Config" -DLY_3RDPARTY_PATH="C:/3rdparty" -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12
> cmake -S /path/to/o3de-netsoaktest -B /path/to/o3de-netsoaktest/build -G "Ninja Multi-Config" -DLY_3RDPARTY_PATH="/home/user/3rdparty" -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12

# example build command
> cmake --build /path/to/o3de-netsoaktest/build --config profile --target Editor NetSoakTest.ServerLauncher
Expand Down

0 comments on commit 5beaffa

Please sign in to comment.