Merging upstream dev

Author: michaeltryby

README.md

@@ -14,7 +14,7 @@ is currently under active development. The build process is likely to change.
 
 
 ### Build Process
-The idea here is to build the SWMM library seperately link it with the SWIG 
+The idea here is to build the SWMM library seperately and link it with the SWIG 
 wrapper. This approach uses implicit linking, therefore, an import library 
 must be created. CMake does this automatically using the Generate Export Header 
 function. Once built the SWMM library and headers are manually copied to the 
@@ -24,16 +24,16 @@ swmm5.dll.
 
 Step 1 - Build SWMM Library
 
-Build the SWMM Library using CMake generator "Visual Studio 14 2015 Win64"
-Be sure "generate export header" section of the SWMM Project CMakeLists.txt 
-is not commented out. 
+Checkout the feature-reentrancy branch of the OWA SWMM project. Build the SWMM 
+Library using CMake generator "Visual Studio 14 2015 Win64". Be sure "generate 
+export header" section of the SWMM Project CMakeLists.txt is not commented out. 
 
 
 Step 2 - Copy SWMM Library
 
-In the swmm-toolkit directory create two directories include and lib. Copy 
-swmm5.h and toolkitAPI.h to include. And copy swmm5.dll, swmm5.lib and 
-swmm5.exp to lib. These are the locations defined in the setup.py file. 
+In the swmm\toolkit directory copy swmm5.h, swmm5_export.h, toolkitAPI.h, 
+swmm5.dll, swmm5.lib, and swmm5.exp all together in the same folder. The 
+setup.py file is configured to find them there. 
 
 
 Step 3 - Build SWMM Toolkit