Skip to content

Commit

Permalink
Fix makefiles to compile new geometries on Windows
Browse files Browse the repository at this point in the history
Use makefile macros for the make and remove commands, because these are
named differently on Windows.
  • Loading branch information
rtownson authored and ftessier committed Jan 31, 2020
1 parent f3e94ec commit c5bed99
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions HEN_HOUSE/egs++/geometry/egs_autoenvelope/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ $(ABS_DSO)$(libpre)egs_autoenvelope$(libext): volcor.h $(GZSTREAM_H) \
..$(DSEP)egs_gtransformed$(DSEP)egs_gtransformed.h

clean:
rm -f $(ABS_DSO)$(libpre)egs_autoenvelope$(libext) $(ABS_DSO)$(libpre)egs_sobol$(libext) $(ABS_DSO)$(libpre)sobol$(libext) \
$(REMOVE) $(ABS_DSO)$(libpre)egs_autoenvelope$(libext) $(ABS_DSO)$(libpre)egs_sobol$(libext) $(ABS_DSO)$(libpre)sobol$(libext) \
$(ABS_DSO)$(libpre)gzstream$(libext) $(ABS_DSO)$(libpre)gzstream$(libext)
rm -f $(DSO2)autoenvelope.$(obje) $(DSO2)sobol.$(obje) $(DSO2)egs_sobol.$(obje) \
$(REMOVE) $(DSO2)autoenvelope.$(obje) $(DSO2)sobol.$(obje) $(DSO2)egs_sobol.$(obje) \
$(DSO2)gzstream.$(obje) $(DSO2)gzstream.$(obje) \

touchup:
Expand Down
6 changes: 3 additions & 3 deletions HEN_HOUSE/egs++/geometry/egs_glib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ $(DSO2)$(library).$(obje): ndgeom
$(ABS_DSO)$(libpre)$(library)$(libext): ndgeom

ndgeom:
cd ..$(DSEP)egs_nd_geometry && make
cd ..$(DSEP)egs_nd_geometry && $(MAKE)

clean:
rm -f $(ABS_DSO)$(libpre)$(library)$(libext)
rm -f $(DSO2)$(library).$(obje)
$(REMOVE) $(ABS_DSO)$(libpre)$(library)$(libext) $(DSO2)$(library).$(obje)

9 changes: 4 additions & 5 deletions HEN_HOUSE/egs++/geometry/egs_rz/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,13 @@ $(DSO2)$(library).$(obje): ndgeom cyls planes
$(ABS_DSO)$(libpre)$(library)$(libext): ndgeom cyls planes

ndgeom:
cd ..$(DSEP)egs_nd_geometry && make
cd ..$(DSEP)egs_nd_geometry && $(MAKE)

cyls:
cd ..$(DSEP)egs_cylinders && make
cd ..$(DSEP)egs_cylinders && $(MAKE)

planes:
cd ..$(DSEP)egs_planes && make
cd ..$(DSEP)egs_planes && $(MAKE)

clean:
rm -f $(ABS_DSO)$(libpre)$(library)$(libext)
rm -f $(DSO2)$(library).$(obje)
$(REMOVE) $(ABS_DSO)$(libpre)$(library)$(libext) $(DSO2)$(library).$(obje)

0 comments on commit c5bed99

Please sign in to comment.