JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Fixes win_build and VS/cmake build problems

Browse Source
This commit is contained in:
Lew Rossman
2019-02-11 14:30:15 -05:00
parent d6d244d4d2
commit 3eb9a68783
6 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -116,6 +116,7 @@ ELSE (BUILD_PY_LIB)
add_library(epanet2 SHARED ${EPANET_LIB_ALL}) add_library(epanet2 SHARED ${EPANET_LIB_ALL})
else(NOT WIN32) else(NOT WIN32)
add_library(epanet2 SHARED ${EPANET_LIB_ALL} ${PROJECT_SOURCE_DIR}/include/epanet2.def) 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) endif(NOT WIN32)
target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include) target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include)

2
include/epanet2.h
View File

@@ -43,7 +43,7 @@ function in epanet2_2.h.
#else #else
#define DLLEXPORT __declspec(dllimport) __stdcall #define DLLEXPORT __declspec(dllimport) __stdcall
#endif #endif
#elif defined(CYGWIN) #elif defined(__CYGWIN__)
#define DLLEXPORT __stdcall #define DLLEXPORT __stdcall
#else #else
#define DLLEXPORT #define DLLEXPORT

2
include/epanet2_2.h
View File

@@ -28,7 +28,7 @@
#else #else
#define DLLEXPORT __declspec(dllimport) __stdcall #define DLLEXPORT __declspec(dllimport) __stdcall
#endif #endif
#elif defined(CYGWIN) #elif defined(__CYGWIN__)
#define DLLEXPORT __stdcall #define DLLEXPORT __stdcall
#else #else
#define DLLEXPORT #define DLLEXPORT

2
src/epanet.c
View File

@@ -26,7 +26,7 @@
#include "text.h" #include "text.h"
#include "enumstxt.h" #include "enumstxt.h"
#ifdef WINDOWS #ifdef _WIN32
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif

10
src/project.c
View File

@@ -19,16 +19,8 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
//*** Need to define WINDOWS to use the getTmpName function ***// //*** For the Windows SDK _tempnam function ***//
// --- define WINDOWS
#undef WINDOWS
#ifdef _WIN32 #ifdef _WIN32
#define WINDOWS
#endif
#ifdef __WIN32__
#define WINDOWS
#endif
#ifdef WINDOWS
#include <windows.h> #include <windows.h>
#endif #endif

2
src/report.c
View File

@@ -19,9 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#undef WINDOWS
#ifdef _WIN32 #ifdef _WIN32
#define WINDOWS
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif