Cleaned up some comments, reorganized some code

[wxWidgets.git] / contrib / build / xrc / makefile.bcc

diff --git a/contrib/build/xrc/makefile.bcc b/contrib/build/xrc/makefile.bcc
index 80f5a2bcae52b9a4b0ead49f61903135cf9f94b6..6c824859a7e8bbdec82af1853b262ff3fc1e6ecd 100644 (file)
--- a/contrib/build/xrc/makefile.bcc
+++ b/contrib/build/xrc/makefile.bcc
@@ -8,7 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
 BCCDIR = $(MAKEDIR)\..
 !endif
 

-!include ../../../build/config.bcc
+!include ../../../build/msw/config.bcc

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -20,18 +20,15 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-LIBDIRNAME = \
-       ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \
-       -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \
-       -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib \
-       -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) -Hu \
-       -H=$(OBJS)\wxprec_xrcdll.csm
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \
+       -I$(SETUPHDIR) -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xrcdll.csm

 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.obj \
        $(OBJS)\xrcdll_xmlres.obj \
 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.obj \
        $(OBJS)\xrcdll_xmlres.obj \


@@ -71,14 +68,12 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_unkwn.obj \
        $(OBJS)\xrcdll_xh_wizrd.obj \
        $(OBJS)\xrcdll_xmlrsall.obj
        $(OBJS)\xrcdll_xh_unkwn.obj \
        $(OBJS)\xrcdll_xh_wizrd.obj \
        $(OBJS)\xrcdll_xmlrsall.obj

-XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \
-       -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \
-       -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib \
-       -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse \
-       -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xrclib.csm
+XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \
+       -I$(SETUPHDIR) -I..\..\src\xrc\..\..\include \
+       -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) -Hu \
+       -H=$(OBJS)\wxprec_xrclib.csm

 XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_dummy.obj \
        $(OBJS)\xrclib_xmlres.obj \
 XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_dummy.obj \
        $(OBJS)\xrclib_xmlres.obj \


@@ -121,6 +116,12 @@ XRCLIB_OBJECTS =  \
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\bcc_dll$(CFG)
+!endif

 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif


@@ -196,6 +197,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib


@@ -475,15 +479,15 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
 
 !if "$(SHARED)" == "1"
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
 
 !if "$(SHARED)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_dummy.obj
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS)
+       ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__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  $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@
 !endif
 
 !if "$(SHARED)" == "0"
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@
 !endif
 
 !if "$(SHARED)" == "0"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(XRCLIB_OBJECTS) $(OBJS)\xrclib_dummy.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj  $(XRCLIB_OBJECTS)

        if exist $@ del $@
        tlib /a /p2048 $@ @&&|
        $(XRCLIB_OBJECTS)
        if exist $@ del $@
        tlib /a /p2048 $@ @&&|
        $(XRCLIB_OBJECTS)