osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

vcredist_*.exe is, AFAICT, still optional yet config.nmake always defines the 

variable for it.  Since it's always defined but it's optional, don't check
for its existence.

svn path=/trunk/; revision=46022
This commit is contained in:
Jeff Morriss 2012-11-13 15:01:49 +00:00
parent 7d39afa6f8
commit 83845c0048
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.nmake
View File

@ -1042,10 +1042,12 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHI
!ERROR MSVC_VARIANT unknown
!ENDIF
!IF DEFINED(VCREDIST_EXE) && ! EXIST("$(VCREDIST_EXE)")
!ERROR Can't find $(VCREDIST_EXE). Have you downloaded it from Microsoft? \
See the developer's guide section "C-Runtime "Redistributable" files" for details how to get it
!ENDIF
# This is still optional yet we define it above for all users.
# So, don't check if it exists...
#!IF DEFINED(VCREDIST_EXE) && ! EXIST("$(VCREDIST_EXE)")
#!ERROR Can't find $(VCREDIST_EXE). Have you downloaded it from Microsoft? \
#See the developer's guide section "C-Runtime "Redistributable" files" for details how to get it
#!ENDIF
##### Advanced: Docbook/XML documentation generation #####
# If you want to generate the Docbook/XML based docs (User's and Developer's