diff --git a/contrib/sdk/sources/Mesa/mesa-9.2.5/Makefile b/contrib/sdk/sources/Mesa/mesa-9.2.5/Makefile index 1d894fb5fe..7605c5f3c1 100644 --- a/contrib/sdk/sources/Mesa/mesa-9.2.5/Makefile +++ b/contrib/sdk/sources/Mesa/mesa-9.2.5/Makefile @@ -5,6 +5,7 @@ export LD = kos32-ld export STRIP = kos32-strip export SDK_DIR:= $(abspath ../../..) +export INSTALLDIR:= /home/autobuild/tools/win32/lib EGL = egl @@ -12,20 +13,18 @@ CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os CFLAGS_OPT+= -fomit-frame-pointer -fno-ident -mno-ms-bitfields CFLAGS = -c $(CFLAGS_OPT) -LDFLAGS = -nostdlib -shared -s --image-base 0 -T ../../newlib/dll.lds -e _DllStartup +LDFLAGS = -shared -s --image-base 0 -T dll.lds -e _DllStartup LDFLAGS+= --out-implib lib$(EGL).dll.a INC_MESA= -I../../newlib/libc/include -I./include -I./src -I./src/glsl -I./src/mesa -I./src/mapi INC_EGL= -I../../newlib/libc/include -I../../../includes -I./include -I../../libdrm -I../../libdrm/include/drm -I./src/egl/main -I./src/gbm/backends/dri -I./src/gbm/main -LIBPATH:= -L../../../lib -L/home/autobuild/tools/win32/mingw32/lib - -LIBS:= -ldll -ldrm.dll -lc.dll -lgcc +LIBS:= -ldll -ldrm.dll -lgcc -lc.dll MESA_DEFS= -DMESA_DLL -DBUILD_GL32 -DMAPI_MODE_UTIL -DMAPI_TABLE_NUM_STATIC=87 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -DMAPI_TABLE_NUM_DYNAMIC=256 MESA_DEFS+= -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_VERSION=\"9.2.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\" MESA_DEFS+= -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa\" -DVERSION=\"9.2.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -MESA_DEFS+= -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 +MESA_DEFS+= -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -D_GNU_SOURCE EGL_DEFS = -DHAVE_DRM_PLATFORM -D__unix__ -DMESA_EGL_NO_X11_HEADERS -D_EGL_BUILT_IN_DRIVER_DRI2 @@ -44,18 +43,18 @@ $(EGL).dll: $(EGL_OBJS) Makefile # $(STRIP) $@ # sed -e "s/ @[^ ]*//" egl1.def > egl.def mv -f $@ ../../../bin - mv -f lib$(EGL).dll.a ../../../lib + mv -f lib$(EGL).dll.a $(INSTALLDIR) libglsl.a : $(GLSL_OBJS) Makefile $(AR) libglsl.a $(GLSL_OBJS) - mv -f libglsl.a ../../../lib + mv -f libglsl.a $(INSTALLDIR) libGL.dll: $(LIBGL_OBJS) Makefile $(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(LIBGL_OBJS) $(LIBS) # $(STRIP) $@ # sed -e "s/ @[^ ]*//" egl1.def > egl.def mv -f $@ ../../bin - mv -f libGL.dll.a ../../../lib + mv -f libGL.dll.a $(INSTALLDIR) src/glsl/glcpp/%.o : src/glsl/glcpp/%.c Makefile $(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) -o $@ $< diff --git a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/egl/Makefile b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/egl/Makefile index 35f2533402..dceb9fe212 100644 --- a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/egl/Makefile +++ b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/egl/Makefile @@ -6,15 +6,13 @@ CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os CFLAGS_OPT+= -fomit-frame-pointer -fno-ident -mno-ms-bitfields CFLAGS = -c $(CFLAGS_OPT) -LDFLAGS = -nostdlib -shared -s --image-base 0 -T $(SRC_DIR)/newlib/dll.lds --out-implib libegl.dll.a -e _DllStartup +LDFLAGS = -shared -s --image-base 0 -T dll.lds --out-implib libegl.dll.a -e _DllStartup INC_EGL:= -I$(SRC_DIR)/newlib/libc/include -I$(SDK_DIR)/includes -I$(SRC_DIR)/Mesa/mesa-9.2.5/include INC_EGL+= -I$(SRC_DIR)/libdrm -I$(SRC_DIR)/libdrm/include/drm -I./main -I./wayland INC_EGL+= -I$(MESA_SRC)/gbm/backends/dri -I$(MESA_SRC)/gbm/main -LIBPATH:= -L$(SDK_DIR)/lib -L/home/autobuild/tools/win32/mingw32/lib - -LIBS:= -ldll -ldrm.dll -lc.dll -lgcc +LIBS:= -ldll -ldrm.dll -lgcc -lc.dll MESA_DEFS= -DMESA_DLL -DBUILD_GL32 -DMAPI_MODE_UTIL -DMAPI_TABLE_NUM_STATIC=87 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -DMAPI_TABLE_NUM_DYNAMIC=256 MESA_DEFS+= -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_VERSION=\"9.2.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\" @@ -57,11 +55,11 @@ EGL_OBJS = $(patsubst %.c, %.o, $(EGL_SRC)) all: libegl.dll libegl.dll: $(EGL_OBJS) Makefile - $(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(MESA_SRC)/../egl.def $(EGL_OBJS) $(LIBS) + $(LD) $(LDFLAGS) -o $@ $(MESA_SRC)/../egl.def $(EGL_OBJS) $(LIBS) # $(STRIP) $@ # sed -e "s/ @[^ ]*//" egl1.def > egl.def mv -f $@ $(SDK_DIR)/bin - mv -f libegl.dll.a $(SDK_DIR)/lib + mv -f libegl.dll.a $(INSTALLDIR) %.o : %.c Makefile $(CC) $(CFLAGS) $(MESA_DEFS) $(EGL_DEFS) $(INC_EGL) -o $@ $< diff --git a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/gallium/Makefile b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/gallium/Makefile index 5e6386cb6d..f526a14fea 100644 --- a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/gallium/Makefile +++ b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/gallium/Makefile @@ -6,7 +6,7 @@ CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os CFLAGS_OPT+= -fomit-frame-pointer -fno-ident -msse2 -mno-ms-bitfields CFLAGS = -c $(CFLAGS_OPT) -LDFLAGS = -nostdlib -shared -s --image-base 0 -T $(SRC_DIR)/newlib/dll.lds -e _DllStartup +LDFLAGS = -shared -s --image-base 0 -T dll.lds -e _DllStartup INC_MESA:= -I$(SRC_DIR)/newlib/libc/include -I$(SRC_DIR)/Mesa/mesa-9.2.5/include -I$(MESA_SRC)/mesa INC_MESA+= -I$(MESA_SRC)/gallium/include -I$(MESA_SRC)/gallium/auxiliary @@ -15,9 +15,7 @@ INC_MESA+= -I$(MESA_SRC)/gallium/state_trackers/gbm -I$(MESA_SRC)/gbm/main INC_MESA+= -I$(SRC_DIR)/libdrm INC_I965:= -I$(SRC_DIR)/libdrm/intel -I$(SRC_DIR)/libdrm/include/drm -LIBPATH:= -L$(SDK_DIR)/lib -L/home/autobuild/tools/win32/mingw32/lib - -LIBS:= -ldll -lgallium -lc.dll -lgcc +LIBS:= -ldll -lgallium -lgcc -lc.dll MESA_DEFS= -DMESA_DLL -DBUILD_GL32 -DMAPI_MODE_UTIL -DMAPI_TABLE_NUM_STATIC=87 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -DMAPI_TABLE_NUM_DYNAMIC=256 MESA_DEFS+= -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_VERSION=\"9.2.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\" @@ -178,19 +176,19 @@ all: libgallium.a gbm_gallium_drm.dll libgallium.a: $(GALLIUM_OBJS) Makefile $(AR) crs $@ $(GALLIUM_OBJS) - mv -f $@ $(SDK_DIR)/lib + mv -f $@ $(INSTALLDIR) gbm_gallium_drm.dll: libgallium.a $(GBM_OBJS) Makefile - $(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(GBM_OBJS) gbm.def $(LIBS) + $(LD) $(LDFLAGS) -o $@ $(GBM_OBJS) gbm.def $(LIBS) mv -f $@ $(SDK_DIR)/bin i965_dri.drv: $(I965_OBJS) $(MESA_OBJS) dri.def Makefile - $(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(I965_OBJS) $(MESA_OBJS) dri.def $(LIBS) + $(LD) $(LDFLAGS) -o $@ $(I965_OBJS) $(MESA_OBJS) dri.def $(LIBS) mv -f $@ $(SDK_DIR)/bin osmesa.dll: $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def Makefile - $(LD) $(LDFLAGS) $(LIBPATH) --out-implib libosmesa.dll.a -o $@ $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def $(LIBS) - mv -f libosmesa.dll.a $(SDK_DIR)/lib + $(LD) $(LDFLAGS) --out-implib libosmesa.dll.a -o $@ $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def $(LIBS) + mv -f libosmesa.dll.a $(INSTALLDIR) mv -f $@ $(SDK_DIR)/bin %.o : %.c Makefile diff --git a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/glsl/Makefile b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/glsl/Makefile index 56a3b99dc4..14dd918928 100644 --- a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/glsl/Makefile +++ b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/glsl/Makefile @@ -114,7 +114,7 @@ all: libglsl.a libglsl.a : $(GLSL_OBJS) Makefile $(AR) crs libglsl.a $(GLSL_OBJS) - mv -f libglsl.a $(SDK_DIR)/lib + mv -f libglsl.a $(INSTALLDIR) %.o : %.c Makefile $(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) -o $@ $< diff --git a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mapi/Makefile b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mapi/Makefile index 9d9f6223dc..d2b901fb4f 100644 --- a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mapi/Makefile +++ b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mapi/Makefile @@ -6,15 +6,12 @@ CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os CFLAGS_OPT+= -fomit-frame-pointer -fno-ident -mno-ms-bitfields CFLAGS = -c $(CFLAGS_OPT) -LDFLAGS = -nostdlib -shared -s --image-base 0 -T $(SRC_DIR)/newlib/dll.lds --out-implib libGL.dll.a -e _DllStartup +LDFLAGS = -shared -s --image-base 0 -T dll.lds --out-implib libGL.dll.a -e _DllStartup INC_MESA:= -I$(SRC_DIR)/newlib/libc/include -I$(SRC_DIR)/Mesa/mesa-9.2.5/include INC_MESA+= -I./src -I$(MESA_SRC)/glsl -I$(MESA_SRC)/mesa -I$(MESA_SRC)/mapi - -LIBPATH:= -L$(SDK_DIR)/lib -L/home/autobuild/tools/win32/mingw32/lib - -LIBS:= -ldll -ldrm.dll -lc.dll -lgcc +LIBS:= -ldll -ldrm.dll -lgcc -lc.dll MESA_DEFS= -DMESA_DLL -DBUILD_GL32 -DMAPI_MODE_UTIL -DMAPI_TABLE_NUM_STATIC=87 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -DMAPI_TABLE_NUM_DYNAMIC=256 MESA_DEFS+= -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_VERSION=\"9.2.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\" @@ -40,10 +37,10 @@ LIBGL_OBJS = $(patsubst %.c, %.o, $(patsubst %.S, %.o, $(LIBGL_SRC))) all: libGL.dll libGL.dll: $(LIBGL_OBJS) Makefile - $(LD) $(LDFLAGS) $(LIBPATH) -o $@ mesa.def $(LIBGL_OBJS) $(LIBS) + $(LD) $(LDFLAGS) -o $@ mesa.def $(LIBGL_OBJS) $(LIBS) # $(STRIP) $@ mv -f $@ $(SDK_DIR)/bin - mv -f libGL.dll.a $(SDK_DIR)/lib + mv -f libGL.dll.a $(INSTALLDIR) %.o : %.c Makefile $(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) -o $@ $< diff --git a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/Makefile b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/Makefile index e5c441bc4e..6e76ddbeae 100644 --- a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/Makefile +++ b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/Makefile @@ -6,16 +6,14 @@ CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os CFLAGS_OPT+= -fomit-frame-pointer -fno-ident -mno-ms-bitfields CFLAGS = -c $(CFLAGS_OPT) -LDFLAGS = -nostdlib -shared -s --image-base 0 -T $(SRC_DIR)/newlib/dll.lds -e _DllStartup +LDFLAGS = -shared -s --image-base 0 -T dll.lds -e _DllStartup INC_MESA:= -I$(SRC_DIR)/newlib/libc/include -I$(SRC_DIR)/Mesa/mesa-9.2.5/include INC_MESA+= -I./ -I$(MESA_SRC)/glsl -I$(MESA_SRC)/mesa -I$(MESA_SRC)/mapi INC_MESA+= -I$(SRC_DIR)/libdrm -I$(MESA_SRC) -I$(SRC_DIR)/expat/lib INC_I965:= -I$(SRC_DIR)/libdrm/intel -I$(SRC_DIR)/libdrm/include/drm -I$(MESA_SRC)/mesa/drivers/dri/common -LIBPATH:= -L$(SDK_DIR)/lib -L/home/autobuild/tools/win32/mingw32/lib - -LIBS:= -ldll -lglsl -lGL.dll -lsupc++ -lgcc_eh -ldrm.dll -lexpat -lc.dll -lgcc +LIBS:= -ldll -lglsl -lGL.dll -lsupc++ -ldrm.dll -lexpat -lgcc -lc.dll MESA_DEFS= -DMESA_DLL -DBUILD_GL32 -DMAPI_MODE_UTIL -DMAPI_TABLE_NUM_STATIC=87 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -DMAPI_TABLE_NUM_DYNAMIC=256 MESA_DEFS+= -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_VERSION=\"9.2.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\" @@ -436,8 +434,8 @@ i915_dri.drv: $(I915_OBJS) $(MESA_OBJS) dri.def Makefile mv -f $@ $(SDK_DIR)/bin osmesa.dll: $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def Makefile - $(LD) $(LDFLAGS) $(LIBPATH) --out-implib libosmesa.dll.a -o $@ $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def $(LIBS) - mv -f libosmesa.dll.a $(SDK_DIR)/lib + $(LD) $(LDFLAGS) --out-implib libosmesa.dll.a -o $@ $(MESA_OBJS) $(OSMESA_OBJS) osmesa.def $(LIBS) + mv -f libosmesa.dll.a $(INSTALLDIR) mv -f $@ $(SDK_DIR)/bin %.o : %.c Makefile diff --git a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/drivers/dri/common/dri_util.c b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/drivers/dri/common/dri_util.c index 98d7c77eed..581ee74760 100644 --- a/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/drivers/dri/common/dri_util.c +++ b/contrib/sdk/sources/Mesa/mesa-9.2.5/src/mesa/drivers/dri/common/dri_util.c @@ -52,7 +52,7 @@ PUBLIC const char __dri2ConfigOptions[] = DRI_CONF_SECTION_END DRI_CONF_END; -static const uint __dri2NConfigOptions = 1; +static const int __dri2NConfigOptions = 1; /*****************************************************************/ /** \name Screen handling functions */