fix sizing of extra control

[wxWidgets.git] / samples / exec / makefile.vc

diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc
index 72745518e2aa4ed39dabd4cd3549ccbd0c9da4fe..91a589a1bbce9a178847e0217a73ff703ebf0ef1 100644 (file)
--- a/samples/exec/makefile.vc
+++ b/samples/exec/makefile.vc
@@ -29,8 +29,8 @@ EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
        /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \
        $(CPPFLAGS) $(CXXFLAGS)
 EXEC_OBJECTS =  \
-       $(OBJS)\exec_exec.obj \
-       $(OBJS)\exec_exec.res
+       $(OBJS)\exec_sample.res \
+       $(OBJS)\exec_exec.obj
 
 ### Conditionally set variables: ###
 
@@ -304,14 +304,14 @@ clean:
        -if exist $(OBJS)\exec.ilk del $(OBJS)\exec.ilk
        -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb
 
-$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_exec.res
+$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
        $(EXEC_OBJECTS)  $(__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 $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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
 <<
 
+$(OBJS)\exec_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) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\exec_exec.obj: .\exec.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(EXEC_CXXFLAGS) .\exec.cpp
 
-$(OBJS)\exec_exec.res: .\exec.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\exec.rc
-