Merge pull request #961 from leethomason/vimproved-master
Testing build fixes
This commit is contained in:
@@ -31,6 +31,7 @@ target_compile_definitions(
|
|||||||
PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>
|
PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>
|
||||||
INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT>
|
INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT>
|
||||||
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
|
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
|
||||||
|
PUBLIC _FILE_OFFSET_BITS=64
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(
|
set_target_properties(
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -10,7 +10,7 @@ ARFLAGS = cr
|
|||||||
RM = rm -f
|
RM = rm -f
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
MKDIR = mkdir -p
|
MKDIR = mkdir -p
|
||||||
CXXFLAGS = -fPIC
|
CXXFLAGS = -D_FILE_OFFSET_BITS=64 -fPIC
|
||||||
|
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
INSTALL_PROGRAM = $(INSTALL)
|
INSTALL_PROGRAM = $(INSTALL)
|
||||||
|
|||||||
@@ -114,9 +114,6 @@ distribution.
|
|||||||
#define TIXML_FSEEK fseeko
|
#define TIXML_FSEEK fseeko
|
||||||
#define TIXML_FTELL ftello
|
#define TIXML_FTELL ftello
|
||||||
#endif
|
#endif
|
||||||
#elif defined(__unix__) && defined(__x86_64__)
|
|
||||||
#define TIXML_FSEEK fseeko64
|
|
||||||
#define TIXML_FTELL ftello64
|
|
||||||
#else
|
#else
|
||||||
#define TIXML_FSEEK fseek
|
#define TIXML_FSEEK fseek
|
||||||
#define TIXML_FTELL ftell
|
#define TIXML_FTELL ftell
|
||||||
|
|||||||
Reference in New Issue
Block a user