Merge pull request #101 from ktbolt/master

Fix make and build files.
SimVascular · Jul 20, 2022 · 3598cb5 · 3598cb5
2 parents e2ce658 + 4003ecf
commit 3598cb5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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 {