Regenerate dll samples makefiles using the correct source file name.

The file is called wx_exe.cpp and not dll_user_wx.cpp in the svn, do use the
correct name.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in
index e4c896e5c50d2df9f9f6e8b7f214f75e672f3f43..f2faf24e21679688c9ec04963ac2e6bc476bba99 100644 (file)
--- a/samples/dll/Makefile.in
+++ b/samples/dll/Makefile.in
@@ -60,7 +60,7 @@ WX_EXE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 WX_EXE_OBJECTS =  \
        $(__wx_exe___win32rc) \
        $(__wx_exe_os2_lib_res) \
-       wx_exe_dll_user_wx.o
+       wx_exe_wx_exe.o
 
 ### Conditionally set variables: ###
 
@@ -204,8 +204,8 @@ my_dll_my_dll.o: $(srcdir)/my_dll.cpp
 wx_exe_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__DEBUG_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) $(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4)   --include-dir $(srcdir) $(__DLLFLAG_p_4) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
-wx_exe_dll_user_wx.o: $(srcdir)/dll_user_wx.cpp
-       $(CXXC) -c -o $@ $(WX_EXE_CXXFLAGS) $(srcdir)/dll_user_wx.cpp
+wx_exe_wx_exe.o: $(srcdir)/wx_exe.cpp
+       $(CXXC) -c -o $@ $(WX_EXE_CXXFLAGS) $(srcdir)/wx_exe.cpp
 
 
 # Include dependency info, if present:

diff --git a/samples/dll/dll.bkl b/samples/dll/dll.bkl
index c00e693ef686f8455af13e2557233e1cca7cc5de..2eeb512a5937a125f6a7cc3fa223910187c4854a 100644 (file)
--- a/samples/dll/dll.bkl
+++ b/samples/dll/dll.bkl
@@ -19,7 +19,7 @@
          the same copy of wx would be used -->
     <exe id="wx_exe" template="wx_sample" template_append="wx_append"
          cond="SHARED=='0' and PLATFORM_WIN32=='1'">
-        <sources>dll_user_wx.cpp</sources>
+        <sources>wx_exe.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <library>my_dll</library>

diff --git a/samples/dll/dll_vc7_wx_exe.vcproj b/samples/dll/dll_vc7_wx_exe.vcproj
index b0c0e4734d21748a687a77ab2ecf3e307da543d3..a7f01664d44d8f2b397b9cca864d3c31e3d1cfe4 100644 (file)
--- a/samples/dll/dll_vc7_wx_exe.vcproj
+++ b/samples/dll/dll_vc7_wx_exe.vcproj
@@ -284,7 +284,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                        <File\r
-                               RelativePath=".\dll_user_wx.cpp">\r
+                               RelativePath=".\wx_exe.cpp">\r
                        </File>\r
                </Filter>\r
                <Filter\r

diff --git a/samples/dll/dll_vc8_wx_exe.vcproj b/samples/dll/dll_vc8_wx_exe.vcproj
index 45304d47cc85e5a5f335e4f4b4d5af75ae72908c..7a924f7f1eac87965d360274099f52809ac40f9a 100644 (file)
--- a/samples/dll/dll_vc8_wx_exe.vcproj
+++ b/samples/dll/dll_vc8_wx_exe.vcproj
@@ -418,7 +418,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\dll_user_wx.cpp"\r
+                               RelativePath=".\wx_exe.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/dll/dll_vc9_wx_exe.vcproj b/samples/dll/dll_vc9_wx_exe.vcproj
index 23cd872182938e5c79530ec059db01fc2d61077d..8b4af5a8a3e1d3df9dd7e4935a7856d61a9c1d63 100644 (file)
--- a/samples/dll/dll_vc9_wx_exe.vcproj
+++ b/samples/dll/dll_vc9_wx_exe.vcproj
@@ -404,7 +404,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\dll_user_wx.cpp"\r
+                               RelativePath=".\wx_exe.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/dll/dll_wx_exe.dsp b/samples/dll/dll_wx_exe.dsp
index 341eab682f26f15aadaad9167ebd86f8a0eda1ed..1b7c9f7bd80bad555183ad2e1734bc15c8713fcf 100644 (file)
--- a/samples/dll/dll_wx_exe.dsp
+++ b/samples/dll/dll_wx_exe.dsp
@@ -144,11 +144,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\dll_user_wx.cpp\r
+SOURCE=.\..\..\samples\sample.rc\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\..\..\samples\sample.rc\r
+SOURCE=.\wx_exe.cpp\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/dll/makefile.bcc b/samples/dll/makefile.bcc
index df2f60545cb0fc403ae8a4ef7879223d1b79bdf6..bef956cafd0161860b8b52b7dfedde08d4375e80 100644 (file)
--- a/samples/dll/makefile.bcc
+++ b/samples/dll/makefile.bcc
@@ -44,7 +44,7 @@ WX_EXE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
        -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
 WX_EXE_OBJECTS =  \\r
