[Cbar-develop] cbar/misc makefile.bcc,1.2,1.3 makefile.dj,1.1.1.1,1.2 makefile.mgw,1.2,1.3 makefile.uni,1.1.1.1,1.2 makefile.vc,1.2,1.3 makefile.ver,1.2,1.3 zipup.sh,1.3,1.4

[<ch...@us...>]

Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv23470/misc

Modified Files:
	makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc 
	makefile.ver zipup.sh 
Log Message:
Updated change log

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.bcc	4 Jun 2003 18:30:57 -0000	1.2
--- makefile.bcc	9 Dec 2003 18:48:39 -0000	1.3
***************
*** 90,97 ****
--- 90,107 ----
  
  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
***************
*** 121,130 ****
  
  
! 
  # -------- Set up mktext --------
! TEXT_ARCHIVE = $(subst /,\,$(TEXT_ARCHIVE_X))
  TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
  
  
--- 131,156 ----
  
  
! ifdef UNIX_TOOLS
  # -------- Set up mktext --------
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_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))
! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_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
  
  

Index: makefile.dj
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** makefile.dj	27 Feb 2003 18:43:44 -0000	1.1.1.1
--- makefile.dj	9 Dec 2003 18:48:39 -0000	1.2
***************
*** 77,85 ****
  
  
  # -------- Set up mktext --------
! TEXT_ARCHIVE = $(subst /,\,$(TEXT_ARCHIVE_X))
  TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
  
  
--- 77,102 ----
  
  
+ ifdef UNIX_TOOLS
  # -------- Set up mktext --------
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_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))
! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_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
  
  

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.mgw	4 Jun 2003 18:30:57 -0000	1.2
--- makefile.mgw	9 Dec 2003 18:48:39 -0000	1.3
***************
*** 69,76 ****
--- 69,86 ----
  
  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
***************
*** 101,105 ****
--- 111,126 ----
  SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib
  
+ ifdef UNIX_TOOLS
  # -------- Set up mktext --------
+ ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
+ ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_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))
  ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
***************
*** 111,114 ****
--- 132,137 ----
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
+ endif
+ 
  
  # -------- Find Allegro and makedoc. --------

Index: makefile.uni
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.uni,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** makefile.uni	27 Feb 2003 18:43:44 -0000	1.1.1.1
--- makefile.uni	9 Dec 2003 18:48:39 -0000	1.2
***************
*** 65,74 ****
  
  
- 
  # -------- Set up mktext --------
! TEXT_ARCHIVE = $(TEXT_ARCHIVE_X)
! TEXT_SOURCES  = $(TEXT_SOURCES_X)
! TEXT_HEADERS = $(TEXT_HEADERS_X)
! MKTEXT = $(MKTEXT_X)
  
  
--- 65,78 ----
  
  
  # -------- Set up mktext --------
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_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))
  
  

Index: makefile.vc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.vc	4 Jun 2003 18:30:57 -0000	1.2
--- makefile.vc	9 Dec 2003 18:48:39 -0000	1.3
***************
*** 78,85 ****
--- 78,95 ----
  
  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
***************
*** 122,131 ****
  
  
! 
  # -------- Set up mktext --------
! TEXT_ARCHIVE = $(subst /,\,$(TEXT_ARCHIVE_X))
  TEXT_SOURCES  = $(subst /,\,$(TEXT_SOURCES_X))
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
  
  # -------- Find Allegro, runner and makedoc. --------
--- 132,157 ----
  
  
! ifdef UNIX_TOOLS
  # -------- Set up mktext --------
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_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))
! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_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
  
  # -------- Find Allegro, runner and makedoc. --------

Index: makefile.ver
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.ver	29 Mar 2003 00:43:38 -0000	1.2
--- makefile.ver	9 Dec 2003 18:48:39 -0000	1.3
***************
*** 7,10 ****
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 1.0.0
  shared_major_minor = 1.0
--- 7,10 ----
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 1.0.1
  shared_major_minor = 1.0

Index: zipup.sh
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** zipup.sh	30 Mar 2003 19:57:51 -0000	1.3
--- zipup.sh	9 Dec 2003 18:48:39 -0000	1.4
***************
*** 12,17 ****
  
  # note: these are patched by fixver.sh script.
! zipversion=100
! tgzversion=1.0.0
  
  if [ "$1" != "-q" ]; then
--- 12,17 ----
  
  # note: these are patched by fixver.sh script.
! zipversion=101
! tgzversion=1.0.1
  
  if [ "$1" != "-q" ]; then
***************
*** 86,88 ****
  
  echo all done!
- 
--- 86,87 ----