diff --git a/.gitignore b/.gitignore
index 022a844..0a9e91b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
.vs
pgsql
x64
-/WebApp/WebApp/log
+/WebApp/log
/config.json
/build
diff --git a/BUILD-Windows.md b/BUILD-Windows.md
index 95b6bae..f98e4a2 100644
--- a/BUILD-Windows.md
+++ b/BUILD-Windows.md
@@ -62,6 +62,6 @@ b2
> Now we should go back to the root directory.
-Use VS2019 to open `WebApp/WebApp.sln`, which is a sample project. Remember to properly configure the database and `config.json` before you `Run` the project.
+Use VS2019 to open `WebApp.sln`, which is a sample project. Remember to properly configure the database and `config.json` before you `Run` the project.
> `bserv` and `WebApp` should be built in `Debug` or `Release` (`x64`), NOT (`Win32`/`x86`).
diff --git a/BUILD-ubuntu.md b/BUILD-ubuntu.md
index d692970..42d4144 100644
--- a/BUILD-ubuntu.md
+++ b/BUILD-ubuntu.md
@@ -61,8 +61,8 @@ cmake --build .
Assuming the shell is in `build`, you can run `WebApp` using:
```
-cd WebApp/WebApp
-./WebApp ../../../config.json
+cd WebApp
+./WebApp ../../config.json
```
given that the database and `config.json` are properly configured.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62b1a5a..3198408 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,5 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()
-add_subdirectory(WebApp/bserv)
-add_subdirectory(WebApp/WebApp)
-
+add_subdirectory(bserv)
+add_subdirectory(WebApp)
diff --git a/README.md b/README.md
index 8451efc..75aa807 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
> NOTE:
> - To build the dependencies & the project, refer to [`BUILD-Windows.md`](BUILD-Windows.md) or [`BUILD-ubuntu.md`](BUILD-ubuntu.md).
-> - `WebApp/bserv` contains the source code for `bserv`.
+> - `bserv` contains the source code for `bserv`.
## Quick Start
@@ -92,7 +92,7 @@ The following table shows some requests & responses:
### Sample Project: `WebApp`
-- `WebApp/WebApp` is a sample project.
+- `WebApp` is a sample project.
- [`config-Windows.json`](config-Windows.json) and [`config-ubuntu.json`](config-ubuntu.json) are two sample config file for `WebApp`'s startup parameters. **It should be configured and renamed to `config.json` before you start `WebApp`.**
- To use `WebApp`, you should setup the database as well.
diff --git a/WebApp/WebApp.sln b/WebApp.sln
similarity index 100%
rename from WebApp/WebApp.sln
rename to WebApp.sln
diff --git a/WebApp/WebApp/CMakeLists.txt b/WebApp/CMakeLists.txt
similarity index 67%
rename from WebApp/WebApp/CMakeLists.txt
rename to WebApp/CMakeLists.txt
index 4e4cf7d..1e1d643 100644
--- a/WebApp/WebApp/CMakeLists.txt
+++ b/WebApp/CMakeLists.txt
@@ -9,8 +9,8 @@ add_executable(
target_include_directories(
WebApp PUBLIC
- ../../dependencies/inja/include
- ../../dependencies/inja/third_party/include
+ ../dependencies/inja/include
+ ../dependencies/inja/third_party/include
)
target_link_libraries(
@@ -18,4 +18,3 @@ target_link_libraries(
bserv
)
-
diff --git a/WebApp/WebApp/WebApp.cpp b/WebApp/WebApp.cpp
similarity index 100%
rename from WebApp/WebApp/WebApp.cpp
rename to WebApp/WebApp.cpp
diff --git a/WebApp/WebApp/WebApp.vcxproj b/WebApp/WebApp.vcxproj
similarity index 78%
rename from WebApp/WebApp/WebApp.vcxproj
rename to WebApp/WebApp.vcxproj
index b9c02ee..e97bfd5 100644
--- a/WebApp/WebApp/WebApp.vcxproj
+++ b/WebApp/WebApp.vcxproj
@@ -65,9 +65,11 @@
+
+
@@ -116,19 +118,14 @@
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- stdcpp17
- ..\..\dependencies\inja\include;..\..\dependencies\inja\third_party\include;..\bserv\include;..\..\dependencies\libpqxx\include;..\..\dependencies;..\..\dependencies\boost;%(AdditionalIncludeDirectories)
+ ..\dependencies\inja\include;..\dependencies\inja\third_party\include;%(AdditionalIncludeDirectories)
/bigobj %(AdditionalOptions)
Console
true
- $(OutDir);..\..\dependencies\libpqxx\src\Debug;..\..\dependencies\pgsql\lib;..\..\dependencies\cryptopp\x64\Output\Debug;..\..\dependencies\boost\stage\lib;%(AdditionalLibraryDirectories)
- bserv.lib;cryptlib.lib;pqxx.lib;libpq.lib;wsock32.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;%(AdditionalDependencies)
-
- xcopy /y /d "..\..\dependencies\pgsql\bin\*.dll" "$(OutDir)"
-
+
@@ -138,20 +135,15 @@
true
NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- stdcpp20
- ..\..\dependencies\inja\include;..\..\dependencies\inja\third_party\include;..\bserv\include;..\..\dependencies\libpqxx\include;..\..\dependencies;..\..\dependencies\boost;%(AdditionalIncludeDirectories)
+ ..\dependencies\inja\include;..\dependencies\inja\third_party\include;%(AdditionalIncludeDirectories)
Console
true
true
true
- $(OutDir);..\..\dependencies\libpqxx\src\Release;..\..\dependencies\pgsql\lib;..\..\dependencies\cryptopp\x64\Output\Release;..\..\dependencies\boost\stage\lib;%(AdditionalLibraryDirectories)
- bserv.lib;cryptlib.lib;pqxx.lib;libpq.lib;wsock32.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;%(AdditionalDependencies)
-
- xcopy /y /d "..\..\dependencies\pgsql\bin\*.dll" "$(OutDir)"
-
+
diff --git a/WebApp/WebApp/WebApp.vcxproj.filters b/WebApp/WebApp.vcxproj.filters
similarity index 100%
rename from WebApp/WebApp/WebApp.vcxproj.filters
rename to WebApp/WebApp.vcxproj.filters
diff --git a/WebApp/WebApp/WebApp.vcxproj.user b/WebApp/WebApp.vcxproj.user
similarity index 76%
rename from WebApp/WebApp/WebApp.vcxproj.user
rename to WebApp/WebApp.vcxproj.user
index 8bd0ba4..f009bea 100644
--- a/WebApp/WebApp/WebApp.vcxproj.user
+++ b/WebApp/WebApp.vcxproj.user
@@ -4,11 +4,11 @@
WindowsLocalDebugger
- ..\..\config.json
+ ..\config.json
WindowsLocalDebugger
- ..\..\config.json
+ ..\config.json
WindowsLocalDebugger
\ No newline at end of file
diff --git a/WebApp/WebApp/handlers.cpp b/WebApp/handlers.cpp
similarity index 100%
rename from WebApp/WebApp/handlers.cpp
rename to WebApp/handlers.cpp
diff --git a/WebApp/WebApp/handlers.h b/WebApp/handlers.h
similarity index 100%
rename from WebApp/WebApp/handlers.h
rename to WebApp/handlers.h
diff --git a/WebApp/WebApp/rendering.cpp b/WebApp/rendering.cpp
similarity index 100%
rename from WebApp/WebApp/rendering.cpp
rename to WebApp/rendering.cpp
diff --git a/WebApp/WebApp/rendering.h b/WebApp/rendering.h
similarity index 100%
rename from WebApp/WebApp/rendering.h
rename to WebApp/rendering.h
diff --git a/bserv-debug-x64.props b/bserv-debug-x64.props
new file mode 100644
index 0000000..5037ec0
--- /dev/null
+++ b/bserv-debug-x64.props
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ ..\bserv\include;..\dependencies\libpqxx\include;..\dependencies;..\dependencies\boost;%(AdditionalIncludeDirectories)
+ stdcpp17
+
+
+ $(OutDir);..\dependencies\libpqxx\src\Debug;..\dependencies\pgsql\lib;..\dependencies\cryptopp\x64\Output\Debug;..\dependencies\boost\stage\lib;%(AdditionalLibraryDirectories)
+ bserv.lib;cryptlib.lib;pqxx.lib;libpq.lib;wsock32.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;%(AdditionalDependencies)
+
+
+ xcopy /y /d "..\dependencies\pgsql\bin\*.dll" "$(OutDir)"
+
+
+
+
\ No newline at end of file
diff --git a/bserv-release-x64.props b/bserv-release-x64.props
new file mode 100644
index 0000000..33483c9
--- /dev/null
+++ b/bserv-release-x64.props
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ ..\bserv\include;..\dependencies\libpqxx\include;..\dependencies;..\dependencies\boost;%(AdditionalIncludeDirectories)
+ stdcpp17
+
+
+ $(OutDir);..\dependencies\libpqxx\src\Release;..\dependencies\pgsql\lib;..\dependencies\cryptopp\x64\Output\Release;..\dependencies\boost\stage\lib;%(AdditionalLibraryDirectories)
+ bserv.lib;cryptlib.lib;pqxx.lib;libpq.lib;wsock32.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;%(AdditionalDependencies)
+
+
+ xcopy /y /d "..\dependencies\pgsql\bin\*.dll" "$(OutDir)"
+
+
+
+
\ No newline at end of file
diff --git a/WebApp/bserv/CMakeLists.txt b/bserv/CMakeLists.txt
similarity index 60%
rename from WebApp/bserv/CMakeLists.txt
rename to bserv/CMakeLists.txt
index 40a5e6f..1d9fc6f 100644
--- a/WebApp/bserv/CMakeLists.txt
+++ b/bserv/CMakeLists.txt
@@ -12,8 +12,8 @@ add_library(
target_include_directories(
bserv PUBLIC
- ../../dependencies
- ../../dependencies/libpqxx/include
+ ../dependencies
+ ../dependencies/libpqxx/include
include
)
@@ -29,8 +29,7 @@ target_link_libraries(
boost_log
boost_log_setup
boost_json
- "${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/cryptopp/libcryptopp.a"
- "${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/libpqxx/src/.libs/libpqxx.a"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/cryptopp/libcryptopp.a"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/libpqxx/src/.libs/libpqxx.a"
pq
)
-
diff --git a/WebApp/bserv/bserv.cpp b/bserv/bserv.cpp
similarity index 100%
rename from WebApp/bserv/bserv.cpp
rename to bserv/bserv.cpp
diff --git a/WebApp/bserv/bserv.vcxproj b/bserv/bserv.vcxproj
similarity index 95%
rename from WebApp/bserv/bserv.vcxproj
rename to bserv/bserv.vcxproj
index c96093d..a23dc45 100644
--- a/WebApp/bserv/bserv.vcxproj
+++ b/bserv/bserv.vcxproj
@@ -126,7 +126,7 @@
true
Use
pch.h
- ..\..\dependencies\libpqxx\include;..\..\dependencies;..\..\dependencies\boost;include;%(AdditionalIncludeDirectories)
+ ..\dependencies\libpqxx\include;..\dependencies;..\dependencies\boost;include;%(AdditionalIncludeDirectories)
stdcpp17
/bigobj %(AdditionalOptions)
@@ -147,7 +147,7 @@
Use
pch.h
stdcpp20
- ..\..\dependencies\libpqxx\include;..\..\dependencies;..\..\dependencies\boost;include;%(AdditionalIncludeDirectories)
+ ..\dependencies\libpqxx\include;..\dependencies;..\dependencies\boost;include;%(AdditionalIncludeDirectories)
diff --git a/WebApp/bserv/bserv.vcxproj.filters b/bserv/bserv.vcxproj.filters
similarity index 100%
rename from WebApp/bserv/bserv.vcxproj.filters
rename to bserv/bserv.vcxproj.filters
diff --git a/WebApp/bserv/bserv.vcxproj.user b/bserv/bserv.vcxproj.user
similarity index 100%
rename from WebApp/bserv/bserv.vcxproj.user
rename to bserv/bserv.vcxproj.user
diff --git a/WebApp/bserv/client.cpp b/bserv/client.cpp
similarity index 100%
rename from WebApp/bserv/client.cpp
rename to bserv/client.cpp
diff --git a/WebApp/bserv/database.cpp b/bserv/database.cpp
similarity index 100%
rename from WebApp/bserv/database.cpp
rename to bserv/database.cpp
diff --git a/WebApp/bserv/framework.h b/bserv/framework.h
similarity index 100%
rename from WebApp/bserv/framework.h
rename to bserv/framework.h
diff --git a/WebApp/bserv/include/bserv/client.hpp b/bserv/include/bserv/client.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/client.hpp
rename to bserv/include/bserv/client.hpp
diff --git a/WebApp/bserv/include/bserv/common.hpp b/bserv/include/bserv/common.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/common.hpp
rename to bserv/include/bserv/common.hpp
diff --git a/WebApp/bserv/include/bserv/config.hpp b/bserv/include/bserv/config.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/config.hpp
rename to bserv/include/bserv/config.hpp
diff --git a/WebApp/bserv/include/bserv/database.hpp b/bserv/include/bserv/database.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/database.hpp
rename to bserv/include/bserv/database.hpp
diff --git a/WebApp/bserv/include/bserv/logging.hpp b/bserv/include/bserv/logging.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/logging.hpp
rename to bserv/include/bserv/logging.hpp
diff --git a/WebApp/bserv/include/bserv/router.hpp b/bserv/include/bserv/router.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/router.hpp
rename to bserv/include/bserv/router.hpp
diff --git a/WebApp/bserv/include/bserv/server.hpp b/bserv/include/bserv/server.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/server.hpp
rename to bserv/include/bserv/server.hpp
diff --git a/WebApp/bserv/include/bserv/session.hpp b/bserv/include/bserv/session.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/session.hpp
rename to bserv/include/bserv/session.hpp
diff --git a/WebApp/bserv/include/bserv/utils.hpp b/bserv/include/bserv/utils.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/utils.hpp
rename to bserv/include/bserv/utils.hpp
diff --git a/WebApp/bserv/include/bserv/websocket.hpp b/bserv/include/bserv/websocket.hpp
similarity index 100%
rename from WebApp/bserv/include/bserv/websocket.hpp
rename to bserv/include/bserv/websocket.hpp
diff --git a/WebApp/bserv/pch.cpp b/bserv/pch.cpp
similarity index 100%
rename from WebApp/bserv/pch.cpp
rename to bserv/pch.cpp
diff --git a/WebApp/bserv/pch.h b/bserv/pch.h
similarity index 100%
rename from WebApp/bserv/pch.h
rename to bserv/pch.h
diff --git a/WebApp/bserv/session.cpp b/bserv/session.cpp
similarity index 100%
rename from WebApp/bserv/session.cpp
rename to bserv/session.cpp
diff --git a/WebApp/bserv/utils.cpp b/bserv/utils.cpp
similarity index 100%
rename from WebApp/bserv/utils.cpp
rename to bserv/utils.cpp
diff --git a/config-Windows.json b/config-Windows.json
index fa4b409..86aa0f7 100644
--- a/config-Windows.json
+++ b/config-Windows.json
@@ -3,7 +3,7 @@
"thread-num": 2,
"conn-num": 4,
"conn-str": "postgresql://[username]:[password]@[url]:[port]/[db]",
- "static_root": "../../templates/statics",
- "template_root": "../../templates",
+ "static_root": "../templates/statics",
+ "template_root": "../templates",
"log-dir": "./log"
}
\ No newline at end of file
diff --git a/config-ubuntu.json b/config-ubuntu.json
index 3111bf7..2e6aa97 100644
--- a/config-ubuntu.json
+++ b/config-ubuntu.json
@@ -3,7 +3,7 @@
"thread-num": 2,
"conn-num": 4,
"conn-str": "postgresql://[username]:[password]@[url]:[port]/[db]",
- "static_root": "../../../templates/statics",
- "template_root": "../../../templates",
+ "static_root": "../../templates/statics",
+ "template_root": "../../templates",
"log-dir": "./log"
}
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 4a83d9a..ba13049 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -5,7 +5,7 @@ project(bserv_examples)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-add_subdirectory(../WebApp/bserv bserv)
+add_subdirectory(../bserv bserv)
add_executable(hello hello.cpp)
target_link_libraries(hello PUBLIC bserv)
diff --git a/examples/Examples.sln b/examples/Examples.sln
index 261d436..1803b11 100644
--- a/examples/Examples.sln
+++ b/examples/Examples.sln
@@ -8,13 +8,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello", "Hello.vcxproj", "{
{F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296} = {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bserv", "..\WebApp\bserv\bserv.vcxproj", "{F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Routing", "Routing.vcxproj", "{9AAF3E12-6588-46C1-BD36-EAAC463C5259}"
ProjectSection(ProjectDependencies) = postProject
{F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296} = {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bserv", "..\bserv\bserv.vcxproj", "{F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -31,14 +31,6 @@ Global
{1BAC7984-10C0-47E8-8F8D-B6CF74810013}.Release|x64.Build.0 = Release|x64
{1BAC7984-10C0-47E8-8F8D-B6CF74810013}.Release|x86.ActiveCfg = Release|Win32
{1BAC7984-10C0-47E8-8F8D-B6CF74810013}.Release|x86.Build.0 = Release|Win32
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x64.ActiveCfg = Debug|x64
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x64.Build.0 = Debug|x64
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x86.ActiveCfg = Debug|Win32
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x86.Build.0 = Debug|Win32
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x64.ActiveCfg = Release|x64
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x64.Build.0 = Release|x64
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x86.ActiveCfg = Release|Win32
- {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x86.Build.0 = Release|Win32
{9AAF3E12-6588-46C1-BD36-EAAC463C5259}.Debug|x64.ActiveCfg = Debug|x64
{9AAF3E12-6588-46C1-BD36-EAAC463C5259}.Debug|x64.Build.0 = Debug|x64
{9AAF3E12-6588-46C1-BD36-EAAC463C5259}.Debug|x86.ActiveCfg = Debug|Win32
@@ -47,6 +39,14 @@ Global
{9AAF3E12-6588-46C1-BD36-EAAC463C5259}.Release|x64.Build.0 = Release|x64
{9AAF3E12-6588-46C1-BD36-EAAC463C5259}.Release|x86.ActiveCfg = Release|Win32
{9AAF3E12-6588-46C1-BD36-EAAC463C5259}.Release|x86.Build.0 = Release|Win32
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x64.ActiveCfg = Debug|x64
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x64.Build.0 = Debug|x64
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x86.ActiveCfg = Debug|Win32
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Debug|x86.Build.0 = Debug|Win32
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x64.ActiveCfg = Release|x64
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x64.Build.0 = Release|x64
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x86.ActiveCfg = Release|Win32
+ {F5C0CF6D-7BF9-40A5-AF2E-8FC36A1D7296}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/examples/Hello.vcxproj b/examples/Hello.vcxproj
index fbc4149..f99c982 100644
--- a/examples/Hello.vcxproj
+++ b/examples/Hello.vcxproj
@@ -68,6 +68,7 @@
+
@@ -119,18 +120,12 @@
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\dependencies\libpqxx\include;..\dependencies;..\dependencies\boost;..\WebApp\bserv\include;%(AdditionalIncludeDirectories)
- stdcpp17
Console
true
- bserv.lib;cryptlib.lib;pqxx.lib;libpq.lib;wsock32.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;%(AdditionalDependencies)
- ..\dependencies\libpqxx\src\Debug;..\dependencies\pgsql\lib;..\dependencies\cryptopp\x64\Output\Debug;..\dependencies\boost\stage\lib;$(OutDir);%(AdditionalLibraryDirectories)
-
- xcopy /y /d "..\dependencies\pgsql\bin\*.dll" "$(OutDir)"
-
+
diff --git a/examples/Routing.vcxproj b/examples/Routing.vcxproj
index 93a7195..8ac9b12 100644
--- a/examples/Routing.vcxproj
+++ b/examples/Routing.vcxproj
@@ -68,6 +68,7 @@
+
@@ -119,18 +120,12 @@
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- stdcpp17
- ..\dependencies\libpqxx\include;..\dependencies;..\dependencies\boost;..\WebApp\bserv\include;%(AdditionalIncludeDirectories)
Console
true
- ..\dependencies\libpqxx\src\Debug;..\dependencies\pgsql\lib;..\dependencies\cryptopp\x64\Output\Debug;..\dependencies\boost\stage\lib;$(OutDir);%(AdditionalLibraryDirectories)
- bserv.lib;cryptlib.lib;pqxx.lib;libpq.lib;wsock32.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;%(AdditionalDependencies)
-
- xcopy /y /d "..\dependencies\pgsql\bin\*.dll" "$(OutDir)"
-
+