-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Statically link C runtime in release mode
When building in release mode, make it more likely that we'll be able to run on most Windows machines by not requiring the C runtime to be present on the user's machine. Also restructured the SOCI directory layout for easier upgrading in the future.
- Loading branch information
1 parent
7b80562
commit a9b7cd8
Showing
384 changed files
with
291 additions
and
324 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1 @@ | ||
# General | ||
*.swp | ||
*.kate-swp | ||
tags | ||
tmp | ||
|
||
# Files generated by CMake | ||
Makefile | ||
src/core/soci_backends_config.h | ||
tests/odbc/test-access.dsn | ||
tests/odbc/test-mysql.dsn | ||
|
||
# ... and the rest of CMake spam | ||
CMakeFiles/ | ||
CMakeCache.txt | ||
CTestTestfile.cmake | ||
cmake_install.cmake | ||
|
||
# Visual Studio / Visual Studio Code | ||
*.opensdf | ||
*.sdf | ||
*.suo | ||
/*.vs* | ||
|
||
# KDevelop | ||
*.kate-swp | ||
*.kdev4 | ||
|
||
# Qt Creator | ||
*.config | ||
*.creator* | ||
*.files | ||
*.includes | ||
CMakeLists.txt.user | ||
|
||
# Eclipse | ||
/.project | ||
|
||
# Vagrant | ||
/.vagrant/ | ||
/build/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,23 @@ | ||
$ErrorActionPreference = 'Stop' | ||
|
||
function SetReleaseModeToStaticLinkRuntimeLibrary([string][parameter(mandatory)]$Path) { | ||
$projectPath = (Resolve-Path -LiteralPath $Path).ProviderPath | ||
Write-Host "$path -> $projectPath" | ||
[xml]$project = cat -LiteralPath $projectPath | ||
($project.Project.ItemDefinitionGroup | ? Condition -eq "'`$(Configuration)|`$(Platform)'=='Release|x64'" ).ClCompile.RuntimeLibrary = 'MultiThreaded' | ||
$project.Save($projectPath) | ||
} | ||
|
||
pushd $PSScriptRoot | ||
try { | ||
if(test-path build) { rm -r -fo build } | ||
md build | cd | ||
cmake -G "Visual Studio 15 Win64" -DWITH_BOOST=OFF -DWITH_ORACLE=OFF -DWITH_ODBC=ON -DWITH_MYSQL=OFF -DWITH_POSTGRESQL=OFF -DWITH_FIREBIRD=OFF -DWITH_DB2=OFF -DSOCI_CXX_C11=ON -DSOCI_STATIC=ON -DSOCI_SHARED=OFF -DSOCI_TESTS=OFF .. | ||
cmake -G "Visual Studio 15 Win64" -DWITH_BOOST=OFF -DWITH_ORACLE=OFF -DWITH_ODBC=ON -DWITH_MYSQL=OFF -DWITH_POSTGRESQL=OFF -DWITH_FIREBIRD=OFF -DWITH_DB2=OFF -DSOCI_CXX_C11=ON -DSOCI_STATIC=ON -DSOCI_SHARED=OFF -DSOCI_TESTS=OFF ../src | ||
SetReleaseModeToStaticLinkRuntimeLibrary src/core/soci_core_static.vcxproj | ||
SetReleaseModeToStaticLinkRuntimeLibrary src/backends/odbc/soci_odbc_static.vcxproj | ||
cmake --build . --config Debug | ||
cmake --build . --config Release | ||
} | ||
finally { | ||
popd | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,44 @@ | ||
*~ | ||
*.kdev[0-9] | ||
# General | ||
*.swp | ||
aclocal.m4 | ||
autom4te.cache | ||
confdefs.h | ||
config.guess | ||
config.log | ||
config.status | ||
config.sub | ||
configure | ||
depcomp | ||
install-sh | ||
libtool | ||
ltmain.sh | ||
m4 | ||
missing | ||
Makefile | ||
Makefile.in | ||
*.kate-swp | ||
tags | ||
tmp | ||
|
||
# Build directories | ||
/*build* | ||
/*site* | ||
|
||
# Files generated by CMake | ||
Makefile | ||
src/core/soci_backends_config.h | ||
tests/odbc/test-access.dsn | ||
tests/odbc/test-mysql.dsn | ||
|
||
# ... and the rest of CMake spam | ||
CMakeFiles/ | ||
CMakeCache.txt | ||
CTestTestfile.cmake | ||
cmake_install.cmake | ||
|
||
# Visual Studio / Visual Studio Code | ||
*.opensdf | ||
*.sdf | ||
*.suo | ||
/*.vs* | ||
|
||
# KDevelop | ||
*.kate-swp | ||
*.kdev4 | ||
|
||
# Qt Creator | ||
*.config | ||
*.creator* | ||
*.files | ||
*.includes | ||
CMakeLists.txt.user | ||
|
||
# Eclipse | ||
/.project | ||
|
||
# Vagrant | ||
/.vagrant/ |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.