diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-24 08:30:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-24 08:30:41 +0000 |
| commit | 8b9c08bcad5fb49daa0348468a25b37793dfe1b9 (patch) | |
| tree | 27f518e6aa27ce27d1d2afb7f439f1905df70850 | |
| parent | 2b82d3a5e4cdf2b9af7c0ff65c713a792109bb91 (diff) | |
| download | vcxsrv-8b9c08bcad5fb49daa0348468a25b37793dfe1b9.tar.gz vcxsrv-8b9c08bcad5fb49daa0348468a25b37793dfe1b9.tar.bz2 vcxsrv-8b9c08bcad5fb49daa0348468a25b37793dfe1b9.zip | |
Use vcbuild also on non-express versions of Visual Studio.
| -rw-r--r-- | mesalib/windows/VC8/mesa/makefile | 17 | ||||
| -rw-r--r-- | tools/mhmake/makefile | 17 |
2 files changed, 4 insertions, 30 deletions
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index e13883d83..34265e497 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -2,24 +2,11 @@ SLNFILE=mesa.sln all: Release\swrast_dri.dll Debug\swrast_dri.dll
-ifneq $(which devenv.com),
-VCSTUDIO_DBG=devenv.com $(SLNFILE) /build Debug
-VCSTUDIO_REL=devenv.com $(SLNFILE) /build Release
-endif
-ifneq $(which vcbuild.exe),
-VCSTUDIO_DBG=vcbuild $(SLNFILE) "Debug|Win32"
-VCSTUDIO_REL=vcbuild $(SLNFILE) "Release|Win32"
-endif
-
-ifndef VCSTUDIO_DBG
-$(error Environment not set correctly for building Visual Studio projects)
-endif
-
Debug\swrast_dri.dll:
- $(VCSTUDIO_DBG)
+ vcbuild $(SLNFILE) "Debug|Win32"
Release\swrast_dri.dll:
- $(VCSTUDIO_REL)
+ vcbuild $(SLNFILE) "Release|Win32"
clean: cleanthis
diff --git a/tools/mhmake/makefile b/tools/mhmake/makefile index 425f9d843..6b8f7c8cb 100644 --- a/tools/mhmake/makefile +++ b/tools/mhmake/makefile @@ -6,24 +6,11 @@ all: debug\mhmake_dbg.exe release\mhmake.exe DEPS=$(wildcard src\*)
-ifneq $(which devenv.com),
-VCSTUDIO_DBG=devenv.com $(MHMAKESLNFILE) /build Debug
-VCSTUDIO_REL=devenv.com $(MHMAKESLNFILE) /build Release
-endif
-ifneq $(which vcbuild.exe),
-VCSTUDIO_DBG=vcbuild $(MHMAKESLNFILE) "Debug|Win32"
-VCSTUDIO_REL=vcbuild $(MHMAKESLNFILE) "Release|Win32"
-endif
-
-ifndef VCSTUDIO_DBG
-$(error Environment not set correctly for building Visual Studio projects)
-endif
-
debug\mhmake_dbg.exe: $(DEPS)
- $(VCSTUDIO_DBG)
+ vcbuild $(MHMAKESLNFILE) "Debug|Win32"
release\mhmake.exe: $(DEPS)
- $(VCSTUDIO_REL)
+ vcbuild $(MHMAKESLNFILE) "Release|Win32"
clean: cleanthis
|