diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-29 08:51:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-29 08:51:20 +0200 |
| commit | 01df5d59e56a1b060568f8cad2e89f7eea22fc70 (patch) | |
| tree | 9db83037fd85d0974b60fc1a05e0665083f26000 /mesalib/src/mesa/Makefile.mgw | |
| parent | fd1f4d9fe3ea67fa6def8ee4927a8f71e0440f12 (diff) | |
| download | vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.tar.gz vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.tar.bz2 vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.zip | |
xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29
aug 2011
Diffstat (limited to 'mesalib/src/mesa/Makefile.mgw')
| -rw-r--r-- | mesalib/src/mesa/Makefile.mgw | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/mesalib/src/mesa/Makefile.mgw b/mesalib/src/mesa/Makefile.mgw index fc0ff28d6..23ceaca01 100644 --- a/mesalib/src/mesa/Makefile.mgw +++ b/mesalib/src/mesa/Makefile.mgw @@ -50,9 +50,6 @@ # As a consequence, you'll need the Win32 Glide3 # library to build any application. # default = no -# ICD=1 build the installable client driver interface -# (windows opengl driver interface) -# default = no # X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow). # default = no # @@ -69,11 +66,7 @@ # Set this to the prefix of your build tools, i.e. mingw32- TOOLS_PREFIX = mingw32- -ifeq ($(ICD),1) - LIB_NAME = mesa32 -else - LIB_NAME = opengl32 -endif +LIB_NAME = opengl32 DLL_EXT = .dll IMP_EXT = .a @@ -106,12 +99,7 @@ ifeq ($(FX),1) GL_DEF = drivers/windows/fx/fxopengl.def GL_RES = drivers/windows/fx/fx.rc else - ifeq ($(ICD),1) - CFLAGS += -DUSE_MGL_NAMESPACE - GL_DEF = drivers/windows/icd/mesa.def - else - GL_DEF = $(LIB_NAME).def - endif + GL_DEF = $(LIB_NAME).def endif @@ -143,16 +131,10 @@ DRIVER_SOURCES = \ $(GLIDE_DRIVER_SOURCES) \ drivers/windows/fx/fxwgl.c else -ifeq ($(ICD),1) -DRIVER_SOURCES = \ - drivers/windows/gdi/wmesa.c \ - drivers/windows/icd/icd.c -else DRIVER_SOURCES = \ drivers/windows/gdi/wmesa.c \ drivers/windows/gdi/wgl.c endif -endif SOURCES = $(MESA_SOURCES) $(GLAPI_SOURCES) $(X86_SOURCES) $(DRIVER_SOURCES) |