mirror of
https://github.com/boostorg/beast.git
synced 2025-07-30 21:07:26 +02:00
Tidy up 32 and 64 bit build support (fix #49):
This fixes up support for building both 32 and 64 bit targets, especially on Windows.
This commit is contained in:
30
.gitignore
vendored
30
.gitignore
vendored
@ -1,30 +0,0 @@
|
|||||||
docs/
|
|
||||||
._*
|
|
||||||
*.mode1v3
|
|
||||||
*.pbxuser
|
|
||||||
*.perspectivev3
|
|
||||||
*.user
|
|
||||||
*.ncb
|
|
||||||
*.suo
|
|
||||||
*.obj
|
|
||||||
*.ilk
|
|
||||||
*.pch
|
|
||||||
*.pdb
|
|
||||||
*.dep
|
|
||||||
*.idb
|
|
||||||
*.manifest
|
|
||||||
*.manifest.res
|
|
||||||
*.o
|
|
||||||
*.opensdf
|
|
||||||
*.d
|
|
||||||
*.sdf
|
|
||||||
xcuserdata
|
|
||||||
contents.xcworkspacedata
|
|
||||||
.DS_Store
|
|
||||||
.svn
|
|
||||||
profile
|
|
||||||
bin/
|
|
||||||
node_modules/
|
|
||||||
cov-int/
|
|
||||||
nohup.out
|
|
||||||
venv/
|
|
@ -7,7 +7,7 @@ project (Beast)
|
|||||||
set_property (GLOBAL PROPERTY USE_FOLDERS ON)
|
set_property (GLOBAL PROPERTY USE_FOLDERS ON)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4 /wd4100 /D_SCL_SECURE_NO_WARNINGS=1 /D_CRT_SECURE_NO_WARNINGS=1")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4 /wd4100 /bigobj /D _WIN32_WINNT=0x0601 /D_SCL_SECURE_NO_WARNINGS=1 /D_CRT_SECURE_NO_WARNINGS=1")
|
||||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
|
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
|
||||||
else()
|
else()
|
||||||
set(Boost_USE_STATIC_LIBS ON)
|
set(Boost_USE_STATIC_LIBS ON)
|
||||||
|
1
Jamroot
1
Jamroot
@ -100,6 +100,7 @@ project beast
|
|||||||
<toolset>clang:<cxxflags>-std=c++11
|
<toolset>clang:<cxxflags>-std=c++11
|
||||||
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
|
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
|
||||||
<toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
|
<toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
|
||||||
|
<toolset>msvc:<cxxflags>-bigobj
|
||||||
<os>LINUX:<define>_XOPEN_SOURCE=600
|
<os>LINUX:<define>_XOPEN_SOURCE=600
|
||||||
<os>LINUX:<define>_GNU_SOURCE=1
|
<os>LINUX:<define>_GNU_SOURCE=1
|
||||||
<os>SOLARIS:<define>_XOPEN_SOURCE=500
|
<os>SOLARIS:<define>_XOPEN_SOURCE=500
|
||||||
|
4
bin/.gitignore
vendored
Normal file
4
bin/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
*
|
||||||
|
*/
|
||||||
|
!.gitignore
|
||||||
|
!README.md
|
8
bin/README.md
Normal file
8
bin/README.md
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# Build output directory
|
||||||
|
|
||||||
|
To build examples and tests for 32-bit on Windows, change to
|
||||||
|
this directory and use:
|
||||||
|
|
||||||
|
```
|
||||||
|
cmake ..
|
||||||
|
```
|
4
bin64/.gitignore
vendored
Normal file
4
bin64/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
*
|
||||||
|
*/
|
||||||
|
!.gitignore
|
||||||
|
!README.md
|
10
bin64/README.md
Normal file
10
bin64/README.md
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# Build output directory
|
||||||
|
|
||||||
|
To build examples and tests for 64-bit on Windows, change to
|
||||||
|
this directory and use:
|
||||||
|
|
||||||
|
```
|
||||||
|
cmake -G"Visual Studio 14 2015 Win64" ..
|
||||||
|
```
|
||||||
|
|
||||||
|
For later versions of Visual Studio edit the string as appropriate.
|
Reference in New Issue
Block a user