yangtse: curl-www/scratch Makefile.msvc.head,1.2,1.3
[email protected] Wed, 25 Feb 2009 13:47:28 +0000
| Newsgroups | gmane.comp.web.curl.www.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/curl/curl-www/scratch
In directory labb:/tmp/cvs-serv25308
Modified Files:
Makefile.msvc.head
Log Message:
+ Control messages shown while processing this makefile.
+ Ensure that Windows/Platform SDK is available.
+ Ensure that current subdirectory matches makefile location.
Index: Makefile.msvc.head
===================================================================
RCS file: /cvsroot/curl/curl-www/scratch/Makefile.msvc.head,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.msvc.head 24 Feb 2009 14:30:57 -0000 1.2
+++ Makefile.msvc.head 25 Feb 2009 13:47:25 -0000 1.3
@@ -25,13 +25,31 @@
# curl and libcurl MSVC makefile
# --------------------------------------------------------------------------
+# -------------------------------------------------------
+# Control messages shown while processing this makefile
+# -------------------------------------------------------
+
+MAKEFILE_VERBOSITY = 2
+
# -------------------------------
# Ensure that MSVC is available
# -------------------------------
!IF "$(MSVCDIR)" == ""
! MESSAGE Environment variable MSVCDIR not set.
-! MESSAGE Run MSVC's vcvars32.bat or vsvars32.bat to fix above condition.
+! MESSAGE Run MSVC's vcvars32.bat or vsvars32.bat to fix above condition
+! MESSAGE and properly configure other Visual Studio environment variables.
+! ERROR See previous message.
+!ENDIF
+
+# -----------------------------------------------
+# Ensure that Windows/Platform SDK is available
+# -----------------------------------------------
+
+!IF "$(MSSDK)" == ""
+! MESSAGE Environment variable MSSDK not set.
+! MESSAGE Run Windows SDK's setenv.bat or setenv.cmd to fix above condition
+! MESSAGE and properly configure other Windows SDK environment variables.
! ERROR See previous message.
!ENDIF
@@ -72,11 +90,24 @@
! ERROR See previous message.
!ENDIF
+# ------------------------------------------------------------
+# Ensure that current subdirectory matches makefile location
+# ------------------------------------------------------------
+
+!IF !EXIST("Makefile.msvc")
+! MESSAGE Makefile.msvc not found in current subdirectory.
+! MESSAGE Process Makefile.msvc from the subdirectory where it is located.
+! ERROR See previous message.
+!ENDIF
+
# --------------------------------
# Show some variables and values
# --------------------------------
-!MESSAGE ----------------------------------
-!MESSAGE CC_VERS = $(CC_VERS)
-!MESSAGE ----------------------------------
+!IF $(MAKEFILE_VERBOSITY) >= 2
+! MESSAGE ----------------------------------
+! MESSAGE CC_VERS = $(CC_VERS)
+! MESSAGE ----------------------------------
+!ENDIF
+