Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
bb50d6fd
Commit
bb50d6fd
authored
Sep 04, 2013
by
Rafał Mużyło
Committed by
Alexandre Julliard
Sep 05, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Don't use X_PRE_LIBS.
parent
74b191a6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
configure
configure
+2
-2
configure.ac
configure.ac
+2
-2
Makefile.in
dlls/glu32/Makefile.in
+1
-1
Makefile.in
dlls/winex11.drv/Makefile.in
+1
-1
No files found.
configure
View file @
bb50d6fd
...
...
@@ -9308,7 +9308,7 @@ if ${ac_cv_lib_GLU_gluLookAt+:} false; then :
$as_echo_n
"(cached) "
>
&6
else
ac_check_lib_save_LIBS
=
$LIBS
LIBS
=
"-lGLU
$OPENGL_LIBS
$X_LIBS
$X
_PRE_LIBS
$X
LIB
-lm
$X_EXTRA_LIBS
$LIBS
"
LIBS
=
"-lGLU
$OPENGL_LIBS
$X_LIBS
$XLIB
-lm
$X_EXTRA_LIBS
$LIBS
"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
...
...
@@ -9360,7 +9360,7 @@ if ${ac_cv_lib_soname_OSMesa+:} false; then :
$as_echo_n
"(cached) "
>
&6
else
ac_check_soname_save_LIBS
=
$LIBS
LIBS
=
"-lOSMesa
$X_LIBS
$X
_PRE_LIBS
$X
LIB
-lm
$X_EXTRA_LIBS
$LIBS
"
LIBS
=
"-lOSMesa
$X_LIBS
$XLIB
-lm
$X_EXTRA_LIBS
$LIBS
"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
...
...
configure.ac
View file @
bb50d6fd
...
...
@@ -1206,14 +1206,14 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
$X_LIBS $XLIB -lm $X_EXTRA_LIBS)
if test "x$with_glu" != "xno"
then
AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $X
_PRE_LIBS $X
LIB -lm $X_EXTRA_LIBS])
AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $XLIB -lm $X_EXTRA_LIBS])
WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_GLU_gluLookAt" != xyes],
[libGLU ${notice_platform}development files not found, GLU won't be supported.])
fi
if test "x$with_osmesa" != "xno"
then
WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X
_PRE_LIBS $X
LIB -lm $X_EXTRA_LIBS])
WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
[libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
fi
...
...
dlls/glu32/Makefile.in
View file @
bb50d6fd
MODULE
=
glu32.dll
IMPORTLIB
=
glu32
EXTRAINCL
=
@X_CFLAGS@
EXTRALIBS
=
-lGLU
@OPENGL_LIBS@ @X_LIBS@ @X
_PRE_LIBS@ @X
LIB@ @X_EXTRA_LIBS@
EXTRALIBS
=
-lGLU
@OPENGL_LIBS@ @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@
C_SRCS
=
\
glu.c
...
...
dlls/winex11.drv/Makefile.in
View file @
bb50d6fd
...
...
@@ -2,7 +2,7 @@ MODULE = winex11.drv
IMPORTS
=
uuid user32 gdi32 advapi32
DELAYIMPORTS
=
comctl32 ole32 shell32 imm32
EXTRAINCL
=
@X_CFLAGS@
EXTRALIBS
=
@X_LIBS@ @X
_PRE_LIBS@ @X
LIB@ @X_EXTRA_LIBS@
EXTRALIBS
=
@X_LIBS@ @XLIB@ @X_EXTRA_LIBS@
C_SRCS
=
\
bitblt.c
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment