diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
| commit | 46d4f558531910ca1f3297da85b99334d6de2921 (patch) | |
| tree | 60c37077eb160948fe317a17ec4c19bef679aa35 /mesalib/configs | |
| parent | 0bf6df93b9fdbb7902bf1014d605c6876a3ad035 (diff) | |
| parent | c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (diff) | |
| download | vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.gz vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.bz2 vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
Diffstat (limited to 'mesalib/configs')
| -rw-r--r-- | mesalib/configs/aix-64-static | 2 | ||||
| -rw-r--r-- | mesalib/configs/aix-static | 3 | ||||
| -rw-r--r-- | mesalib/configs/linux-osmesa-static | 1 | ||||
| -rw-r--r-- | mesalib/configs/linux-x86-64-static | 3 | ||||
| -rw-r--r-- | mesalib/configs/linux-x86-static | 2 |
5 files changed, 0 insertions, 11 deletions
diff --git a/mesalib/configs/aix-64-static b/mesalib/configs/aix-64-static index b9c878bb8..de92daf00 100644 --- a/mesalib/configs/aix-64-static +++ b/mesalib/configs/aix-64-static @@ -19,5 +19,3 @@ GLU_LIB_NAME = libGLU.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a - -lX11 -lXext -lXmu -lXi -lm -lpthread -lC - diff --git a/mesalib/configs/aix-static b/mesalib/configs/aix-static index 0068ba413..5c36cb053 100644 --- a/mesalib/configs/aix-static +++ b/mesalib/configs/aix-static @@ -18,6 +18,3 @@ GLU_LIB_NAME = libGLU.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a - -lX11 -lXext -lXmu -lXi -lm -lpthread -lC - - diff --git a/mesalib/configs/linux-osmesa-static b/mesalib/configs/linux-osmesa-static index 00154900a..4bb15bc54 100644 --- a/mesalib/configs/linux-osmesa-static +++ b/mesalib/configs/linux-osmesa-static @@ -30,4 +30,3 @@ GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLW_LIB_DEPS = - $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm diff --git a/mesalib/configs/linux-x86-64-static b/mesalib/configs/linux-x86-64-static index dfb136f92..a066743b5 100644 --- a/mesalib/configs/linux-x86-64-static +++ b/mesalib/configs/linux-x86-64-static @@ -19,6 +19,3 @@ OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLW_LIB_DEPS = -# Need to specify all libraries we may need - -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group \ - $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread -lstdc++ -lm diff --git a/mesalib/configs/linux-x86-static b/mesalib/configs/linux-x86-static index 19151d203..255a5dd5e 100644 --- a/mesalib/configs/linux-x86-static +++ b/mesalib/configs/linux-x86-static @@ -19,5 +19,3 @@ OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLW_LIB_DEPS = -# Need to specify all libraries we may need - -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread -lstdc++ -lm |