[Winpt-commits] r385 - trunk/PTD

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2011-12-13 12:05:49 +0100 (Tue, 13 Dec 2011)
New Revision: 385

Modified:
   trunk/PTD/ChangeLog
   trunk/PTD/Makefile.am
Log:
2011-12-13  Timo Schulz  <twoaday at gmx.net>

        * Makefile.am: Enabled SSP again.
	


Modified: trunk/PTD/ChangeLog
===================================================================
--- trunk/PTD/ChangeLog	2011-12-13 11:04:49 UTC (rev 384)
+++ trunk/PTD/ChangeLog	2011-12-13 11:05:49 UTC (rev 385)
@@ -1,9 +1,13 @@
-2011-12-12  Timo Schulz <twoaday at gmx.net>
+2011-12-13  Timo Schulz  <twoaday at gmx.net>
 
+	* Makefile.am: Enabled SSP again.
+
+2011-12-12  Timo Schulz  <twoaday at gmx.net>
+
 	* Makefile.am: Disable stack protector until we
 	figured out how to include it statically.
 
-2011-11-27  Timo Schulz <twoaday at gmx.net>
+2011-11-27  Timo Schulz  <twoaday at gmx.net>
 
         * wptDNSKeys.{cpp,h}: Moved to source folder.
         * resource.h: Removed.

Modified: trunk/PTD/Makefile.am
===================================================================
--- trunk/PTD/Makefile.am	2011-12-13 11:04:49 UTC (rev 384)
+++ trunk/PTD/Makefile.am	2011-12-13 11:05:49 UTC (rev 385)
@@ -18,9 +18,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/w32gpgme -I$(top_srcdir)/Include \
 	      -I$(top_srcdir)/Gnupg \
               -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL -DPTD_EXPORTS
-# The protector leads to additional dependencies	      
-#AM_CXXFLAGS = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS) -shared
-AM_CXXFLAGS = -fexceptions  $(GPGME_CFLAGS) -shared
+
+AM_CXXFLAGS = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS) -shared
+
 AM_LDFLAGS  = -mwindows
 
 PTD_SOURCES = \