diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-23 17:49:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-23 17:49:53 +0000 |
| commit | 71a8c2cacbc0e9c9b6bb0778a1ffd8dc417be20f (patch) | |
| tree | f547ef931ab38987d2bec71094a4b19599502205 | |
| parent | 367ec8361fffdd7d82ed9e497bab0c0d433bb5aa (diff) | |
| download | vcxsrv-71a8c2cacbc0e9c9b6bb0778a1ffd8dc417be20f.tar.gz vcxsrv-71a8c2cacbc0e9c9b6bb0778a1ffd8dc417be20f.tar.bz2 vcxsrv-71a8c2cacbc0e9c9b6bb0778a1ffd8dc417be20f.zip | |
vcexpress: use vcbuild to do the build from mhmake
| -rw-r--r-- | mesalib/windows/VC8/mesa/makefile | 14 | ||||
| -rw-r--r-- | tools/mhmake/makefile | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index fefdf3d5c..e13883d83 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -3,21 +3,23 @@ SLNFILE=mesa.sln all: Release\swrast_dri.dll Debug\swrast_dri.dll
ifneq $(which devenv.com),
-VCSTUDIO=devenv.com
+VCSTUDIO_DBG=devenv.com $(SLNFILE) /build Debug
+VCSTUDIO_REL=devenv.com $(SLNFILE) /build Release
endif
-ifneq $(which vcexpress.exe),
-VCSTUDIO=vcexpress
+ifneq $(which vcbuild.exe),
+VCSTUDIO_DBG=vcbuild $(SLNFILE) "Debug|Win32"
+VCSTUDIO_REL=vcbuild $(SLNFILE) "Release|Win32"
endif
-ifndef VCSTUDIO
+ifndef VCSTUDIO_DBG
$(error Environment not set correctly for building Visual Studio projects)
endif
Debug\swrast_dri.dll:
- $(VCSTUDIO) $(SLNFILE) /build Debug
+ $(VCSTUDIO_DBG)
Release\swrast_dri.dll:
- $(VCSTUDIO) $(SLNFILE) /build Release
+ $(VCSTUDIO_REL)
clean: cleanthis
diff --git a/tools/mhmake/makefile b/tools/mhmake/makefile index 504f9af76..425f9d843 100644 --- a/tools/mhmake/makefile +++ b/tools/mhmake/makefile @@ -7,21 +7,23 @@ all: debug\mhmake_dbg.exe release\mhmake.exe DEPS=$(wildcard src\*)
ifneq $(which devenv.com),
-VCSTUDIO=devenv.com
+VCSTUDIO_DBG=devenv.com $(MHMAKESLNFILE) /build Debug
+VCSTUDIO_REL=devenv.com $(MHMAKESLNFILE) /build Release
endif
-ifneq $(which vcexpress.exe),
-VCSTUDIO=vcexpress
+ifneq $(which vcbuild.exe),
+VCSTUDIO_DBG=vcbuild $(MHMAKESLNFILE) "Debug|Win32"
+VCSTUDIO_REL=vcbuild $(MHMAKESLNFILE) "Release|Win32"
endif
-ifndef VCSTUDIO
+ifndef VCSTUDIO_DBG
$(error Environment not set correctly for building Visual Studio projects)
endif
debug\mhmake_dbg.exe: $(DEPS)
- $(VCSTUDIO) $(MHMAKESLNFILE) /build Debug
+ $(VCSTUDIO_DBG)
release\mhmake.exe: $(DEPS)
- $(VCSTUDIO) $(MHMAKESLNFILE) /build Release
+ $(VCSTUDIO_REL)
clean: cleanthis
|