Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jason Beetham
wine
Commits
2941a212
Commit
2941a212
authored
24 years ago
by
Patrik Stridvall
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Compile fix for --without-x.
parent
a4ecb41e
Loading
Loading
No related merge requests found
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Make.rules.in
+6
-3
6 additions, 3 deletions
Make.rules.in
configure
+207
-203
207 additions, 203 deletions
configure
configure.in
+6
-3
6 additions, 3 deletions
configure.in
dlls/Makefile.in
+6
-3
6 additions, 3 deletions
dlls/Makefile.in
dlls/ddraw/Makefile.in
+2
-2
2 additions, 2 deletions
dlls/ddraw/Makefile.in
with
227 additions
and
214 deletions
Make.rules.in
+
6
−
3
View file @
2941a212
...
...
@@ -84,12 +84,16 @@ LINTS = $(C_SRCS:.c=.ln)
# DLL list
X_DLLS = \
ddraw \
x11drv
DLLS = \
@X_DLLS@ \
avifil32 \
comctl32 \
comdlg32 \
dciman32 \
ddraw \
dinput \
dplayx \
dsound \
...
...
@@ -138,8 +142,7 @@ DLLS = \
winmm \
winspool.drv \
wnaspi32 \
wsock32 \
x11drv
wsock32
# Implicit rules
...
...
This diff is collapsed.
Click to expand it.
configure
+
207
−
203
View file @
2941a212
This diff is collapsed.
Click to expand it.
configure.in
+
6
−
3
View file @
2941a212
...
...
@@ -117,8 +117,10 @@ AC_CHECK_HEADERS(dlfcn.h,
LIBEXT="a"
)
AC_SUBST(XLIB)
AC_SUBST(X_SRCS)
X_SRCS=""
AC_SUBST(X_DLLS)
X_DLLS=""
AC_SUBST(XFILES)
XFILES=""
AC_SUBST(DGA_SRCS)
DGA_SRCS=""
AC_SUBST(MESA_SRCS)
...
...
@@ -247,7 +249,8 @@ then
fi
CPPFLAGS="$ac_save_CPPFLAGS"
X_SRCS='$(X_SRCS)'
X_DLLS='$(X_DLLS)'
XFILES='$(XFILES)'
else
XLIB=""
X_CFLAGS=""
...
...
This diff is collapsed.
Click to expand it.
dlls/Makefile.in
+
6
−
3
View file @
2941a212
...
...
@@ -3,12 +3,16 @@ TOPOBJDIR = ..
SRCDIR
=
@srcdir@
VPATH
=
@srcdir@
XFILES
=
\
ddraw/libddraw.@LIBEXT@
\
x11drv/libx11drv.@LIBEXT@
DLLFILES
=
\
@XFILES@
\
avifil32/libavifil32.@LIBEXT@
\
comctl32/libcomctl32.@LIBEXT@
\
commdlg/libcomdlg32.@LIBEXT@
\
dciman32/libdciman32.@LIBEXT@
\
ddraw/libddraw.@LIBEXT@
\
dinput/libdinput.@LIBEXT@
\
dplayx/libdplayx.@LIBEXT@
\
dsound/libdsound.@LIBEXT@
\
...
...
@@ -57,8 +61,7 @@ DLLFILES = \
winmm/wavemap/libmsacm.drv.@LIBEXT@
\
winmm/wineoss/libwineoss.drv.@LIBEXT@
\
winsock/libwsock32.@LIBEXT@
\
winspool/libwinspool.drv.@LIBEXT@
\
x11drv/libx11drv.@LIBEXT@
winspool/libwinspool.drv.@LIBEXT@
# extra names for dlls containing multiple spec files
EXTRADLLNAMES
=
\
...
...
This diff is collapsed.
Click to expand it.
dlls/ddraw/Makefile.in
+
2
−
2
View file @
2941a212
...
...
@@ -26,7 +26,7 @@ DGA_SRCS = \
dsurface/dga.c
\
dga.c
X
_SRC
S
=
\
X
FILE
S
=
\
@DGA_SRCS@
\
@MESA_SRCS@
\
ddraw/x11.c
\
...
...
@@ -35,7 +35,7 @@ X_SRCS = \
x11.c
C_SRCS
=
\
@X
_SRC
S@
\
@X
FILE
S@
\
convert.c
\
d3ddevice/main.c
\
dclipper/main.c
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment