octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

MSVC compiler support [patch 9]: Default object suffix


From: Michael Goffioul
Subject: MSVC compiler support [patch 9]: Default object suffix
Date: Tue, 17 Oct 2006 21:45:27 +0200
User-agent: Thunderbird 1.5.0.7 (Windows/20060909)

MSVC uses .obj object suffix by default.

Index: aclocal.m4
===================================================================
RCS file: /cvs/octave/aclocal.m4,v
retrieving revision 1.97
diff -p -c -r1.97 aclocal.m4
*** aclocal.m4  17 Aug 2006 20:29:51 -0000      1.97
--- aclocal.m4  17 Oct 2006 11:07:41 -0000
*************** AC_DEFUN(OCTAVE_CXX_PREPENDS_UNDERSCORE,
*** 633,639 ****
  bool FSmy_dld_fcn (void) { return false; }
  EOF
      if AC_TRY_EVAL(ac_compile); then
!       if test "`${NM-nm} conftest.o | grep _FSmy_dld_fcn`" != ""; then
          octave_cv_cxx_prepends_underscore=yes
        fi
      else
--- 636,642 ----
  bool FSmy_dld_fcn (void) { return false; }
  EOF
      if AC_TRY_EVAL(ac_compile); then
!       if test "`${NM-nm} conftest.$ac_cv_objext | grep _FSmy_dld_fcn`" != ""; 
then
          octave_cv_cxx_prepends_underscore=yes
        fi
      else
*************** AC_DEFUN(OCTAVE_CXX_ABI, [
*** 742,754 ****
  bool FSmy_dld_fcn (void) { return false; }
  EOF
      if AC_TRY_EVAL(ac_compile); then
!       if test "`${NM-nm} conftest.o | grep FSmy_dld_fcn__Fv`" != ""; then
          octave_cv_cxx_abi='gnu_v2'
        fi
!       if test "`${NM-nm} conftest.o | grep _Z12FSmy_dld_fcnv`" != ""; then
          octave_cv_cxx_abi='gnu_v3'
        fi
!       if test "`${NM-nm} conftest.o | grep __1cMFSmy_dld_fcn6F_b_`" != ""; 
then
          octave_cv_cxx_abi='sun_v5'
        fi
      else
--- 745,757 ----
  bool FSmy_dld_fcn (void) { return false; }
  EOF
      if AC_TRY_EVAL(ac_compile); then
!       if test "`${NM-nm} conftest.$ac_cv_objext | grep FSmy_dld_fcn__Fv`" != 
""; then
          octave_cv_cxx_abi='gnu_v2'
        fi
!       if test "`${NM-nm} conftest.$ac_cv_objext | grep _Z12FSmy_dld_fcnv`" != 
""; then
          octave_cv_cxx_abi='gnu_v3'
        fi
!       if test "`${NM-nm} conftest.$ac_cv_objext | grep 
__1cMFSmy_dld_fcn6F_b_`" != ""; then
          octave_cv_cxx_abi='sun_v5'
        fi
      else
Index: libcruft/misc/Makefile.in
===================================================================
RCS file: /cvs/octave/libcruft/misc/Makefile.in,v
retrieving revision 1.31
diff -p -c -r1.31 Makefile.in
*** libcruft/misc/Makefile.in   30 Oct 2003 16:48:09 -0000      1.31
--- libcruft/misc/Makefile.in   17 Oct 2006 11:07:41 -0000
*************** XCC = $(patsubst -O%, , $(CC))
*** 62,68 ****
  XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
  
  machar.o: $(srcdir)/machar.c
!       $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
  
  pic/machar.o: $(srcdir)/machar.c
        $(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@
--- 65,71 ----
  XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
  
  machar.o: $(srcdir)/machar.c
!       $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< -o $@
  
  pic/machar.o: $(srcdir)/machar.c
        $(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@

reply via email to

[Prev in Thread] Current Thread [Next in Thread]