aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2006-12-26 20:20:52 +0000
committerUlf Lamping <ulf.lamping@web.de>2006-12-26 20:20:52 +0000
commita672d53330974aa6597cc676d38e5027d135e0d4 (patch)
tree33f6558ba55112e75827edb7fe34797fbf3fd3ed /config.nmake
parent7f8fba06a4c8af9f1e76ec9ffd23da46b879ba7d (diff)
cygwins python doesn't work on a lot of machines, make the native python the default (until we know what the cause of the problems are)
set VERSION_EXTRA back to empty - I guess this was checked in by mistake svn path=/trunk/; revision=20218
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake
index 88385a0564..4efbeeac4b 100644
--- a/config.nmake
+++ b/config.nmake
@@ -14,7 +14,7 @@ VERSION_MINOR=99
VERSION_MICRO=5
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
-VERSION_EXTRA=-SVN-20180
+VERSION_EXTRA=
# The version of the wiretap library (recommended: leave unchanged)
WTAP_VERSION_MAJOR=0
@@ -272,13 +272,13 @@ PERL=perl
POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
-# command for python (cygwin's python package recommended)
-PYTHON=env python
-
-# command for native windows python (not recommended)
-#PYTHON="C:/python24/python.exe"
+# command for native windows python (recommended)
+PYTHON="C:/python24/python.exe"
# add native python to the path (not needed if cygwin's python is used)
-#PATH=c:\python24;$(PATH)
+PATH=c:\python24;$(PATH)
+
+# command for python (cygwin's python package, not recommended)
+#PYTHON=env python
# command for lex/flexx (cygwin's flex recommended)
LEX=flex