Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use shared samples icon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-03-23 23:19:30 +00:00
parent ae403b112c
commit 814e9c24c2
10 changed files with 30 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/taskbar/makefile.vc
View File

@@ -23,8 +23,8 @@ TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
/W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \
$(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
TASKBAR_OBJECTS = \
$(OBJS)\taskbar_tbtest.obj \
$(OBJS)\taskbar_tbtest.res
$(OBJS)\taskbar_sample.res \
$(OBJS)\taskbar_tbtest.obj
### Conditionally set variables: ###
@@ -252,13 +252,13 @@ clean:
-if exist $(OBJS)\taskbar.ilk del $(OBJS)\taskbar.ilk
-if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb
$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest.res
$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
$(TASKBAR_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
<<
$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TASKBAR_CXXFLAGS) $**
$(OBJS)\taskbar_tbtest.res: .\tbtest.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**