diff --git a/README.md b/README.md index 8547d70..0f41d6d 100644 --- a/README.md +++ b/README.md @@ -89,9 +89,8 @@ brew install libsodium brew install pkg-config cd .. git clone https://github.com/zeromq/libzmq -cd libzmq -mkdir build -cd build +mkdir -p libzmq/build +cd libzmq/build /Applications/CMake.app/Contents/bin/cmake .. -DENABLE_CURVE=ON -DWITH_LIBSODIUM=../../homebrew/Cellar/libsodium/1.0.20/include/sodium -DSODIUM_INCLUDE_DIRS=~/homebrew/Cellar/libsodium/1.0.20/include -DSODIUM_LIBRARIES=~/homebrew/Cellar/libsodium/1.0.20/lib/libsodium.a make -j4 cd ../.. @@ -100,6 +99,7 @@ git clone https://github.com/SpartanJ/efsw.git mkdir -p efsw/build cd efsw/build /Applications/CMake.app/Contents/bin/cmake .. +make -j4 cd ../.. git clone https://github.com/oomer/bellatui.git cd bellatui @@ -160,6 +160,7 @@ cd build cmake .. cd ../.. git clone https://github.com/SpartanJ/efsw.git + mkdir -p efsw/build cd efsw/build cmake .. @@ -184,13 +185,17 @@ Get bella_engine_sdk ``` git clone https://github.com/microsoft/vcpkg.git cd vcpkg +bootstrap-vcpkg.bat vcpkg install zeromq[sodium]:x64-windows +vcpkg.exe install cppzmq:x64-windows +vcpkg integrate install cd .. git clone https://github.com/SpartanJ/efsw.git mkdir -p efsw/build cd efsw/build cmake .. - +msbuild efsw.sln /p:Configuration=Release /p:Platform=x64 +cd ../.. git clone https://github.com/oomer/bellatui.git msbuild bellatui.vcxproj /p:Configuration=release /p:Platform=x64 /p:PlatformToolset=v143 diff --git a/bellatui.cpp b/bellatui.cpp index e2d9b4f..a24801e 100644 --- a/bellatui.cpp +++ b/bellatui.cpp @@ -24,6 +24,9 @@ #include #include // For string streams #include +#include // Add this line for std::mutex and std::lock_guard +#include // Add this line for std::map + #include // For std::system #include // For std::runtime_error diff --git a/bellatui.vcxproj b/bellatui.vcxproj index d0e7cdd..c8cc68e 100644 --- a/bellatui.vcxproj +++ b/bellatui.vcxproj @@ -19,13 +19,13 @@ Application false - v141 + v143 Unicode Application false - v141 + v143 Unicode @@ -47,13 +47,13 @@ PSEUDODEBUG;_CONSOLE;DL_USE_SHARED;%(PreprocessorDefinitions) Disabled Disabled - ..\bella_engine_sdk\src + ..\bella_engine_sdk\src;..\efsw\include;..\efsw\src;..\vcpkg\installed\x64-windows\include Console true - lib - bella_engine_sdk.lib;Shlwapi.lib;vulkan-1.lib;%(AdditionalDependencies) + lib;..\efsw\build\Debug;..\vcpkg\installed\x64-windows\lib + efsw-static.lib;libzmq-mt-4_3_5.lib;bella_engine_sdk.lib;Shlwapi.lib;vulkan-1.lib;%(AdditionalDependencies) vulkan-1.dll @@ -64,17 +64,15 @@ true false NDEBUG;_CONSOLE;DL_USE_SHARED;%(PreprocessorDefinitions) - ..\bella_engine_sdk\src + ..\bella_engine_sdk\src;..\efsw\include;..\efsw\src;..\vcpkg\installed\x64-windows\include Console true true true - lib - ../vcpkg/installed/x64-windows/lib - ../bella_engine_sdk/lib - libzmq-mt-4_3_5.lib;bella_engine_sdk.lib;Shlwapi.lib;vulkan-1.lib;%(AdditionalDependencies) + lib;..\efsw\build\Release;..\vcpkg\installed\x64-windows\lib;..\bella_engine_sdk\lib + efsw-static.lib;libzmq-mt-4_3_5.lib;bella_engine_sdk.lib;Shlwapi.lib;vulkan-1.lib;%(AdditionalDependencies) vulkan-1.dll @@ -91,19 +89,18 @@ - echo Post-build event started & - copy "$(ProjectDir)..\bella_engine_sdk\lib\bella_engine_sdk.dll" "$(TargetDir)" & - echo bella_engine_sdk.dll copied & - copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_core.dll" "$(TargetDir)" & - echo dl_core.dll copied & - copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_oidn_core.dll" "$(TargetDir)" & - echo dl_oidn_core.dll copied & + echo Post-build event started & + copy "$(ProjectDir)..\bella_engine_sdk\lib\bella_engine_sdk.dll" "$(TargetDir)" & + echo bella_engine_sdk.dll copied & + copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_core.dll" "$(TargetDir)" & + echo dl_core.dll copied & + copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_oidn_core.dll" "$(TargetDir)" & + echo dl_oidn_core.dll copied & copy "$(ProjectDir)..\vcpkg\installed\x64-windows\bin\libzmq-mt-4_3_5.dll" "$(TargetDir)" & - echo libzmq-mt-4_3_5.dll copied & - copy "$(ProjectDir)..\vcpkg\installed\x64-windows\bin\libsodium.dll" "$(TargetDir)" & - echo libsodium.dll copied & + echo libzmq-mt-4_3_5.dll copied & + copy "$(ProjectDir)..\vcpkg\installed\x64-windows\bin\libsodium.dll" "$(TargetDir)" & + echo libsodium.dll copied & echo Post-build event finished -