Update of /cvsroot/ccomx/ccom/misc In directory sc8-pr-cvs1:/tmp/cvs-serv27856/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/ccomx/ccom/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:29:50 -0000 1.2 --- makefile.bcc 9 Dec 2003 19:03:30 -0000 1.3 *************** *** 79,86 **** --- 79,96 ---- 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 *************** *** 110,115 **** ! # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) --- 120,135 ---- ! ifdef UNIX_TOOLS # -------- Set up mktext -------- + ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) + ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) + CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) + CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) + CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) + CCOM_LABELS = $(subst \,/,$(CCOM_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)) *************** *** 121,124 **** --- 141,145 ---- TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) + endif Index: makefile.dj =================================================================== RCS file: /cvsroot/ccomx/ccom/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 2 Mar 2003 17:06:05 -0000 1.1.1.1 --- makefile.dj 9 Dec 2003 19:03:31 -0000 1.2 *************** *** 77,81 **** --- 77,92 ---- + ifdef UNIX_TOOLS # -------- Set up mktext -------- + ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) + ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) + CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) + CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) + CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) + CCOM_LABELS = $(subst \,/,$(CCOM_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)) *************** *** 87,90 **** --- 98,102 ---- TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) + endif Index: makefile.mgw =================================================================== RCS file: /cvsroot/ccomx/ccom/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:29:50 -0000 1.2 --- makefile.mgw 9 Dec 2003 19:03:31 -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 *************** *** 102,107 **** ! # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) --- 112,127 ---- ! ifdef UNIX_TOOLS # -------- Set up mktext -------- + ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) + ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) + CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) + CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) + CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) + CCOM_LABELS = $(subst \,/,$(CCOM_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)) *************** *** 113,116 **** --- 133,137 ---- TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) + endif Index: makefile.uni =================================================================== RCS file: /cvsroot/ccomx/ccom/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 2 Mar 2003 17:06:07 -0000 1.1.1.1 --- makefile.uni 9 Dec 2003 19:03:32 -0000 1.2 *************** *** 65,79 **** - # -------- Set up mktext -------- ! ALLEGRO_DAT = $(ALLEGRO_DAT_X) ! ALLEGRO_DAT2C = $(ALLEGRO_DAT2C_X) ! CCOM_DAT = $(CCOM_DAT_X) ! CCOM_DAT_C = $(CCOM_DAT_C_X) ! CCOM_DAT_H = $(CCOM_DAT_H_X) ! CCOM_LABELS = $(CCOM_LABELS) ! 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)) ! CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) ! CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) ! CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) ! CCOM_LABELS = $(subst \,/,$(CCOM_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) Index: makefile.vc =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.vc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.vc 4 Jun 2003 18:29:50 -0000 1.4 --- makefile.vc 9 Dec 2003 19:03:32 -0000 1.5 *************** *** 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,127 **** ! # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) --- 132,147 ---- ! ifdef UNIX_TOOLS # -------- Set up mktext -------- + ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) + ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) + CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) + CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) + CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) + CCOM_LABELS = $(subst \,/,$(CCOM_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)) *************** *** 133,136 **** --- 153,158 ---- TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) + endif + # -------- Find Allegro, runner and makedoc. -------- Index: makefile.ver =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.ver,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.ver 30 Mar 2003 19:50:41 -0000 1.3 --- makefile.ver 9 Dec 2003 19:03:32 -0000 1.4 *************** *** 7,10 **** # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 0.9.0 shared_major_minor = 0.9 --- 7,10 ---- # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 0.9.1 shared_major_minor = 0.9 Index: zipup.sh =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/zipup.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** zipup.sh 30 Mar 2003 19:50:41 -0000 1.4 --- zipup.sh 9 Dec 2003 19:03:32 -0000 1.5 *************** *** 12,17 **** # note: these are patched by fixver.sh script. ! zipversion=090 ! tgzversion=0.9.0 if [ "$1" != "-q" ]; then --- 12,17 ---- # note: these are patched by fixver.sh script. ! zipversion=091 ! tgzversion=0.9.1 if [ "$1" != "-q" ]; then |