From 4003ecf64281330251d4e96521487dc8ae9f61ca Mon Sep 17 00:00:00 2001
From: DaveP <dvdpax@gmail.com>
Date: Tue, 19 Jul 2022 16:33:23 -0700
Subject: [PATCH] Fix make and build files.

---
 BuildWithMake/Makefile                                   | 9 ++++++---
 .../Release/windows_msi_helpers/makewxs-svonedsolver.tcl | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/BuildWithMake/Makefile b/BuildWithMake/Makefile
index 1a36964..67f1596 100644
--- a/BuildWithMake/Makefile
+++ b/BuildWithMake/Makefile
@@ -13,11 +13,14 @@ endif
 src=../Code/Source/*.cxx
 obj = $(src:.cpp=.o)
 
+# Set option to use Skyline solver
+flags=/DUSE_SKYLINE
+
 exe = svOneDSolver
 
 $(exe): $(obj)
-	$(CXX) -o $(exe) $(obj) $(libs) 
+	$(CXX) $(OPT_FLAGS) $(flags) -o $(exe) $(obj) $(libs) 
 
-.cpp.o:
-	$(CXX) $(copt) $(flags) -c $<
+clean:
+	rm *.obj *.exe
 
diff --git a/BuildWithMake/Release/windows_msi_helpers/makewxs-svonedsolver.tcl b/BuildWithMake/Release/windows_msi_helpers/makewxs-svonedsolver.tcl
index 837a38f..aa054b8 100644
--- a/BuildWithMake/Release/windows_msi_helpers/makewxs-svonedsolver.tcl
+++ b/BuildWithMake/Release/windows_msi_helpers/makewxs-svonedsolver.tcl
@@ -67,13 +67,13 @@ proc file_find {dir wildcard args} {
     global outputRegistry
     if {!$outputRegistry} {
         set outputRegistry 1
-        set regid 11
-        puts $outfp "<Registry Id='regid$regid' Root='HKLM' Key='Software\\SimVascular\\Solvers\\svOneDSolver\\$SV_TIMESTAMP' Name='SVSOLVER_HOME' Action='write' Type='string' Value='\[INSTALLDIR\]$SV_TIMESTAMP' />"
+        set regid 21
+        puts $outfp "<Registry Id='regid$regid' Root='HKLM' Key='Software\\SimVascular\\Solvers\\svOneDSolver\\$SV_TIMESTAMP' Name='SVONEDSOLVER_HOME' Action='write' Type='string' Value='\[INSTALLDIR\]$SV_TIMESTAMP' />"
         incr regid
 	puts $outfp "<Registry Id='regid$regid' Root='HKLM' Key='Software\\SimVascular\\Solvers\\svOneDSolver\\$SV_TIMESTAMP' Name='TimeStamp' Action='write' Type='string' Value='$SV_TIMESTAMP' />"
 
         incr regid
-	puts $outfp "<Registry Id='regid$regid' Root='HKLM' Key='Software\\SimVascular\\Solvers\\svOneDSolver\\$SV_TIMESTAMP' Name='SVONDSOLVER_EXE' Action='write' Type='string' Value='\[INSTALLDIR\]$SV_TIMESTAMP\\svonedsolver.exe'  />"
+	puts $outfp "<Registry Id='regid$regid' Root='HKLM' Key='Software\\SimVascular\\Solvers\\svOneDSolver\\$SV_TIMESTAMP' Name='SVONEDSOLVER_EXE' Action='write' Type='string' Value='\[INSTALLDIR\]$SV_TIMESTAMP\\svonedsolver.exe'  />"
         incr regid
     }
     foreach i $files {