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 b82a9c2f5ddeaf87fb7474d6972238e2754584ff..0a740e42d48c6c6a2d7ef2e00d741f1ac9dd2198 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -9,7 +9,7 @@
 #
 # Makefile for wxsocket example (UNIX).
 
 #
 # Makefile for wxsocket example (UNIX).
 

-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..

 top_builddir = ../..
 program_dir = samples/sockets
 # the comment at the end of the next line is needed because otherwise autoconf
 top_builddir = ../..
 program_dir = samples/sockets
 # the comment at the end of the next line is needed because otherwise autoconf


@@ -21,19 +21,22 @@ 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 $(CPPFLAGS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) -o $@ $<

 
 # Set defaults from configure
 include ../../src/make.env
 
 all:   client@PROGRAM_EXT@ server@PROGRAM_EXT@
 
 
 # Set defaults from configure
 include ../../src/make.env
 
 all:   client@PROGRAM_EXT@ server@PROGRAM_EXT@
 

-client@PROGRAM_EXT@:   client.o ../../lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o client@PROGRAM_EXT@ client.o $(LDLIBS)
+sockets_resources.o:  sockets.rc
+       $(RESCOMP) -i $< -o $@ $(RESFLAGS)
+
+client@PROGRAM_EXT@:   client.o ../../lib/@WX_TARGET_LIBRARY@ sockets_resources.o
+       $(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@ server.o $(LDLIBS)
+       $(CXX) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS)

 
 clean:
 
 clean:

-       rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ client.o server.o core
+       rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core