osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

add experimental support for some more of the MSVC_VARIANTs: 

- Microsoft .Net Framework SDK Version 1.1
- Microsoft .Net Framework 2.0 SDK
... which seems to work fine now (except for the open problems like zlib) :-)

Some of the plugins need different linker flags depending on the MSVC. I've set a "define" in config.nmake (PLUGIN_LDFLAGS) and used it in the affected plugins/.../Makefile.nmake. Maybe we should generally change the plugins that way.

btw: The "Microsoft Visual C++ Toolkit 2003" (mentioned some time ago on the list) doesn't work as some important files are missing - and we have much easier alternatives now :-)

svn path=/trunk/; revision=20332
This commit is contained in:
Ulf Lamping 2007-01-06 01:05:59 +00:00
parent d0724fc02f
commit cc164653a0
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config.nmake
View File

@ -35,7 +35,7 @@ WIRESHARK_LIBS=C:\wireshark-win32-libs
# Base directory, where your programs reside. # Base directory, where your programs reside.
# This setting is used only inside this file. # This setting is used only inside this file.
# #
PROGRAM_FILES=C:/Program Files PROGRAM_FILES=C:/Programme
@ -55,14 +55,14 @@ MSVC_VARIANT=MSVC6
# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll # Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
#MSVC_VARIANT=MSVC2003 #MSVC_VARIANT=MSVC2003
# "Microsoft Visual C++ Toolkit 2003" - NOT YET WORKING # "Microsoft Visual C++ Toolkit 2003" - DOESN'T WORK
# needs additional Platform SDK installation # needs additional Platform SDK installation
# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll # Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
#MSVC_VARIANT=VC2003TOOLKIT #MSVC_VARIANT=VC2003TOOLKIT
# "Microsoft .Net Framework SDK Version 1.1" - NOT YET WORKING # "Microsoft .Net Framework SDK Version 1.1" - EXPERIMENTAL
# needs additional Platform SDK installation # needs additional Platform SDK installation
# XXX - Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll # Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
#MSVC_VARIANT=DOTNET11FRAMEWORK #MSVC_VARIANT=DOTNET11FRAMEWORK
# "Microsoft Visual Studio 2005" - EXPERIMENTAL # "Microsoft Visual Studio 2005" - EXPERIMENTAL
@ -71,6 +71,11 @@ MSVC_VARIANT=MSVC6
# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll # Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
#MSVC_VARIANT=MSVC2005 #MSVC_VARIANT=MSVC2005
# "Microsoft .Net Framework 2.0 SDK" - EXPERIMENTAL
# needs additional Platform SDK installation
# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
#MSVC_VARIANT=DOTNET20FRAMEWORK
# #
# Optional: Microsoft Platform SDK. # Optional: Microsoft Platform SDK.
# (Mandatory for some MSVC_VARIANTs, see above) # (Mandatory for some MSVC_VARIANTs, see above)
@ -399,9 +404,9 @@ MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
# /D_CRT_SECURE_NO_DEPRECATE don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT" # /D_CRT_SECURE_NO_DEPRECATE don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT"
# /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this # /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this
# #
!IF "$(MSVC_VARIANT)" == "MSVC6" !IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT"
LOCAL_CFLAGS=/Zi /W3 LOCAL_CFLAGS=/Zi /W3
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK"
LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
!ELSE !ELSE
!ERROR MSVC_VARIANT unknown !ERROR MSVC_VARIANT unknown
@ -415,14 +420,17 @@ LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
# #
!IF "$(MSVC_VARIANT)" == "MSVC6" !IF "$(MSVC_VARIANT)" == "MSVC6"
LOCAL_LDFLAGS=/DEBUG LOCAL_LDFLAGS=/DEBUG
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK"
#LOCAL_LDFLAGS=/DEBUG /DEFAULTLIB:msvcrt /NODEFAULTLIB:libc /NODEFAULTLIB:libcmt
LOCAL_LDFLAGS=/DEBUG /DEFAULTLIB:msvcrt /NODEFAULTLIB:libc /NODEFAULTLIB:libcmt LOCAL_LDFLAGS=/DEBUG /DEFAULTLIB:msvcrt /NODEFAULTLIB:libc /NODEFAULTLIB:libcmt
!ELSE !ELSE
!ERROR MSVC_VARIANT unknown !ERROR MSVC_VARIANT unknown
!ENDIF !ENDIF
WS_PLUGIN_LDFLAGS=/DEBUG /NOLOGO /INCREMENTAL:no /MACHINE:I386 !IF "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK"
PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386
!ELSE
PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
!ENDIF
# #

2
plugins/asn1/Makefile.nmake
View File

@ -12,7 +12,7 @@ include Makefile.common
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK !IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib

2
plugins/mate/Makefile.nmake
View File

@ -17,7 +17,7 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) /I$(LEMON)\
.c.obj:: .c.obj::
$(CC) $(CFLAGS) -Fdmate.pdb -c $< $(CC) $(CFLAGS) -Fdmate.pdb -c $<
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK !IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib

2
plugins/megaco/Makefile.nmake
View File

@ -12,7 +12,7 @@ include Makefile.common
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK !IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib

2
plugins/mgcp/Makefile.nmake
View File

@ -12,7 +12,7 @@ include Makefile.common
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK !IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib