aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2004-02-18 20:45:54 +0000
committerGerald Combs <gerald@wireshark.org>2004-02-18 20:45:54 +0000
commit037c2c12e41bee877c2d39dca8e61a7efd48d37a (patch)
treea93dfc028d3f748126e69344c27a12a58c5f2fe0 /plugins
parentf121ee94d09de998585687dd63999a13aaad3815 (diff)
From Lars Roland: Add support for a combined GTK1/2 Windows installer.
svn path=/trunk/; revision=10098
Diffstat (limited to 'plugins')
-rw-r--r--plugins/asn1/Makefile.nmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index dfc6926d8a..2a91f17bbb 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.5 2004/01/24 20:01:36 ulfl Exp $
+# $Id: Makefile.nmake,v 1.6 2004/02/18 20:45:53 gerald Exp $
#
include ..\..\config.nmake
@@ -19,7 +19,11 @@ OBJECTS=packet-asn1.obj
asn1.dll asn1.exp asn1.lib : $(OBJECTS) ..\plugin_api.obj
link -dll /out:asn1.dll $(OBJECTS) ..\plugin_api.obj \
+!IFDEF GTK1_DIR
$(GTK1_LIBS)
+!ELSE
+ $(GTK2_LIBS)
+!ENDIF
clean:
rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib $(PDB_FILE)