diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-24 14:25:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 08:25:18 +0200 |
| commit | de54c5b749b3eefb75d420840c889533a58aa342 (patch) | |
| tree | 6502771c9dd5a0d455388734060469b18f2e4011 /mesalib/windows/VC8/mesa/makefile | |
| parent | 0606cba5be2dab08f0b4de540d7b278fa6273daf (diff) | |
| download | vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.gz vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.bz2 vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.zip | |
64-bit compilation now compiles and runs
Diffstat (limited to 'mesalib/windows/VC8/mesa/makefile')
| -rw-r--r-- | mesalib/windows/VC8/mesa/makefile | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index 9b19ad899..adef514ed 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -6,6 +6,17 @@ MHMAKESLNFILE=mesavc10.sln BUILDCMD=devenv.com $(MHMAKESLNFILE) /build
endif
+ifdef IS64
+DBGBUILDCMD=$(BUILDCMD) "Debug|x64"
+RELBUILDCMD=$(BUILDCMD) "Release|x64"
+TARGETDIR=x64
+else
+DBGBUILDCMD=$(BUILDCMD) "Debug|Win32"
+RELBUILDCMD=$(BUILDCMD) "Release|Win32"
+TARGETDIR=Win32
+endif
+
+
DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \
$(wildcard ..\..\..\src\mesa\swrast\*.h) \
$(wildcard ..\..\..\src\mesa\swrast_setup\*.c) \
@@ -49,7 +60,7 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\get_hash.h \
..\..\..\src\mesa\main\remap_helper.h
-all: Release\swrast_dri.dll Debug\swrast_dri.dll
+all: $(TARGETDIR)\Release\swrast_dri.dll $(TARGETDIR)\Debug\swrast_dri.dll
..\..\..\src\mesa\main\dispatch.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_table.py
cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml -m remap_table > ..\..\..\mesa\main\dispatch.h
@@ -71,11 +82,11 @@ REMAP_HELPER = ..\..\..\src\mapi\glapi\gen\remap_helper.py ..\..\..\src\mesa\main\remap_helper.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml $(REMAP_HELPER)
python $(REMAP_HELPER) -f $< > $@
-Debug\swrast_dri.dll: $(DEPS)
- $(BUILDCMD) "Debug|Win32"
+$(TARGETDIR)\Debug\swrast_dri.dll: $(DEPS)
+ $(DBGBUILDCMD)
-Release\swrast_dri.dll: $(DEPS)
- $(BUILDCMD) "Release|Win32"
+$(TARGETDIR)\Release\swrast_dri.dll: $(DEPS)
+ $(RELBUILDCMD)
clean: cleanthis
|