[Xlw-cvs] CVS: xlw/xlwExample makefile.mak,1.5,1.6

[Ferdinando A. <na...@us...>]

Update of /cvsroot/xlw/xlw/xlwExample
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30635/xlwExample

Modified Files:
	makefile.mak 
Log Message:
improving support for BCB and MinGW

Index: makefile.mak
===================================================================
RCS file: /cvsroot/xlw/xlw/xlwExample/makefile.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** makefile.mak	25 Oct 2004 10:50:07 -0000	1.5
--- makefile.mak	25 Oct 2004 14:20:59 -0000	1.6
***************
*** 1,6 ****
  
- #
  # makefile for xlwExample.cpp under Borland C++
- #
  
  .autodepend
--- 1,4 ----
***************
*** 17,37 ****
  BCC_INCLUDE     = $(MAKEDIR)\..\include
  BCC_LIBS        = $(MAKEDIR)\..\lib
  
- CC_OPTS = -vi- \
-     -I$(XLW_INCLUDE_DIR) \
-     -I$(BCC_INCLUDE)
  !ifdef DEBUG
! CC_OPTS = $(CC_OPTS) -v -DXLW_DEBUG
  !endif
  
  # Primary target:
! xlwExample-bcb$(_D).xll: xlwExample.cpp
!     bcc32 $(CC_OPTS) -L$(XLW_LIB_DIR) -L$(BCC_LIBS) -tWD \
!         -oxlwExample-bcb$(_D).obj -e"xll\xlwExample-bcb$(_D).xll" \
!         xlwExample.cpp xlw$(_D).lib
  
  # Clean up
  clean::
!     if exist *.obj   del /q *.obj
!     if exist *.tds   del /q *.tds
!     if exist *.xll   del /q *.xll
--- 15,55 ----
  BCC_INCLUDE     = $(MAKEDIR)\..\include
  BCC_LIBS        = $(MAKEDIR)\..\lib
+ XLL_DIR         = .\xll
+ 
+ # Object files
+ EXAMPLE_FILES = \
+     "xlwExample.obj$(_mt)$(_D)" \
+     "Win32StreamBuf.obj$(_mt)$(_D)" \
+ 
+ # Tools to be used
+ CC        = bcc32
+ 
+ # Options
+ CC_OPTS = -vi- -I$(XLW_INCLUDE_DIR) -I$(BCC_INCLUDE)
  
  !ifdef DEBUG
!     CC_OPTS = $(CC_OPTS) -v -DXLW_DEBUG
  !endif
  
+ # Generic rules
+ .cpp.obj:
+     $(CC) -c -q $(CC_OPTS) $<
+ .cpp.obj$(_mt)$(_D):
+     $(CC) -c -q $(CC_OPTS) -o$@ $<
+ 
  # Primary target:
! $(XLL_DIR)\xlwExample-bcb$(_D)-1_2_3.xll: $(XLL_DIR) $(EXAMPLE_FILES)
!     if exist $(XLL_DIR)\xlwExample-bcb$(_mt)$(_D)-1_2_3.xll \
!          del $(XLL_DIR)\xlwExample-bcb$(_mt)$(_D)-1_2_3.xll
!     $(CC) $(CC_OPTS) -L$(XLW_LIB_DIR) -L$(BCC_LIBS) -tWD \
!         -e"$(XLL_DIR)\xlwExample-bcb$(_D).xll" \
!         $(EXAMPLE_FILES) xlw-bcb-1_2_3$(_D).lib
! 
! $(XLL_DIR):
!     if not exist .\xll md .\xll
  
  # Clean up
  clean::
!     if exist *.obj                   del /q *.obj
!     if exist $(XLL_DIR)\*-bcb*.tds   del /q $(XLL_DIR)\*-bcb*.tds
!     if exist $(XLL_DIR)\*-bcb*.xll   del /q $(XLL_DIR)\*-bcb*.xll