-       $(OBJS)\wx_exe_dll_user_wx.obj\r
+       $(OBJS)\wx_exe_wx_exe.obj\r
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -269,6 +269,6 @@ $(OBJS)\my_dll_my_dll.obj: .\my_dll.cpp
 $(OBJS)\wx_exe_sample.res: .\..\..\samples\sample.rc\r
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
 \r
-$(OBJS)\wx_exe_dll_user_wx.obj: .\dll_user_wx.cpp\r
-       $(CXX) -q -c -P -o$@ $(WX_EXE_CXXFLAGS) .\dll_user_wx.cpp\r
+$(OBJS)\wx_exe_wx_exe.obj: .\wx_exe.cpp\r
+       $(CXX) -q -c -P -o$@ $(WX_EXE_CXXFLAGS) .\wx_exe.cpp\r
 \r

diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc
index 743340a62e41557a2057aff9a9df92039f783f81..e6e4db6d09b8a097e9b0fda1dec796f139841418 100644 (file)
--- a/samples/dll/makefile.gcc
+++ b/samples/dll/makefile.gcc
@@ -38,7 +38,7 @@ WX_EXE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 WX_EXE_OBJECTS =  \\r
        $(OBJS)\wx_exe_sample_rc.o \\r
-       $(OBJS)\wx_exe_dll_user_wx.o\r
+       $(OBJS)\wx_exe_wx_exe.o\r
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -248,7 +248,7 @@ $(OBJS)\my_dll_my_dll.o: ./my_dll.cpp
 $(OBJS)\wx_exe_sample_rc.o: ./../../samples/sample.rc\r
        windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../samples --define NOPCH\r
 \r
-$(OBJS)\wx_exe_dll_user_wx.o: ./dll_user_wx.cpp\r
+$(OBJS)\wx_exe_wx_exe.o: ./wx_exe.cpp\r
        $(CXX) -c -o $@ $(WX_EXE_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 .PHONY: all clean\r

diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc
index f4bd6d27b80c7dfde061d671d300639e617004c3..ac4d06d553cdb399d3877cfcc9211e9620ab6a3d 100644 (file)
--- a/samples/dll/makefile.vc
+++ b/samples/dll/makefile.vc
@@ -40,7 +40,7 @@ WX_EXE_CXXFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 \
        /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
        $(CXXFLAGS)\r
 WX_EXE_OBJECTS =  \\r
-       $(OBJS)\wx_exe_dll_user_wx.obj\r
+       $(OBJS)\wx_exe_wx_exe.obj\r
 WX_EXE_RESOURCES =  \\r
        $(OBJS)\wx_exe_sample.res\r
 \r
@@ -389,6 +389,6 @@ $(OBJS)\my_dll_my_dll.obj: .\my_dll.cpp
 $(OBJS)\wx_exe_sample.res: .\..\..\samples\sample.rc\r
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_18_p_1) $(__NO_VC_CRTDBG_p_3)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
 \r
-$(OBJS)\wx_exe_dll_user_wx.obj: .\dll_user_wx.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WX_EXE_CXXFLAGS) .\dll_user_wx.cpp\r
+$(OBJS)\wx_exe_wx_exe.obj: .\wx_exe.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WX_EXE_CXXFLAGS) .\wx_exe.cpp\r
 \r

diff --git a/samples/dll/makefile.wat b/samples/dll/makefile.wat
index 2a3369f2729c9cc7c291ab011d4ba74c5cbde6eb..33482a7c81b7c7127d30e01bd9962dfa8260ba70 100644 (file)
--- a/samples/dll/makefile.wat
+++ b/samples/dll/makefile.wat
@@ -246,7 +246,7 @@ WX_EXE_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) &\r
        $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
 WX_EXE_OBJECTS =  &\r
-       $(OBJS)\wx_exe_dll_user_wx.obj\r
+       $(OBJS)\wx_exe_wx_exe.obj\r
 \r
 \r
 all : $(OBJS)\r
@@ -300,6 +300,6 @@ $(OBJS)\my_dll_my_dll.obj :  .AUTODEPEND .\my_dll.cpp
 $(OBJS)\wx_exe_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
        wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
 \r
-$(OBJS)\wx_exe_dll_user_wx.obj :  .AUTODEPEND .\dll_user_wx.cpp\r
+$(OBJS)\wx_exe_wx_exe.obj :  .AUTODEPEND .\wx_exe.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WX_EXE_CXXFLAGS) $<\r
 \r