[Cbar-develop] cbar/misc makefile.all,1.7,1.8 makefile.bcc,1.7,1.8 makefile.dj,1.7,1.8 makefile.mgw,1.9,1.10 makefile.uni,1.5,1.6 makefile.vc,1.9,1.10 makefile.ver,1.5,1.6

[Rasmus M. <ras...@us...>]

Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2477/misc

Modified Files:
	makefile.all makefile.bcc makefile.dj makefile.mgw 
	makefile.uni makefile.vc makefile.ver 
Log Message:
Line endings

Index: makefile.uni
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.uni,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.uni	21 Jun 2004 19:18:32 -0000	1.5
--- makefile.uni	8 Nov 2004 21:20:45 -0000	1.6
***************
*** 1,233 ****
! #  makefile.uni:
! #  Makefile for the CBAR library with Unix. Should not be used directly!
! #
! #  By Christer Sandberg (copied from ADIME made by Sven Sandberg)
! #
! #  See readme.txt for more information about CBAR.
! #
! #  See makefile.all for a list of the available targets.
! 
! # -------- Define some variables that the primary makefile may use. --------
! 
! PLATFORM = UNIX
! 
! EXE_SUFFIX =
! OBJ_SUFFIX = .o
! LIB_SUFFIX = .a
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! 
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! 
! ifndef OBJ_ROOT_DIR
! OBJ_ROOT_DIR = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix
! 
! ifndef LIB_ROOT_DIR
! LIB_ROOT_DIR = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/unix
! 
! HAVE_TEXINFO = 1
! 
! ifdef STATICLINK
!  # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s
!  IMPLIB_BASENAME = lib$(PACKAGE)_s.a
! else
!  # link as a shared object
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
!  IMPLIB_BASENAME = lib$(PACKAGE).so
! endif
! 
! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
! LIB_NAME = $(IMPLIB_NAME)
! 
! # -------- Default system paths. ------------
! 
! ifndef SYSTEM_DIR
! SYSTEM_DIR = /usr/local
! endif
! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include
! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib
! 
! # -------- Set up mktext --------
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
! CBAR_ICONS = $(subst \,/,$(CBAR_ICONS_X))
! CBAR_ICONS_C = $(subst \,/,$(CBAR_ICONS_C_X))
! CBAR_ICONS_H = $(subst \,/,$(CBAR_ICONS_H_X))
! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! 
! # -------- Give a sensible default target for make without any args. --------
! # This must be done right after the tests, which can generate error targets.
! 
! .PHONY: _default
! 
! _default: default
! 
! # -------- Decide what compiler options and libraries to use. --------
! 
! ifdef WARNMODE
! WFLAGS = -Wall -W -Werror
! else
! WFLAGS = -Wall -Wno-unused
! endif
! 
! ifdef PGCC
!  OFLAGS = -mcpu=pentium -O6 -ffast-math
! else
!  ifdef PENTIUMONLY
!   OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
!  else
!   OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
!  endif
! endif
! 
! ifdef STATICLINK
!  AL_CONF_OPTION = --static
!  LIB_FLAGS = -lccom_s -lcgui_s
! else
!  AL_CONF_OPTION = --shared
!  LIB_FLAGS = -lccom -lcgui
! endif
! 
! ifdef DEBUGMODE
!  CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
!  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
!  LFLAGS += -g
!  AL_CONF_LIB = debug
! else
!  ifdef PROFILEMODE
!   CFLAGS = $(WFLAGS) $(OFLAGS) -pg
!   SFLAGS = $(WFLAGS)
!   LFLAGS += -pg
!   AL_CONF_LIB = profile
!  else # optimised build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
!   SFLAGS = $(WFLAGS)
!   AL_CONF_LIB = release
!  endif
! endif # DEBUGMODE
! 
! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)`
! 
! ifdef CBAR_DEVELOPING
!  CFLAGS += -D_CBAR_DEVELOPING=1
! endif
! ifdef CBAR_FORTIFY
!  CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY
! endif
! 
! CFLAGS_NO_OPTIMIZE = $(WFLAGS)
! 
! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS)
! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE)
! 
! ifdef STATICLINK
!  COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK
! endif
! 
! ifdef PROFILEMODE
!  LIB_FLAGS += -lgmon
! endif
! 
! 
! 
! # -------- List platform specific objects and programs. --------
! 
! VPATH +=
! 
! OBJ_LIST = $(COMMON_OBJS)
! 
! # Insert names of targets to build platform specific programs here.
! PROGRAMS =
! # Insert targets to build platform specific programs here.
! # myprogram: path/myprogram$(EXE_SUFFIX)
! 
! 
! 
! # -------- Define how to compile. --------
! 
! GCC2UNIX = -D__UNIX__ -UDJGPP
! 
! define COMPILE_C_TO_OBJ
!  gcc $(COMPILE_FLAGS) -I./include -o $@ -c $<
! endef
! 
! ifdef STATICLINK
!  # link as a static library
!  define LINK_OBJ_TO_LIB
!  ar rs $(LIB_NAME) $(LIB_OBJS)
!  endef
! 
!  define LINK_OBJ_TO_EXE
!  gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS)
!  endef
! else
!  # link as a shared object
!  define LINK_OBJ_TO_LIB
!  gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS)
!  endef
! 
!  define LINK_OBJ_TO_EXE
!  gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcbar $(LIB_FLAGS)
!  endef
! endif # ifdef STATICLINK
! 
! # -------- Rules for installing and removing the library files. --------
! 
! # If you don't have the install command, you may use cp and mkdir, but
! # this will not set permissions.
! 
! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	install -m 755 -d $(SYSTEM_LIB_DIR)
! 	install -m 644 $< $@
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	install -m 755 -d $(SYSTEM_INCLUDE_DIR)
! 	install -m 644 $< $@
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cbar
! 	install -m 644 $< $@
! 
! 
! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cbar/*.h))
! 
! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(INSTALL_HEADERS)
! 
! install: $(INSTALL_FILES)
! 	@echo The $(DESCRIPTION) UNIX library has been installed.
! 
! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar_s.a $(SYSTEM_LIB_DIR)/libcbard_s.a \
!  $(SYSTEM_LIB_DIR)/libcbar.so $(SYSTEM_LIB_DIR)/libcbard.so \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h
! 
! uninstall:
! 	-rm -fv $(UNINSTALL_FILES)
! 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
! 	@echo All gone!
! 
! # -------- generate automatic dependencies --------
! 
! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCBAR_SCAN_DEPEND
! 
! depend:
! 	gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar\/\1\.o:/" _depend.tmp > obj/unix/cbar/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard\/\1\.o:/" _depend.tmp > obj/unix/cbard/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar_s\/\1\.o:/" _depend.tmp > obj/unix/cbar_s/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard_s\/\1\.o:/" _depend.tmp > obj/unix/cbard_s/makefile.dep
! 	rm _depend.tmp 
--- 1,233 ----
! #  makefile.uni:
! #  Makefile for the CBAR library with Unix. Should not be used directly!
! #
! #  By Christer Sandberg (copied from ADIME made by Sven Sandberg)
! #
! #  See readme.txt for more information about CBAR.
! #
! #  See makefile.all for a list of the available targets.
! 
! # -------- Define some variables that the primary makefile may use. --------
! 
! PLATFORM = UNIX
! 
! EXE_SUFFIX =
! OBJ_SUFFIX = .o
! LIB_SUFFIX = .a
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! 
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! 
! ifndef OBJ_ROOT_DIR
! OBJ_ROOT_DIR = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix
! 
! ifndef LIB_ROOT_DIR
! LIB_ROOT_DIR = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/unix
! 
! HAVE_TEXINFO = 1
! 
! ifdef STATICLINK
!  # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s
!  IMPLIB_BASENAME = lib$(PACKAGE)_s.a
! else
!  # link as a shared object
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
!  IMPLIB_BASENAME = lib$(PACKAGE).so
! endif
! 
! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
! LIB_NAME = $(IMPLIB_NAME)
! 
! # -------- Default system paths. ------------
! 
! ifndef SYSTEM_DIR
! SYSTEM_DIR = /usr/local
! endif
! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include
! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib
! 
! # -------- Set up mktext --------
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
! CBAR_ICONS = $(subst \,/,$(CBAR_ICONS_X))
! CBAR_ICONS_C = $(subst \,/,$(CBAR_ICONS_C_X))
! CBAR_ICONS_H = $(subst \,/,$(CBAR_ICONS_H_X))
! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! 
! # -------- Give a sensible default target for make without any args. --------
! # This must be done right after the tests, which can generate error targets.
! 
! .PHONY: _default
! 
! _default: default
! 
! # -------- Decide what compiler options and libraries to use. --------
! 
! ifdef WARNMODE
! WFLAGS = -Wall -W -Werror
! else
! WFLAGS = -Wall -Wno-unused
! endif
! 
! ifdef PGCC
!  OFLAGS = -mcpu=pentium -O6 -ffast-math
! else
!  ifdef PENTIUMONLY
!   OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
!  else
!   OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
!  endif
! endif
! 
! ifdef STATICLINK
!  AL_CONF_OPTION = --static
!  LIB_FLAGS = -lccom_s -lcgui_s
! else
!  AL_CONF_OPTION = --shared
!  LIB_FLAGS = -lccom -lcgui
! endif
! 
! ifdef DEBUGMODE
!  CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
!  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
!  LFLAGS += -g
!  AL_CONF_LIB = debug
! else
!  ifdef PROFILEMODE
!   CFLAGS = $(WFLAGS) $(OFLAGS) -pg
!   SFLAGS = $(WFLAGS)
!   LFLAGS += -pg
!   AL_CONF_LIB = profile
!  else # optimised build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
!   SFLAGS = $(WFLAGS)
!   AL_CONF_LIB = release
!  endif
! endif # DEBUGMODE
! 
! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)`
! 
! ifdef CBAR_DEVELOPING
!  CFLAGS += -D_CBAR_DEVELOPING=1
! endif
! ifdef CBAR_FORTIFY
!  CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY
! endif
! 
! CFLAGS_NO_OPTIMIZE = $(WFLAGS)
! 
! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS)
! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE)
! 
! ifdef STATICLINK
!  COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK
! endif
! 
! ifdef PROFILEMODE
!  LIB_FLAGS += -lgmon
! endif
! 
! 
! 
! # -------- List platform specific objects and programs. --------
! 
! VPATH +=
! 
! OBJ_LIST = $(COMMON_OBJS)
! 
! # Insert names of targets to build platform specific programs here.
! PROGRAMS =
! # Insert targets to build platform specific programs here.
! # myprogram: path/myprogram$(EXE_SUFFIX)
! 
! 
! 
! # -------- Define how to compile. --------
! 
! GCC2UNIX = -D__UNIX__ -UDJGPP
! 
! define COMPILE_C_TO_OBJ
!  gcc $(COMPILE_FLAGS) -I./include -o $@ -c $<
! endef
! 
! ifdef STATICLINK
!  # link as a static library
!  define LINK_OBJ_TO_LIB
!  ar rs $(LIB_NAME) $(LIB_OBJS)
!  endef
! 
!  define LINK_OBJ_TO_EXE
!  gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS)
!  endef
! else
!  # link as a shared object
!  define LINK_OBJ_TO_LIB
!  gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS)
!  endef
! 
!  define LINK_OBJ_TO_EXE
!  gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcbar $(LIB_FLAGS)
!  endef
! endif # ifdef STATICLINK
! 
! # -------- Rules for installing and removing the library files. --------
! 
! # If you don't have the install command, you may use cp and mkdir, but
! # this will not set permissions.
! 
! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	install -m 755 -d $(SYSTEM_LIB_DIR)
! 	install -m 644 $< $@
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	install -m 755 -d $(SYSTEM_INCLUDE_DIR)
! 	install -m 644 $< $@
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cbar
! 	install -m 644 $< $@
! 
! 
! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cbar/*.h))
! 
! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(INSTALL_HEADERS)
! 
! install: $(INSTALL_FILES)
! 	@echo The $(DESCRIPTION) UNIX library has been installed.
! 
! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar_s.a $(SYSTEM_LIB_DIR)/libcbard_s.a \
!  $(SYSTEM_LIB_DIR)/libcbar.so $(SYSTEM_LIB_DIR)/libcbard.so \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h
! 
! uninstall:
! 	-rm -fv $(UNINSTALL_FILES)
! 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
! 	@echo All gone!
! 
! # -------- generate automatic dependencies --------
! 
! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCBAR_SCAN_DEPEND
! 
! depend:
! 	gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar\/\1\.o:/" _depend.tmp > obj/unix/cbar/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard\/\1\.o:/" _depend.tmp > obj/unix/cbard/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar_s\/\1\.o:/" _depend.tmp > obj/unix/cbar_s/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard_s\/\1\.o:/" _depend.tmp > obj/unix/cbard_s/makefile.dep
! 	rm _depend.tmp 

Index: makefile.ver
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.ver	21 Jun 2004 19:18:32 -0000	1.5
--- makefile.ver	8 Nov 2004 21:20:45 -0000	1.6
***************
*** 1,10 ****
! # version numbers included by the main makefile
! # this file is patched by fixver.sh
! 
! # DLL filename number for Windows
! LIB_VERSION = 10
! 
! # Shared library versions for Unix
! # todo: this is unused at the moment
! shared_version = 1.0.2
! shared_major_minor = 1.0
--- 1,10 ----
! # version numbers included by the main makefile
! # this file is patched by fixver.sh
! 
! # DLL filename number for Windows
! LIB_VERSION = 10
! 
! # Shared library versions for Unix
! # todo: this is unused at the moment
! shared_version = 1.0.2
! shared_major_minor = 1.0

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.bcc	21 Jun 2004 19:18:32 -0000	1.7
--- makefile.bcc	8 Nov 2004 21:20:45 -0000	1.8
***************
*** 1,363 ****
! #  makefile.bcc:
! #  Makefile for the CBAR library with Borland C++Builder.
! #  Should not be used directly!
! #
! #  By Christer Sandberg (ported from Adime made by Sven Sandberg).
! #
! #  See readme.txt for more information about CBAR.
! #
! #  See makefile.all for a list of the available targets.
! #
! #
! #  You need to set BCC32DIR to the directory where Borland C++Builder is
! #  located.
! #
! #  This build uses djgpp for calculating source dependencies.
! #
! #  The "depend" target uses sed.
! 
! 
! 
! # -------- define some variables that the primary makefile will use --------
! 
! PLATFORM = BCC32
! 
! EXE_SUFFIX = .exe
! OBJ_SUFFIX = .obj
! LIB_SUFFIX = .lib
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! 
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! 
! ifndef OBJ_ROOT_DIR
! OBJ_ROOT_DIR = obj
! OBJ_ROOT_DIR_D = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32
! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32
! 
! ifndef LIB_ROOT_DIR
! LIB_ROOT_DIR = lib
! LIB_ROOT_DIR_D = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/bcc32
! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32
! 
! ifdef STATICLINK
!  # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s
!  IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX)
!  IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
!  LIB_NAME = $(IMPLIB_NAME)
! else
!  # link as a DLL
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
!  DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll
!  DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
!  IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX)
!  IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
!  LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME)
!  EXPDEF_NAME = $(LIB_DIR)/cbar.def
!  IMPDEF_NAME = $(LIB_DIR)/impcbar.def
! endif
! 
! # -------- Check that environment path variables are set. --------
! 
! .PHONY: badwin badbcc32
! 
! ifeq ($(OS),Windows_NT)
! # true 32 bit OS:
! ifeq ($(TERM),msys)
! WINSYSDIR = $(SYSTEMROOT)
! else
! WINSYSDIR = $(SystemRoot)
! endif
! WINSUBDIR = system32
! else
! # DOS based windows:
! ifeq ($(TERM),msys)
! WINSYSDIR = $(WINDIR)
! else
! WINSYSDIR = $(windir)
! endif
! WINSUBDIR = system
! endif
! 
! ifneq ($(WINSYSDIR),)
! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR))
! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR))
! else
! badwin:
! 	@echo Your SYSTEMROOT or windir environment variable is not set!
! endif
! 
! ifdef BCC32DIR
! 	BCC32DIR_U = $(subst \,/,$(BCC32DIR))
! 	BCC32DIR_D = $(subst /,\,$(BCC32DIR))
! else
! badbcc32:
! 	@echo You need to set BCC32DIR to the directory where Borland C++Builder is
! 	@echo located.
! endif
! 
! 
! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include
! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include
! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib
! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib
! 
! 
! # -------- Set up mktext --------
! ifdef UNIX_TOOLS
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! else
! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
! MKTEXT = $(subst /,\,$(MKTEXT_X))
! endif
! 
! 
! # -------- give a sensible default target for make without any args --------
! 
! .PHONY: _default
! 
! _default: default
! 
! # -------- decide what compiler options to use --------
! 
! ifdef WARNMODE
! WFLAGS = -w
! else
! WFLAGS =
! endif
! 
! ifdef DEBUGMODE
! # -------- debugging build --------
! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v
! SFLAGS = -DDEBUGMODE=$(DEBUGMODE)
! LFLAGS = /q /Gn /v
! ifdef STATICLINK
! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib
! else
! LIB_FLAGS = ccomd.lib cguid.lib alld.lib
! endif
! else
! ifdef PROFILEMODE
! # -------- profiling build --------
! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v
! SFLAGS = $(WFLAGS)
! LFLAGS = /q /Gn /v
! ifdef STATICLINK
! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib
! else
! LIB_FLAGS = ccom.lib cgui.lib allp.lib
! endif
! else
! # -------- optimised build --------
! CFLAGS = $(WFLAGS) -O2 -OS -q
! SFLAGS = $(WFLAGS)
! LFLAGS = /x /q /Gn
! DELETE_TDS_FILES = 1
! ifdef STATICLINK
! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib
! else
! LIB_FLAGS = ccom.lib cgui.lib alleg.lib
! endif
! endif
! endif
! 
! ifdef CBAR_DEVELOPING
! CFLAGS += -D_CBAR_DEVELOPING=1
! endif
! ifdef CBAR_FORTIFY
! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY
! endif
! 
! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q
! 
! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS)
! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE)
! 
! ifdef STATICLINK
! COMPILE_FLAGS += -DCBAR_STATICLINK
! endif
! 
! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \
!  dinput.lib ddraw.lib winmm.lib dsound.lib
! 
! # -------- List platform specific objects and programs. --------
! 
! VPATH +=
! 
! OBJ_LIST = $(COMMON_OBJS)
! 
! # Insert names of targets to build platform specific programs here.
! PROGRAMS =
! # Insert targets to build platform specific programs here.
! # myprogram: path/myprogram$(EXE_SUFFIX)
! 
! # -------- Define how to compile. --------
! 
! GCC2BCC = -D__BORLANDC__ -UDJGPP
! 
! COMPILE_C_TO_OBJ_DEPS =
! define COMPILE_C_TO_OBJ
! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<)
! endef
! define MAKE_LIB_RSP
! 	$(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp
! 	)
! endef
! 
! lib.rsp:
! 	$(MAKE_LIB_RSP)
! 
! CLEAN_FILES += lib.rsp
! 
! LINK_OBJ_TO_EXE_DEPS = lib.rsp
! define DO_LINK_OBJ_TO_EXE
! 	ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp)
! endef
! ifdef DELETE_TDS_FILES
! 	define LINK_OBJ_TO_EXE
! 		$(DO_LINK_OBJ_TO_EXE)
! 		@del $(subst .exe,.tds,$(subst /,\,$@))
! 	endef
! else
! 	LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE)
! endif
! 
! ifdef STATICLINK
! # link as a static library
! 
! LINK_OBJ_TO_LIB_DEPS =
! define LINK_OBJ_TO_LIB
! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile))
! )
! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME)))
! endef
! 
! else
! # link as a DLL
! 
! LINK_OBJ_TO_LIB_DEPS = lib.rsp
! define DO_LINK_OBJ_TO_LIB
! 	-del libobj.rsp
! 	$(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp
! 	)
! 	ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME))
! 	del libobj.rsp
! 	echo LIBRARY     $(DLL_BASENAME) > _impcbar.def
! 	copy _impcbar.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def
! 	implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def
! 	del _impcbar.def
! 	del _impdim2.def
! endef
! ifdef DELETE_TDS_FILES
! 	define LINK_OBJ_TO_LIB
! 		$(DO_LINK_OBJ_TO_LIB)
! 		@del $(subst .dll,.tds,$(subst /,\,$@))
! 	endef
! else
! 	LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB)
! endif
! 
! endif # ifdef STATICLINK
! 
! 
! 
! # -------- Rules for installing and removing the library files. --------
! 
! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),)
! HAVE_CP = 1
! endif
! 
! ifndef STATICLINK
! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! endif
! 
! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! $(SYSTEM_INCLUDE_DIR)/cbar:
! 	md $(subst /,\,$@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! 
! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cbar/*.h))
! 
! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(SYSTEM_INCLUDE_DIR)/cbar \
!  $(INSTALL_HEADERS)
! 
! ifndef STATICLINK
! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME)
! endif
! 
! install: $(INSTALL_FILES)
! 	@echo The $(DESCRIPTION) BCC32 library has been installed.
! 
! UNINSTALL_FILES = \
!  $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \
!  $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll
! 
! uninstall:
! 	-rm -fv $(UNINSTALL_FILES)
! 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
! 	@echo All gone!
! 
! # -------- Generate automatic dependencies. --------
! 
! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND
! 
! depend:
! 	gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar_s/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard_s/makefile.dep
! 	rm _depend.tmp
--- 1,363 ----
! #  makefile.bcc:
! #  Makefile for the CBAR library with Borland C++Builder.
! #  Should not be used directly!
! #
! #  By Christer Sandberg (ported from Adime made by Sven Sandberg).
! #
! #  See readme.txt for more information about CBAR.
! #
! #  See makefile.all for a list of the available targets.
! #
! #
! #  You need to set BCC32DIR to the directory where Borland C++Builder is
! #  located.
! #
! #  This build uses djgpp for calculating source dependencies.
! #
! #  The "depend" target uses sed.
! 
! 
! 
! # -------- define some variables that the primary makefile will use --------
! 
! PLATFORM = BCC32
! 
! EXE_SUFFIX = .exe
! OBJ_SUFFIX = .obj
! LIB_SUFFIX = .lib
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! 
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! 
! ifndef OBJ_ROOT_DIR
! OBJ_ROOT_DIR = obj
! OBJ_ROOT_DIR_D = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32
! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32
! 
! ifndef LIB_ROOT_DIR
! LIB_ROOT_DIR = lib
! LIB_ROOT_DIR_D = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/bcc32
! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32
! 
! ifdef STATICLINK
!  # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s
!  IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX)
!  IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
!  LIB_NAME = $(IMPLIB_NAME)
! else
!  # link as a DLL
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
!  DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll
!  DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
!  IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX)
!  IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
!  LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME)
!  EXPDEF_NAME = $(LIB_DIR)/cbar.def
!  IMPDEF_NAME = $(LIB_DIR)/impcbar.def
! endif
! 
! # -------- Check that environment path variables are set. --------
! 
! .PHONY: badwin badbcc32
! 
! ifeq ($(OS),Windows_NT)
! # true 32 bit OS:
! ifeq ($(TERM),msys)
! WINSYSDIR = $(SYSTEMROOT)
! else
! WINSYSDIR = $(SystemRoot)
! endif
! WINSUBDIR = system32
! else
! # DOS based windows:
! ifeq ($(TERM),msys)
! WINSYSDIR = $(WINDIR)
! else
! WINSYSDIR = $(windir)
! endif
! WINSUBDIR = system
! endif
! 
! ifneq ($(WINSYSDIR),)
! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR))
! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR))
! else
! badwin:
! 	@echo Your SYSTEMROOT or windir environment variable is not set!
! endif
! 
! ifdef BCC32DIR
! 	BCC32DIR_U = $(subst \,/,$(BCC32DIR))
! 	BCC32DIR_D = $(subst /,\,$(BCC32DIR))
! else
! badbcc32:
! 	@echo You need to set BCC32DIR to the directory where Borland C++Builder is
! 	@echo located.
! endif
! 
! 
! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include
! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include
! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib
! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib
! 
! 
! # -------- Set up mktext --------
! ifdef UNIX_TOOLS
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! else
! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
! MKTEXT = $(subst /,\,$(MKTEXT_X))
! endif
! 
! 
! # -------- give a sensible default target for make without any args --------
! 
! .PHONY: _default
! 
! _default: default
! 
! # -------- decide what compiler options to use --------
! 
! ifdef WARNMODE
! WFLAGS = -w
! else
! WFLAGS =
! endif
! 
! ifdef DEBUGMODE
! # -------- debugging build --------
! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v
! SFLAGS = -DDEBUGMODE=$(DEBUGMODE)
! LFLAGS = /q /Gn /v
! ifdef STATICLINK
! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib
! else
! LIB_FLAGS = ccomd.lib cguid.lib alld.lib
! endif
! else
! ifdef PROFILEMODE
! # -------- profiling build --------
! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v
! SFLAGS = $(WFLAGS)
! LFLAGS = /q /Gn /v
! ifdef STATICLINK
! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib
! else
! LIB_FLAGS = ccom.lib cgui.lib allp.lib
! endif
! else
! # -------- optimised build --------
! CFLAGS = $(WFLAGS) -O2 -OS -q
! SFLAGS = $(WFLAGS)
! LFLAGS = /x /q /Gn
! DELETE_TDS_FILES = 1
! ifdef STATICLINK
! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib
! else
! LIB_FLAGS = ccom.lib cgui.lib alleg.lib
! endif
! endif
! endif
! 
! ifdef CBAR_DEVELOPING
! CFLAGS += -D_CBAR_DEVELOPING=1
! endif
! ifdef CBAR_FORTIFY
! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY
! endif
! 
! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q
! 
! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS)
! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE)
! 
! ifdef STATICLINK
! COMPILE_FLAGS += -DCBAR_STATICLINK
! endif
! 
! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \
!  dinput.lib ddraw.lib winmm.lib dsound.lib
! 
! # -------- List platform specific objects and programs. --------
! 
! VPATH +=
! 
! OBJ_LIST = $(COMMON_OBJS)
! 
! # Insert names of targets to build platform specific programs here.
! PROGRAMS =
! # Insert targets to build platform specific programs here.
! # myprogram: path/myprogram$(EXE_SUFFIX)
! 
! # -------- Define how to compile. --------
! 
! GCC2BCC = -D__BORLANDC__ -UDJGPP
! 
! COMPILE_C_TO_OBJ_DEPS =
! define COMPILE_C_TO_OBJ
! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<)
! endef
! define MAKE_LIB_RSP
! 	$(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp
! 	)
! endef
! 
! lib.rsp:
! 	$(MAKE_LIB_RSP)
! 
! CLEAN_FILES += lib.rsp
! 
! LINK_OBJ_TO_EXE_DEPS = lib.rsp
! define DO_LINK_OBJ_TO_EXE
! 	ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp)
! endef
! ifdef DELETE_TDS_FILES
! 	define LINK_OBJ_TO_EXE
! 		$(DO_LINK_OBJ_TO_EXE)
! 		@del $(subst .exe,.tds,$(subst /,\,$@))
! 	endef
! else
! 	LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE)
! endif
! 
! ifdef STATICLINK
! # link as a static library
! 
! LINK_OBJ_TO_LIB_DEPS =
! define LINK_OBJ_TO_LIB
! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile))
! )
! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME)))
! endef
! 
! else
! # link as a DLL
! 
! LINK_OBJ_TO_LIB_DEPS = lib.rsp
! define DO_LINK_OBJ_TO_LIB
! 	-del libobj.rsp
! 	$(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp
! 	)
! 	ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME))
! 	del libobj.rsp
! 	echo LIBRARY     $(DLL_BASENAME) > _impcbar.def
! 	copy _impcbar.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def
! 	implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def
! 	del _impcbar.def
! 	del _impdim2.def
! endef
! ifdef DELETE_TDS_FILES
! 	define LINK_OBJ_TO_LIB
! 		$(DO_LINK_OBJ_TO_LIB)
! 		@del $(subst .dll,.tds,$(subst /,\,$@))
! 	endef
! else
! 	LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB)
! endif
! 
! endif # ifdef STATICLINK
! 
! 
! 
! # -------- Rules for installing and removing the library files. --------
! 
! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),)
! HAVE_CP = 1
! endif
! 
! ifndef STATICLINK
! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! endif
! 
! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! $(SYSTEM_INCLUDE_DIR)/cbar:
! 	md $(subst /,\,$@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! 
! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cbar/*.h))
! 
! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(SYSTEM_INCLUDE_DIR)/cbar \
!  $(INSTALL_HEADERS)
! 
! ifndef STATICLINK
! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME)
! endif
! 
! install: $(INSTALL_FILES)
! 	@echo The $(DESCRIPTION) BCC32 library has been installed.
! 
! UNINSTALL_FILES = \
!  $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \
!  $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll
! 
! uninstall:
! 	-rm -fv $(UNINSTALL_FILES)
! 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
! 	@echo All gone!
! 
! # -------- Generate automatic dependencies. --------
! 
! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND
! 
! depend:
! 	gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar_s/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard_s/makefile.dep
! 	rm _depend.tmp

Index: makefile.dj
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.dj	21 Jun 2004 19:18:32 -0000	1.7
--- makefile.dj	8 Nov 2004 21:20:45 -0000	1.8
***************
*** 1,288 ****
! #  makefile.dj:
! #  Makefile for the CBAR library with DJGPP. Should not be used directly!
! #
! #  By Christer Sandberg (ported from Adime made by Sven Sandberg).
! #  See readme.txt for more information about CBAR
! #  See makefile.all for a list of the available targets.
! 
! # -------- Define some variables that the primary makefile may use. --------
! 
! PLATFORM = djgpp
! 
! EXE_SUFFIX = .exe
! OBJ_SUFFIX = .o
! LIB_SUFFIX = .a
! 
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! ifndef CROSSCOMPILE
! ifneq ($(LFN),y)
! HTML_SUFFIX = .htm
! INFO_SUFFIX = .inf
! TEXI_SUFFIX = .txi
! _TX_HTML_FLAG = -htm
! _TX_TEXI_FLAG = -txi
! endif
! endif
! 
! HAVE_TEXINFO = 1
! 
! ifndef OBJ_ROOT_DIR
!  OBJ_ROOT_DIR = obj
!  OBJ_ROOT_DIR_D = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp
! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
! 
! ifndef LIB_ROOT_DIR
!  LIB_ROOT_DIR = lib
!  LIB_ROOT_DIR_D = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/djgpp
! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp
! 
! LIB_BASENAME = lib$(PACKAGE).a
! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME)
! 
! 
! 
! # -------- Find djgpp. --------
! 
! .PHONY: baddjgpp
! 
! ifndef DJDIR
! baddjgpp:
! 	@echo DJDIR variable not set!
! 	@echo You must set the environment variable DJDIR to point to your djgpp
! 	@echo directory, e.g. "set DJDIR=c:\djgpp"
! endif
! DJGPPDIR_U = $(subst \,/,$(DJDIR))
! DJGPPDIR_D = $(subst /,\,$(DJDIR))
! 
! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include
! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include
! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib
! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib
! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info
! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info
! 
! ifneq (,$(findstring /sh.exe,$(SHELL)))
!   UNIX_TOOLS = 1
! endif
! 
! ifdef UNIX_TOOLS
!   CP = cp
!   RM = rm
!   MKDIR = mkdir
! else
!   CP = copy
!   RM = del
!   MKDIR = md
! endif
! 
! # -------- Set up mktext --------
! ifdef UNIX_TOOLS
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! else
! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
! MKTEXT = $(subst /,\,$(MKTEXT_X))
! endif
! 
! 
! # -------- Give a sensible default target for make without any args. --------
! # This must be done right after the tests, which can generate error targets.
! 
! .PHONY: _default
! 
! _default: default
! 
! 
! 
! # -------- Decide what compiler options and libraries to use. --------
! 
! ifdef WARNMODE
!  WFLAGS = -Wall -W -Werror
! else
!  WFLAGS = -Wall -Wno-unused
! endif
! 
! ifdef PGCC
!  OFLAGS = -mcpu=pentium -O6 -ffast-math
! else
!  ifdef PENTIUMONLY
!   OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
!  else
!   OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
!  endif
! endif
! 
! ifdef DEBUGMODE
!  # debugging build
!  CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
!  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
!  LFLAGS = -g3
!  LIB_FLAGS = -lccomd -lcguid -lalld
! else
!  ifdef PROFILEMODE
!   # profiling build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -pg
!   SFLAGS = $(WFLAGS)
!   LFLAGS = -pg
!   LIB_FLAGS = -lccom -lcgui -lallp
!  else
!   # optimised build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
!   SFLAGS = $(WFLAGS)
!   ifndef SYMBOLMODE
!    LFLAGS = -s
!    LIB_FLAGS = -lccom -lcgui -lalleg
!   endif
!  endif
! endif
! 
! ifdef CBAR_DEVELOPING
!  CFLAGS += -D_CBAR_DEVELOPING=1
! endif
! ifdef CBAR_FORTIFY
!  CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY
! endif
! 
! # This is just so that we can test that CBAR doesn't relies on Allegro
! # including some standard header.
! ifdef CBAR_NO_ALLEGRO_STD_HEADERS
! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1
! endif
! 
! CFLAGS_NO_OPTIMIZE = $(WFLAGS)
! 
! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS)
! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE)
! 
! 
! 
! # -------- List platform specific objects and programs. --------
! 
! VPATH +=
! 
! OBJ_LIST = $(COMMON_OBJS)
! 
! # Insert names of targets to build platform specific programs here.
! PROGRAMS =
! # Insert targets to build platform specific programs here.
! # myprogram: path/myprogram$(EXE_SUFFIX)
! 
! 
! 
! # -------- Define how to compile. --------
! 
! GCC2DJGPP = -DDJGPP=2 -U__unix__
! 
! define COMPILE_C_TO_OBJ
! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $<
! endef
! 
! define LINK_OBJ_TO_LIB
! ar rs $(LIB_NAME) $(LIB_OBJS)
! endef
! 
! define LINK_OBJ_TO_EXE
! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS)
! endef
! 
! # -------- Rules for installing and removing the library files. --------
! 
! ifdef CROSSCOMPILE
! 
! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	cp $(subst \,/,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	cp $(subst \,/,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar:
! 	mkdir $(subst \,/,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	cp $(subst \,/,$< $@)
! 
! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	cp $(subst \,/,$< $@)
! 	-install-info $(subst \,/,$@) $(SYSTEM_INFO_DIR)/dir
! 
! else # ifdef CROSSCOMPILE
! 
! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	$(CP) $(subst /,\,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar:
! 	$(MKDIR) $(subst /,\,$@)
! 
! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	$(CP) $(subst /,\,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	$(CP) $(subst /,\,$< $@)
! 
! endif # ifdef CROSSCOMPILE else
! 
! 
! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cbar/*.h))
! 
! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \
! 					 $(SYSTEM_INCLUDE_DIR)/cbar.h \
! 					 $(SYSTEM_INCLUDE_DIR)/cbar \
! 					 $(INSTALL_HEADERS) \
! 					 $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX)
! 
! install: $(INSTALL_FILES)
! 	@echo $(INSTALL_FILES)
! 	@echo The $(DESCRIPTION) djgpp library has been installed.
! 
! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar.a $(SYSTEM_LIB_DIR)/libcbard.a \
! 						$(SYSTEM_INCLUDE_DIR)/cbar.h \
! 						$(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX)
! 
! uninstall:
! 	-rm -fv $(UNINSTALL_FILES)
! 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
! 	@echo All gone!
! 
! 
! 
! # -------- Compile anything that can't be done in makefile.all. --------
! 
! # this section is empty
! 
! 
! # -------- Generate automatic dependencies. --------
! 
! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND
! 
! depend:
! 	gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp
! 	sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbar\/\1/" _depend.tmp > obj/djgpp/cbar/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbard\/\1/" _depend.tmp > obj/djgpp/cbard/makefile.dep
! 	rm _depend.tmp
--- 1,288 ----
! #  makefile.dj:
! #  Makefile for the CBAR library with DJGPP. Should not be used directly!
! #
! #  By Christer Sandberg (ported from Adime made by Sven Sandberg).
! #  See readme.txt for more information about CBAR
! #  See makefile.all for a list of the available targets.
! 
! # -------- Define some variables that the primary makefile may use. --------
! 
! PLATFORM = djgpp
! 
! EXE_SUFFIX = .exe
! OBJ_SUFFIX = .o
! LIB_SUFFIX = .a
! 
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! ifndef CROSSCOMPILE
! ifneq ($(LFN),y)
! HTML_SUFFIX = .htm
! INFO_SUFFIX = .inf
! TEXI_SUFFIX = .txi
! _TX_HTML_FLAG = -htm
! _TX_TEXI_FLAG = -txi
! endif
! endif
! 
! HAVE_TEXINFO = 1
! 
! ifndef OBJ_ROOT_DIR
!  OBJ_ROOT_DIR = obj
!  OBJ_ROOT_DIR_D = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp
! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
! 
! ifndef LIB_ROOT_DIR
!  LIB_ROOT_DIR = lib
!  LIB_ROOT_DIR_D = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/djgpp
! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp
! 
! LIB_BASENAME = lib$(PACKAGE).a
! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME)
! 
! 
! 
! # -------- Find djgpp. --------
! 
! .PHONY: baddjgpp
! 
! ifndef DJDIR
! baddjgpp:
! 	@echo DJDIR variable not set!
! 	@echo You must set the environment variable DJDIR to point to your djgpp
! 	@echo directory, e.g. "set DJDIR=c:\djgpp"
! endif
! DJGPPDIR_U = $(subst \,/,$(DJDIR))
! DJGPPDIR_D = $(subst /,\,$(DJDIR))
! 
! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include
! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include
! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib
! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib
! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info
! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info
! 
! ifneq (,$(findstring /sh.exe,$(SHELL)))
!   UNIX_TOOLS = 1
! endif
! 
! ifdef UNIX_TOOLS
!   CP = cp
!   RM = rm
!   MKDIR = mkdir
! else
!   CP = copy
!   RM = del
!   MKDIR = md
! endif
! 
! # -------- Set up mktext --------
! ifdef UNIX_TOOLS
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! else
! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
! MKTEXT = $(subst /,\,$(MKTEXT_X))
! endif
! 
! 
! # -------- Give a sensible default target for make without any args. --------
! # This must be done right after the tests, which can generate error targets.
! 
! .PHONY: _default
! 
! _default: default
! 
! 
! 
! # -------- Decide what compiler options and libraries to use. --------
! 
! ifdef WARNMODE
!  WFLAGS = -Wall -W -Werror
! else
!  WFLAGS = -Wall -Wno-unused
! endif
! 
! ifdef PGCC
!  OFLAGS = -mcpu=pentium -O6 -ffast-math
! else
!  ifdef PENTIUMONLY
!   OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
!  else
!   OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
!  endif
! endif
! 
! ifdef DEBUGMODE
!  # debugging build
!  CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
!  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
!  LFLAGS = -g3
!  LIB_FLAGS = -lccomd -lcguid -lalld
! else
!  ifdef PROFILEMODE
!   # profiling build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -pg
!   SFLAGS = $(WFLAGS)
!   LFLAGS = -pg
!   LIB_FLAGS = -lccom -lcgui -lallp
!  else
!   # optimised build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
!   SFLAGS = $(WFLAGS)
!   ifndef SYMBOLMODE
!    LFLAGS = -s
!    LIB_FLAGS = -lccom -lcgui -lalleg
!   endif
!  endif
! endif
! 
! ifdef CBAR_DEVELOPING
!  CFLAGS += -D_CBAR_DEVELOPING=1
! endif
! ifdef CBAR_FORTIFY
!  CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY
! endif
! 
! # This is just so that we can test that CBAR doesn't relies on Allegro
! # including some standard header.
! ifdef CBAR_NO_ALLEGRO_STD_HEADERS
! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1
! endif
! 
! CFLAGS_NO_OPTIMIZE = $(WFLAGS)
! 
! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS)
! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE)
! 
! 
! 
! # -------- List platform specific objects and programs. --------
! 
! VPATH +=
! 
! OBJ_LIST = $(COMMON_OBJS)
! 
! # Insert names of targets to build platform specific programs here.
! PROGRAMS =
! # Insert targets to build platform specific programs here.
! # myprogram: path/myprogram$(EXE_SUFFIX)
! 
! 
! 
! # -------- Define how to compile. --------
! 
! GCC2DJGPP = -DDJGPP=2 -U__unix__
! 
! define COMPILE_C_TO_OBJ
! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $<
! endef
! 
! define LINK_OBJ_TO_LIB
! ar rs $(LIB_NAME) $(LIB_OBJS)
! endef
! 
! define LINK_OBJ_TO_EXE
! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS)
! endef
! 
! # -------- Rules for installing and removing the library files. --------
! 
! ifdef CROSSCOMPILE
! 
! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	cp $(subst \,/,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	cp $(subst \,/,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar:
! 	mkdir $(subst \,/,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	cp $(subst \,/,$< $@)
! 
! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	cp $(subst \,/,$< $@)
! 	-install-info $(subst \,/,$@) $(SYSTEM_INFO_DIR)/dir
! 
! else # ifdef CROSSCOMPILE
! 
! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	$(CP) $(subst /,\,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar:
! 	$(MKDIR) $(subst /,\,$@)
! 
! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	$(CP) $(subst /,\,$< $@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	$(CP) $(subst /,\,$< $@)
! 
! endif # ifdef CROSSCOMPILE else
! 
! 
! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cbar/*.h))
! 
! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \
! 					 $(SYSTEM_INCLUDE_DIR)/cbar.h \
! 					 $(SYSTEM_INCLUDE_DIR)/cbar \
! 					 $(INSTALL_HEADERS) \
! 					 $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX)
! 
! install: $(INSTALL_FILES)
! 	@echo $(INSTALL_FILES)
! 	@echo The $(DESCRIPTION) djgpp library has been installed.
! 
! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar.a $(SYSTEM_LIB_DIR)/libcbard.a \
! 						$(SYSTEM_INCLUDE_DIR)/cbar.h \
! 						$(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX)
! 
! uninstall:
! 	-rm -fv $(UNINSTALL_FILES)
! 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
! 	@echo All gone!
! 
! 
! 
! # -------- Compile anything that can't be done in makefile.all. --------
! 
! # this section is empty
! 
! 
! # -------- Generate automatic dependencies. --------
! 
! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND
! 
! depend:
! 	gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp
! 	sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbar\/\1/" _depend.tmp > obj/djgpp/cbar/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbard\/\1/" _depend.tmp > obj/djgpp/cbard/makefile.dep
! 	rm _depend.tmp

Index: makefile.vc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.vc	21 Jun 2004 19:18:32 -0000	1.9
--- makefile.vc	8 Nov 2004 21:20:45 -0000	1.10
***************
*** 1,322 ****
! #  makefile.vc:
! #  Makefile for the CBAR library with MSVC. Should not be used directly!
! #
! #  By Christer Sandberg (ported from Adime made by Sven Sandberg).
! #  See readme.txt for more information about CBAR.
! #  See makefile.all for a list of the available targets.
! #
! #  To path MSVC so it can be used from the commandline, run the
! #  vcvars32.bat file which can be found in your MSVC bin directory.
! #
! #  This build uses djgpp for calculating
! #  source dependencies, so you'll need to have that installed as well.
! #
! #  The "depend" target uses sed.
! 
! # -------- define some variables that the primary makefile will use --------
! 
! PLATFORM = MSVC
! 
! EXE_SUFFIX = .exe
! OBJ_SUFFIX = .obj
! LIB_SUFFIX = .lib
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! 
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! 
! ifndef OBJ_ROOT_DIR
! OBJ_ROOT_DIR = obj
! OBJ_ROOT_DIR_D = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc
! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc
! 
! ifndef LIB_ROOT_DIR
!  LIB_ROOT_DIR = lib
!  LIB_ROOT_DIR_D = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/msvc
! LIB_DIR_D = $(LIB_ROOT_DIR)\msvc
! 
! 
! ifdef STATICLINK
!  # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s
!  IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX)
!  IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
!  LIB_NAME = $(IMPLIB_NAME)
! else
!  # link as a DLL
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
!  DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll
!  DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
!  IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX)
!  IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
!  LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME)
!  EXPDEF_NAME = $(LIB_DIR)/cbar.def
! endif
! 
! # -------- Check that environment path variables are set. --------
! 
! .PHONY: badwin badmsvc badspaces
! 
! ifeq ($(OS),Windows_NT)
!    WINSYSDIR = $(SYSTEMROOT)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(SystemRoot)
!    endif
!    WINSUBDIR = system32
! else
!    WINSYSDIR = $(WINDIR)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(windir)
!    endif
!    WINSUBDIR = system
! endif
! 
! ifneq ($(WINSYSDIR),)
!  WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR))
!  WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR))
! else
! badwin:
! 	@echo Your SYSTEMROOT or windir environment variable is not set!
! endif
! 
! ifdef MSVCDIR
! MSVCDIR_U = $(subst \,/,$(MSVCDIR))
! MSVCDIR_D = $(subst /,\,$(MSVCDIR))
! else
! ifdef MSDEVDIR
! MSVCDIR_U = $(subst \,/,$(MSDEVDIR))
! MSVCDIR_D = $(subst /,\,$(MSDEVDIR))
! else
! badmsvc:
! 	@echo Your MSVCDIR or MSDEVDIR environment variable is not set!
! endif
! endif
! 
! NULLSTRING :=
! SPACE := $(NULLSTRING) # special magic to get an isolated space character
! 
! ifneq ($(findstring $(SPACE),$(MSVCDIR)$(MSDEVDIR)),)
! badspaces:
! 	@echo There are spaces in your MSVCDIR or MSDEVDIR environment
! 	@echo variables: please change these to the 8.3 short filename
! 	@echo version, or move your compiler to a different directory.
! endif
! 
! SYSTEM_INCLUDE_DIR = $(MSVCDIR_U)/include
! SYSTEM_INCLUDE_DIR_D = $(MSVCDIR_D)\include
! SYSTEM_LIB_DIR = $(MSVCDIR_U)/lib
! SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib
! 
! 
! # -------- Set up mktext --------
! ifdef UNIX_TOOLS
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! else
! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X))
! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X))
! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X))
! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X))
! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X))
! TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
! MKTEXT = $(subst /,\,$(MKTEXT_X))
! endif
! 
! RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX)
! 
! # -------- give a sensible default target for make without any args --------
! 
! .PHONY: _default
! 
! _default: default
! 
! # -------- decide what compiler options to use --------
! 
! ifdef WARNMODE
! WFLAGS = -W3 -WX
! else
! WFLAGS = -W1
! endif
! 
! ifdef DEBUGMODE
! # -------- debugging build --------
! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Gd -Zi -MDd
! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall
! LFLAGS = -debug -debugtype:cv
! 
! ifdef STATICLINK
!   LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib
!  else
!   LIB_FLAGS = ccomd.lib cguid.lib alld.lib
!  endif
! else
!  ifdef PROFILEMODE
!   # -------- profiling build --------
!   CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD
!   SFLAGS = -Wall
!   LFLAGS = -profile
!   ifdef STATICLINK
!    LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib
!   else
!    LIB_FLAGS = ccom.lib cgui.lib allp.lib
!   endif
!  else
!   # -------- optimised build --------
!   CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD
!   SFLAGS = -Wall
!   LFLAGS = -release
!   ifdef STATICLINK
!    LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib
!   else
!    LIB_FLAGS = ccom.lib cgui.lib alleg.lib
!   endif
!  endif
! endif
! 
! ifdef CBAR_DEVELOPING
!  CFLAGS += -D_CBAR_DEVELOPING=1
! endif
! ifdef CBAR_FORTIFY
!  CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY
! endif
! 
! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Gd -MT
! 
! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS)
! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE)
! 
! ifdef STATICLINK
! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK -DCCOM_STATICLINK
! endif
! 
! LIB_FLAGS += kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \
!  dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib
! 
! # -------- List platform specific objects and programs. --------
! 
! VPATH +=
! 
! OBJ_LIST = $(COMMON_OBJS)
! 
! # Insert names of targets to build platform specific programs here.
! PROGRAMS =
! # Insert targets to build platform specific programs here.
! # myprogram: path/myprogram$(EXE_SUFFIX)
! 
! # -------- Define how to compile. --------
! 
! GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__
! 
! define COMPILE_C_TO_OBJ
! $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $<
! endef
! 
! define LINK_OBJ_TO_EXE
! $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS)
! endef
! 
! ifdef STATICLINK
!  # link as a static library
!  define LINK_OBJ_TO_LIB
!  $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS)
!  endef
! else
!  # link as a DLL
!  define LINK_OBJ_TO_LIB
!  $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS)
!  endef
! endif # ifdef STATICLINK
! 
! # -------- Rules for installing and removing the library files. --------
! 
! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),)
! HAVE_CP = 1
! endif
! 
! ifndef STATICLINK
! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! endif
! 
! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! $(SYSTEM_INCLUDE_DIR)/cbar:
! 	md $(subst /,\,$@)
! 
! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! ifdef HAVE_CP
! 	$(DJDIR)/bin/cp $(subst \,/,$< $@)
! else
! 	copy $(subst /,\,$< $@)
! endif
! 
! 
! INSTALL_HEADERS = $(addprefix $(MSVCDIR_U)/,$(wildcard include/cbar/*.h))
! 
! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(SYSTEM_INCLUDE_DIR)/cbar \
!  $(INSTALL_HEADERS)
! 
! ifndef STATICLINK
! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME)
! endif
! 
! install: $(INSTALL_FILES)
! 	@echo The $(DESCRIPTION) MSVC library has been installed.
! 
! UNINSTALL_FILES = \
!  $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \
!  $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \
!  $(SYSTEM_INCLUDE_DIR)/cbar.h \
!  $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll
! 
! uninstall:
! 	-rm -fv $(UNINSTALL_FILES)
! 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
! 	@echo All gone!
! 
! # -------- Generate automatic dependencies. --------
! 
! DEPEND_PARAMS = $(GCC2MSVC) -MM -MG -I./include -DCBAR_SCAN_DEPEND
! 
! depend:
! 	gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbar\/\1\.obj:/" _depend.tmp > obj/msvc/cbar/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbard\/\1\.obj:/" _depend.tmp > obj/msvc/cbard/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbar_s\/\1\.obj:/" _depend.tmp > obj/msvc/cbar_s/makefile.dep
! 	sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbard_s\/\1\.obj:/" _depend.tmp > obj/msvc/cbard_s/makefile.dep
! 	rm _depend.tmp
--- 1,322 ----
! #  makefile.vc:
! #  Makefile for the CBAR library with MSVC. Should not be used directly!
! #
! #  By Christer Sandberg (ported from Adime made by Sven Sandberg).
! #  See readme.txt for more information about CBAR.
! #  See makefile.all for a list of the available targets.
! #
! #  To path MSVC so it can be used from the commandline, run the
! #  vcvars32.bat file which can be found in your MSVC bin directory.
! #
! #  This build uses djgpp for calculating
! #  source dependencies, so you'll need to have that installed as well.
! #
! #  The "depend" target uses sed.
! 
! # -------- define some variables that the primary makefile will use --------
! 
! PLATFORM = MSVC
! 
! EXE_SUFFIX = .exe
! OBJ_SUFFIX = .obj
! LIB_SUFFIX = .lib
! HTML_SUFFIX = .html
! INFO_SUFFIX = .info
! TEXI_SUFFIX = .texi
! 
! _TX_HTML_FLAG = -html
! _TX_TEXI_FLAG = -texi
! 
! ifndef OBJ_ROOT_DIR
! OBJ_ROOT_DIR = obj
! OBJ_ROOT_DIR_D = obj
! endif
! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc
! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc
! 
! ifndef LIB_ROOT_DIR
!  LIB_ROOT_DIR = lib
!  LIB_ROOT_DIR_D = lib
! endif
! LIB_DIR = $(LIB_ROOT_DIR)/msvc
! LIB_DIR_D = $(LIB_ROOT_DIR)\msvc
! 
! 
! ifdef STATICLINK
!  # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s
!  OBJ_DIR_D = $(...
 
[truncated message content]