From a6896899aa6594fd7048d732836c1ebdb9391b92 Mon Sep 17 00:00:00 2001
From: Jessica James <jessica.aj@outlook.com>
Date: Wed, 19 Dec 2018 16:29:13 -0600
Subject: [PATCH] Some cleanup

---
 build/MSVC/CMakeLists.txt |  5 +++++
 build/cmake_vs17.bat      |  1 +
 src/common/CMakeLists.txt |  7 ++-----
 src/common/File.cpp       | 12 ++++++++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/build/MSVC/CMakeLists.txt b/build/MSVC/CMakeLists.txt
index e69de29..a8f5587 100644
--- a/build/MSVC/CMakeLists.txt
+++ b/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)
diff --git a/build/cmake_vs17.bat b/build/cmake_vs17.bat
index 154dd7a..c957df6 100644
--- a/build/cmake_vs17.bat
+++ b/build/cmake_vs17.bat
@@ -1,3 +1,4 @@
+rmdir /S /Q vs17
 mkdir vs17
 cd vs17
 cmake ..\.. -G "Visual Studio 15 2017"
\ No newline at end of file
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index c9e0bed..1020b4b 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -33,8 +33,5 @@ find_package(OpenSSL REQUIRED)
 target_include_directories(jupiter PUBLIC ../include)
 target_include_directories(jupiter PRIVATE ${OPENSSL_INCLUDE_DIR})
 
-# Setup additionally needed libs
-target_link_libraries(jupiter ${OPENSSL_LIBRARIES})
-
-# Setup macros JUPITER_EXPORTS
-target_compile_definitions(jupiter PRIVATE JUPITER_EXPORTS)
+# Setup platform-specific definitions
+target_compile_definitions(jupiter PRIVATE ${JUPITER_PRIVATE_DEFS})
\ No newline at end of file
diff --git a/src/common/File.cpp b/src/common/File.cpp
index 26552ed..82dbd96 100644
--- a/src/common/File.cpp
+++ b/src/common/File.cpp
@@ -41,8 +41,11 @@ int64_t getFileSize(const char *file)
 
 const size_t defaultBufferSize = 8192;
 
-//template class JUPITER_API Jupiter::CString_Type<char>;
-//template class JUPITER_API Jupiter::ArrayList<Jupiter::StringS>;
+/** DLL Linkage Nagging */
+#if defined _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
 
 struct JUPITER_API Jupiter::File::Data
 {
@@ -54,6 +57,11 @@ struct JUPITER_API Jupiter::File::Data
 	~Data();
 };
 
+/** Re-enable warnings */
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
 Jupiter::File::Data::Data()
 {
 }