Added a few files; fixed some warnings and wxMotif compile problems

[wxWidgets.git] / src / msw / makefile.bcc

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index e887b9c1b287d13b3e92db2c328e471e6e4e228c..bf74b2988f99979ae61a87cbe434f02057a188bb 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -77,7 +77,6 @@ GENERICOBJS= \
   $(MSWDIR)\helpxlp.obj \
   $(MSWDIR)\laywin.obj \
   $(MSWDIR)\listctrl.obj \
   $(MSWDIR)\helpxlp.obj \
   $(MSWDIR)\laywin.obj \
   $(MSWDIR)\listctrl.obj \

-  $(MSWDIR)\msgdlgg.obj \

   $(MSWDIR)\notebook.obj \
   $(MSWDIR)\panelg.obj \
   $(MSWDIR)\prop.obj \
   $(MSWDIR)\notebook.obj \
   $(MSWDIR)\panelg.obj \
   $(MSWDIR)\prop.obj \


@@ -91,6 +90,7 @@ GENERICOBJS= \
   $(MSWDIR)\textdlgg.obj \
   $(MSWDIR)\treectrl.obj
 
   $(MSWDIR)\textdlgg.obj \
   $(MSWDIR)\treectrl.obj
 

+#  $(MSWDIR)\msgdlgg.obj \

 #  $(MSWDIR)\printps.obj \
 #  $(MSWDIR)\prntdlgg.obj \
 
 #  $(MSWDIR)\printps.obj \
 #  $(MSWDIR)\prntdlgg.obj \
 


@@ -115,7 +115,6 @@ COMMONOBJS = \
   $(MSWDIR)\memory.obj \
   $(MSWDIR)\module.obj \
   $(MSWDIR)\object.obj \
   $(MSWDIR)\memory.obj \
   $(MSWDIR)\module.obj \
   $(MSWDIR)\object.obj \

-  $(MSWDIR)\postscrp.obj \

   $(MSWDIR)\prntbase.obj \
   $(MSWDIR)\resource.obj \
   $(MSWDIR)\resourc2.obj \
   $(MSWDIR)\prntbase.obj \
   $(MSWDIR)\resource.obj \
   $(MSWDIR)\resourc2.obj \


@@ -233,6 +232,7 @@ MSWOBJS = \
   $(MSWDIR)\utilsexc.obj \
   $(MSWDIR)\wave.obj \
   $(MSWDIR)\window.obj \
   $(MSWDIR)\utilsexc.obj \
   $(MSWDIR)\wave.obj \
   $(MSWDIR)\window.obj \

+  $(MSWDIR)\xpmhand.obj

 
 # Unfortunately this causes a crash when the oleauto sample starts.
 #  $(MSWDIR)\automtn.obj
 
 # Unfortunately this causes a crash when the oleauto sample starts.
 #  $(MSWDIR)\automtn.obj


@@ -505,8 +505,6 @@ $(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
 
 $(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
 
 
 $(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
 

-$(MSWDIR)\postscrp.obj:     $(COMMDIR)\postscrp.$(SRCSUFF)
-

 $(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)
 $(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)


@@ -701,7 +699,7 @@ $(CFG): makefile.bcc
 -Fs-
 -Vf
 -Ff=4
 -Fs-
 -Vf
 -Ff=4

--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm

 -I$(WXDIR)\include\wx\msw\gnuwin32
 -L$(BCCDIR)\lib
 -D__WXWIN__
 -I$(WXDIR)\include\wx\msw\gnuwin32
 -L$(BCCDIR)\lib
 -D__WXWIN__