From 3eb9a68783ce92c4b02954155fe1f3c972430fc5 Mon Sep 17 00:00:00 2001
From: Lew Rossman <LRossman@cinci.rr.com>
Date: Mon, 11 Feb 2019 14:30:15 -0500
Subject: [PATCH] Fixes win_build and VS/cmake build problems

---
 CMakeLists.txt      |  1 +
 include/epanet2.h   |  2 +-
 include/epanet2_2.h |  2 +-
 src/epanet.c        |  2 +-
 src/project.c       | 10 +---------
 src/report.c        |  2 --
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccbeac6..82c8161 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,7 @@ ELSE (BUILD_PY_LIB)
     add_library(epanet2 SHARED ${EPANET_LIB_ALL})
   else(NOT WIN32)
     add_library(epanet2 SHARED ${EPANET_LIB_ALL} ${PROJECT_SOURCE_DIR}/include/epanet2.def)
+    set_source_files_properties(${PROJECT_SOURCE_DIR}/include/epanet2.def PROPERTIES_HEADER_FILE_ONLY TRUE)
   endif(NOT WIN32)
   target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include)
 
diff --git a/include/epanet2.h b/include/epanet2.h
index 96285d4..64cf3d4 100644
--- a/include/epanet2.h
+++ b/include/epanet2.h
@@ -43,7 +43,7 @@ function in epanet2_2.h.
     #else
       #define DLLEXPORT __declspec(dllimport) __stdcall
     #endif
-  #elif defined(CYGWIN)
+  #elif defined(__CYGWIN__)
     #define DLLEXPORT __stdcall
   #else
     #define DLLEXPORT
diff --git a/include/epanet2_2.h b/include/epanet2_2.h
index 2f32d70..7b79701 100644
--- a/include/epanet2_2.h
+++ b/include/epanet2_2.h
@@ -28,7 +28,7 @@
       #else
         #define DLLEXPORT __declspec(dllimport) __stdcall
       #endif
-    #elif defined(CYGWIN)
+    #elif defined(__CYGWIN__)
       #define DLLEXPORT __stdcall
     #else
       #define DLLEXPORT
diff --git a/src/epanet.c b/src/epanet.c
index eda2523..969c4a0 100644
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -26,7 +26,7 @@
 #include "text.h"
 #include "enumstxt.h"
 
-#ifdef WINDOWS
+#ifdef _WIN32
 #define snprintf _snprintf
 #endif
 
diff --git a/src/project.c b/src/project.c
index 1e34602..85e6552 100644
--- a/src/project.c
+++ b/src/project.c
@@ -19,16 +19,8 @@
 #include <stdlib.h>
 #endif
 
-//*** Need to define WINDOWS to use the getTmpName function ***//
-// --- define WINDOWS
-#undef WINDOWS
+//*** For the Windows SDK _tempnam function ***//
 #ifdef _WIN32
-#define WINDOWS
-#endif
-#ifdef __WIN32__
-#define WINDOWS
-#endif
-#ifdef WINDOWS
 #include <windows.h>
 #endif
 
diff --git a/src/report.c b/src/report.c
index 4e749e8..84f3bb3 100644
--- a/src/report.c
+++ b/src/report.c
@@ -19,9 +19,7 @@
 #include <stdlib.h>
 #endif
 
-#undef WINDOWS
 #ifdef _WIN32
-#define WINDOWS
 #define snprintf _snprintf
 #endif