Skip to content

Commit

Permalink
Fix Windows issues (#62)
Browse files Browse the repository at this point in the history
* Fix #59 Remove EGS_EXPORT from EB_UniformRunControl

EGS_EXPORT only needed to create a shared library, but EB_UniformRunControl does not need that.

* Fix #60 Fix Windows Makefile issues

* Fix Makefile on Windows and macOS
  • Loading branch information
mchamberland authored Jun 5, 2024
1 parent 0219903 commit c4df498
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
19 changes: 9 additions & 10 deletions egs_brachy/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,7 @@ other_dep_user_code = $(source_deps) $(ABS_EGSPP)egs_transformations.h $(ABS_EGS

egspp_geom_libs = $(link2_prefix)egs_autoenvelope$(link2_suffix)

UNAME := $(shell uname)
ifeq ($(UNAME), Darwin)
TURN_OFF_MACOS_COMPACT_UNWIND = -Wl,-no_compact_unwind
endif

user_libs = $(TURN_OFF_MACOS_COMPACT_UNWIND) $(egspp_geom_libs) $(link2_prefix)iaea_phsp $(link2_prefix)z
user_libs = $(egspp_geom_libs) $(link2_prefix)iaea_phsp $(link2_prefix)z

include $(HEN_HOUSE)makefiles$(DSEP)cpp_makefile

Expand Down Expand Up @@ -87,14 +82,18 @@ docs: _docs/egs_brachy.md
cp _docs/egs_brachy_paper2016.pdf ../docs/pdf
rm -rf docs/*

UNAME := $(shell uname)
ifeq ($(UNAME), Darwin)
ifeq ($(OS), Windows_NT)
eb_iaeaphsp:
cd eb_iaeaphsp_source; $(make_prog)
$(make_prog) -C eb_iaeaphsp_source
else
ifeq ($(shell uname), Darwin)
eb_iaeaphsp:
$(make_pr og) -C eb_iaeaphsp_source
ln -sf ${HEN_HOUSE}/egs++/dso/${my_machine}/libeb_iaeaphsp_source.dylib ${HEN_HOUSE}/egs++/dso/${my_machine}/libeb_iaeaphsp_source.so
else
eb_iaeaphsp:
cd eb_iaeaphsp_source; $(make_prog)
$(make_prog) -C eb_iaeaphsp_source
endif
endif

test:
Expand Down
2 changes: 1 addition & 1 deletion egs_brachy/egs_brachy.h
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ class APP_EXPORT EB_Application : public EGS_AdvancedApplication {

};

class EGS_EXPORT EB_UniformRunControl : public EGS_RunControl {
class EB_UniformRunControl : public EGS_RunControl {

public:

Expand Down

0 comments on commit c4df498

Please sign in to comment.