Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
9a51c110
Commit
9a51c110
authored
12 years ago
by
Steve Holme
Committed by
Daniel Stenberg
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Makefile.vc6: Added version.lib if built with SSPI
parent
cb142cf2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/Makefile.vc6
+3
-2
3 additions, 2 deletions
lib/Makefile.vc6
src/Makefile.vc6
+27
-3
27 additions, 3 deletions
src/Makefile.vc6
with
30 additions
and
5 deletions
lib/Makefile.vc6
+
3
−
2
View file @
9a51c110
...
...
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1999 - 201
1
, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1999 - 201
2
, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
...
...
@@ -22,7 +22,7 @@
# All files in the Makefile.vc* series are generated automatically from the
# one made for MSVC version 6. Alas, if you want to do changes to any of the
# fi
e
ls and send back to the project, edit the version six, make your diff and
# fil
e
s and send back to the project, edit the version six, make your diff and
# mail curl-library.
###########################################################################
...
...
@@ -123,6 +123,7 @@ CFGSET = FALSE
!IFDEF
WINDOWS_SSPI
CFLAGS
=
$(
CFLAGS
)
/DUSE_WINDOWS_SSPI /I
$(
WINDOWS_SDK_PATH
)
\i
nclude
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
!IFDEF
USE_IPV6
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.vc6
+
27
−
3
View file @
9a51c110
...
...
@@ -22,7 +22,7 @@
# All files in the Makefile.vc* series are generated automatically from the
# one made for MSVC version 6. Alas, if you want to do changes to any of the
# fi
e
ls and send back to the project, edit the version six, make your diff and
# fil
e
s and send back to the project, edit the version six, make your diff and
# mail curl-users.
#############################################################
...
...
@@ -90,6 +90,7 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
########################################################
## Nothing more to do below this line!
ZLIB_CFLAGS
=
/DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I
"
$(
ZLIB_PATH
)
"
ZLIB_LFLAGS
=
"/LIBPATH:
$(
ZLIB_PATH
)
"
ZLIB_LIBS
=
zlib.lib
...
...
@@ -100,6 +101,8 @@ SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32"
SSL_IMP_LFLAGS
=
/LIBPATH:
"
$(
OPENSSL_PATH
)
/out32dll"
SSL_LIBS
=
libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
WINLIBS
=
ws2_32.lib wldap32.lib
# Runtime library configuration
RTLIB
=
/MD
RTLIBD
=
/MDd
...
...
@@ -226,6 +229,9 @@ DEBUG_OBJS= \
CFLAGS
=
$(
CFLAGS
)
/DCURL_STATICLIB
LINKLIBS
=
$(
LIBCURL_STA_LIB_REL
)
LINKLIBS_DEBUG
=
$(
LIBCURL_STA_LIB_DBG
)
!IFDEF
WINDOWS_SSPI
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
#################################################
# release dynamic library
...
...
@@ -243,6 +249,9 @@ CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
LINKLIBS
=
$(
LIBCURL_STA_LIB_REL
)
$(
ZLIB_LIBS
)
LINKLIBS_DEBUG
=
$(
LIBCURL_STA_LIB_DBG
)
$(
ZLIB_LIBS
)
LFLAGS
=
$(
LFLAGS
)
$(
ZLIB_LFLAGS
)
!IFDEF
WINDOWS_SSPI
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
!ENDIF
#################################################
...
...
@@ -253,6 +262,9 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB
LINKLIBS
=
$(
LIBCURL_STA_LIB_REL
)
$(
SSL_LIBS
)
LINKLIBS_DEBUG
=
$(
LIBCURL_STA_LIB_DBG
)
$(
SSL_LIBS
)
LFLAGS
=
$(
LFLAGS
)
$(
SSL_LFLAGS
)
!IFDEF
WINDOWS_SSPI
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
!ENDIF
#################################################
...
...
@@ -273,6 +285,9 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
LINKLIBS
=
$(
LIBCURL_STA_LIB_REL
)
$(
SSL_LIBS
)
$(
ZLIB_LIBS
)
LINKLIBS_DEBUG
=
$(
LIBCURL_STA_LIB_DBG
)
$(
SSL_LIBS
)
$(
ZLIB_LIBS
)
LFLAGS
=
$(
LFLAGS
)
$(
SSL_LFLAGS
)
$(
ZLIB_LFLAGS
)
!IFDEF
WINDOWS_SSPI
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
!ENDIF
#################################################
...
...
@@ -283,6 +298,9 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB
LINKLIBS
=
$(
LIBCURL_STA_LIB_REL
)
$(
SSL_LIBS
)
LINKLIBS_DEBUG
=
$(
LIBCURL_STA_LIB_DBG
)
$(
SSL_LIBS
)
LFLAGS
=
$(
LFLAGS
)
$(
SSL_IMP_LFLAGS
)
!IFDEF
WINDOWS_SSPI
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
!ENDIF
#################################################
...
...
@@ -293,6 +311,9 @@ CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
LINKLIBS
=
$(
LIBCURL_STA_LIB_REL
)
$(
ZLIB_IMP_LIBS
)
LINKLIBS_DEBUG
=
$(
LIBCURL_STA_LIB_DBG
)
$(
ZLIB_IMP_LIBS
)
LFLAGS
=
$(
LFLAGS
)
$(
ZLIB_LFLAGS
)
!IFDEF
WINDOWS_SSPI
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
!ENDIF
#################################################
...
...
@@ -313,6 +334,9 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
LINKLIBS
=
$(
LIBCURL_STA_LIB_REL
)
$(
SSL_LIBS
)
$(
ZLIB_IMP_LIBS
)
LINKLIBS_DEBUG
=
$(
LIBCURL_STA_LIB_DBG
)
$(
SSL_LIBS
)
$(
ZLIB_IMP_LIBS
)
LFLAGS
=
$(
LFLAGS
)
$(
SSL_IMP_LFLAGS
)
$(
ZLIB_LFLAGS
)
!IFDEF
WINDOWS_SSPI
WINLIBS
=
$(
WINLIBS
)
version.lib
!ENDIF
!ENDIF
#################################################
...
...
@@ -326,8 +350,8 @@ LFLAGS = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)
!ENDIF
LINKLIBS
=
$(
LINKLIBS
)
ws2_32.lib wldap32.lib
LINKLIBS_DEBUG
=
$(
LINKLIBS_DEBUG
)
ws2_32.lib wldap32.lib
LINKLIBS
=
$(
LINKLIBS
)
$(
WINLIBS
)
LINKLIBS_DEBUG
=
$(
LINKLIBS_DEBUG
)
$(
WINLIBS
)
all
:
release
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment