X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0292142ee82f361edf4385bb6366a6a300b5b3a0..39178e3bdf1944bb73ee64586ba2390c505bee24:/samples/sockets/Makefile.in diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index b82a9c2f5d..0a740e42d4 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -9,7 +9,7 @@ # # 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 @@ -21,19 +21,22 @@ VPATH = @PATH_IFS@$(top_srcdir)/samples/sockets # ':' for autoconf .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@ -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@ - $(CC) $(LDFLAGS) -o server@PROGRAM_EXT@ server.o $(LDLIBS) + $(CXX) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS) 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