configuration
Eric Pouech
eric.pouech at wanadoo.fr
Sun Oct 20 13:20:19 CDT 2002
I dunno if Alexandre will like this patch, but
- when compiling with --disable-win16 turned on
- the glue generation is based on the C_SRCS16 files as well as the
C_SRCS
- this, of course, brings in lots of unneed imports (triggered by the
non needed glue code)
the attached patch, when wine compilation is configured with
--disable-win16, removes all 16 bit .c files from the inspection for
glue generation
this might not be sufficient:
- the .glue.c file is generated in any case
- however, it should compile as an empty compilation unit
A+
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/configure.ac,v
retrieving revision 1.84
diff -u -r1.84 configure.ac
--- configure.ac 10 Oct 2002 17:54:28 -0000 1.84
+++ configure.ac 20 Oct 2002 17:43:53 -0000
@@ -25,10 +25,12 @@
AC_SUBST(OPTIONS)
AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)")
AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)")
+AC_SUBST(C_SRCS16,"\$(C_SRCS16)")
if test "x$enable_win16" = "xno"
then
WIN16_FILES=""
WIN16_INSTALL=""
+ C_SRCS16=""
fi
if test "x$enable_debug" = "xno"
then
Index: dlls/Makedll.rules.in
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/dlls/Makedll.rules.in,v
retrieving revision 1.36
diff -u -r1.36 Makedll.rules.in
--- dlls/Makedll.rules.in 2 Oct 2002 02:34:10 -0000 1.36
+++ dlls/Makedll.rules.in 20 Oct 2002 17:42:51 -0000
@@ -37,7 +37,7 @@
# Rule for 16-bit glue
$(MODULE).glue.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD)
- $(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -glue -C$(SRCDIR) $(C_SRCS) $(C_SRCS16)
+ $(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -glue -C$(SRCDIR) $(C_SRCS) @C_SRCS16@
# Rules for .dll files
More information about the wine-devel
mailing list