Workaround for Ctrl-A giving a keycode of 1 in EVT_KEY_DOWN on wxGTK

[wxWidgets.git] / samples / sockets / Makefile.in

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index f7ff32f5a3162f9852c2a2d3955a9a0191defb3c..0a740e42d48c6c6a2d7ef2e00d741f1ac9dd2198 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -21,7 +21,7 @@ VPATH = @PATH_IFS@$(top_srcdir)/samples/sockets # ':' for autoconf
 .SUFFIXES:     .o .cpp .c .cxx
 
 .cpp.o :
 .SUFFIXES:     .o .cpp .c .cxx
 
 .cpp.o :

-       $(CC) -c $(CXXFLAGS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) -o $@ $<

 
 # Set defaults from configure
 include ../../src/make.env
 
 # Set defaults from configure
 include ../../src/make.env


@@ -29,13 +29,13 @@ include ../../src/make.env
 all:   client@PROGRAM_EXT@ server@PROGRAM_EXT@
 
 sockets_resources.o:  sockets.rc
 all:   client@PROGRAM_EXT@ server@PROGRAM_EXT@
 
 sockets_resources.o:  sockets.rc

-       $(RESCOMP) $(RCINPUTSWITCH) $< $(RCOUTPUTSWITCH) $@ $(RESFLAGS)
+       $(RESCOMP) -i $< -o $@ $(RESFLAGS)

 
 client@PROGRAM_EXT@:   client.o ../../lib/@WX_TARGET_LIBRARY@ sockets_resources.o
 
 client@PROGRAM_EXT@:   client.o ../../lib/@WX_TARGET_LIBRARY@ sockets_resources.o

-       $(CC) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS)
+       $(CXX) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS)

 
 server@PROGRAM_EXT@:   server.o ../../lib/@WX_TARGET_LIBRARY@
 
 server@PROGRAM_EXT@:   server.o ../../lib/@WX_TARGET_LIBRARY@

-       $(CC) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS)
+       $(CXX) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS)

 
 clean:
        rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core
 
 clean:
        rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core