Skip to content

Commit 456bd72

Browse files
authored
Merge pull request #37 from dmpas/develop
Выпуск 3.0.39
2 parents 114bc8d + 96bdaf4 commit 456bd72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1315
-1709
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.sh -crlf

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
dist: trusty
2+
sudo: required
3+
language: cpp
4+
compiler: gcc
5+
before_install:
6+
- sudo apt-get -qq update
7+
install: sudo apt-get install -y cmake zlib1g-dev libboost-filesystem-dev libboost-system-dev
8+
script:
9+
- cmake . && cmake --build .
10+
- cd test && ./run.sh ../v8unpack
11+

CMakeLists.txt

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,40 @@
1-
cmake_minimum_required (VERSION 3.5)
1+
cmake_minimum_required (VERSION 2.8)
22
project (v8unpack)
33

44
set (v8unpack_VERSION_MAJOR 3)
55
set (v8unpack_VERSION_MINOR 0)
66

7-
add_executable (v8unpack src/main.cpp src/V8File.cpp)
7+
if(WIN32)
8+
set(RC_FILE "VersionInfo.rc")
9+
else()
10+
set(RC_FILE "")
11+
endif()
812

13+
if(MSVC)
14+
15+
foreach(flag_var
16+
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
17+
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
18+
19+
if(${flag_var} MATCHES "/MD")
20+
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
21+
endif(${flag_var} MATCHES "/MD")
22+
23+
endforeach(flag_var)
24+
25+
SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "/NODEFAULTLIBS:MSVCRT" )
26+
27+
endif()
28+
29+
set(CMAKE_CXX_STANDARD 11)
30+
add_executable (v8unpack src/main.cpp src/V8File.cpp ${RC_FILE})
31+
32+
add_definitions (-DBOOST_ALL_NO_LIB)
933
set (Boost_USE_STATIC_LIBS ON)
10-
set (Boost_USE_MULTITHREADED ON)
11-
set (Boost_USE_STATIC_RUNTIME OFF)
34+
set (Boost_USE_MULTITHREADED OFF)
35+
set (Boost_USE_STATIC_RUNTIME ON)
1236

13-
find_package (Boost 1.53 REQUIRED COMPONENTS filesystem)
37+
find_package (Boost 1.53 REQUIRED COMPONENTS filesystem system)
1438

1539
include_directories (${Boost_INCLUDE_DIRS})
1640
target_link_libraries (v8unpack ${Boost_LIBRARIES})

0 commit comments

Comments
 (0)