dlls: don't build unbuildable DLLs on MinGW

Dimitrie O. Paun dpaun at rogers.com
Sat Feb 28 17:38:43 CST 2004


This time around I've changed the dlls/make_dlls script.
I've also included the changes to dlls/Makefile.in so
that (1) you can easily review the actual changes, and
(2) it makes the patch more convenient to apply. :)

Please rerun autoconf.

ChangeLog
    Avoid building Unix dependant files on MinGW.

Index: configure.ac
===================================================================
RCS file: /var/cvs/wine/configure.ac,v
retrieving revision 1.244
diff -u -r1.244 configure.ac
--- configure.ac	27 Feb 2004 21:51:13 -0000	1.244
+++ configure.ac	28 Feb 2004 06:14:44 -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"
@@ -367,6 +369,26 @@
     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 ***
 CURSESLIBS=""
 if test "x$with_curses" != "xno"
Index: dlls/make_dlls
===================================================================
RCS file: /var/cvs/wine/dlls/make_dlls,v
retrieving revision 1.35
diff -u -r1.35 make_dlls
--- dlls/make_dlls	26 Jan 2004 21:29:05 -0000	1.35
+++ dlls/make_dlls	28 Feb 2004 23:29:38 -0000
@@ -32,14 +32,24 @@
 my %special_dlls =
 (
   "ddraw"    => "XFILES",
+  "gdi"      => "UNIXFILES",
   "glu32"    => "GLU32FILES",
   "glut32"   => "GLUT32FILES",
+  "icmp"     => "UNIXFILES",
+  "iphlpapi" => "UNIXFILES",
+  "kernel"   => "UNIXFILES",
+  "msvcrt"   => "UNIXFILES",
+  "ntdll"    => "UNIXFILES",
   "opengl32" => "OPENGLFILES",
   "d3d8"     => "OPENGLFILES",
   "d3d9"     => "OPENGLFILES",
   "d3dx8"    => "OPENGLFILES",
+  "vnb.vxd"  => "UNIXFILES",
   "wined3d"  => "OPENGLFILES",
-  "x11drv"   => "XFILES"
+  "x11drv"   => "XFILES",
+  "wininet"  => "UNIXFILES",
+  "winsock"  => "UNIXFILES",
+  "wsock32"  => "UNIXFILES"
 );
 
 foreach my $i (split(/\s/,$makefiles))
@@ -109,7 +119,10 @@
 {
     printf NEWMAKE "%s =%s\n", $i, $specials{$i};
 }
-printf NEWMAKE "EXTRADIRS =";
+printf NEWMAKE "EXTRASUBDIRS =";
+foreach my $i (sort keys %specials) { printf NEWMAKE " \$(%s)", $i; }
+printf NEWMAKE "\n";
+printf NEWMAKE "EXTRABUILDDIRS =";
 foreach my $i (sort keys %specials) { printf NEWMAKE " \@%s\@", $i; }
 printf NEWMAKE "\n\n";
 
@@ -124,15 +137,11 @@
     printf NEWMAKE " \\\n\t%s", $dir;
 }
 
-printf NEWMAKE "\n\nSUBDIRS = \\\n\t\$(BASEDIRS)";
-foreach my $dir (sort (keys %special_dlls, values %implib_dirs))
-{
-    printf NEWMAKE " \\\n\t%s", $dir;
-}
+printf NEWMAKE "\n\nSUBDIRS = \$(BASEDIRS) \$(EXTRASUBDIRS)";
 printf NEWMAKE <<EOF;
 
 
-BUILDSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS)
+BUILDSUBDIRS = \$(BASEDIRS) \$(EXTRABUILDDIRS)
 
 INSTALLSUBDIRS = \$(BUILDSUBDIRS)
 EOF
@@ -167,7 +176,7 @@
 print NEWMAKE <<EOF;
 
 SYMLINKS = \\
-	\$(EXTRADIRS:%=%.dll\$(DLLEXT)) \\
+	\$(EXTRABUILDDIRS:%=%.dll\$(DLLEXT)) \\
 	\@WIN16_FILES\@ \\
 EOF
 printf NEWMAKE "\t%s\n", join( " \\\n\t", sort keys %targets );
Index: dlls/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/Makefile.in,v
retrieving revision 1.205
diff -u -r1.205 Makefile.in
--- dlls/Makefile.in	27 Feb 2004 21:51:13 -0000	1.205
+++ dlls/Makefile.in	28 Feb 2004 23:29:51 -0000
@@ -10,8 +10,10 @@
 GLU32FILES = glu32
 GLUT32FILES = glut32
 OPENGLFILES = d3d8 d3d9 d3dx8 opengl32 wined3d
+UNIXFILES = gdi icmp iphlpapi kernel msvcrt ntdll vnb.vxd wininet winsock wsock32
 XFILES = ddraw x11drv
-EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
+EXTRASUBDIRS = $(GLU32FILES) $(GLUT32FILES) $(OPENGLFILES) $(UNIXFILES) $(XFILES)
+EXTRABUILDDIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @UNIXFILES@ @XFILES@
 
 # Subdir list
 
@@ -47,14 +49,10 @@
 	dpnhpast \
 	dsound \
 	dswave \
-	gdi \
 	iccvid \
-	icmp \
 	ifsmgr.vxd \
 	imagehlp \
 	imm32 \
-	iphlpapi \
-	kernel \
 	lzexpand \
 	mapi32 \
 	mmdevldr.vxd \
@@ -72,7 +70,6 @@
 	msisys \
 	msnet32 \
 	msrle32 \
-	msvcrt \
 	msvcrt20 \
 	msvcrt40 \
 	msvcrtd \
