diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-03-11 16:13:17 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-03-11 16:13:17 +0000 |
| commit | 0d446ae826ff8d8ff827d770726aecf8dd187b15 (patch) | |
| tree | 5a2991c257f5123060bdabd72b2291c0590ea628 /config.nmake | |
| parent | 7bff5bf554e68bedc1f63e8828b070b75ee04e53 (diff) | |
Use WIRESHARK_TARGET_PLATFORM instead of PLATFORM.
svn path=/trunk/; revision=27701
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake index 4f2e8a7afc..34ab91195e 100644 --- a/config.nmake +++ b/config.nmake @@ -6,8 +6,8 @@ ##### Target platform ##### # Only "win32" and "win64" are valid (for now). # This can be defined in the system environment. -!IFNDEF PLATFORM -PLATFORM=win32 +!IFNDEF WIRESHARK_TARGET_PLATFORM +WIRESHARK_TARGET_PLATFORM=win32 !ENDIF ##### Versions ##### @@ -35,7 +35,7 @@ WTAP_VERSION_MICRO=1 # Base directory, where your libraries reside, which are needed to # compile the sources. This setting is used only inside this file. # -WIRESHARK_LIBS=C:\wireshark-$(PLATFORM)-libs +WIRESHARK_LIBS=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs # # Base directory, where your programs reside. @@ -55,14 +55,14 @@ TOOLS_DIR=tools # TARGET_MACHINE (Used for link /MACHINE) should be one of "X86" or "X64" # (sorry ARM, Alpha, MIPS, and Itanium fans). # CPU (Used by win32.mak) should be one of "i386" or "AMD64". -!if "$(PLATFORM)" == "win32" +!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" TARGET_MACHINE=X86 CPU=i386 -!else if "$(PLATFORM)" == "win64" +!else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64" TARGET_MACHINE=X64 CPU=AMD64 !else -!ERROR Your mysterious moon-man architecture "$(PLATFORM)" frightens and confuses us. +!error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us. !endif @@ -127,7 +127,7 @@ MSVC_VARIANT=MSVC2008 NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe -!if "$(PLATFORM)" == "win32" +!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" ##### Win32 Libraries ##### # # Mandatory: GLib settings |