octave-maintainers
[Top][All Lists]
Advanced

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

MSVC compiler support [patch 14]: Additional configuration


From: Michael Goffioul
Subject: MSVC compiler support [patch 14]: Additional configuration
Date: Tue, 17 Oct 2006 21:49:31 +0200
User-agent: Thunderbird 1.5.0.7 (Windows/20060909)

* defines default LIBS (link against kernel32 and ws2_32)
* force having LoadLibrary API
* do not use soft links (simply copy files)
* force definition of __WIN32__ under MSVC
Index: configure.in
===================================================================
RCS file: /cvs/octave/configure.in,v
retrieving revision 1.526
diff -p -c -r1.526 configure.in
*** configure.in        13 Oct 2006 18:11:26 -0000      1.526
--- configure.in        17 Oct 2006 11:07:41 -0000
*************** case "$canonical_host_type" in
*** 1159,1164 ****
--- 1220,1228 ----
     AC_CHECK_LIB(wsock32, gethostname)
     LIBS="$LIBS -lwsock32"
    ;;
+   *-*-msdos*)
+   LIBS="$LIBS -lws2_32 -lkernel32"
+   ;;
  esac
  
  ### Type stuff.
*************** if $SHARED_LIBS || $ENABLE_DYNAMIC_LINKI
*** 1337,1343 ****
    ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw 
    if !($dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api); then
      case "$canonical_host_type" in
!       *-*-cygwin* | *-*-mingw*)
         loadlibrary_api=true;
        ;;
      esac
--- 1429,1435 ----
    ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw 
    if !($dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api); then
      case "$canonical_host_type" in
!       *-*-cygwin* | *-*-mingw* | *-*-msdos)
         loadlibrary_api=true;
        ;;
      esac
*************** OCTAVE_PROG_PYTHON
*** 1561,1567 ****
  OCTAVE_PROG_FLEX
  OCTAVE_PROG_BISON
  
! AC_PROG_LN_S
  
  OCTAVE_PROG_NM
  
--- 1664,1678 ----
  OCTAVE_PROG_FLEX
  OCTAVE_PROG_BISON
  
! case "$canonical_host_type" in
!   *-*-msdos)
!     LN_S=cp
!     AC_SUBST(LN_S)
!   ;;
!   *)
!     AC_PROG_LN_S
!   ;;
! esac
  
  OCTAVE_PROG_NM
  
*************** AC_CONFIG_SUBDIRS(scripts)
*** 1673,1678 ****
--- 1784,1793 ----
  ### Some things to add to the bottom of config.h.
  
  AH_BOTTOM([
+ #ifdef _MSC_VER
+ #define __WIN32__
+ #endif
+ 
  #if defined (__GNUC__)
  #define GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
  #define GCC_ATTR_NORETURN __attribute__ ((__noreturn__))

reply via email to

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