Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix build on windows (mingw64) #279

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions amalgamate/merge_all.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Merges all the header files."""
from glob import glob
from os import path as pt
import os
import re
from collections import defaultdict
import sys
Expand All @@ -11,8 +12,8 @@

OUTPUT = 'crow_all.h'
re_depends = re.compile('^#include "(.*)"', re.MULTILINE)
headers = [x.rsplit('/', 1)[-1] for x in glob(pt.join(header_path, '*.h*'))]
headers += ['crow/' + x.rsplit('/', 1)[-1] for x in glob(pt.join(header_path, 'crow/*.h*'))]
headers = [x.rsplit(os.sep, 1)[-1] for x in glob(pt.join(header_path, '*.h*'))]
headers += ['crow/' + x.rsplit(os.sep, 1)[-1] for x in glob(pt.join(header_path, 'crow/*.h*'))]
print(headers)
edges = defaultdict(list)
for header in headers:
Expand Down
4 changes: 4 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 2.8)
project (crow_examples)

if(WIN32)
list(APPEND Boost_LIBRARIES Ws2_32 Mswsock)
endif()

if (MSVC)
add_executable(example_vs example_vs.cpp)
target_link_libraries(example_vs ${Boost_LIBRARIES})
Expand Down
4 changes: 4 additions & 0 deletions examples/example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,11 @@ int main()
});

// enables all log
#ifndef ERROR
app.loglevel(crow::LogLevel::DEBUG);
#else
app.loglevel(crow::LogLevel::Debug);
#endif
//crow::logger::setHandler(std::make_shared<ExampleLogHandler>());

app.port(18080)
Expand Down
4 changes: 4 additions & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ set(TEST_SRCS
unittest.cpp
)

if(WIN32)
list(APPEND Boost_LIBRARIES Ws2_32 Mswsock)
endif()

add_executable(unittest ${TEST_SRCS})
#target_link_libraries(unittest crow)
target_link_libraries(unittest ${Boost_LIBRARIES})
Expand Down