From 9a0001509dc41395dbcec5bcbf19566bdc0f3738 Mon Sep 17 00:00:00 2001 From: mariosmsk Date: Mon, 13 May 2019 12:14:27 +0300 Subject: [PATCH 1/4] rm WinSDK folder and update Makefiles Co-Authored-By: Demetrios G. Eliades --- win_build/{WinSDK => }/Makefile.bat | 0 win_build/{WinSDK => }/Makefile2.bat | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename win_build/{WinSDK => }/Makefile.bat (100%) rename win_build/{WinSDK => }/Makefile2.bat (94%) diff --git a/win_build/WinSDK/Makefile.bat b/win_build/Makefile.bat similarity index 100% rename from win_build/WinSDK/Makefile.bat rename to win_build/Makefile.bat diff --git a/win_build/WinSDK/Makefile2.bat b/win_build/Makefile2.bat similarity index 94% rename from win_build/WinSDK/Makefile2.bat rename to win_build/Makefile2.bat index 99ee57c..47c2973 100644 --- a/win_build/WinSDK/Makefile2.bat +++ b/win_build/Makefile2.bat @@ -21,7 +21,7 @@ rem : 64 bit MKDIR "%COMPILE_PATH_WIN64TMP%" CD "%COMPILE_PATH_WIN64TMP%" MKDIR "%COMPILE_PATH_WIN64%" -%CMAKE_PATH% -G "%GENERATOR% Win64" ../../../ +%CMAKE_PATH% -G "%GENERATOR% Win64" ../../ rem : %CMAKE_PATH% --build . --config Debug %CMAKE_PATH% --build . --config Release @@ -33,7 +33,7 @@ rem : 32 bit MKDIR "%COMPILE_PATH_WIN32TMP%" CD "%COMPILE_PATH_WIN32TMP%" MKDIR "%COMPILE_PATH_WIN32%" -%CMAKE_PATH% -G "%GENERATOR%" ../../../ +%CMAKE_PATH% -G "%GENERATOR%" ../../ rem : %CMAKE_PATH% --build . --config Debug %CMAKE_PATH% --build . --config Release From d51b65f0040b436fb2344356dcb2b64e16a9a1df Mon Sep 17 00:00:00 2001 From: mariosmsk Date: Wed, 15 May 2019 12:55:13 +0300 Subject: [PATCH 2/4] add help file win_build.md Co-Authored-By: Elad Salomons --- win_build/win_build.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 win_build/win_build.md diff --git a/win_build/win_build.md b/win_build/win_build.md new file mode 100644 index 0000000..f310355 --- /dev/null +++ b/win_build/win_build.md @@ -0,0 +1,12 @@ +Building the EPANET library and executable files +============================ +The most straightforward way to build the EPANET files is by using CMake (https://cmake.org/). CMake is a cross-platform build tool. CMake generates platform native build systems that can be used with your compiler of choice. CMake uses a generator concept to represent different build tooling. CMake automatically detects the platform it is running on and generates the appropriate makefiles for the platform default compiler. Different generators can also be specified. + +The project's CMake file (CMakeLists.txt) is located in the root directory and supports builds for Linux, Max and Windows. + +In addition, two Windows one-click-build scripts are included in the win_build/WinSDK directory: + +**Makefile2.bat:** this scripts uses the CMake file and requires the build tools for Visual Studio available from https://visualstudio.microsoft.com/downloads/. The Community version will work just fine. This script was tested with Visual Studio 2017 and 2019. + +**Makefile.bat:** this is the legacy build script compatible with Visual Studio 2010 which conforms with the C89 Standard which was the standard EPANET supported from earlier versions. This script requires the installation of Microsoft Windows SDK 7.1 (https://www.microsoft.com/en-us/download/details.aspx?id=8279). +Both scripts will build the EPANET library (DLL) and the executable files for 32 and 64 bits Windows platforms. \ No newline at end of file From 55c9607bce0fd7a5d7fe4a2733a1bb013da6a525 Mon Sep 17 00:00:00 2001 From: mariosmsk Date: Wed, 15 May 2019 16:36:26 +0300 Subject: [PATCH 3/4] move win_build.md to root dir and renaiming to BUILDING.md --- win_build/win_build.md => BUILDING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename win_build/win_build.md => BUILDING.md (100%) diff --git a/win_build/win_build.md b/BUILDING.md similarity index 100% rename from win_build/win_build.md rename to BUILDING.md From 9e80fe67b8a009021c1c264c353077ff76b9339a Mon Sep 17 00:00:00 2001 From: Elad Salomons Date: Thu, 16 May 2019 01:24:46 +0300 Subject: [PATCH 4/4] Move BuildAndTest.md to the tools directory --- {.github => tools}/BuildAndTest.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.github => tools}/BuildAndTest.md (100%) diff --git a/.github/BuildAndTest.md b/tools/BuildAndTest.md similarity index 100% rename from .github/BuildAndTest.md rename to tools/BuildAndTest.md