fix sizing of extra control

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

diff --git a/samples/docvwmdi/makefile.vc b/samples/docvwmdi/makefile.vc
index b8826e43d2d07bc11b71fef4d06ca801b4baaec7..c7ad4f8238bad8815f04ae5ec981b1e5bee8996f 100644 (file)
--- a/samples/docvwmdi/makefile.vc
+++ b/samples/docvwmdi/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,25 +12,27 @@
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 27
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
 OBJS = \
-       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_2_p) \
+DOCVWMDI_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\docvwmdi.pdb $(____DEBUGRUNTIME_2_p) \
        $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
        /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \
        $(CPPFLAGS) $(CXXFLAGS)
-DOCVIEW_OBJECTS =  \
-       $(OBJS)\docview_docview.obj \
-       $(OBJS)\docview_doc.obj \
-       $(OBJS)\docview_view.obj \
-       $(OBJS)\docview_docview.res
+DOCVWMDI_OBJECTS =  \
+       $(OBJS)\docvwmdi_docview.obj \
+       $(OBJS)\docvwmdi_doc.obj \
+       $(OBJS)\docvwmdi_view.obj \
+       $(OBJS)\docvwmdi_docview.res
 
 ### Conditionally set variables: ###
 
@@ -229,9 +231,15 @@ __THREAD_DEFINE_p = /DwxNO_THREADS
 !if "$(USE_THREADS)" == "0"
 __THREAD_DEFINE_p_1 = /d wxNO_THREADS
 !endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
 !endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d _UNICODE
 !endif
@@ -288,30 +296,30 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\docview.exe
+all: $(OBJS)\docvwmdi.exe
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
-       -if exist $(OBJS)\docview.ilk del $(OBJS)\docview.ilk
-       -if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb
+       -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe
+       -if exist $(OBJS)\docvwmdi.ilk del $(OBJS)\docvwmdi.ilk
+       -if exist $(OBJS)\docvwmdi.pdb del $(OBJS)\docvwmdi.pdb
 
-$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-       $(DOCVIEW_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 odbc32.lib
+$(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\docvwmdi.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       $(DOCVWMDI_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)\docview_docview.obj: .\docview.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) $**
+$(OBJS)\docvwmdi_docview.obj: .\docview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DOCVWMDI_CXXFLAGS) .\docview.cpp
 
-$(OBJS)\docview_doc.obj: .\doc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) $**
+$(OBJS)\docvwmdi_doc.obj: .\doc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DOCVWMDI_CXXFLAGS) .\doc.cpp
 
-$(OBJS)\docview_view.obj: .\view.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) $**
+$(OBJS)\docvwmdi_view.obj: .\view.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DOCVWMDI_CXXFLAGS) .\view.cpp
 
-$(OBJS)\docview_docview.res: .\docview.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 $**
+$(OBJS)\docvwmdi_docview.res: .\docview.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 .\docview.rc