Commit 148cb0f2 authored by Lynn Garren's avatar Lynn Garren
Browse files

fix for Visual C++

parent b748f830
......@@ -9,17 +9,23 @@ INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
if BUILD_STATIC
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.a
OUTFLAG = -o $@
else
if BUILD_VISUAL
LDADD = $(top_builddir)/src/CLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) /Fo $@
OUTFLAG = /Fo$@
else
LIBS += $(MY_LD)$(top_builddir)/src
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.$(SHEXT)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
OUTFLAG = -o $@
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
$(OUTFLAG)
# Identify executables needed during testing:
check_PROGRAMS = \
testThreeVector testLorentzVector testRotation testSubscripts
......@@ -48,3 +54,20 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = testThreeVector.sh testLorentzVector.sh testRotation.sh testSubscripts.sh
# supply our own suffix rule
.cc.obj:
if BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
$(CXXCOMPILE) -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
else
if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c $(OUTFLAG) `$(CYGPATH_W) '$<'`; \
then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment