AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Regenerate dll samples makefiles using the correct source file name.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2009-12-07 03:04:22 +00:00
parent a60c479545
commit 1ffe64ef70
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/dll/Makefile.in
View File

@ -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:

2
samples/dll/dll.bkl
View File

@ -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>

2
samples/dll/dll_vc7_wx_exe.vcproj
View File

@ -284,7 +284,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\dll_user_wx.cpp">
RelativePath=".\wx_exe.cpp">
</File>
</Filter>
<Filter

2
samples/dll/dll_vc8_wx_exe.vcproj
View File

@ -418,7 +418,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\dll_user_wx.cpp"
RelativePath=".\wx_exe.cpp"
>
</File>
</Filter>

2
samples/dll/dll_vc9_wx_exe.vcproj
View File

@ -404,7 +404,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\dll_user_wx.cpp"
RelativePath=".\wx_exe.cpp"
>
</File>
</Filter>

4
samples/dll/dll_wx_exe.dsp
View File

@ -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

6
samples/dll/makefile.bcc
View File

@ -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

4
samples/dll/makefile.gcc
View File

@ -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

6
samples/dll/makefile.vc
View File

@ -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

4
samples/dll/makefile.wat
View File

@ -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) $<