From 1ffe64ef70d0a320fd0f20d5c3700bc81b6fd890 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 7 Dec 2009 03:04:22 +0000 Subject: [PATCH] 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 --- samples/dll/Makefile.in | 6 +++--- samples/dll/dll.bkl | 2 +- samples/dll/dll_vc7_wx_exe.vcproj | 2 +- samples/dll/dll_vc8_wx_exe.vcproj | 2 +- samples/dll/dll_vc9_wx_exe.vcproj | 2 +- samples/dll/dll_wx_exe.dsp | 4 ++-- samples/dll/makefile.bcc | 6 +++--- samples/dll/makefile.gcc | 4 ++-- samples/dll/makefile.vc | 6 +++--- samples/dll/makefile.wat | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in index e4c896e5c5..f2faf24e21 100644 --- 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 c00e693ef6..2eeb512a59 100644 --- a/samples/dll/dll.bkl +++ b/samples/dll/dll.bkl @@ -19,7 +19,7 @@ the same copy of wx would be used --> - dll_user_wx.cpp + wx_exe.cpp core base my_dll diff --git a/samples/dll/dll_vc7_wx_exe.vcproj b/samples/dll/dll_vc7_wx_exe.vcproj index b0c0e4734d..a7f01664d4 100644 --- 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" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\wx_exe.cpp"> diff --git a/samples/dll/dll_vc9_wx_exe.vcproj b/samples/dll/dll_vc9_wx_exe.vcproj index 23cd872182..8b4af5a8a3 100644 --- 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}" > diff --git a/samples/dll/dll_wx_exe.dsp b/samples/dll/dll_wx_exe.dsp index 341eab682f..1b7c9f7bd8 100644 --- a/samples/dll/dll_wx_exe.dsp +++ b/samples/dll/dll_wx_exe.dsp @@ -144,11 +144,11 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\dll_user_wx.cpp +SOURCE=.\..\..\samples\sample.rc # End Source File # Begin Source File -SOURCE=.\..\..\samples\sample.rc +SOURCE=.\wx_exe.cpp # End Source File # End Group # End Target diff --git a/samples/dll/makefile.bcc b/samples/dll/makefile.bcc index df2f60545c..bef956cafd 100644 --- 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 \ -DNOPCH $(CPPFLAGS) $(CXXFLAGS) WX_EXE_OBJECTS = \ - $(OBJS)\wx_exe_dll_user_wx.obj + $(OBJS)\wx_exe_wx_exe.obj ### Conditionally set variables: ### @@ -269,6 +269,6 @@ $(OBJS)\my_dll_my_dll.obj: .\my_dll.cpp $(OBJS)\wx_exe_sample.res: .\..\..\samples\sample.rc 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 -$(OBJS)\wx_exe_dll_user_wx.obj: .\dll_user_wx.cpp - $(CXX) -q -c -P -o$@ $(WX_EXE_CXXFLAGS) .\dll_user_wx.cpp +$(OBJS)\wx_exe_wx_exe.obj: .\wx_exe.cpp + $(CXX) -q -c -P -o$@ $(WX_EXE_CXXFLAGS) .\wx_exe.cpp diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc index 743340a62e..e6e4db6d09 100644 --- 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) WX_EXE_OBJECTS = \ $(OBJS)\wx_exe_sample_rc.o \ - $(OBJS)\wx_exe_dll_user_wx.o + $(OBJS)\wx_exe_wx_exe.o ### Conditionally set variables: ### @@ -248,7 +248,7 @@ $(OBJS)\my_dll_my_dll.o: ./my_dll.cpp $(OBJS)\wx_exe_sample_rc.o: ./../../samples/sample.rc 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 -$(OBJS)\wx_exe_dll_user_wx.o: ./dll_user_wx.cpp +$(OBJS)\wx_exe_wx_exe.o: ./wx_exe.cpp $(CXX) -c -o $@ $(WX_EXE_CXXFLAGS) $(CPPDEPS) $< .PHONY: all clean diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc index f4bd6d27b8..ac4d06d553 100644 --- 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) \ $(CXXFLAGS) WX_EXE_OBJECTS = \ - $(OBJS)\wx_exe_dll_user_wx.obj + $(OBJS)\wx_exe_wx_exe.obj WX_EXE_RESOURCES = \ $(OBJS)\wx_exe_sample.res @@ -389,6 +389,6 @@ $(OBJS)\my_dll_my_dll.obj: .\my_dll.cpp $(OBJS)\wx_exe_sample.res: .\..\..\samples\sample.rc 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 -$(OBJS)\wx_exe_dll_user_wx.obj: .\dll_user_wx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WX_EXE_CXXFLAGS) .\dll_user_wx.cpp +$(OBJS)\wx_exe_wx_exe.obj: .\wx_exe.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WX_EXE_CXXFLAGS) .\wx_exe.cpp diff --git a/samples/dll/makefile.wat b/samples/dll/makefile.wat index 2a3369f272..33482a7c81 100644 --- 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) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) WX_EXE_OBJECTS = & - $(OBJS)\wx_exe_dll_user_wx.obj + $(OBJS)\wx_exe_wx_exe.obj all : $(OBJS) @@ -300,6 +300,6 @@ $(OBJS)\my_dll_my_dll.obj : .AUTODEPEND .\my_dll.cpp $(OBJS)\wx_exe_sample.res : .AUTODEPEND .\..\..\samples\sample.rc 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 $< -$(OBJS)\wx_exe_dll_user_wx.obj : .AUTODEPEND .\dll_user_wx.cpp +$(OBJS)\wx_exe_wx_exe.obj : .AUTODEPEND .\wx_exe.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WX_EXE_CXXFLAGS) $< -- 2.47.2