The U3 and PortableApps packaging processes depend on simple

defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659

1 files changed, 11 insertions, 2 deletions

diff --git a/packaging/u3/win32/makenmake.pl b/packaging/u3/win32/makenmake.pl
index 56a1273e9a..c3d19868a7 100755
--- a/packaging/u3/win32/makenmake.pl
+++ b/packaging/u3/win32/makenmake.pl
@@ -4,6 +4,10 @@
 #
 
 print q{
+#
+# DO NOT EDIT - autogenerated from makenmake.pl
+#
+
 include ../../../config.nmake
 include <win32.mak>
 
@@ -31,6 +35,12 @@ while($line = <>) {
 	$dir = $1;
 	undef $u3loc;
 
+	# Close any previous !IFDEFs
+	if(defined $define) {
+	    print "!ENDIF\n";
+	}
+	undef $define;
+
 	if($line =~ /u3loc=(\w+)/) {
 	    $u3loc = "\$(" . uc $1 . ")";
 	}
@@ -62,8 +72,7 @@ while($line = <>) {
 		$define = $1;
 		print "!IF DEFINED($define)\n";
 	    }
-	} else {
-	    
+	} else {	    
 	    if(defined $define) {
 		print "!ENDIF\n";
 	    }