mention wxTheApp

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

diff --git a/samples/docvwmdi/makefile.bcc b/samples/docvwmdi/makefile.bcc
index 39e4901d71b7046f1b45c93296f7a17f08d1de93..ad77c8c40607cdb0ee3079fbab2f80ac327cf47e 100644 (file)
--- a/samples/docvwmdi/makefile.bcc
+++ b/samples/docvwmdi/makefile.bcc
@@ -20,23 +20,27 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) \
-       -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \
-       -I.\..\..\src\regex -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) \
-       -I..\..\samples $(CXXFLAGS)
+DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
+       -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS)
 DOCVIEW_OBJECTS =  \
        $(OBJS)\docview_docview.obj \
        $(OBJS)\docview_doc.obj \
        $(OBJS)\docview_view.obj
-LIBDIRNAME = \
-       .\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -116,10 +120,10 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -158,7 +162,7 @@ $(OBJS)\docview_docview.obj: .\docview.cpp
        $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $**
 
 $(OBJS)\docview_docview.res: .\docview.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(LIBDIRNAME) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib  -i.\..\..\src\regex -i.\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\samples $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
 
 $(OBJS)\docview_view.obj: .\view.cpp
        $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $**
@@ -167,8 +171,13 @@ clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
+       -if exist $(OBJS)\docview.tds del $(OBJS)\docview.tds
+       -if exist $(OBJS)\docview.ilc del $(OBJS)\docview.ilc
+       -if exist $(OBJS)\docview.ild del $(OBJS)\docview.ild
+       -if exist $(OBJS)\docview.ilf del $(OBJS)\docview.ilf
+       -if exist $(OBJS)\docview.ils del $(OBJS)\docview.ils
 
 $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS)  $(OBJS)\docview_docview.res
-       ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
-       c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\docview_docview.res
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\docview_docview.res
 |