Updated makefiles etc. for 2.5.1

[wxWidgets.git] / contrib / samples / ogl / studio / makefile.bcc

diff --git a/contrib/samples/ogl/studio/makefile.bcc b/contrib/samples/ogl/studio/makefile.bcc
index da67322ed00b10e50ba0c86e57f06f6e7ae3f969..ea8103945a22a09e6b95bf553ddf3781968af0f2 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.bcc
+++ b/contrib/samples/ogl/studio/makefile.bcc
@@ -128,10 +128,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
@@ -147,6 +147,10 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 __WXLIB_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+!endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
@@ -192,7 +196,7 @@ $(OBJS)\studio_studio.obj: .\studio.cpp
        $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
 
 $(OBJS)\studio_studio.res: .\studio.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$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -i.\..\..\..\include $**
+       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 -i.\..\..\..\include $**
 
 $(OBJS)\studio_symbols.obj: .\symbols.cpp
        $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
@@ -204,6 +208,11 @@ clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
+       -if exist $(OBJS)\studio.tds del $(OBJS)\studio.tds
+       -if exist $(OBJS)\studio.ilc del $(OBJS)\studio.ilc
+       -if exist $(OBJS)\studio.ild del $(OBJS)\studio.ild
+       -if exist $(OBJS)\studio.ilf del $(OBJS)\studio.ilf
+       -if exist $(OBJS)\studio.ils del $(OBJS)\studio.ils
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
@@ -211,5 +220,5 @@ data:
 
 $(OBJS)\studio.exe: $(STUDIO_OBJECTS)  $(OBJS)\studio_studio.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(STUDIO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\studio_studio.res
+       c0w32.obj $(STUDIO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__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)\studio_studio.res
 |