CVS: winex configure.ac, 1.101, 1.102 Make.rules.in, 1.18, 1.19

Subject: winex configure.ac,1.101,1.102 Make.rules.in,1.18,1.19Update of /var/lib/cvsd/cvsroot/winex
In directory agravaine:/tmp/cvs-serv19947

Modified Files:
	configure.ac Make.rules.in 
Log Message:

- support building objective-C++ (.mm) files


Index: configure.ac
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/configure.ac,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- configure.ac	30 Mar 2007 20:33:34 -0000	1.101
+++ configure.ac	30 Mar 2007 20:40:33 -0000	1.102
@@ -85,7 +85,9 @@
 case $host in
    *darwin*)
         OBJC="cc -Werror";
+        OBJCXX="CC";
         _OBJC_SRCS="\$(OBJC_SRCS)";
+        _OBJCXX_SRCS="\$(OBJCXX_SRCS)";
         MACEXTRALIBS="\$(MACEXTRALIBS)";
         AC_SUBST(LDEXECFLAGS,["-seg1addr 0x80000000 -Wl,-segaddr,WINE,0x00000000"])
         enable_pthreads="yes" # Always on on the Mac
@@ -93,7 +95,9 @@
         ;;
    *)
         OBJC="";
+        OBJCXX="";
         _OBJC_SRCS="";
+        _OBJCXX_SRCS="";
         MACEXTRALIBS="";
         ;;
 esac
@@ -125,7 +129,9 @@
 AC_PROG_YACC
 AC_PROG_LEX
 AC_SUBST(OBJC)
+AC_SUBST(OBJCXX)
 AC_SUBST(_OBJC_SRCS)
+AC_SUBST(_OBJCXX_SRCS)
 AC_SUBST(MACEXTRALIBS)
 
 # Some of the libraries we link against on the commandline are different
@@ -1078,7 +1084,6 @@
         case $host_cpu in i[[3456789]]86*) 
            CEDEGACFLAGS="$CEDEGACFLAGS -msse2" ;;
         esac
-        CEDEGACFLAGS="$CEDEGACFLAGS -Wno-pointer-sign" ;;
   esac
 
   AC_CACHE_CHECK( [for gcc strength-reduce bug], ac_cv_c_gcc_strength_bug,
@@ -1481,6 +1486,7 @@
         LIBSDL="$LIBSDL -framework Cocoa -framework OpenGL -framework Carbon"
         LIBMACCA="-framework CoreAudio -framework AudioToolbox"
         LIBJOYSTICK="-framework IOKit -framework ForceFeedback -framework CoreFoundation"
+        LIBSDL="$LIBSDL -framework SystemConfiguration"
         dnl Set up arguments for packaged mode of wine
         if test "x$enable_package" = "xyes"
         then

Index: Make.rules.in
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/Make.rules.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Make.rules.in	30 Mar 2007 20:03:43 -0000	1.18
+++ Make.rules.in	30 Mar 2007 20:40:33 -0000	1.19
@@ -10,6 +10,7 @@
 # C_SRCS       : C sources for the module
 # CXX_SRCS     : C++ sources for the module
 # OBJC_SRCS    : objective-c sources
+# OBJCXX_SRCS  : objective-c++ sources
 # ASM_SRCS     : assembly sources
 # GEN_C_SRCS   : generated C files
 # GEN_ASM_SRCS : generated assembly sources
@@ -32,6 +33,7 @@
 CPP       = @CPP@
 CXX       = @CXX@
 OBJC      = @OBJC@
+OBJCXX    = @OBJCXX@
 CFLAGS    = @CFLAGS@
 OPTIONS   = @OPTIONS@ -D_REENTRANT
 X_CFLAGS  = @X_CFLAGS@
@@ -126,9 +128,10 @@
 		  *.tab.[ch] *.yy.c
 
 _OBJC_SRCS             = @_OBJC_SRCS@
+_OBJCXX_SRCS             = @_OBJCXX_SRCS@
 OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
        $(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(CXX_SRCS:.cpp=.o) $(_OBJC_SRCS:.m=.o) \
-       $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS)
+       $(_OBJCXX_SRCS:.mm=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS)
 
 .PRECIOUS: $(ALL_OBJS) $(OBJS) $(SPEC_SRCS:.spec=.spec.c)
 
@@ -136,7 +139,7 @@
 
 # Implicit rules
 
-.SUFFIXES: .cpp .mc .rc .mc.rc .res .spec .spec.c .spec.def .glue.c .pl .ok .i .m .y .l .tab.c .tab.h .yy.c
+.SUFFIXES: .cpp .mc .rc .mc.rc .res .spec .spec.c .spec.def .glue.c .pl .ok .i .m .mm .y .l .tab.c .tab.h .yy.c
 
 .cpp.o:
 	$(CXX) -c $(ALLCFLAGS) -o $@ $<
@@ -153,6 +156,9 @@
 .m.o:
 	$(OBJC) -c $(ALLCFLAGS) -o $@ $<
 
+.mm.o:
+	$(OBJCXX) -c $(ALLCFLAGS) -o $@ $<
+
 .c.i:
 	$(CPP) $(ALLCFLAGS) -o $@ $<