From a7313d3a6c1a2074ab83fa3d605cd2c5e4a99f87 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 4 Jun 2013 17:08:21 +0200 Subject: Solved compilation problems --- libX11/libX11.def | 1 + libX11/modules/im/ximcp/makefile | 2 +- libX11/src/xlibi18n/makefile | 4 ++-- libXext/src/eat.h | 4 ++++ libXinerama/src/Xinerama.c | 4 ++++ mesalib/src/mapi/glapi/gen/gen.bat | 2 +- mesalib/src/mapi/glapi/gen/gen.sh | 2 +- .../mesa/glsl_apps_compile/glsl_apps_compile.vcxproj | 5 +++++ .../glsl_apps_compile.vcxproj.filters | 15 +++++++++++++++ mesalib/windows/VC8/mesa/makefile | 11 +++++++---- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 6 ++++++ mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 18 ++++++++++++++++++ xorg-server/include/eventstr.h | 2 +- 13 files changed, 66 insertions(+), 10 deletions(-) diff --git a/libX11/libX11.def b/libX11/libX11.def index b2fd214ca..22d3eb9e2 100644 --- a/libX11/libX11.def +++ b/libX11/libX11.def @@ -14,6 +14,7 @@ EXPORTS _Xglobal_lock _Xglobal_lock_p _XInitImageFuncPtrs + _XIOError _XLockMutex_fn _XLockMutex_fn_p _XRead diff --git a/libX11/modules/im/ximcp/makefile b/libX11/modules/im/ximcp/makefile index 48ad05749..3e7997cad 100644 --- a/libX11/modules/im/ximcp/makefile +++ b/libX11/modules/im/ximcp/makefile @@ -32,5 +32,5 @@ CSRCS = \ imTransR.c \ imTrX.c -INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n +INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src diff --git a/libX11/src/xlibi18n/makefile b/libX11/src/xlibi18n/makefile index d5dfcf723..ec9b946b8 100644 --- a/libX11/src/xlibi18n/makefile +++ b/libX11/src/xlibi18n/makefile @@ -43,7 +43,7 @@ LIBRARY = libi18n #libi18n_la_LIBADD = \ # $(IM_LIBS) $(LC_LIBS) $(OM_LIBS) -INCLUDES += ..\..\include\X11 +INCLUDES += ..\..\include\X11 .. DEFINES += XLOCALELIBDIR="\".\"" LIB11_DLL CSRCS = \ @@ -76,5 +76,5 @@ CSRCS = \ utf8WMProps.c\ utf8Wrap.c\ wcWrap.c - + diff --git a/libXext/src/eat.h b/libXext/src/eat.h index 239532b6d..38d782949 100644 --- a/libXext/src/eat.h +++ b/libXext/src/eat.h @@ -29,6 +29,10 @@ #include /* for LONG64 on 64-bit platforms */ #include +#ifdef _MSC_VER +#define inline __inline +#endif + static inline void _XEatDataWords(Display *dpy, unsigned long n) { # ifndef LONG64 diff --git a/libXinerama/src/Xinerama.c b/libXinerama/src/Xinerama.c index 67a35b578..1680b9886 100644 --- a/libXinerama/src/Xinerama.c +++ b/libXinerama/src/Xinerama.c @@ -39,6 +39,10 @@ Equipment Corporation. #include /* for LONG64 on 64-bit platforms */ #include +#ifdef _MSC_VER +#define inline __inline +#endif + static inline void _XEatDataWords(Display *dpy, unsigned long n) { # ifndef LONG64 diff --git a/mesalib/src/mapi/glapi/gen/gen.bat b/mesalib/src/mapi/glapi/gen/gen.bat index 5759bacf3..aec698a80 100644 --- a/mesalib/src/mapi/glapi/gen/gen.bat +++ b/mesalib/src/mapi/glapi/gen/gen.bat @@ -22,5 +22,5 @@ glX_proto_send.py -m init_c > indirect_init.c gl_enums.py -f gl_and_es_API.xml > enums.c remap_helper.py -f gl_and_es_API.xml > remap_helper.h -copy ..\..\mapi\mapi_abi.py +copy ..\..\mapi_abi.py mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h diff --git a/mesalib/src/mapi/glapi/gen/gen.sh b/mesalib/src/mapi/glapi/gen/gen.sh index c4d8cf914..1c50f2c5c 100755 --- a/mesalib/src/mapi/glapi/gen/gen.sh +++ b/mesalib/src/mapi/glapi/gen/gen.sh @@ -21,6 +21,6 @@ ./gl_enums.py -f gl_and_es_API.xml > enums.c ./remap_helper.py -f gl_and_es_API.xml > remap_helper.h -cp ../../mapi/mapi_abi.py . +cp ../../mapi_abi.py . ./mapi_abi.py --printer glapi --mode lib gl_and_es_API.xml > glapi_mapi_tmp.h diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index f30faa3c3..84c85879c 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -90,6 +90,7 @@ + @@ -126,6 +127,7 @@ + @@ -141,11 +143,13 @@ + + @@ -160,6 +164,7 @@ + diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters index c96c9bee8..a037b606b 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters @@ -270,6 +270,21 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index 45ecd6cd7..9b19ad899 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -46,7 +46,8 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\glapitable.h \ ..\..\..\src\mesa\main\enums.c \ ..\..\..\src\mesa\main\api_exec.c \ - ..\..\..\src\mesa\main\get_hash.h + ..\..\..\src\mesa\main\get_hash.h \ + ..\..\..\src\mesa\main\remap_helper.h all: Release\swrast_dri.dll Debug\swrast_dri.dll @@ -62,11 +63,13 @@ all: Release\swrast_dri.dll Debug\swrast_dri.dll ..\..\..\src\mesa\main\api_exec.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_genexec.py cd ..\..\..\src\mapi\glapi\gen & python gl_genexec.py -f gl_and_es_API.xml > ..\..\..\mesa\main\api_exec.c -API_DEFINES=-DFEATURE_GL=1 GET_HASH_GEN = ..\..\..\src\mesa\main\get_hash_generator.py -GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, $(patsubst -DFEATURE_%=0,,$(API_DEFINES))) ..\..\..\src\mesa\main\get_hash.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml ..\..\..\src\mesa\main\get_hash_params.py $(GET_HASH_GEN) - python $(GET_HASH_GEN) $(GET_HASH_GEN_FLAGS) -f $< > $@ + python $(GET_HASH_GEN) -f $< > $@ + +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" diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 31f8742c6..f0470d3a1 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -103,6 +103,7 @@ + @@ -148,6 +149,7 @@ + @@ -163,11 +165,13 @@ + + @@ -181,6 +185,7 @@ + @@ -208,6 +213,7 @@ + diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 45950cfb5..b1cb9b736 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -728,6 +728,24 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + diff --git a/xorg-server/include/eventstr.h b/xorg-server/include/eventstr.h index 3950584d5..cce903d04 100644 --- a/xorg-server/include/eventstr.h +++ b/xorg-server/include/eventstr.h @@ -176,7 +176,7 @@ struct _DeviceChangedEvent { struct { uint32_t min; /**< Minimum value */ uint32_t max; /**< Maximum value */ - double value; /**< Current value */; + double value; /**< Current value */ /* FIXME: frac parts of min/max */ uint32_t resolution; /**< Resolution counts/m */ uint8_t mode; /**< Relative or Absolute */ -- cgit v1.2.3