Subject: [libssh2] #222: Windows build settings enhancement request (diff included)

[libssh2] #222: Windows build settings enhancement request (diff included)

From: libssh2 Trac <trac_at_libssh2.stuge.se>
Date: Wed, 10 Aug 2011 22:47:23 -0000

#222: Windows build settings enhancement request (diff included)
------------------------+---------------------------------------------------
  Reporter: kdekker | Owner:
      Type: defect | Status: new
  Priority: normal | Milestone: 1.2.9
 Component: misc | Version: 1.2.8
  Keywords: win build | Blocks:
Blocked By: |
------------------------+---------------------------------------------------
 Facilitate Windows build to set other openssl/zlib directories as default.

 Please apply the following diffs.
 1. On libssh2-1.2.8\src\NMakefile (to add the possibility to create a
 static library):

 {{{
 12a13
> $(INTDIR)\knownhost.obj \
 25a27,29
> STATICLIB=$(INTDIR)\libssh2.lib
> AR = lib
> ARFLAGS = -nologo /LTCG
 29,30c33,37
 <
 < all: $(DLL)
 ---
>
> $(STATICLIB): $(OBJECT)
> $(AR) $(ARFLAGS) -out:$@ $(OBJECTS)
>
> all: $(DLL) $(STATICLIB)
 33d39
 <
 }}}

 2. on libssh2-1.2.8\win32\config.mk to bypass predefined settings and use
 another openssl directory. Also deprecated option (for Visual Studio 2005)
 /Og has been removed.

 {{{
 1d0
 <
 3,4c2,4
 < OPENSSLINC=..\openssl-0.9.8q\inc32
 < OPENSSLLIB=..\openssl-0.9.8q\out32dll
 ---
> !if "$(OPENSSLINC)" == ""
> OPENSSLINC=..\openssl-0.9.8o\inc32
> !endif
 5a6,10
> !if "$(OPENSSLLIB)" == ""
> OPENSSLLIB=..\openssl-0.9.8o\out32dll
> !endif
>
> !if "$(ZLIBINC)" == ""
 6a12,13
> !endif
> !if "$(ZLIBLIB)" == ""
 7a15
> !endif
 18c26
 < CPPFLAGS=/Og /Oi /O2 /Oy /GF /Y- /MD /DNDEBUG
 ---
> CPPFLAGS=/Oi /O2 /Oy /GF /Y- /MD /DNDEBUG
 22c30
 < CPPFLAGS=/nologo /GL /Zi /EHsc $(CPPFLAGS) /Iwin32 /Iinclude
 /I$(OPENSSLINC) $(ZLIBINC) -DLIBSSH2_WIN32
 ---
> CPPFLAGS=/nologo /EHsc $(CPPFLAGS) /Iwin32 /Iinclude /I$(OPENSSLINC)
 $(ZLIBINC) -DLIBSSH2_WIN32
 }}}

-- 
Ticket URL: <http://trac.libssh2.org/ticket/222>
libssh2 <http://trac.libssh2.org/>
C library for writing portable SSH2 clients
_______________________________________________
libssh2-devel http://cool.haxx.se/cgi-bin/mailman/listinfo/libssh2-devel
Received on 2011-08-11