ccomx-develop Mailing List for CCOM - a lib for serial port interface
Brought to you by:
chrisan,
rasmusmyklebust
Menu
▾
▴
ccomx-develop — development info, cvs updates etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(7) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
(62) |
Mar
|
Apr
|
May
(4) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(8) |
Oct
(4) |
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
(24) |
2
|
3
|
4
|
5
|
6
|
7
|
|
8
(33) |
9
(1) |
10
|
11
|
12
|
13
|
14
|
|
15
|
16
(2) |
17
|
18
|
19
|
20
|
21
|
|
22
|
23
|
24
|
25
|
26
|
27
(1) |
28
(1) |
|
29
|
|
|
|
|
|
|
|
From: <ras...@us...> - 2004-02-28 00:05:17
|
Update of /cvsroot/ccomx/ccom/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12067 Modified Files: makefile.vc Log Message: Made the it build in msvc Index: makefile.vc =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.vc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.vc 27 Feb 2004 23:31:30 -0000 1.7 --- makefile.vc 27 Feb 2004 23:48:23 -0000 1.8 *************** *** 122,126 **** ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) --- 122,126 ---- ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) |
|
From: <ras...@us...> - 2004-02-27 23:48:24
|
Update of /cvsroot/ccomx/ccom/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8887 Modified Files: makefile.vc Log Message: Made the it build in msvc Index: makefile.vc =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.vc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.vc 8 Feb 2004 20:47:22 -0000 1.6 --- makefile.vc 27 Feb 2004 23:31:30 -0000 1.7 *************** *** 121,124 **** --- 121,125 ---- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) + CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) *************** *** 131,134 **** --- 132,136 ---- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) + CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) |
|
From: <ch...@us...> - 2004-02-16 07:28:11
|
Update of /cvsroot/ccomx/ccom/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2171/src Modified Files: comunix.c comx.c Log Message: modifications due to the unix port Index: comunix.c =================================================================== RCS file: /cvsroot/ccomx/ccom/src/comunix.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** comunix.c 8 Feb 2004 20:57:51 -0000 1.1 --- comunix.c 16 Feb 2004 07:20:20 -0000 1.2 *************** *** 65,68 **** --- 65,72 ---- *error = 1; } + if (n) { + char s[100]; + sprintf(s, "number:%2x|OK", n); + Req("",s);} return n; } Index: comx.c =================================================================== RCS file: /cvsroot/ccomx/ccom/src/comx.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** comx.c 8 Feb 2004 20:47:22 -0000 1.4 --- comx.c 16 Feb 2004 07:20:20 -0000 1.5 *************** *** 139,143 **** t_serport *port = data; t_serialq *qel; ! unsigned char error, c; if (port->scanning) { --- 139,143 ---- t_serport *port = data; t_serialq *qel; ! unsigned char error, c=0; if (port->scanning) { |
|
From: <ch...@us...> - 2004-02-16 07:28:08
|
Update of /cvsroot/ccomx/ccom/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2171/examples Modified Files: 1_com.c Log Message: modifications due to the unix port Index: 1_com.c =================================================================== RCS file: /cvsroot/ccomx/ccom/examples/1_com.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 1_com.c 29 Mar 2003 00:40:26 -0000 1.3 --- 1_com.c 16 Feb 2004 07:20:19 -0000 1.4 *************** *** 16,20 **** t_portdata *pd = data; int len = 2; ! if (pd->rec) len += strlen(pd->rec); --- 16,22 ---- t_portdata *pd = data; int len = 2; ! char s[100]; ! sprintf(s, "%2x|OK", readdata); ! Req("",s); if (pd->rec) len += strlen(pd->rec); |
|
From: <ras...@us...> - 2004-02-09 21:40:57
|
Update of /cvsroot/ccomx/ccom/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20433 Modified Files: makefile.all Log Message: Fixed building of ht-files in W&D Index: makefile.all =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.all,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.all 8 Feb 2004 20:47:21 -0000 1.7 --- makefile.all 9 Feb 2004 21:37:36 -0000 1.8 *************** *** 207,211 **** dat: $(CCOM_DAT_C_X) ! $(CCOM_DAT_C) $(CCOM_DAT_H): $(CCOM_DAT) -$(CGUI_DAT2C) $(CCOM_DAT) -o $(CCOM_DAT_C) -h $(CCOM_DAT_H) -p ccom -g -n labels --- 207,211 ---- dat: $(CCOM_DAT_C_X) ! $(CCOM_DAT_C_X) $(CCOM_DAT_H_X): $(CCOM_DAT_X) -$(CGUI_DAT2C) $(CCOM_DAT) -o $(CCOM_DAT_C) -h $(CCOM_DAT_H) -p ccom -g -n labels |
|
From: <ch...@us...> - 2004-02-08 21:00:57
|
Update of /cvsroot/ccomx/ccom/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11461 Added Files: comunix.c Log Message: Added unix driver --- NEW FILE: comunix.c --- /* Module COMUNIX This module contains the asynchronous commounication basics for UNIX only. */ #include <allegro.h> #ifdef ALLEGRO_UNIX #include <cgui.h> #include <termios.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include "common.h" #include "comx.h" #include "labldata.h" #include "dialser.ht" #define NR_FILE_ALTERANTIVES 6 static int OpenPort(t_serport *port) { static char *file_names[NR_FILE_ALTERANTIVES][4]={ {"/dev/tts/0", "/dev/tts/1", "/dev/tts/2", "/dev/tts/3"}, {"/dev/ttyS0", "/dev/ttyS1", "/dev/ttyS2", "/dev/ttyS3"}, {"/dev/ttyf1", "/dev/ttyf2", "/dev/ttyf3", "/dev/ttyf4"}, {"/dev/ttya", "/dev/ttyb", "/dev/ttyc", "/dev/ttyd"}, {"/dev/tty1p0", "/dev/tty2p0", "/dev/tty3p0", "/dev/tty4p0"}, {"/dev/tty01", "/dev/tty02", "/dev/tty03", "/dev/tty04"}}; int i; if (port->fd > 0) return 1; if (port->fd < 0) return 0; for (i=0; i<NR_FILE_ALTERANTIVES; i++) { struct stat buf; if (stat(file_names[i][port->portno], &buf) == 0) { /* File exists */ port->fd = open(file_names[i][port->portno], O_RDWR | O_NOCTTY | O_NDELAY); if (port->fd > 0) { fcntl(port->fd, F_SETFL, FNDELAY); return 1; } else { static const char * const * txt; char s[1000]; int nr; txt = LoadCompiledTexts(ccom_labels, "dialser", &nr); sprintf(s, txt[L_ERROR_ACCESS_RIGHTS], port->portno+1, file_names[i][port->portno]); Req("", s); } } } return 0; } extern int _CcomReadPort(t_serport *port, unsigned char *c, unsigned char *error) { int n = 0; if (port->fd == 0) OpenPort(port); *error = 0; n = read(port->fd, &c, 1); if (n < 0) { n = 0; *error = 1; } return n; } extern int _CcomWritePort(t_serport *port, int c) { int n = 0; if (port->fd == 0) OpenPort(port); n = write(port->fd, &c, 1); return n; } extern void _CcomSetBaud(t_serport *port) { struct termios options; int baud; tcgetattr(port->fd, &options); switch (port->baud_rate) { case 50: baud = B50; break; case 75: baud = B75; break; case 110: baud = B110; break; case 134: baud = B134; break; case 150: baud = B150; break; case 200: baud = B200; break; case 300: baud = B300; break; case 600: baud = B600; break; case 1200: baud = B1200; break; case 1800: baud = B1800; break; case 2400: baud = B2400; break; case 4800: baud = B4800; break; case 9600: baud = B9600; break; case 19200: baud = B19200; break; case 38400: baud = B38400; break; case 57600: baud = B57600; break; case 115200: baud = B115200; break; case 230400: baud = B230400; break; default: baud = B0; break; } cfsetispeed(&options, baud); cfsetospeed(&options, baud); options.c_cflag |= (CLOCAL | CREAD); tcsetattr(port->fd, TCSANOW, &options); } extern void _CcomApplySettingsToPort(t_serport *port) { struct termios options; tcgetattr(port->fd, &options); options.c_cflag &= ~CSIZE; options.c_cflag &= ~CSTOPB; options.c_cflag &= ~PARENB; options.c_cflag &= ~PARODD; options.c_iflag &= ~(INPCK | ISTRIP); switch (port->nobits) { case 5: options.c_cflag |= CS5; break; case 6: options.c_cflag |= CS6; break; case 7: options.c_cflag |= CS7; break; default: options.c_cflag |= CS8; break; } if (port->parityena) { options.c_cflag |= PARENB; options.c_iflag |= INPCK | ISTRIP; } if (port->parity==0) options.c_cflag |= PARODD; if (port->stopbits==2) options.c_cflag |= CSTOPB; options.c_cflag |= CLOCAL | CREAD; options.c_lflag &= ~ICANON | ECHO | ECHOE | ISIG; options.c_oflag &= ~OPOST; tcsetattr(port->fd, TCSANOW, &options); } extern void _CcomLoopBackMode(t_serport *port, int mode) { } #endif |
Update of /cvsroot/ccomx/ccom/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8749/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver zipup.sh Removed Files: makefile.doc Log Message: fixed feature 715534, fixed docs accordingly, fixed allegro.cfg Index: makefile.all =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.all,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.all 30 Mar 2003 19:50:41 -0000 1.6 --- makefile.all 8 Feb 2004 20:47:21 -0000 1.7 *************** *** 19,22 **** --- 19,23 ---- # clean: Remove rebuildable files. # compress: Compress the example executable using upx. + # uninstall: Uninstalls the header files of CCOM and all brands of the lib that has been installed. # help: Display this help. # *************** *** 42,117 **** include misc/makefile.ver LIB_SOURCE = \ ! comx.c \ ! comdos.c \ ! comwin.c \ ! dialser.c \ ! labldata.c - EXAMPLES_SOURCE = 1_com.c ! MAKEDOC_FILES = chm doc html man misc rtf texi txt ! MAKEDOC_FILES := $(addprefix misc/makedoc/make,$(MAKEDOC_FILES)) ! MAKEDOC_SOURCE := $(addsuffix .c,$(MAKEDOC_FILES)) ! MAKEDOC_FILES := $(addsuffix .h,$(MAKEDOC_FILES)) $(MAKEDOC_SOURCE) ! RUNNER_SOURCE = misc/runner.c CLEAN_FILES = \ ! obj/*/*.o obj/*/*/*.o obj/*/*/*/*.o \ ! obj/*/*.obj obj/*/*/*.obj obj/*/*/*/*.obj \ ! lib/*/*.a lib/*/*/*.a lib/*/*/*/*.a \ ! lib/*.so* lib/*/*.so* lib/*/*/*.so* lib/*/*/*/*.so* \ ! lib/*.lib lib/*/*.lib lib/*/*/*.lib lib/*/*/*/*.lib \ ! lib/*.exp lib/*/*.exp lib/*/*/*.exp lib/*/*/*/*.exp \ ! lib/*/*.pdb lib/*/*.ilk lib/*/*.map *.pdb */*.pdb \ ! */*.ilk */*.map */*.sym gmon.out */gmon.out */*.prf \ ! lib/*.dll lib/*/*.dll lib/*/*/*.dll \ ! *.exe */*.exe \ ! $(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE) */$(EXAMPLES_SOURCE))) \ ! *.htm */*.htm *.html */*.html *.rtf */*.rtf *.inf */*.inf *.info */*.info \ ! *.txi */*.txi *.texi */*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp \ *.log */*.log */*/*.log core */core */*/core ! VERY_CLEAN_FILES = \ ! */makefile.dep */*/makefile.dep */*/*/makefile.dep */*/*/*/makefile.dep \ ! lib/*.def lib/*/*.def lib/*/*/*.def \ ! changes.txt readme.txt thanks.txt ccom.txt \ ! docs/wishlist.txt docs/internal.txt \ ! src/*.ht $(TEXT_ARCHIVE_X) VPATH = src examples docs ! PACKAGE5_OPTIMIZED = ccom ! PACKAGE4_OPTIMIZED = ccom ! DESCRIPTION_OPTIMIZED = optimized ifdef DEBUGMODE ! PACKAGE5 = ccomd ! PACKAGE4 = ccomd DESCRIPTION = debugging else ! PACKAGE5 = $(PACKAGE5_OPTIMIZED) ! PACKAGE4 = $(PACKAGE4_OPTIMIZED) ! DESCRIPTION = $(DESCRIPTION_OPTIMIZED) ! endif ! ! # By default, Allegro is linked the same way as ccom, but this can be ! # overridden. ! # Note that it is not a good idea to do anything particular with the ! # STATICLINK_ALLEGRO or NO_STATICLINK_ALLEGRO variables, since it would be ! # bad to have two dlls around with the same name that link differently to ! # Allegro. ! ifdef STATICLINK ! ifndef NO_STATICLINK_ALLEGRO ! STATICLINK_ALLEGRO=1 ! endif endif - - # Tell the platform specific makefile to look for Allegro's makedoc. - NEED_MAKEDOC = 1 - - - # -------- Include platform specific makefile. -------- --- 43,90 ---- include misc/makefile.ver + GEN_C_FILES = \ + labldata.c + + GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES))) + LIB_SOURCE = \ ! $(GEN_C_FILES) \ ! comx.c \ ! comdos.c \ ! comwin.c \ ! comunix.c \ ! dialser.c ! EXAMPLES_SOURCE = 1_com.c CLEAN_FILES = \ ! obj/*/*/*.o obj/*/*/*.obj \ ! lib/*/*.a lib/*/*.so* lib/*/*.lib lib/*/*.exp lib/*/*.pdb \ ! lib/*/*.ilk lib/*/*.map lib/*/*.dll \ ! $(addsuffix $(EXE_SUFFIX),$(basename examples/$(EXAMPLES_SOURCE))) \ ! *.htm docs/*.htm *.html docs/*.html docs/*.rtf docs/*.inf docs/*.info \ ! docs/*.txi docs/*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp docs/*.txt \ *.log */*.log */*/*.log core */core */*/core ! VERY_CLEAN_FILES = $(CLEAN_FILES) \ ! obj/*/*/makefile.dep \ ! lib/*/*.def \ ! $(CCOM_LABELS) $(CCOM_DAT) $(TEXT_HEADERS) \ ! $(addprefix src/,$(GEN_C_FILES)) \ ! $(addprefix src/,$(GEN_H_FILES)) VPATH = src examples docs ! MAKEDOC_PROGRAM := $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) ifdef DEBUGMODE ! PACKAGE = ccomd DESCRIPTION = debugging else ! PACKAGE = ccom ! DESCRIPTION = optimized endif # -------- Include platform specific makefile. -------- *************** *** 123,130 **** DOCS = \ ! ccom.txt docs/ccom$(HTML_SUFFIX) docs/ccom$(INFO_SUFFIX) docs/ccom.rtf \ ! readme.txt docs/readme$(INFO_SUFFIX) \ ! changes.txt docs/changes$(HTML_SUFFIX) \ ! docs/internal.txt docs/internal$(HTML_SUFFIX) docs/internal$(INFO_SUFFIX) docs/internal.rtf ifndef HAVE_TEXINFO --- 96,103 ---- DOCS = \ ! docs/ccom.txt docs/ccom$(HTML_SUFFIX) docs/ccom$(INFO_SUFFIX) docs/ccom.rtf \ ! docs/internal.txt docs/internal$(HTML_SUFFIX) docs/internal$(INFO_SUFFIX) docs/internal.rtf \ ! docs/readme.txt docs/readme$(INFO_SUFFIX) \ ! docs/changes.txt docs/changes$(HTML_SUFFIX) ifndef HAVE_TEXINFO *************** *** 135,144 **** LIB_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(LIB_SOURCE)))) endif ! MAKEDOC_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(notdir $(MAKEDOC_SOURCE))))) EXAMPLES_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) EXAMPLES_NAME = $(addprefix examples/,$(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) - # -------- Compile -------- --- 108,116 ---- LIB_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(LIB_SOURCE)))) endif ! EXAMPLES_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) EXAMPLES_NAME = $(addprefix examples/,$(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) # -------- Compile -------- *************** *** 177,185 **** veryclean: ! -rm -fv $(VERY_CLEAN_FILES) $(CLEAN_FILES) compress: ifdef UPX_PROGRAM ! $(UPX_PROGRAM) $(EXAMPLES_NAME) $(wildcard lib/*/$(PACKAGE4_OPTIMIZED)$(LIB_VERSION).dll) else @echo No executable compressor specified! You must set the environment variable --- 149,157 ---- veryclean: ! -rm -fv $(VERY_CLEAN_FILES) compress: ifdef UPX_PROGRAM ! $(UPX_PROGRAM) $(EXAMPLES_NAME) else @echo No executable compressor specified! You must set the environment variable *************** *** 187,230 **** endif ! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(SYSTEM_INCLUDE_DIR)/cgui.h $(COMPILE_C_TO_OBJ) ! $(LIB_NAME): $(LIB_OBJS) $(LINK_OBJ_TO_LIB_DEPS) $(LINK_OBJ_TO_LIB) ! ifndef NATIVE_LINK_OBJ_TO_EXE ! */%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) - ifneq ($(MAKEDOC_DEP),) - $(MAKEDOC_DEP): $(MAKEDOC_OBJS) $(LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS) - $(LINK_ALL_OBJ_TO_EXE_NOLIB) - - $(OBJ_DIR)/make%$(OBJ_SUFFIX): misc/makedoc/make%.c $(COMPILE_C_TO_OBJ_DEPS) - $(COMPILE_C_TO_OBJ) - endif - - ifneq ($(RUNNER_DEP),) - $(RUNNER): $(RUNNER_SOURCE) - $(COMPILE_RUNNER) - endif - endif - chm-docs: docs/ccom.chm ! %.txt: docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%.txt: docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%$(HTML_SUFFIX): docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< ! docs/%.rtf: docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) -rtf $@ $< ! docs/ccom.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/ccom._tx $(MAKEDOC_DEP) ! $(MAKEDOC_PROGRAM) -chm docs/ccom.html docs/ccom._tx -hhc docs/ccom.hhp --- 159,187 ---- endif ! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ) ! $(LIB_NAME): $(LIB_OBJS) $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE) chm-docs: docs/ccom.chm ! docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%$(HTML_SUFFIX): docs/%._tx -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< ! docs/%.rtf: docs/%._tx -$(MAKEDOC_PROGRAM) -rtf $@ $< ! docs/ccom.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/ccom._tx ! -$(MAKEDOC_PROGRAM) -chm docs/ccom.html docs/ccom._tx -hhc docs/ccom.hhp *************** *** 233,237 **** -makeinfo --no-split -o $@ $< ! docs/%$(TEXI_SUFFIX): docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $< endif --- 190,194 ---- -makeinfo --no-split -o $@ $< ! docs/%$(TEXI_SUFFIX): docs/%._tx -$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $< endif *************** *** 239,243 **** # -------- Building the textfiles (i.e. the lables etc. used in dialogues) -------- ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat ! ALLEGRO_DAT2C_X = $(ALLEGRO)/tools/dat2c MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX) CCOM_DAT_C_X = src/labldata.c --- 196,200 ---- # -------- Building the textfiles (i.e. the lables etc. used in dialogues) -------- ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat ! CGUI_DAT2C_X = $(CGUIDIR)/tools/dat2c MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX) CCOM_DAT_C_X = src/labldata.c *************** *** 250,262 **** dat: $(CCOM_DAT_C_X) ! $(CCOM_DAT_C_X): $(CCOM_DAT_X) ! -$(ALLEGRO_DAT2C) $(CCOM_DAT) -o $(CCOM_DAT_C) -h $(CCOM_DAT_H) -p ccom -g -n labels $(CCOM_DAT_X): $(CCOM_LABELS_X) -$(ALLEGRO_DAT) $(CCOM_DAT) -a $(CCOM_LABELS) - #$(CCOM_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) $(MKTEXT_X) $(CCOM_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) ! $(MKTEXT) -o$(CCOM_LABELS) $(TEXT_SOURCES) # -------- Misc stuff -------- --- 207,218 ---- dat: $(CCOM_DAT_C_X) ! $(CCOM_DAT_C) $(CCOM_DAT_H): $(CCOM_DAT) ! -$(CGUI_DAT2C) $(CCOM_DAT) -o $(CCOM_DAT_C) -h $(CCOM_DAT_H) -p ccom -g -n labels $(CCOM_DAT_X): $(CCOM_LABELS_X) -$(ALLEGRO_DAT) $(CCOM_DAT) -a $(CCOM_LABELS) $(CCOM_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) ! -$(MKTEXT) -o$(CCOM_LABELS) $(TEXT_SOURCES) # -------- Misc stuff -------- Index: makefile.bcc =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.bcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.bcc 9 Dec 2003 19:03:30 -0000 1.3 --- makefile.bcc 8 Feb 2004 20:47:21 -0000 1.4 *************** *** 4,22 **** # # By Christer Sandberg (ported from Adime made by Sven Sandberg). - # # See readme.txt for more information about CCOM. - # # 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 -------- --- 4,17 ---- *************** *** 34,39 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 --- 29,34 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 *************** *** 41,46 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/bcc32 --- 36,41 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/bcc32 *************** *** 49,77 **** ifdef STATICLINK ! ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/ccom.def ! IMPDEF_NAME = $(LIB_DIR)/impccom.def ! endif - - # -------- Check that environment path variables are set. -------- --- 44,62 ---- 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) 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) ! EXPDEF_NAME = $(LIB_DIR)/ccom.def ! IMPDEF_NAME = $(LIB_DIR)/impccom.def endif # -------- Check that environment path variables are set. -------- *************** *** 79,102 **** 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: --- 64,77 ---- ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! WINSUBDIR = system32 else ! WINSYSDIR = $(windir) ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) else badwin: *************** *** 119,137 **** SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib - - 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)) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) --- 94,100 ---- SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(CGUI_DAT2C_X) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) *************** *** 141,169 **** TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) - endif - - - # -------- Find Allegro, runner and makedoc. -------- - - NEED_ALLEGRO = 1 - - .PHONY: badalleg - - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives, e.g. - @echo "set ALLEGRO=c:\allegro". - endif - - - ifdef NEED_MAKEDOC - include misc/makefile.doc - endif - - # -------- give a sensible default target for make without any args -------- --- 104,107 ---- *************** *** 173,226 **** _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_ALLEGRO ! LIB_FLAGS = alld_s.lib ! else ! LIB_FLAGS = alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = allp_s.lib ! else ! LIB_FLAGS = allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = alleg_s.lib else ! LIB_FLAGS = alleg.lib ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif --- 111,162 ---- _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 = alld_s.lib ! else ! LIB_FLAGS = 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 = allp_s.lib ! else ! LIB_FLAGS = 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 = alleg_s.lib ! else ! LIB_FLAGS = alleg.lib ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif *************** *** 231,235 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif --- 167,171 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif *************** *** 237,242 **** dinput.lib ddraw.lib winmm.lib dsound.lib - - # -------- List platform specific objects and programs. -------- --- 173,176 ---- *************** *** 250,270 **** # 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 COMPILE_C_TO_OBJ_NO_OPTIMIZE - bcc32 $(COMPILE_FLAGS_NO_OPTIMIZE) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - endef define MAKE_LIB_RSP --- 184,194 ---- *************** *** 291,339 **** endif - LINK_ALL_OBJ_TO_EXE_DEPS = lib.rsp - define DO_LINK_ALL_OBJ_TO_EXE_DEPS - $(foreach objfile, $(filter %.$(OBJ_SUFFIX),$^), echo $(subst /,\\,$(objfile)) + >> obj.rsp - ) - ilink32 $(LFLAGS) /aa /Tpe c0w32 @obj.rsp,$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) - del obj.rsp - endef - ifdef DELETE_TDS_FILES - define LINK_ALL_OBJ_TO_EXE - $(DO_LINK_ALL_OBJ_TO_EXE) - @del $(subst .exe,.tds,$(subst /,\,$@)) - endef - else - LINK_ALL_OBJ_TO_EXE = $(DO_LINK_ALL_OBJ_TO_EXE) - endif - - LINK_CONSOLE_DEPS = $(IMPLIB_NAME) lib.rsp - define DO_LINK_CONSOLE - ilink32 $(LFLAGS) /ap /Tpe c0x32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) - endef - ifdef DELETE_TDS_FILES - define LINK_CONSOLE - $(DO_LINK_CONSOLE) - @del $(subst .exe,.tds,$(subst /,\,$@)) - endef - else - DO_LINK_CONSOLE = $(DO_LINK_CONSOLE) - 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 --- 215,228 ---- endif ifdef STATICLINK ! # link as a static library ! 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 *************** *** 346,363 **** del _impccom.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. -------- --- 235,249 ---- del _impccom.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. -------- *************** *** 367,376 **** ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else copy $(subst /,\,$< $@) ! endif endif --- 253,262 ---- ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else copy $(subst /,\,$< $@) ! endif endif *************** *** 399,403 **** endif - INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/ccom/*.h)) --- 285,288 ---- *************** *** 408,412 **** ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif --- 293,297 ---- ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif *************** *** 422,434 **** uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - # this section is empty - - # -------- Generate automatic dependencies. -------- --- 307,313 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! # -------- Generate automatic dependencies. -------- Index: makefile.dj =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.dj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.dj 9 Dec 2003 19:03:31 -0000 1.2 --- makefile.dj 8 Feb 2004 20:47:22 -0000 1.3 *************** *** 3,13 **** # # By Christer Sandberg (ported from Adime made by Sven Sandberg). - # # See readme.txt for more information about CCOM. - # # See makefile.all for a list of the available targets. - - # -------- Define some variables that the primary makefile may use. -------- --- 3,9 ---- *************** *** 36,59 **** 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)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) 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$(PACKAGE5).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) - - # -------- Find djgpp. -------- --- 32,53 ---- 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. -------- *************** *** 76,94 **** SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info - - 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)) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) --- 70,76 ---- SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(CGUI_DAT2C_X) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) *************** *** 98,136 **** TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) - endif - - - # -------- Find Allegro and makedoc. -------- - - ifdef NEED_MAKEDOC - ifndef NEED_ALLEGRO - ifeq ($(wildcard $(MAKEDOC_SOURCE)),) - NEED_ALLEGRO = 1 - endif - endif - endif - - ifdef NEED_ALLEGRO - .PHONY: badalleg - - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives, e.g. c:\djgpp\allegro. Run - @echo make ALLEGRO=c:\djgpp\allegro - @echo (or whatever the location of Allegro is). - @echo See also readme.txt - endif - - endif # ifdef NEED_ALLEGRO - - - ifdef NEED_MAKEDOC - include misc/makefile.doc - endif - --- 80,83 ---- *************** *** 142,195 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused 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 = -lcgui -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lcgui -lallp else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif --- 89,139 ---- _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 = -lcgui -lalld else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif *************** *** 197,201 **** # including some standard header. ifdef CCOM_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 endif --- 141,145 ---- # including some standard header. ifdef CCOM_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 endif *************** *** 205,210 **** COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCCOM_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) - - # -------- List platform specific objects and programs. -------- --- 149,152 ---- *************** *** 218,267 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- GCC2DJGPP = -DDJGPP=2 -U__unix__ - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef - LINK_OBJ_TO_LIB_DEPS = define LINK_OBJ_TO_LIB ar rs $(LIB_NAME) $(LIB_OBJS) endef - LINK_OBJ_TO_EXE_DEPS = define LINK_OBJ_TO_EXE gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) endef - LINK_OBJ_TO_EXE_NOLIB_DEPS = - define LINK_OBJ_TO_EXE_NOLIB - gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_DEPS = - define LINK_ALL_OBJ_TO_EXE - gcc $(LFLAGS) -o $@ $^ $(LIB_NAME) $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = - define LINK_ALL_OBJ_TO_EXE_NOLIB - gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) - endef - - - # -------- Rules for installing and removing the library files. -------- --- 160,179 ---- *************** *** 321,324 **** --- 233,237 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! Index: makefile.mgw =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.mgw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.mgw 9 Dec 2003 19:03:31 -0000 1.3 --- makefile.mgw 8 Feb 2004 20:47:22 -0000 1.4 *************** *** 8,13 **** # See makefile.all for a list of the available targets. - - # -------- Define some variables that the primary makefile may use. -------- --- 8,11 ---- *************** *** 25,30 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/mingw32 --- 23,28 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/mingw32 *************** *** 32,66 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/mingw32 LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 - ifdef STATICLINK ! ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE5).a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/ccom.def ! endif ! # -------- Check that environment path variable is set. -------- --- 30,56 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/mingw32 LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 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 = lib$(PACKAGE)_s.a 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 = lib$(PACKAGE).a ! EXPDEF_NAME = $(LIB_DIR)/ccom.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variable is set. -------- *************** *** 69,102 **** 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 ! ifndef CROSSCOMPILE badwin: @echo Your SYSTEMROOT or WINDIR environment variable is not set! ! endif endif ifdef MINGDIR ! MINGDIR_U = $(subst \,/,$(MINGDIR)) ! MINGDIR_D = $(subst /,\,$(MINGDIR)) else badming: --- 59,90 ---- ifeq ($(OS),Windows_NT) ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 else ! 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 ! ifndef CROSSCOMPILE badwin: @echo Your SYSTEMROOT or WINDIR environment variable is not set! ! endif endif ifdef MINGDIR ! MINGDIR_U = $(subst \,/,$(MINGDIR)) ! MINGDIR_D = $(subst /,\,$(MINGDIR)) else badming: *************** *** 111,129 **** 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)) - 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)) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) --- 99,105 ---- SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(CGUI_DAT2C_X) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) *************** *** 133,169 **** TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) - endif - - - # -------- Find Allegro and makedoc. -------- - - ifdef NEED_MAKEDOC - ifndef NEED_ALLEGRO - ifeq ($(wildcard $(MAKEDOC_SOURCE)),) - NEED_ALLEGRO = 1 - endif - endif - endif - - ifdef NEED_ALLEGRO - .PHONY: badalleg - - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives, e.g. c:\mingw32\allegro. - endif - - endif # ifdef NEED_ALLEGRO - - - ifdef NEED_MAKEDOC - include misc/makefile.doc - endif - - # -------- Give a sensible default target for make without any args. -------- --- 109,112 ---- *************** *** 174,248 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused 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 += -g ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = -lcguid_s -lalld_s ! else ! LIB_FLAGS = -lcguid -lalld ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = -lcgui_s -lallp_s ! else ! LIB_FLAGS = -lcgui -lallp ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS += -s ! endif ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = -lcgui_s -lalleg_s else ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif LFLAGS += -L$(SYSTEM_LIB_DIR) ! ifdef STATICLINK_ALLEGRO ! CFLAGS += -DALLEGRO_STATICLINK ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -DALLEGRO_STATICLINK else ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) endif --- 117,188 ---- _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 += -g ! ifdef STATICLINK ! LIB_FLAGS = -lcguid_s -lalld_s ! else ! LIB_FLAGS = -lcguid -lalld ! endif else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! ifdef STATICLINK ! LIB_FLAGS = -lcgui_s -lallp_s ! else ! LIB_FLAGS = -lcgui -lallp ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS += -s ! endif ! ifdef STATICLINK ! LIB_FLAGS = -lcgui_s -lalleg_s ! else ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif LFLAGS += -L$(SYSTEM_LIB_DIR) ! ifdef STATICLINK ! CFLAGS += -DALLEGRO_STATICLINK ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -DALLEGRO_STATICLINK else ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) endif *************** *** 251,265 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK ! LIB_FLAGS += -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lole32 -ldinput \ -lddraw -ldxguid -lwinmm -ldsound endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif - - # -------- List platform specific objects and programs. -------- --- 191,203 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK ! LIB_FLAGS += -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lole32 -ldinput \ -lddraw -ldxguid -lwinmm -ldsound endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif # -------- List platform specific objects and programs. -------- *************** *** 273,278 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- --- 211,214 ---- *************** *** 280,394 **** ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = $(IMPLIB_NAME) ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $< ! endef endif # ifdef STATICLINK - - # -------- Rules for installing and removing the library files. -------- ifdef CROSSCOMPILE ! ! ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) cp $(subst \,/,$< $@) --- 216,260 ---- ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif 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) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef else ! # link as a DLL ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif + define LINK_OBJ_TO_EXE + gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) + endef endif # ifdef STATICLINK # -------- Rules for installing and removing the library files. -------- ifdef CROSSCOMPILE ! ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) cp $(subst \,/,$< $@) *************** *** 428,432 **** endif # ifdef CROSSCOMPILE else - INSTALL_HEADERS = $(addprefix $(MINGDIR_U)/,$(wildcard include/ccom/*.h)) --- 294,297 ---- *************** *** 437,443 **** ifndef CROSSCOMPILE ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif endif --- 302,308 ---- ifndef CROSSCOMPILE ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif endif *************** *** 451,463 **** uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - # this section is empty - - # -------- generate automatic dependencies -------- # Note that this must be done with djgpp! --- 316,322 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! # -------- generate automatic dependencies -------- # Note that this must be done with djgpp! Index: makefile.uni =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.uni,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.uni 9 Dec 2003 19:03:32 -0000 1.2 --- makefile.uni 8 Feb 2004 20:47:22 -0000 1.3 *************** *** 3,13 **** # # By Christer Sandberg (copied from ADIME made by Sven Sandberg) - # # See readme.txt for more information about CCOM. - # # See makefile.all for a list of the available targets. - - # -------- Define some variables that the primary makefile may use. -------- --- 3,9 ---- *************** *** 30,34 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib endif LIB_DIR = $(LIB_ROOT_DIR)/unix --- 26,30 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib endif LIB_DIR = $(LIB_ROOT_DIR)/unix *************** *** 36,59 **** HAVE_TEXINFO = 1 ! ifdef STATICLINK ! ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! else - # link as a shared object - OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) - IMPLIB_BASENAME = lib$(PACKAGE5).so IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) - endif - - - # -------- Default system paths. ------------ --- 32,46 ---- 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. ------------ *************** *** 64,109 **** SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib - # -------- 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)) ! ! ! # -------- Find Allegro and makedoc. -------- ! ! ifdef NEED_MAKEDOC ! ifndef NEED_ALLEGRO ! ifeq ($(wildcard $(MAKEDOC_SOURCE)),) ! NEED_ALLEGRO = 1 ! endif ! endif ! endif ! ! ifdef NEED_ALLEGRO ! .PHONY: badalleg ! ! ifdef ALLEGRO ! ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) ! else ! badalleg: ! @echo Couldnt find Allegro! ! @echo Is your ALLEGRO environment variable set correctly? It should ! @echo point to the place where Allegro lives. ! endif ! ! endif # ifdef NEED_ALLEGRO ! ! ! ifdef NEED_MAKEDOC ! include misc/makefile.doc ! endif ! # -------- Give a sensible default target for make without any args. -------- --- 51,64 ---- SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib # -------- Set up mktext -------- ! ALLEGRO_DAT = $(ALLEGRO_DAT_X) ! CGUI_DAT2C = $(CGUI_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_X) ! TEXT_SOURCES = $(TEXT_SOURCES_X) ! TEXT_HEADERS = $(TEXT_HEADERS_X) ! MKTEXT = $(MKTEXT_X) # -------- Give a sensible default target for make without any args. -------- *************** *** 114,173 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused 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_ALLEGRO ! ALLEGRO_CONFIG_FLAGS = --static else ! ALLEGRO_CONFIG_FLAGS = --shared endif ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! LIB_FLAGS = `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)` ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! LIB_FLAGS = `allegro-config --libs profile $(ALLEGRO_CONFIG_FLAGS)` else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS += -s ! LIB_FLAGS = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif --- 69,127 ---- _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 ! ALLEGRO_CONFIG_FLAGS = --static ! LIB_FLAGS = -lcgui_s else ! ALLEGRO_CONFIG_FLAGS = --shared ! LIB_FLAGS = -lcgui endif ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! LIB_FLAGS += `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)` else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! LIB_FLAGS += `allegro-config --libs profile $(ALLEGRO_CONFIG_FLAGS)` ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS += -s ! LIB_FLAGS += `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif *************** *** 178,190 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif - - # -------- List platform specific objects and programs. -------- --- 132,142 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif # -------- List platform specific objects and programs. -------- *************** *** 198,279 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- GCC2UNIX = -D__UNIX__ -UDJGPP - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) ! endef else ! # link as a shared object ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lccom $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $^ -L$(LIB_DIR) -lccom $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) ! endef ! ! endif # ifdef STATICLINK ! # -------- Rules for installing and removing the library files. -------- --- 150,180 ---- # 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) -lccom $(LIB_FLAGS) + endef + endif # -------- Rules for installing and removing the library files. -------- *************** *** 304,325 **** @echo The $(DESCRIPTION) UNIX library has been installed. ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libccom.a $(SYSTEM_LIB_DIR)/libccomd.a \ $(SYSTEM_INCLUDE_DIR)/ccom.h - # $(WINDIR_U)/ccom$(LIB_VERSION).dll $(WINDIR_U)/ccom$(LIB_VERSION).dll uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - examples/ex%: $(OBJ_DIR)/ex%$(OBJ_SUFFIX) - $(LINK_OBJ_TO_EXE) - - NATIVE_LINK_OBJ_TO_EXE = 1 - - # -------- generate automatic dependencies -------- --- 205,217 ---- @echo The $(DESCRIPTION) UNIX library has been installed. ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libccom_s.a $(SYSTEM_LIB_DIR)/libccomd_s.a \ ! $(SYSTEM_LIB_DIR)/libccom.so $(SYSTEM_LIB_DIR)/libccomd.so \ $(SYSTEM_INCLUDE_DIR)/ccom.h uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! # -------- generate automatic dependencies -------- Index: makefile.vc =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.vc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.vc 9 Dec 2003 19:03:32 -0000 1.5 --- makefile.vc 8 Feb 2004 20:47:22 -0000 1.6 *************** *** 3,9 **** # # By Christer Sandberg (ported from Adime made by Sven Sandberg). - # # See readme.txt for more information about CCOM. - # # See makefile.all for a list of the available targets. # --- 3,7 ---- *************** *** 17,22 **** # The "depend" target uses sed. - - # -------- define some variables that the primary makefile will use -------- --- 15,18 ---- *************** *** 34,39 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc --- 30,35 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc *************** *** 41,75 **** 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)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/ccom.def ! endif ! # -------- Check that environment path variables are set. -------- --- 37,63 ---- 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) 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) ! EXPDEF_NAME = $(LIB_DIR)/ccom.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variables are set. -------- *************** *** 78,101 **** 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: --- 66,87 ---- ifeq ($(OS),Windows_NT) ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 else ! 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: *************** *** 104,117 **** 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 --- 90,103 ---- 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 *************** *** 131,135 **** SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib - ifdef UNIX_TOOLS # -------- Set up mktext -------- --- 117,120 ---- *************** *** 155,213 **** endif ! ! # -------- Find Allegro, runner and makedoc. -------- ! ! ifndef NEED_ALLEGRO ! ifeq ($(wildcard docs/makedoc.c),) ! NEED_ALLEGRO = 1 ! else ! ifeq ($(wildcard src/misc/runner.c),) ! NEED_ALLEGRO = 1 ! endif ! endif ! endif ! ! .PHONY: badalleg ! ! ifdef NEED_ALLEGRO ! ifdef ALLEGRO ! ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) ! else ! badalleg: ! @echo Couldnt find Allegro! ! @echo Is your ALLEGRO environment variable set correctly? It should ! @echo point to the place where Allegro lives, e.g. ! @echo "set ALLEGRO=c:\msvc\allegro". ! endif ! endif ! ! ! ifneq ($(wildcard $(RUNNER_SOURCE)),) ! RUNNER := obj/msvc/runner.exe ! RUNNER_DEP := obj/msvc/runner.exe ! define COMPILE_RUNNER ! gcc -O -Wall -Werror -o $(RUNNER) $(RUNNER_SOURCE) ! endef ! else ! RUNNER := $(wildcard $(ALLEGRODIR_U)/obj/msvc/runner.exe) ! RUNNER_DEP := ! ifeq ($(RUNNER),) ! .PHONY: badrunner ! badrunner: ! @echo Couldnt find Allegros runner utility. ! @echo Have you forgotten to make Al... [truncated message content] |
|
From: <ch...@us...> - 2004-02-08 20:50:28
|
Update of /cvsroot/ccomx/ccom/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8749/src Modified Files: comdos.c comx.c comx.h dialser.c dialser.t Log Message: fixed feature 715534, fixed docs accordingly, fixed allegro.cfg Index: comdos.c =================================================================== RCS file: /cvsroot/ccomx/ccom/src/comdos.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** comdos.c 3 Apr 2003 20:11:41 -0000 1.4 --- comdos.c 8 Feb 2004 20:47:22 -0000 1.5 *************** *** 2,10 **** This module contains the asynchronous commounication basics for DOS only. */ #include "common.h" #include "comx.h" - #include <cgui.h> - - #ifdef DJGPP #include <pc.h> --- 2,10 ---- This module contains the asynchronous commounication basics for DOS only. */ + #include <allegro.h> + #ifdef ALLEGRO_DOS + #include "common.h" #include "comx.h" #include <pc.h> *************** *** 104,129 **** outportb(port->addr + MODEM_CONTROL_REG, control_reg); } - - #elif !defined _WIN32 - extern void _CcomApplySettingsToPort(t_serport *port nouse) - { - } - - extern void _CcomSetBaud(t_serport *port nouse) - { - } - - extern int _CcomWritePort(t_serport *port nouse, int c) - { - return 1; - } - - extern int _CcomReadPort(t_serport *port nouse, unsigned char *c, unsigned char *error) - { - return 0; - } - - extern void _CcomLoopBackMode(t_serport *port nouse, int mode nouse) - { - } #endif --- 104,106 ---- Index: comx.c =================================================================== RCS file: /cvsroot/ccomx/ccom/src/comx.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** comx.c 29 Mar 2003 00:39:19 -0000 1.3 --- comx.c 8 Feb 2004 20:47:22 -0000 1.4 *************** *** 135,145 **** } - /* Linux - int ReadPort(t_serport *port, unsigned char *c, unsigned char *error) - { - *error = 0; - return read(port->fd, c, 1); - }*/ - static void BidirectionalPoller(void *data) { --- 135,138 ---- Index: comx.h =================================================================== RCS file: /cvsroot/ccomx/ccom/src/comx.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** comx.h 3 Apr 2003 20:44:24 -0000 1.4 --- comx.h 8 Feb 2004 20:47:22 -0000 1.5 *************** *** 35,40 **** int i; /* index in the current sending buffer */ int addr; /* The physical address of the port */ ! #ifdef _WIN32 void *hport; #endif } t_serport; --- 35,42 ---- int i; /* index in the current sending buffer */ int addr; /* The physical address of the port */ ! #if defined ALLEGRO_WINDOWS void *hport; + #elif defined ALLEGRO_UNIX + int fd; #endif } t_serport; Index: dialser.c =================================================================== RCS file: /cvsroot/ccomx/ccom/src/dialser.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dialser.c 29 Mar 2003 00:39:20 -0000 1.2 --- dialser.c 8 Feb 2004 20:47:22 -0000 1.3 *************** *** 69,75 **** t_dialser *dialser; char s[100]; - static const char * const * txt; static const char * const bitstrings2[] = { "5", "6", "7", "8" }; static const char * const bitstrings[] = { "1 ", "2" }; txt = LoadCompiledTexts(ccom_labels, "dialser", &nr); --- 69,75 ---- t_dialser *dialser; char s[100]; static const char * const bitstrings2[] = { "5", "6", "7", "8" }; static const char * const bitstrings[] = { "1 ", "2" }; + static const char * const * txt; txt = LoadCompiledTexts(ccom_labels, "dialser", &nr); *************** *** 91,110 **** tmp->nobits -= 5; tmp->stopbits--; ! sprintf(s, "%s COM%d", txt[edport], port->portno + 1); MkDialogue(ADAPTIVE, s, 0); ! AddDropDownS(DOWNLEFT, 0, txt[t_nobits], &tmp->nobits, bitstrings2, 4); ! AddFlip(DOWN, txt[t_stopbits], bitstrings, &tmp->stopbits); ! AddDropDownS(DOWN, 0, txt[baud], &dialser->rindex, dialser->srat, NORATES); ! AddFlip(DOWN, txt[parityena_lead], txt + parity_ena_sel, ! &tmp->parityena); ! AddFlip(DOWN, txt[parity_lead], txt + parity_sel, &tmp->parity); ! AddCheck(DOWNLEFT, txt[t_intcontr], &tmp->intcontr); ! AddEditBox(RIGHT, 20, txt[irqno], FINT, 2, &tmp->irq); ! AddEditBox(DOWNLEFT, 40, txt[portaddr], FHEX2, 3, &tmp->addr); ! AddCheck(DOWNLEFT, txt[flowcntr], &tmp->flowcontrol); ! AddButton(DOWNLEFT, txt[T_Cancel], CancelEditComPort, dialser); ! AddButton(DOWNLEFT, txt[T_OK], OKEditComPort, dialser); ! /* Flow control buffer size: bufsize ??? */ DisplayWin(); } --- 91,104 ---- tmp->nobits -= 5; tmp->stopbits--; ! sprintf(s, "%s COM%d", txt[L_EDITPORT], port->portno + 1); MkDialogue(ADAPTIVE, s, 0); ! AddDropDownS(DOWNLEFT, 0, txt[L_NRBITS], &tmp->nobits, bitstrings2, 4); ! AddFlip(DOWN, txt[L_STOPBITS], bitstrings, &tmp->stopbits); ! AddDropDownS(DOWN, 0, txt[L_BAUD], &dialser->rindex, dialser->srat, NORATES); ! AddFlip(DOWN, txt[L_PARITYENA], txt + PARITY_ENA_ALT, &tmp->parityena); ! AddFlip(DOWN, txt[L_PARITY], txt + PARITY_ALT, &tmp->parity); ! AddButton(DOWNLEFT, txt[L_CANCEL], CancelEditComPort, dialser); ! AddButton(DOWNLEFT, txt[L_OK], OKEditComPort, dialser); DisplayWin(); } Index: dialser.t =================================================================== RCS file: /cvsroot/ccomx/ccom/src/dialser.t,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dialser.t 2 Mar 2003 17:06:35 -0000 1.1.1.1 --- dialser.t 8 Feb 2004 20:47:22 -0000 1.2 *************** *** 1,48 **** ! <language = se> ! [dialser] ! t_stopbits "Stopp bitar" ! t_nobits "Antal bitar" ! baud "Baudrate" ! parityena_lead "Paritet" ! parity_lead "Paritetsbit" ! edport "Anpassa portinställning för" ! t_intcontr "Avbrottsstyrd" ! irqno "IRQ-nummer" ! portaddr "Portadress" ! flowcntr "Flödesreglering" ! <start = parity_ena_sel> ! _ "Urkopplat" ! _ "Inkopplat" ! <end=NR_PARITY_ENA> ! ! <start = parity_sel> ! _ "Udda" ! _ "Jämn" ! <end=NR_PARITY_SEL> ! T_Cancel "~Avbryt" ! T_OK "~OK" ! <language = en> ! [dialser] ! t_stopbits "Stop bits" ! t_nobits "No bits" ! baud "Baudrate" ! parityena_lead "Parity" ! parity_lead "Parity bit" ! edport "Adapt port settings for" ! t_intcontr "Interrupt controlled" ! irqno "IRQ-number" ! portaddr "Port address" ! flowcntr "Flow control" ! ! <start = parity_ena_sel> ! _ "Disabled" ! _ "Enabled" ! <end=NR_PARITY_ENA> ! ! <start = parity_sel> ! _ "Odd" ! _ "Even" ! <end=NR_PARITY_SEL> ! ! T_Cancel "~Cancel" ! T_OK "~OK" --- 1,43 ---- ! <language = se> ! [dialser] ! L_STOPBITS "Stopp bitar" ! L_NRBITS "Antal bitar" ! L_BAUD "Baudrate" ! L_PARITYENA "Paritet" ! L_PARITY "Paritetsbit" ! L_EDITPORT "Anpassa portinställning för" ! <start = PARITY_ENA_ALT> ! _ "Urkopplat" ! _ "Inkopplat" ! <end=NR_PARITY_ENA_ALT> ! <start = PARITY_ALT> ! _ "Udda" ! _ "Jämn" ! <end=NR_PARITY_ALT> ! L_CANCEL "~Avbryt" ! L_OK "~OK" ! L_ERROR_ACCESS_RIGHTS "Filnamnet som är associerat med din serieport %d är %s. Du " ! "måste sätta ägare och/eller rättigheter på den filen så att " ! "programmet kan få tillgång till den.| OK " ! ! <language = en> ! [dialser] ! L_STOPBITS "Stop bits" ! L_NRBITS "No bits" ! L_BAUD "Baudrate" ! L_PARITYENA "Parity" ! L_PARITY "Parity bit" ! L_EDITPORT "Adapt port settings for" ! <start = PARITY_ENA_ALT> ! _ "Disabled" ! _ "Enabled" ! <end=NR_PARITY_ENA_ALT> ! <start = PARITY_ALT> ! _ "Odd" ! _ "Even" ! <end=NR_PARITY_ALT> ! L_CANCEL "~Cancel" ! L_OK "~OK" ! L_ERROR_ACCESS_RIGHTS "The file name associated with your serial port %d is %s. " ! "You must set ownership and/or access rights on that file so that " ! "this program can get access to it.| OK " |
|
From: <ch...@us...> - 2004-02-08 20:50:28
|
Update of /cvsroot/ccomx/ccom/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8749/docs Modified Files: ccom._tx changes._tx internal._tx readme._tx Log Message: fixed feature 715534, fixed docs accordingly, fixed allegro.cfg Index: ccom._tx =================================================================== RCS file: /cvsroot/ccomx/ccom/docs/ccom._tx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ccom._tx 9 Dec 2003 19:03:29 -0000 1.4 --- ccom._tx 8 Feb 2004 20:47:21 -0000 1.5 *************** *** 6,10 **** @# @multiwordheaders ! @manh="version 0.9.1" "CCOM" "Manual" @document_title=CCOM Manual @rtfh=CCOM - an add on lib to CGUI for accessing the serial ports --- 6,10 ---- @# @multiwordheaders ! @manh="version 1.0.0" "CCOM" "Manual" @document_title=CCOM Manual @rtfh=CCOM - an add on lib to CGUI for accessing the serial ports *************** *** 32,36 **** <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> <center><b> ! The Manual of CCOM 0.9.1 </b></center> @!text --- 32,36 ---- <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> <center><b> ! The Manual of CCOM 1.0.0 </b></center> @!text Index: changes._tx =================================================================== RCS file: /cvsroot/ccomx/ccom/docs/changes._tx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** changes._tx 9 Dec 2003 19:03:29 -0000 1.3 --- changes._tx 8 Feb 2004 20:47:21 -0000 1.4 *************** *** 1,3 **** - @# @# This is the source for the CCOM changes file, in Allegro's custom format. @# Read allegro/docs/makedoc.c for a description of what is going on... --- 1,2 ---- *************** *** 5,11 **** @#ignore_css @multiwordheaders ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="changes.html">Back to Contents</a><p> @rtfh=Changes in CCOM @$\input texinfo --- 4,8 ---- @#ignore_css @multiwordheaders ! @document_title=CCOM Changes @rtfh=Changes in CCOM @$\input texinfo *************** *** 23,27 **** @$This is the Info version of the Changes in CCOM file. @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 20,24 ---- @$This is the Info version of the Changes in CCOM file. @$ ! @$By Christer Sandberg Rasmus Myklebust @$@end ifinfo @$ *************** *** 31,40 **** @<title>Changes in CCOM</title> @<body> ! <center><b>A CGUI and Allegro addon for serial communication</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> <center><b> ! The change log of CPRI </b></center> @!text --- 28,37 ---- @<title>Changes in CCOM</title> @<body> ! <center><b>A CGUI and Allegro addon for serial port communication</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> <center><b> ! The changes log of CCOM </b></center> @!text *************** *** 42,46 **** Changes ! 0.9.1: <ul> <li> --- 39,55 ---- Changes ! 0.9.2: ! <ul> ! <li> ! Fixed feature 715534 "Add driver for linux" ! <li> ! Fixed bug 888637 "Doesn't build on Linux" ! <li> ! Fixed bug 715554 "Remove unused items from dialogue" ! <li> ! Made some minor corrections in the doc files ! </ul> ! ! 0.9.1: <ul> <li> Index: internal._tx =================================================================== RCS file: /cvsroot/ccomx/ccom/docs/internal._tx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** internal._tx 30 Mar 2003 19:50:40 -0000 1.2 --- internal._tx 8 Feb 2004 20:47:21 -0000 1.3 *************** *** 1,32 **** ! @# ! @# This is the source for the document describing the internals of CCOM. ! @# Allegro's custom format is used here. Read allegro/docs/makedoc.c for a ! @# description of what is going on... ! @# ! @# The point is that you read some of the documents internal.txt, ! @# internal.info, internal.html or internal.rtf rather than this file! @# @#ignore_css - @#multiplefiles @multiwordheaders ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="internal.html">Back to Contents</a><p> ! @rtfh=CCOM Internal ! @# Note: this version number is patched by fixver.sh ! @manh="version 0.9.0" "CCOM" "CCOM Internal" @$\input texinfo ! @$@setfilename internal.inf ! @$@settitle CCOM Internal @$@setchapternewpage odd @$@paragraphindent 0 @$ @$@ifinfo @$@direntry ! @$* Internal: (internal). Internal description of CCOM. @$@end direntry ! @$This is the Info version of the CCOM Internal description. @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 1,24 ---- ! @# This is the source for the document describing the internals of CCOM in Allegro's custom format. ! @# Read allegro/docs/makedoc.c for a description of what is going on... @# @#ignore_css @multiwordheaders ! @document_title=CCOM Internals ! @rtfh=Internals of CCOM @$\input texinfo ! @$@setfilename internals.inf ! @$@settitle Internals of CCOM @$@setchapternewpage odd @$@paragraphindent 0 + @$@setchapternewpage off + @# This should remain commented at the moment (dvi output) @$@finalout @$ @$@ifinfo @$@direntry ! @$* Internals: (internals). Internals in CCOM @$@end direntry ! @$This is the Info version of the internals CCOM file. @$ ! @$By Christer Sandberg and Rasmus Myklebust @$@end ifinfo @$ *************** *** 34,74 **** @<html> @<head> ! @<title>CCOM Internal description</title> ! @<head> ! @<title>Readme for CCOM</title> @<body> ! <center><b>CCOM</b></center> ! <center><b>A CGUI and Allegro addon Communication package</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b>Internal description of CCOM</b></center> @!text - @heading Contents ! @shortcontents @text @heading Introduction ! Currently CCOM only supports the DJGPP an Windows platforms. It uses the ! DJGPP specific functions for direct access to the I/O-bus on the PC. This ! is use both when setting parameters and when sending/receiving data. <br> ! The sending/receiving of data is always performed in polling mode. The ! async device was ment to be run in interrupt mode (the original 16-bit ! DOS version of CCOM made it that way), but we havn't yet implemented ! that in DJGPP. ! ! @heading ! Porting ! The intention is also to make a Linux port of CCOM. This can at first ! stage be limited to polling only. This may sound a big limitation, but there ! are still very useful for devices like barcode readers that can fully ! benefit a polling driver. A barcode reader has a normal operational speed ! that makes polling sufficient in most case, specially if assuming a ! 16-byte buffered port, like 16550 which is the standard chip of computers ! since many years. @heading --- 26,50 ---- @<html> @<head> ! @<title>Internals in CCOM</title> @<body> ! <center><b>A CGUI and Allegro addon for serial port communication</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b> ! The internals of CCOM ! </b></center> @!text @heading Contents ! @contents @text @heading Introduction ! CCOM is a library with functions for sending and receiving data via the ! serial ports, using the event queue of CGUI. It also provides a dialogue ! that lets the user modify the port settings. @heading Index: readme._tx =================================================================== RCS file: /cvsroot/ccomx/ccom/docs/readme._tx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme._tx 4 Jun 2003 18:34:36 -0000 1.3 --- readme._tx 8 Feb 2004 20:47:21 -0000 1.4 *************** *** 1,3 **** - @# @# This is the source for the CCOM readme file, in Allegro's custom format. @# Read allegro/docs/makedoc.c for a description of what is going on... --- 1,2 ---- *************** *** 5,16 **** @#ignore_css @multiwordheaders ! @#multiplefiles ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="readme.html">Back to Contents</a><p> ! @rtfh=Readme for CCOM @$\input texinfo @$@setfilename readme.inf ! @$@settitle Readme for CCOM @$@setchapternewpage odd @$@paragraphindent 0 --- 4,12 ---- @#ignore_css @multiwordheaders ! @document_title=CCOM readme ! @rtfh=Readme file of CCOM @$\input texinfo @$@setfilename readme.inf ! @$@settitle Readme of CCOM @$@setchapternewpage odd @$@paragraphindent 0 *************** *** 20,28 **** @$@ifinfo @$@direntry ! @$* CCOM: (CCOM). Readme file for CCOM @$@end direntry @$This is the Info version of the CCOM readme file. @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 16,24 ---- @$@ifinfo @$@direntry ! @$* Readme: (readme). Readme in CCOM @$@end direntry @$This is the Info version of the CCOM readme file. @$ ! @$By Christer Sandberg and Rasmus Myklebust @$@end ifinfo @$ *************** *** 30,43 **** @<html> @<head> ! @<title>Readme for CCOM</title> @<body> ! <center><b>CCOM</b></center> ! <center><b>A CGUI and Allegro addon Communication package</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b>Readme file for CCOM</b></center> @!text - @heading Contents --- 26,39 ---- @<html> @<head> ! @<title>Readme file of CCOM</title> @<body> ! <center><b>A CGUI and Allegro addon for serial port communication</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b> ! Readme file of CCOM ! </b></center> @!text @heading Contents *************** *** 53,76 **** that lets the user modify the port settings. ! CCOM compiles on the following platforms: DOS/DJGPP, Linux, Windows/Mingw32 and Windows/MSVC. - The current version have full functionality only on the DJGPP and Windows - platforms, there are only stubs present for the other platforms. - - You need to have compiled and installed Allegro version 4.0 or later, as - well as CGUI version 1.6 or later. - - @heading Requirements ! You need to have compiled and installed Allegro as well as CGUI. ! You need at least version 4.0 of Allegro and 1.6 of CGUI. ! You must set the environment variable ALLEGRO to point out your Allegro ! installation and set CGUIDIR to point to your CGUI installation. There are also other requirements like correctly installed compilers etc. ! but these are already fulfilled if you succeded in making Allegro (no ! additional requirements are needed). You can find Allegro at: --- 49,63 ---- that lets the user modify the port settings. ! CCOM builds and operates on the following platforms: DOS/DJGPP, Linux, Windows/Mingw32 and Windows/MSVC. @heading Requirements ! You need to have compiled and installed Allegro version 4.0.x, as well as ! CGUI vesion 1.6.5 or later. There are also other requirements like correctly installed compilers etc. ! but these are already fulfilled if you succeded in making and installing ! Allegro and CGUI (no additional requirements are needed). You can find Allegro at: *************** *** 84,100 **** Installation ! Installation goes in three simple steps, and should be familiar since it is ! exactly the same way as you installed Allegro and CGUI: <ul> <li> ! Tell the installation process what platform you use. This is done by ! running one of the following:<br> <pre> fix.bat djgpp - to compile with DOS/DJGPP fix.bat mingw32 - to compile with Windows/MinGW32 - fix.bat bcc32 - to compile with Windows/Borland C++ fix.bat msvc - to compile with Windows/MSVC ! fix.sh unix - to compile with Linux/gcc ! </pre><li> <li> Specify the path to your allegro installation by setting the environment --- 71,88 ---- Installation ! Installation goes in five simple steps, and should be familiar since it is ! similar to the installation procedure as of Allegro and CGUI: <ul> <li> ! Tell the installation process what platform you use. Start a command window ! (shell) and set the main directory of CCOM to you current directory ! (i.e. enter the command > cd <the path to your CCOM directory>). Choose ! platform by running one of the following commands:<br> <pre> fix.bat djgpp - to compile with DOS/DJGPP fix.bat mingw32 - to compile with Windows/MinGW32 fix.bat msvc - to compile with Windows/MSVC ! ./fix.sh unix - to compile with Linux/gcc ! </pre> <li> Specify the path to your allegro installation by setting the environment *************** *** 105,115 **** </pre> or alternatively put that line into your autoexec file and restart. <li> Specify the path to your CGUI installation by setting the environment ! variable CGUIDIR E.g.<br> <pre> set CGUIDIR=c:\cgui </pre> ! if your cgui directory is located at c: <li> Compile the library. This is done by running "make" at the command line. --- 93,110 ---- </pre> or alternatively put that line into your autoexec file and restart. + For unix users: + <pre> + export ALLEGRO=/home/user/allegro-4.0.3 + </pre> + or whatever is the name of your allegro directory. <li> Specify the path to your CGUI installation by setting the environment ! CGUIDIR the same way as ALLEGRO, e.g.<br> <pre> set CGUIDIR=c:\cgui </pre> ! <pre> ! export CGUIDIR=/home/user/cgui ! </pre> <li> Compile the library. This is done by running "make" at the command line. *************** *** 119,146 **** Under Linux, you may want to instead run "make install SYSTEM_DIR=<dir>", which will cause headers to be installed to <dir>/include and libraries to ! <dir>/lib. (default for <dir> is /usr/local) </ul> ! That's it! You may also want to perform some of the optional steps: ! <ul><li> ! You can compile a debugging library by typing "make DEBUGMODE=1". To ! compile both the usual and the debug library in one step, type "make all". ! <li> ! To use the debugging library, link with libccomd.a instead of libccom.a. <li> ! If you want to read the CCOM documentation with the Rhide online help ! system, go to the "Help / Syntax help / Files to search" menu, and add ! "ccom" after the existing "libc" entry (separated by a space). <li> If you want statically linked libraries under Unix or Windows as well as the default dynamically linked libraries (dll under Windows, .so under ! Unix), set the environment variable "STATICLINK=1", and repeat the ! "make install" and "make install DEBUGMODE=1". These static libraries ! require the statically linked version of Allegro and CGUI. </ul> - @heading - MSys - Users of the MSys environment needs to set teh environment vaariable - UNIX_TOOLS to 1 before make install is run. @heading --- 114,151 ---- Under Linux, you may want to instead run "make install SYSTEM_DIR=<dir>", which will cause headers to be installed to <dir>/include and libraries to ! <dir>/lib. (default for <dir> is /usr/local), or else you need to ! run make install as root. </ul> ! That's it! Now you are ready to run the example program in the example directory. ! <p> ! You may also want to perform some of the optional steps during the installation: ! <ul> <li> ! You can compile a debugging library by typing "make DEBUGMODE=1" instead of ! just "make" and "make install DEBUGMODE=1" instead of "make install". ! To compile both the usual and the debug library in one step, ! type "make all" and "make installall".<br> ! These debugging libraries require that you also have maked and installed ! the debugging versions of Allegro and CGUI. <li> If you want statically linked libraries under Unix or Windows as well as the default dynamically linked libraries (dll under Windows, .so under ! Unix), add "STATICLINK=1" to the make command like "make STATICLINK=1", ! or "make DEBUGMODE=1 STATICLINK=1" and also add it to the installation ! command.<br> ! These static libraries require that you also have maked and installed ! the static versions of Allegro and CGUI. ! <li> ! Users of the MSys environment needs to set teh environment vaariable ! UNIX_TOOLS to 1 before make install is run. ! <li> ! If you want to read the CCOM documentation with the Rhide online help ! system, go to the "Help / Syntax help / Files to search" menu in Rhide, ! and add "ccom" after the existing "libc" entry (separated by a space). ! <li> ! To use the ! To use the debugging library, link with libccomd.a instead of libccom.a. </ul> @heading *************** *** 150,170 **** the library. <li> If you link on the command line, link with '-lccom -lcgui -lalleg'. It is important that you specify the libraries in that order. If you want the ! ability to debug inside CCOM's functions, or if you want the library to ! check for bad format strings (recommended for everything that is not a ! release version), then link with '-lccomd' instead of '-lccom'. <li> ! If you use RHIDE, go to the menu Options/Libraries and fill in ccom. It is ! important that ccom is above cgui and allegro. Don't forget to check the ! box to the left of the library. You have to replace ccom with ccomd to ! include debugging information. <li> ! Before calling any CCOM functions you must have initialized CGUI, Note! ! CGUI! </ul> - @heading Contact Info --- 155,187 ---- the library. <li> + Before calling any CCOM functions you must have initialized CGUI, Note! + CGUI! For info about available functions, please read the manual, e.g. + ccom.html (but the docs are also available in other formats). + <li> If you link on the command line, link with '-lccom -lcgui -lalleg'. It is important that you specify the libraries in that order. If you want the ! ability to debug inside CCOM's functions, then link with '-lccomd' ! instead of '-lccom'. ! <p> ! On Linux you can use the following command to link with the default ! lib of CCOM (please note the ` ) ! <pre> ! gcc -s -lccom -lcgui `allegro-config --libs release --shared` file.o ! </pre> ! where `file' is the name of your file. <br> ! For debug libraries use -lccomd -lcguid instead and replace release ! with debug in the allegro config option. For linking a static application ! use -lccom_s and -lcgui_s and replace --shared with --static. <li> ! If you use the RHIDE environment, go to the menu Options/Libraries and ! fill in ccom. It is important that ccom is above cgui and allegro. Don't ! forget to check the box to the left of the library. You have to replace ! ccom with ccomd to include debugging information. <li> ! If you use some other environment, there is probably some options dialog ! where you can enter the libraries names (e.g. -lccom -lcgui -lalleg). </ul> @heading Contact Info |
|
From: <ch...@us...> - 2004-02-08 20:50:28
|
Update of /cvsroot/ccomx/ccom/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8749/examples Modified Files: allegro.cfg Log Message: fixed feature 715534, fixed docs accordingly, fixed allegro.cfg Index: allegro.cfg =================================================================== RCS file: /cvsroot/ccomx/ccom/examples/allegro.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** allegro.cfg 30 Mar 2003 19:50:41 -0000 1.3 --- allegro.cfg 8 Feb 2004 20:47:21 -0000 1.4 *************** *** 1,37 **** [system] ! language = se [cgui] ! language = se ! ! [Printer:LPT1] ! Char-set = 0 ! Installed = 1 ! Brand = 0 ! ! [Printer:LPT2] ! Char-set = 0 ! Installed = 0 ! Brand = 0 ! ! [Printer:LPT3] ! Char-set = 0 ! Installed = 0 ! Brand = 0 ! ! [Printer:DOS] ! Char-set = 0 ! Installed = 0 ! Brand = 0 ! ! [Printer:NET] ! Char-set = 0 ! Installed = 0 ! Brand = 0 ! Net-command = ! Command-cont = ! ! [soss] ! windowed_mode = 1 [cgui:screen-res] --- 1,8 ---- [system] ! language = en ! keyboard = us [cgui] ! language = en [cgui:screen-res] |
|
From: <ch...@us...> - 2004-02-08 20:50:28
|
Update of /cvsroot/ccomx/ccom/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8749/include Modified Files: ccom.h Log Message: fixed feature 715534, fixed docs accordingly, fixed allegro.cfg Index: ccom.h =================================================================== RCS file: /cvsroot/ccomx/ccom/include/ccom.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ccom.h 9 Dec 2003 19:03:30 -0000 1.5 --- ccom.h 8 Feb 2004 20:47:21 -0000 1.6 *************** *** 2,11 **** #define CCOM_H ! #define CCOM_VERSION_MAJOR 0 ! #define CCOM_VERSION_MINOR 9 ! #define CCOM_VERSION_PATCH 1 ! #define CCOM_VERSION_STRING "0.9.1" ! #define CCOM_DATE 20031209 /* yyyymmdd */ ! #define CCOM_DATE_STRING "Dec 09, 2003" #include "ccom/ccomcfg.h" --- 2,11 ---- #define CCOM_H ! #define CCOM_VERSION_MAJOR 1 ! #define CCOM_VERSION_MINOR 0 ! #define CCOM_VERSION_PATCH 0 ! #define CCOM_VERSION_STRING "1.0.0" ! #define CCOM_DATE 20040208 /* yyyymmdd */ ! #define CCOM_DATE_STRING "Feb 08, 2004" #include "ccom/ccomcfg.h" |
|
From: <ch...@us...> - 2004-02-08 20:42:38
|
Update of /cvsroot/ccomx/ccom/obj/unix/ccomd_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/unix/ccomd_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:38
|
Update of /cvsroot/ccomx/ccom/obj/unix/ccomd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/unix/ccomd Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:37
|
Update of /cvsroot/ccomx/ccom/obj/unix/ccom_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/unix/ccom_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:37
|
Update of /cvsroot/ccomx/ccom/obj/msvc/ccom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/msvc/ccom Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:37
|
Update of /cvsroot/ccomx/ccom/obj/msvc/ccomd_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/msvc/ccomd_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:37
|
Update of /cvsroot/ccomx/ccom/obj/msvc/ccomd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/msvc/ccomd Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:37
|
Update of /cvsroot/ccomx/ccom/obj/unix/ccom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/unix/ccom Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:37
|
Update of /cvsroot/ccomx/ccom/obj/msvc/ccom_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/msvc/ccom_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:36
|
Update of /cvsroot/ccomx/ccom/obj/mingw32/ccom_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/mingw32/ccom_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:36
|
Update of /cvsroot/ccomx/ccom/obj/mingw32/ccomd_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/mingw32/ccomd_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:36
|
Update of /cvsroot/ccomx/ccom/obj/djgpp/ccom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/djgpp/ccom Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:36
|
Update of /cvsroot/ccomx/ccom/obj/mingw32/ccom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/mingw32/ccom Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:36
|
Update of /cvsroot/ccomx/ccom/obj/bcc32/ccomd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/bcc32/ccomd Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@us...> - 2004-02-08 20:42:36
|
Update of /cvsroot/ccomx/ccom/obj/mingw32/ccomd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/mingw32/ccomd Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: re-done some stuff --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |