updated wxMBConv docs slightly; added brief docs for UTF16/32 conversions

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

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index b1d4b101158a4b0ff97e875fa67b43bc0e960cdc..51a600eec2fc16041d13865b618bf8946cc8593a 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@

+NM = @NM@

 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@


@@ -46,7 +47,7 @@ SERVER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 SERVER_OBJECTS =  \
        server_server.o \
        $(__server___win32rc)
 SERVER_OBJECTS =  \
        server_server.o \
        $(__server___win32rc)

-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -82,12 +83,12 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \

-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \

-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -105,11 +106,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2)
 @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C client$(EXEEXT)
 @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2)
 @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C client$(EXEEXT)

+COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd)

 @COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o
 @COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle
 @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3)
 @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C server$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o
 @COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle
 @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3)
 @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C server$(EXEEXT)

+COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd)

 @COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o
 @COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle
 
 @COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o
 @COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle
 


@@ -126,12 +133,13 @@ clean:
        rm -rf server.app
 
 client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
        rm -rf server.app
 
 client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)

-       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)

        $(__client___mac_rezcmd)
        $(__client___mac_setfilecmd)
        $(__client___mac_rezcmd)
        $(__client___mac_setfilecmd)

+       $(__client___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p client.app/Contents
        mkdir -p client.app/Contents/MacOS
        mkdir -p client.app/Contents/Resources
        mkdir -p client.app/Contents
        mkdir -p client.app/Contents/MacOS
        mkdir -p client.app/Contents/Resources


@@ -149,16 +157,16 @@ client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        ln -f client$(EXEEXT) client.app/Contents/MacOS/client
        
        
        ln -f client$(EXEEXT) client.app/Contents/MacOS/client
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc client.app/Contents/Resources/client.rsrc

        ln -f $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns
 
        ln -f $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns
 

-@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents
+@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents/PkgInfo

 
 client_client.o: $(srcdir)/client.cpp
        $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $<
 
 client_client_rc.o: $(srcdir)/client.rc
 
 client_client.o: $(srcdir)/client.cpp
        $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $<
 
 client_client_rc.o: $(srcdir)/client.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples

 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile


@@ -168,12 +176,13 @@ install: all
 install-strip: install
 
 server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
 install-strip: install
 
 server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)

-       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)

        $(__server___mac_rezcmd)
        $(__server___mac_setfilecmd)
        $(__server___mac_rezcmd)
        $(__server___mac_setfilecmd)

+       $(__server___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p server.app/Contents
        mkdir -p server.app/Contents/MacOS
        mkdir -p server.app/Contents/Resources
        mkdir -p server.app/Contents
        mkdir -p server.app/Contents/MacOS
        mkdir -p server.app/Contents/Resources


@@ -191,16 +200,16 @@ server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        ln -f server$(EXEEXT) server.app/Contents/MacOS/server
        
        
        ln -f server$(EXEEXT) server.app/Contents/MacOS/server
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc server.app/Contents/Resources/server.rsrc

        ln -f $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns
 
        ln -f $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns
 

-@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents
+@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents/PkgInfo

 
 server_server.o: $(srcdir)/server.cpp
        $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $<
 
 server_server_rc.o: $(srcdir)/server.rc
 
 server_server.o: $(srcdir)/server.cpp
        $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $<
 
 server_server_rc.o: $(srcdir)/server.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples

 
 uninstall: 
 
 
 uninstall: