diff --git a/README.md b/README.md
index cc6b9b1f..1dad00f0 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,6 @@ zlib, math, quadmath, and gfortran for pydsstools to work in Ubuntu.
```
git clone https://github.com/HydrologicEngineeringCenter/hec-dss.git
cd hec-dss
-rm -fr ./dss-test-data
git clone https://github.com/HydrologicEngineeringCenter/dss-test-data.git
In the hec-dss/heclib directory, execute make clean ; make
In the hec-dss/test/C directory, execute ./unix_test
@@ -70,20 +69,42 @@ export JAVA_HOME=/usr/jdk/instances/jdk1.8.0
export LD_LIBRARY_PATH=/usr/gcc/7/lib/sparcv9
```
-1. bash
-2. git clone -j2 --recurse-submodules https://github.com/HydrologicEngineeringCenter/hec-dss.git
-3. In the hec-dss/heclib directory, execute gmake clean ; gmake
-4. In the hec-dss/test/C directory, execute ./unix_test
-5. In the hec-dss/test/Dss-C directory, execute gmake clean ; gmake test
-6. In the hec-dss/test/Fortran directory, execute gmake -f Makefile.Solaris clean ; gmake -f Makefile.Solaris test
+ bash
+ git clone https://github.com/HydrologicEngineeringCenter/hec-dss.git
+ cd hec-dss
+ git clone https://github.com/HydrologicEngineeringCenter/dss-test-data.git
+ In the hec-dss/heclib directory, execute gmake clean ; gmake
+ In the hec-dss/test/C directory, execute ./unix_test
+ In the hec-dss/test/Dss-C directory, execute gmake clean ; gmake test
+ In the hec-dss/test/Fortran directory, execute gmake -f Makefile.Solaris clean ; gmake -f Makefile.Solaris test
```
### Windows
+For Windows we are using the intel compiler and Visual Studio 2022.
+
+
+The environment variables IFORT_COMPILER_LIB and JAVA_HOME need to be set.
+example:
+
```cmd
+set IFORT_COMPILER_LIB=C:\Program Files (x86)\Intel\oneAPI\compiler\2024.2\lib
+set JAVA_HOME=c:\bin\jdk1.8.0
+
+git clone https://github.com/HydrologicEngineeringCenter/hec-dss.git
+cd hec-dss
+git clone https://github.com/HydrologicEngineeringCenter/dss-test-data.git
build_release.bat
+
+cd test
+test_c.bat
+cd ..
+test_Dss-C.bat
+test_fortran.bat
+
+
```
## running the java tests
diff --git a/dss-test-data b/dss-test-data
deleted file mode 160000
index 87c6165c..00000000
--- a/dss-test-data
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 87c6165c63e28c4104e35abcfcfee74ab2a72dcc
diff --git a/heclib/hecdss/hecdss.vcxproj b/heclib/hecdss/hecdss.vcxproj
index b5baccdd..a1ef1138 100644
--- a/heclib/hecdss/hecdss.vcxproj
+++ b/heclib/hecdss/hecdss.vcxproj
@@ -136,7 +136,7 @@
Windows
true
false
- ..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER22)compiler\lib\intel64_win;..\heclib_c\$(PlatformName)\$(ConfigurationName);C:\project\hec-dss\heclib\heclib_c\x64\Debug;%(AdditionalLibraryDirectories)
+ ..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER_LIB);..\heclib_c\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories)
heclib_f.lib;heclib_c.lib;%(AdditionalDependencies)
$(ProjectDir)$(Platform)\$(Configuration)\$(TargetName)$(TargetExt)
LIBCMTD;MSVCRT
@@ -164,7 +164,7 @@
true
true
false
- ..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER22)compiler\lib\intel64_win;..\heclib_c\$(PlatformName)\$(ConfigurationName);C:\project\hec-dss\heclib\heclib_c\x64\$(ConfigurationName);%(AdditionalLibraryDirectories)
+ ..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER_LIB);..\heclib_c\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories)
heclib_f.lib;heclib_c.lib;%(AdditionalDependencies)
$(ProjectDir)$(Platform)\$(Configuration)\$(TargetName)$(TargetExt)
diff --git a/heclib/javaHeclib/javaHeclib.vcxproj b/heclib/javaHeclib/javaHeclib.vcxproj
index 5181c6a6..4c83b52a 100644
--- a/heclib/javaHeclib/javaHeclib.vcxproj
+++ b/heclib/javaHeclib/javaHeclib.vcxproj
@@ -64,7 +64,7 @@
Disabled
- C:\Programs\java\jdk1.8.0\include;C:\Programs\java\jdk1.8.0\include\win32;..\heclib_c\src\headers;%(AdditionalIncludeDirectories)
+ $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\heclib_c\src\headers;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;JAVAHECLIB_EXPORTS;%(PreprocessorDefinitions)
false
EnableFastChecks
@@ -79,7 +79,7 @@
heclib_f.lib;heclib_c.lib;zlibstatic.lib
$(ProjectDir)$(Platform)\$(Configuration)\javaHeclib.dll
- ..\heclib_c\$(PlatformName)\$(ConfigurationName);..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER22)compiler\lib\intel64_win
+ ..\heclib_c\$(PlatformName)\$(ConfigurationName);..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER_LIB)
MSVCRT
true
Windows
@@ -104,7 +104,7 @@
X64
- C:\Programs\java\jdk1.8.0\include;C:\Programs\java\jdk1.8.0\include\win32;..\heclib_c\src\headers;%(AdditionalIncludeDirectories)
+ $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\heclib_c\src\headers;%(AdditionalIncludeDirectories)
MultiThreadedDLL
NotUsing
Level3
@@ -123,7 +123,7 @@
heclib_f.lib;heclib_c.lib;zlibstatic.lib;%(AdditionalDependencies)
$(ProjectDir)$(Platform)\$(Configuration)\javaHeclib.dll
- ..\heclib_c\$(PlatformName)\$(ConfigurationName);..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER22)compiler\lib\intel64_win
+ ..\heclib_c\$(PlatformName)\$(ConfigurationName);..\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(PlatformName);$(IFORT_COMPILER_LIB)
false
Windows
@@ -148,7 +148,6 @@
..\heclib_c\src\headers
-
diff --git a/lib/win32/zlibstatic.lib b/lib/win32/zlibstatic.lib
deleted file mode 100644
index 2c29c6ab..00000000
Binary files a/lib/win32/zlibstatic.lib and /dev/null differ
diff --git a/test/Dss-C/Dss-C.vcxproj b/test/Dss-C/Dss-C.vcxproj
index a2fe09ac..9bc9627c 100644
--- a/test/Dss-C/Dss-C.vcxproj
+++ b/test/Dss-C/Dss-C.vcxproj
@@ -76,7 +76,7 @@
Console
true
- ..\..\heclib\heclib_c\$(PlatformName)\$(ConfigurationName);..\..\heclib\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(Platform);$(IFORT_COMPILER22)compiler\lib\intel64_win
+ ..\..\heclib\heclib_c\$(PlatformName)\$(ConfigurationName);..\..\heclib\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(Platform);$(IFORT_COMPILER_LIB)
heclib_f.lib;heclib_c.lib;zlibstatic.lib;%(AdditionalDependencies)
LIBCMTD;MSVCRT
true
@@ -125,7 +125,7 @@
..\..\heclib\heclib_c\src\headers;source;.
- ..\..\heclib\heclib_c\$(PlatformName)\$(ConfigurationName);..\..\heclib\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(Platform);$(IFORT_COMPILER22)compiler\lib\intel64_win
+ ..\..\heclib\heclib_c\$(PlatformName)\$(ConfigurationName);..\..\heclib\heclib_f\$(PlatformName)\$(ConfigurationName);..\..\lib\$(Platform);$(IFORT_COMPILER_LIB)
heclib_f.lib;heclib_c.lib;zlibstatic.lib;%(AdditionalDependencies)
LIBCMT