diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-05 12:17:40 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-05 19:54:26 +0000 |
| commit | eb21b1f8002973a4d152564bb81cafeb16ad84d8 (patch) | |
| tree | b0bf151f487dce0036b896c53d861409d5b894ae /config.nmake | |
| parent | d52322efb3ab782871312950876803334ec018b9 (diff) | |
| download | wireshark-eb21b1f8002973a4d152564bb81cafeb16ad84d8.tar.gz wireshark-eb21b1f8002973a4d152564bb81cafeb16ad84d8.tar.bz2 wireshark-eb21b1f8002973a4d152564bb81cafeb16ad84d8.zip | |
Initialize master-2.0.v2.0.0rc0
There is a checklist for all of this. It is sizeable.
Change-Id: Ib538ac32a2764753a3f339c8466cac077c470166
Signed-off-by: Gerald Combs <gerald@wireshark.org>
Reviewed-on: https://code.wireshark.org/review/10808
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index 0233a71db6..5061f09eff 100644 --- a/config.nmake +++ b/config.nmake @@ -33,9 +33,9 @@ VCS_REVISION=0 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl -VERSION_MAJOR=1 -VERSION_MINOR=99 -VERSION_MICRO=10 +VERSION_MAJOR=2 +VERSION_MINOR=0 +VERSION_MICRO=0 VERSION_BUILD=$(VCS_REVISION) # Local build information. Recommended: Unique string for your @@ -65,9 +65,9 @@ WTAP_VERSION_MICRO=0 # !IFNDEF WIRESHARK_LIB_DIR !IFDEF WIRESHARK_BASE_DIR -WIRESHARK_LIB_DIR=$(WIRESHARK_BASE_DIR)\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs +WIRESHARK_LIB_DIR=$(WIRESHARK_BASE_DIR)\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs-2.0 !ELSE -WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs +WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs-2.0 !ENDIF !ENDIF @@ -1112,7 +1112,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX- STANDARD_CFLAGS=/DWINPCAP_VERSION=$(WINPCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS) #Comment out the following if warnings are not to be treated as errors -WARNINGS_ARE_ERRORS=-WX +#WARNINGS_ARE_ERRORS=-WX # Linker flags: # /DEBUG generate debug info |