Browse Source

Some cleanup

release/0.19
Jessica James 6 years ago
parent
commit
a6896899aa
  1. 5
      build/MSVC/CMakeLists.txt
  2. 1
      build/cmake_vs17.bat
  3. 7
      src/common/CMakeLists.txt
  4. 12
      src/common/File.cpp

5
build/MSVC/CMakeLists.txt

@ -0,0 +1,5 @@
# Setup MSVC-specific macros
set(JUPITER_PRIVATE_DEFS
JUPITER_EXPORTS
_CRT_SECURE_NO_WARNINGS
_CRT_NONSTDC_NO_DEPRECATE)

1
build/cmake_vs17.bat

@ -1,3 +1,4 @@
rmdir /S /Q vs17
mkdir vs17 mkdir vs17
cd vs17 cd vs17
cmake ..\.. -G "Visual Studio 15 2017" cmake ..\.. -G "Visual Studio 15 2017"

7
src/common/CMakeLists.txt

@ -33,8 +33,5 @@ find_package(OpenSSL REQUIRED)
target_include_directories(jupiter PUBLIC ../include) target_include_directories(jupiter PUBLIC ../include)
target_include_directories(jupiter PRIVATE ${OPENSSL_INCLUDE_DIR}) target_include_directories(jupiter PRIVATE ${OPENSSL_INCLUDE_DIR})
# Setup additionally needed libs # Setup platform-specific definitions
target_link_libraries(jupiter ${OPENSSL_LIBRARIES}) target_compile_definitions(jupiter PRIVATE ${JUPITER_PRIVATE_DEFS})
# Setup macros JUPITER_EXPORTS
target_compile_definitions(jupiter PRIVATE JUPITER_EXPORTS)

12
src/common/File.cpp

@ -41,8 +41,11 @@ int64_t getFileSize(const char *file)
const size_t defaultBufferSize = 8192; const size_t defaultBufferSize = 8192;
//template class JUPITER_API Jupiter::CString_Type<char>; /** DLL Linkage Nagging */
//template class JUPITER_API Jupiter::ArrayList<Jupiter::StringS>; #if defined _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4251)
#endif
struct JUPITER_API Jupiter::File::Data struct JUPITER_API Jupiter::File::Data
{ {
@ -54,6 +57,11 @@ struct JUPITER_API Jupiter::File::Data
~Data(); ~Data();
}; };
/** Re-enable warnings */
#if defined _MSC_VER
#pragma warning(pop)
#endif
Jupiter::File::Data::Data() Jupiter::File::Data::Data()
{ {
} }

Loading…
Cancel
Save