build: avoid Unix file on MinGW
Dimitrie O. Paun
dpaun at rogers.com
Fri Feb 27 08:19:08 CST 2004
BTW, why do we need the {GLU32,GLUT32,OPENGL}FILES cases?
Should those just be listed under X files? And shouldn't
we just build those, and dload() the Unix libs at run time?
ChangeLog
Avoid building Unix dependant files on MinGW.
Index: configure.ac
===================================================================
RCS file: /var/cvs/wine/configure.ac,v
retrieving revision 1.243
diff -u -r1.243 configure.ac
--- configure.ac 24 Feb 2004 01:24:20 -0000 1.243
+++ configure.ac 27 Feb 2004 13:40:31 -0000
@@ -169,6 +169,8 @@
GLU32FILES=""
AC_SUBST(OPENGL_LIBS)
OPENGL_LIBS=""
+AC_SUBST(UNIXFILES)
+UNIXFILES=""
if test "$have_x" = "yes"
then
XLIB="-lXext -lX11"
@@ -365,6 +367,26 @@
XLIB=""
X_CFLAGS=""
X_LIBS=""
+fi
+
+only_windows_files="no"
+case $host_os in
+ mingw32*)
+ only_windows_files="yes"
+ ;;
+esac
+
+if test "$cross_compiling" = "yes"; then
+ only_windows_files="yes"
+fi
+
+if test "$only_windows_files" = "yes"
+then
+ XFILES=""
+ OPENGLFILES=""
+ GLU32FILES=""
+ GLUT32FILES=""
+ UNIXFILES=""
fi
dnl **** Check which curses lib to use ***
Index: dlls/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/Makefile.in,v
retrieving revision 1.204
diff -u -r1.204 Makefile.in
--- dlls/Makefile.in 21 Feb 2004 04:13:56 -0000 1.204
+++ dlls/Makefile.in 27 Feb 2004 13:28:57 -0000
@@ -11,7 +11,10 @@
GLUT32FILES = glut32
OPENGLFILES = d3d8 d3d9 d3dx8 opengl32 wined3d
XFILES = ddraw x11drv
-EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
+UNIXFILES = kernel gdi ntdll winsock icmp iphlpapi vnb.vxd wininet wsock32
+
+EXTRASUBDIRS = $(GLU32FILES) $(GLUT32FILES) $(OPENGLFILES) $(XFILES) $(UNIXFILES)
+EXTRABUILDDIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@ @UNIXFILES@
# Subdir list
@@ -47,14 +50,10 @@
dpnhpast \
dsound \
dswave \
- gdi \
iccvid \
- icmp \
ifsmgr.vxd \
imagehlp \
imm32 \
- iphlpapi \
- kernel \
lzexpand \
mapi32 \
mmdevldr.vxd \
@@ -81,7 +80,6 @@
mswsock \
netapi32 \
newdev \
- ntdll \
odbc32 \
ole32 \
oleacc \
@@ -116,7 +114,6 @@
vdhcp.vxd \
version \
vmm.vxd \
- vnb.vxd \
vnetbios.vxd \
vtdapi.vxd \
vwin32.vxd \
@@ -124,7 +121,6 @@
winaspi \
winedos \
wineps \
- wininet \
winmm \
winmm/joystick \
winmm/mcianim \
@@ -141,28 +137,14 @@
winmm/winenas \
winmm/wineoss \
winnls \
- winsock \
winspool \
wintab32 \
wintrust \
- wow32 \
- wsock32
+ wow32
-SUBDIRS = \
- $(BASEDIRS) \
- d3d8 \
- d3d9 \
- d3dx8 \
- ddraw \
- dxguid \
- glu32 \
- glut32 \
- opengl32 \
- uuid \
- wined3d \
- x11drv
+SUBDIRS = $(BASEDIRS) $(EXTRASUBDIRS)
-BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS)
+BUILDSUBDIRS = $(BASEDIRS) $(EXTRABUILDDIRS)
INSTALLSUBDIRS = $(BUILDSUBDIRS)
@@ -221,7 +203,7 @@
wprocs.dll$(DLLEXT)
SYMLINKS = \
- $(EXTRADIRS:%=%.dll$(DLLEXT)) \
+ $(EXTRABUILDDIRS:%=%.dll$(DLLEXT)) \
@WIN16_FILES@ \
advapi32.dll$(DLLEXT) \
avicap32.dll$(DLLEXT) \
--
Dimi.
More information about the wine-patches
mailing list