@@ -81,7 +78,6 @@
 	mswsock \
 	netapi32 \
 	newdev \
-	ntdll \
 	odbc32 \
 	ole32 \
 	oleacc \
@@ -116,7 +112,6 @@
 	vdhcp.vxd \
 	version \
 	vmm.vxd \
-	vnb.vxd \
 	vnetbios.vxd \
 	vtdapi.vxd \
 	vwin32.vxd \
@@ -124,7 +119,6 @@
 	winaspi \
 	winedos \
 	wineps \
-	wininet \
 	winmm \
 	winmm/joystick \
 	winmm/mcianim \
@@ -141,28 +135,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)
 
@@ -172,18 +152,14 @@
 
 WIN16_FILES = \
 	avifile.dll$(DLLEXT) \
-	comm.drv$(DLLEXT) \
 	commdlg.dll$(DLLEXT) \
 	compobj.dll$(DLLEXT) \
 	ctl3d.dll$(DLLEXT) \
 	ctl3dv2.dll$(DLLEXT) \
 	ddeml.dll$(DLLEXT) \
-	dispdib.dll$(DLLEXT) \
 	display.drv$(DLLEXT) \
-	gdi.exe$(DLLEXT) \
 	imm.dll$(DLLEXT) \
 	keyboard.drv$(DLLEXT) \
-	krnl386.exe$(DLLEXT) \
 	lzexpand.dll$(DLLEXT) \
 	mmsystem.dll$(DLLEXT) \
 	mouse.drv$(DLLEXT) \
@@ -202,26 +178,19 @@
 	shell.dll$(DLLEXT) \
 	sound.dll$(DLLEXT) \
 	storage.dll$(DLLEXT) \
-	stress.dll$(DLLEXT) \
-	system.drv$(DLLEXT) \
-	toolhelp.dll$(DLLEXT) \
 	typelib.dll$(DLLEXT) \
 	user.exe$(DLLEXT) \
 	ver.dll$(DLLEXT) \
 	w32sys.dll$(DLLEXT) \
 	win32s16.dll$(DLLEXT) \
-	win87em.dll$(DLLEXT) \
 	winaspi.dll$(DLLEXT) \
-	windebug.dll$(DLLEXT) \
 	wineps16.drv$(DLLEXT) \
-	wing.dll$(DLLEXT) \
 	winnls.dll$(DLLEXT) \
-	winsock.dll$(DLLEXT) \
 	wintab.dll$(DLLEXT) \
 	wprocs.dll$(DLLEXT)
 
 SYMLINKS = \
-	$(EXTRADIRS:%=%.dll$(DLLEXT)) \
+	$(EXTRABUILDDIRS:%=%.dll$(DLLEXT)) \
 	@WIN16_FILES@ \
 	advapi32.dll$(DLLEXT) \
 	avicap32.dll$(DLLEXT) \
@@ -254,16 +223,12 @@
 	dpnhpast.dll$(DLLEXT) \
 	dsound.dll$(DLLEXT) \
 	dswave.dll$(DLLEXT) \
-	gdi32.dll$(DLLEXT) \
 	iccvid.dll$(DLLEXT) \
-	icmp.dll$(DLLEXT) \
 	ifsmgr.vxd$(DLLEXT) \
 	imaadp32.acm$(DLLEXT) \
 	imagehlp.dll$(DLLEXT) \
 	imm32.dll$(DLLEXT) \
-	iphlpapi.dll$(DLLEXT) \
 	joystick.drv$(DLLEXT) \
-	kernel32.dll$(DLLEXT) \
 	libdxguid.a \
 	libuuid.a \
 	lz32.dll$(DLLEXT) \
@@ -288,7 +253,6 @@
 	msisys.ocx$(DLLEXT) \
 	msnet32.dll$(DLLEXT) \
 	msrle32.dll$(DLLEXT) \
-	msvcrt.dll$(DLLEXT) \
 	msvcrt20.dll$(DLLEXT) \
 	msvcrt40.dll$(DLLEXT) \
 	msvcrtd.dll$(DLLEXT) \
@@ -297,7 +261,6 @@
 	mswsock.dll$(DLLEXT) \
 	netapi32.dll$(DLLEXT) \
 	newdev.dll$(DLLEXT) \
-	ntdll.dll$(DLLEXT) \
 	odbc32.dll$(DLLEXT) \
 	ole32.dll$(DLLEXT) \
 	oleacc.dll$(DLLEXT) \
@@ -332,7 +295,6 @@
 	vdhcp.vxd$(DLLEXT) \
 	version.dll$(DLLEXT) \
 	vmm.vxd$(DLLEXT) \
-	vnb.vxd$(DLLEXT) \
 	vnetbios.vxd$(DLLEXT) \
 	vtdapi.vxd$(DLLEXT) \
 	vwin32.vxd$(DLLEXT) \
@@ -346,16 +308,13 @@
 	winenas.drv$(DLLEXT) \
 	wineoss.drv$(DLLEXT) \
 	wineps.dll$(DLLEXT) \
-	wininet.dll$(DLLEXT) \
 	winmm.dll$(DLLEXT) \
 	winnls32.dll$(DLLEXT) \
 	winspool.drv$(DLLEXT) \
 	wintab32.dll$(DLLEXT) \
 	wintrust.dll$(DLLEXT) \
 	wnaspi32.dll$(DLLEXT) \
-	wow32.dll$(DLLEXT) \
-	ws2_32.dll$(DLLEXT) \
-	wsock32.dll$(DLLEXT)
+	wow32.dll$(DLLEXT)
 
 # Main target
 


-- 
Dimi.




More information about the wine-patches mailing list