QuasarApp/LIEF
4
0
Fork 0
mirror of https://github.com/QuasarApp/LIEF.git synced 2025-04-28 13:24:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #229 from mingwandroid/master

Browse Source 
A few fixes from the Anaconda Distribution.
This commit is contained in:
Romain 2018-10-31 17:58:46 +01:00 committed by GitHub
commit cc7a2657ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -13,11 +13,17 @@ include(Findcppcheck)
include(CppcheckTargets)
include(ExternalProject)
find_package(Git REQUIRED)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
find_package(Git REQUIRED)
# Information from git
# ====================
include(LIEFGit)
# Information from git
# ====================
include(LIEFGit)
else()
set(LIEF_VERSION_MAJOR "0")
set(LIEF_VERSION_MINOR "9")
set(LIEF_VERSION_PATCH "0")
endif()
# LIEF Project
# ============
@ -142,6 +148,11 @@ if(WINDOWS AND BUILD_SHARED_LIBS)
target_link_libraries(LIB_LIEF ws2_32)
endif()
if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /bigobj")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
endif(MSVC)
target_compile_definitions(LIB_LIEF PRIVATE -DLIEF_STATIC)
if (LIEF_SUPPORT_CXX14)
target_compile_features(LIB_LIEF PRIVATE cxx_std_14)

2
include/LIEF/MachO/DataCodeEntry.hpp
View File

@ -29,7 +29,7 @@ namespace LIEF {
namespace MachO {
//! Interface of an entry in DataInCode
class DataCodeEntry : public LIEF::Object {
class LIEF_API DataCodeEntry : public LIEF::Object {
public:
enum class TYPES {
UNKNOWN = 0,

2
include/LIEF/Object.hpp
View File

@ -30,7 +30,7 @@ using add_const_t = typename std::add_const<T>::type;
namespace LIEF {
class Object {
class LIEF_API Object {
public:
template<class T>
using output_t = add_pointer_t<decay_t<T>>;