File tree Expand file tree Collapse file tree 10 files changed +23
-12
lines changed Expand file tree Collapse file tree 10 files changed +23
-12
lines changed Original file line number Diff line number Diff line change @@ -12,5 +12,5 @@ if [[ "$COMPILER" == "Emscripten" ]]; then
12
12
-w /mfast/build \
13
13
-t thewtex/cross-compiler-browser-asmjs "
14
14
else
15
- export CONFIG_ARGS=" -DCMAKE_CXX_COMPILER=$COMPILER "
16
- fi
15
+ export CONFIG_ARGS=" -DCMAKE_CXX_COMPILER=$COMPILER -DBUILD_SHARED_LIBS=ON "
16
+ fi
Original file line number Diff line number Diff line change @@ -46,8 +46,8 @@ before_build:
46
46
- cmd : cd C:\projects\mfast
47
47
- cmd : md build
48
48
- cmd : cd build
49
- - cmd : if "%platform%"=="Win32" cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" ..
50
- - cmd : if "%platform%"=="x64" cmake -G "%GENERATOR% Win64" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" ..
49
+ - cmd : if "%platform%"=="Win32" cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_SHARED_LIB=ON - DBOOST_ROOT="%BOOST_ROOT%" ..
50
+ - cmd : if "%platform%"=="x64" cmake -G "%GENERATOR% Win64" -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_SHARED_LIB=ON - DBOOST_ROOT="%BOOST_ROOT%" ..
51
51
52
52
build :
53
53
project : C:\projects\mfast\build\mfast.sln
Original file line number Diff line number Diff line change 1
1
2
2
file (GLOB_RECURSE headers "*.h" ) ## retrieve all header files in current directory
3
- file (GLOB_RECURSE sources "*.cpp" ) ## retrieve all source files in current directory
4
3
4
+ set (sources common/dictionary_builder.cpp
5
+ decoder/decoder_field_operator.cpp
6
+ decoder/decoder_presence_map.cpp
7
+ decoder/fast_decoder.cpp
8
+ decoder/fast_istream.cpp
9
+ encoder/encoder_field_operator.cpp
10
+ encoder/fast_encoder.cpp
11
+ encoder/fast_ostreambuf.cpp
12
+ encoder_v2/fast_encoder_core.cpp
13
+ )
5
14
6
15
7
16
SET (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR} /lib )
@@ -26,7 +35,7 @@ set(MFAST_STATIC_COMPONENTS ${MFAST_STATIC_COMPONENTS} coder_static CACHE INTERN
26
35
27
36
28
37
if (BUILD_SHARED_LIBS )
29
- add_library (mfast_coder SHARED ${mfast_coder_SRCS} )
38
+ add_library (mfast_coder SHARED ${mfast_coder_SRCS} decoder_v2/fast_decoder_core.cpp )
30
39
31
40
if (NOT "${CMAKE_VERSION} " VERSION_LESS "2.8.12" )
32
41
target_compile_definitions (mfast_coder INTERFACE "-DMFAST_DYN_LINK" )
Original file line number Diff line number Diff line change
1
+ // required for MSVC when building DLL
2
+ #include " fast_decoder_core.h"
Original file line number Diff line number Diff line change 14
14
#else
15
15
/* We are either using or building static libs */
16
16
#define MFAST_CODER_EXPORT
17
- #define MAST_CODER_NO_SHARED_LIBS
17
+ #define MFAST_CODER_NO_SHARED_LIBS
18
18
#endif
19
19
#endif
Original file line number Diff line number Diff line change 25
25
#if defined __GNUC__
26
26
#pragma GCC diagnostic pop
27
27
#endif
28
- #if defined(MAST_NO_SHARED_LIBS ) && !defined(BOOST_NO_CXX11_EXTERN_TEMPLATE)
28
+ #if defined(MFAST_NO_SHARED_LIBS ) && !defined(BOOST_NO_CXX11_EXTERN_TEMPLATE)
29
29
namespace boost {
30
30
namespace multiprecision {
31
31
namespace backends {
Original file line number Diff line number Diff line change 19
19
#else
20
20
/* We are either using or building static libs */
21
21
#define MFAST_JSON_EXPORT
22
- #define MAST_JSON_NO_SHARED_LIBS
22
+ #define MFAST_JSON_NO_SHARED_LIBS
23
23
#endif
24
24
#endif
Original file line number Diff line number Diff line change 22
22
23
23
/* We are either using or building static libs */
24
24
#define MFAST_EXPORT
25
- #define MAST_NO_SHARED_LIBS
25
+ #define MFAST_NO_SHARED_LIBS
26
26
#endif
27
27
#endif
28
28
Original file line number Diff line number Diff line change 14
14
#else
15
15
/* We are either using or building static libs */
16
16
#define MFAST_SQLITE3_EXPORT
17
- #define MAST_SQLITE3_NO_SHARED_LIBS
17
+ #define MFAST_SQLITE3_NO_SHARED_LIBS
18
18
#endif
19
19
#endif
20
20
Original file line number Diff line number Diff line change 14
14
#else
15
15
/* We are either using or building static libs */
16
16
#define MFAST_XML_PARSER_EXPORT
17
- #define MAST_XML_PARSER_NO_SHARED_LIBS
17
+ #define MFAST_XML_PARSER_NO_SHARED_LIBS
18
18
#endif
19
19
#endif
You can’t perform that action at this time.
0 commit comments