From de54c5b749b3eefb75d420840c889533a58aa342 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 24 Jul 2013 14:25:51 +0200 Subject: 64-bit compilation now compiles and runs --- mesalib/windows/VC8/mesa/makefile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'mesalib/windows/VC8/mesa/makefile') 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 -- cgit v1.2.3