Make the frame_data_sequence structure opaque, and move some other

[obnox/wireshark/wip.git] / config.nmake

diff --git a/config.nmake b/config.nmake
index ed6f42f4e792fc2d19f7e281ec07cee8862e3e1c..4f50330ca701a70a05ab6d1dca533e1f4a07caec 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -7,7 +7,7 @@
 # Only "win32" and "win64" are valid (for now).
 # This can be defined in the system environment.
 !IFNDEF WIRESHARK_TARGET_PLATFORM
-WIRESHARK_TARGET_PLATFORM=win64
+WIRESHARK_TARGET_PLATFORM=win32
 !ENDIF
 
 ##### Versions #####
@@ -231,8 +231,8 @@ FONTCONFIG_DLL=libfontconfig-1.dll
 EXPAT_DLL=libexpat-1.dll
 INTL_DLL=intl.dll
 # This macro is used by the setup target.
-GTK_PKG=2.16.6-20100912
-#GTK_PKG=2.22.0-20101016
+#GTK_PKG=2.16.6-20100912
+GTK_PKG=2.22.1-20101227
 
 #
 # Mandatory: Version numbers of GTK and pango.
@@ -240,8 +240,8 @@ GTK_PKG=2.16.6-20100912
 # (MAJOR + MINOR Version number but without MICRO version number)
 # These macros are used by the nsis installer script and by the setup target.
 #
-GTK_INST_VERSION=2.16
-#GTK_INST_VERSION=2.22
+#GTK_INST_VERSION=2.16
+GTK_INST_VERSION=2.22
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -438,8 +438,8 @@ EXPAT_DLL=libexpat-1.dll
 INTL_DLL=libintl-8.dll
 
 # These macros are used by the setup target.
-GTK_PKG=2.16.6-20100912
-#GTK_PKG=2.22.0-20101016
+#GTK_PKG=2.16.6-20100912
+GTK_PKG=2.22.1-20101229
 
 #
 # Mandatory: Version numbers of GTK and pango.
@@ -447,8 +447,8 @@ GTK_PKG=2.16.6-20100912
 # (MAJOR + MINOR Version number but without MICRO version number)
 # These macros are used by the nsis installer script and by the setup target.
 #
-GTK_INST_VERSION=2.16
-#GTK_INST_VERSION=2.22
+#GTK_INST_VERSION=2.16
+GTK_INST_VERSION=2.22
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -846,13 +846,22 @@ DLL_LDFLAGS =
 DLL_LDFLAGS = /MANIFEST:no
 !ENDIF
 
+# Enable Safe Exception Handler.
+# http://msdn.microsoft.com/en-us/magazine/cc337897.aspx
+!IF $(MSC_VER_REQUIRED) >= 1300
+LOCAL_CFLAGS= $(LOCAL_CFLAGS) /GS
+!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
+LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /SafeSEH
+!ENDIF
+!ENDIF
+
 # Enable ASLR. Requires VS2008 or later.
 # http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx
-# DEP is handled in init_process_policies()
+# DEP (/NXCompat) is handled in init_process_policies() via SetProcessDEPPolicy.
 
 # ASLR http://msdn.microsoft.com/en-us/library/bb384887.aspx
 !IF $(MSC_VER_REQUIRED) >= 1500
-LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE
+LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE /FIXED:no
 !ENDIF
 
 PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS)