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
|
|
From: <ch...@us...> - 2004-02-08 20:42:35
|
Update of /cvsroot/ccomx/ccom/obj/bcc32/ccom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6675/bcc32/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 --- |
Update of /cvsroot/ccomx/ccom/misc/makedoc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4977/makedoc Removed Files: makechm.c makechm.h makedoc.c makedoc.h makehtml.c makehtml.h makeman.c makeman.h makemisc.c makemisc.h makertf.c makertf.h maketexi.c maketexi.h maketxt.c maketxt.h Log Message: removed unused file --- makechm.c DELETED --- --- makechm.h DELETED --- --- makedoc.c DELETED --- --- makedoc.h DELETED --- --- makehtml.c DELETED --- --- makehtml.h DELETED --- --- makeman.c DELETED --- --- makeman.h DELETED --- --- makemisc.c DELETED --- --- makemisc.h DELETED --- --- makertf.c DELETED --- --- makertf.h DELETED --- --- maketexi.c DELETED --- --- maketexi.h DELETED --- --- maketxt.c DELETED --- --- maketxt.h DELETED --- |
|
From: <ch...@us...> - 2004-02-08 18:07:39
|
Update of /cvsroot/ccomx/ccom/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4977 Removed Files: runner.c Log Message: removed unused file --- runner.c DELETED --- |
|
From: <ch...@us...> - 2004-02-08 12:10:18
|
Update of /cvsroot/ccomx/ccomx/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25030/misc Modified Files: makefile.all Log Message: Added the windows port to cvs... Index: makefile.all =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.all,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.all 8 Feb 2004 11:35:09 -0000 1.3 --- makefile.all 8 Feb 2004 12:07:13 -0000 1.4 *************** *** 52,55 **** --- 52,56 ---- comx.c \ comdos.c \ + comwin.c \ dialser.c |
|
From: <ch...@us...> - 2004-02-08 12:10:18
|
Update of /cvsroot/ccomx/ccomx/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25030/docs Modified Files: readme.info Log Message: Added the windows port to cvs... Index: readme.info =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/readme.info,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme.info 8 Feb 2004 11:35:09 -0000 1.3 --- readme.info 8 Feb 2004 12:07:13 -0000 1.4 *************** *** 45,50 **** ************ ! You need to have compiled and installed Allegro v.4.0.x, as well as ! CGUI v. 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 --- 45,50 ---- ************ ! 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 *************** *** 65,69 **** * 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 ). Choose platform by running one of the following commands: --- 65,69 ---- * 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 ). Choose platform by running one of the following commands: *************** *** 71,75 **** 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 --- 71,74 ---- *************** *** 127,130 **** --- 126,132 ---- installed the static versions of Allegro and CGUI. + * Users of the MSys environment needs to set teh environment + vaariable UNIX_TOOLS to 1 before make install is run. + * If you want to read the CCOM documentation with the Rhide online help system, go to the "Help / Syntax help / Files to search" menu *************** *** 145,150 **** * Before calling any CCOM functions you must have initialized CGUI, ! Note! CGUI! For infor about available functions, read the manual, ! e.g. ccom.html (but the docs are also available in other formats). * If you link on the command line, link with '-lccom -lcgui --- 147,153 ---- * 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). * If you link on the command line, link with '-lccom -lcgui *************** *** 153,164 **** then link with '-lccomd' instead of '-lccom'. ! On linux you can use the following command to link with the default ! lib of ccom (please note the ` ) ! gcc -s -lccom -lcgui `allegro-config --libs release --shared` 1_com.o For debug libraries use -lccomd -lcguid instead and replace release with debug in the allegro config option. For linking a static ! application -lccom_s and -lcgui_s and replace -shared with -static. * If you use the RHIDE environment, go to the menu Options/Libraries --- 156,169 ---- then link with '-lccomd' instead of '-lccom'. ! On Linux you can use the following command to link with the default ! lib of CCOM (please note the ` ) ! gcc -s -lccom -lcgui `allegro-config --libs release --shared` file.o + where `file' is the name of your file. 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. * If you use the RHIDE environment, go to the menu Options/Libraries *************** *** 193,199 **** Node: Introduction718 Node: Requirements1115 ! Node: Installation1644 ! Node: Usage4843 ! Node: Contact Info6365 End Tag Table --- 198,204 ---- Node: Introduction718 Node: Requirements1115 ! Node: Installation1654 ! Node: Usage4911 ! Node: Contact Info6496 End Tag Table |
|
From: <ch...@us...> - 2004-02-08 12:10:17
|
Update of /cvsroot/ccomx/ccomx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25030/src Added Files: common.h comwin.c Log Message: Added the windows port to cvs... --- NEW FILE: common.h --- #ifndef COMMON_H #define COMMON_H struct t_serport; extern int _CcomWritePort(struct t_serport *port, int c); extern int _CcomReadPort(struct t_serport *port, unsigned char *c, unsigned char *error); extern void _CcomApplySettingsToPort(struct t_serport *port); extern void _CcomSetBaud(struct t_serport *port); extern void _CcomLoopBackMode(struct t_serport *port, int mode); #endif --- NEW FILE: comwin.c --- /* Module COMWIN This module contains the asynchronous commounication basics for WINDOWS only. */ #ifdef _WIN32 #include <allegro.h> #include <winalleg.h> #include "common.h" #include "comx.h" #define BAUD_LOW 0 #define BAUD_HIGH 1 #define CONTROL_REG 3 #define MODEM_CONTROL_REG 4 #define LINE_STATUS_REG 5 #define MODEM_STATUS_REG 6 #define GETADDR(portno, addr) dosmemget(0x400 + (portno) * 2, 2, (addr)) #define XOFF 0x11 #define XON 0x13 static int CheckOpened(t_serport *port) { COMMTIMEOUTS cm={MAXDWORD,0,0,0,0}; char portname[5]="COM0"; if(port->hport) return 1; portname[3]=port->portno+'0'+1; port->hport=CreateFile(portname,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); SetCommTimeouts(port->hport,&cm); if(port->hport==INVALID_HANDLE_VALUE) { port->hport=NULL; return 0; } return 1; } extern int _CcomReadPort(t_serport *port, unsigned char *c, unsigned char *error) { DWORD BytesRead; *error = 0; ReadFile(port->hport,c,1,&BytesRead,NULL); return BytesRead; } extern int _CcomWritePort(t_serport *port, int c) { DWORD BytesWritten; WriteFile(port->hport,&c,1,&BytesWritten,NULL); return BytesWritten; } extern void _CcomSetBaud(t_serport *port) { DCB dcb; if(!CheckOpened(port)) return; GetCommState(port->hport,&dcb); dcb.BaudRate=port->baud_rate; SetCommState(port->hport,&dcb); } /* Applies all settings stored in the port-struct except the baud-rate to the hardware */ extern void _CcomApplySettingsToPort(t_serport *port) { DCB dcb; if(!CheckOpened(port)) return; GetCommState(port->hport,&dcb); dcb.ByteSize=port->nobits; dcb.fAbortOnError=FALSE; dcb.Parity=port->parityena==0?NOPARITY:port->parity==0?EVENPARITY:ODDPARITY; dcb.fParity=port->parityena; dcb.StopBits=port->stopbits; SetCommState(port->hport,&dcb); } extern void _CcomLoopBackMode(t_serport *port, int mode) { } #endif |
Update of /cvsroot/ccomx/ccomx/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17886/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc zipup.sh Removed Files: makefile.doc Log Message: Some more makefile cleanup/improvements Index: makefile.all =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.all,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.all 1 Feb 2004 18:05:11 -0000 1.2 --- makefile.all 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 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. # *************** *** 85,101 **** 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 - - # -------- Include platform specific makefile. -------- --- 86,89 ---- *************** *** 172,182 **** 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) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) --- 160,170 ---- 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) Index: makefile.bcc =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.bcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.bcc 1 Feb 2004 18:05:11 -0000 1.2 --- makefile.bcc 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 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,67 **** 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 --- 44,60 ---- 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 *************** *** 71,84 **** 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: --- 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: *************** *** 101,106 **** SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib - - # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) --- 94,97 ---- *************** *** 114,141 **** MKTEXT = $(subst /,\,$(MKTEXT_X)) - - # -------- 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 -------- --- 105,108 ---- *************** *** 144,197 **** _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 *************** *** 202,206 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif --- 167,171 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif *************** *** 208,213 **** dinput.lib ddraw.lib winmm.lib dsound.lib - - # -------- List platform specific objects and programs. -------- --- 173,176 ---- *************** *** 221,241 **** # 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 ---- *************** *** 262,309 **** 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 *************** *** 316,333 **** 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. -------- *************** *** 337,346 **** 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 *************** *** 369,373 **** endif - INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/ccom/*.h)) --- 285,288 ---- *************** *** 378,382 **** ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif --- 293,297 ---- ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif *************** *** 392,404 **** 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/ccomx/misc/makefile.dj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.dj 1 Feb 2004 18:05:11 -0000 1.2 --- makefile.dj 8 Feb 2004 11:35:09 -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,41 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp --- 32,37 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp *************** *** 45,50 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/djgpp --- 41,46 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/djgpp *************** *** 54,59 **** LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) - - # -------- Find djgpp. -------- --- 50,53 ---- *************** *** 76,80 **** SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info - # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) --- 70,73 ---- *************** *** 89,126 **** - # -------- 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 - - - # -------- Give a sensible default target for make without any args. -------- # This must be done right after the tests, which can generate error targets. --- 82,85 ---- *************** *** 130,183 **** _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 *************** *** 185,189 **** # 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 *************** *** 193,198 **** COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCCOM_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) - - # -------- List platform specific objects and programs. -------- --- 149,152 ---- *************** *** 206,255 **** # 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 ---- *************** *** 309,312 **** --- 233,237 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! Index: makefile.mgw =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.mgw,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.mgw 1 Feb 2004 18:05:11 -0000 1.2 --- makefile.mgw 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 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,37 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/mingw32 --- 30,35 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/mingw32 *************** *** 39,54 **** 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 --- 37,52 ---- 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 *************** *** 61,84 **** 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 ! 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,82 ---- 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 ! 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: *************** *** 93,98 **** SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib - - # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) --- 91,94 ---- *************** *** 106,141 **** 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, 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. -------- # This must be done right after the tests, which can generate error targets. --- 102,105 ---- *************** *** 145,219 **** _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 --- 109,180 ---- _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 *************** *** 222,236 **** 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. -------- --- 183,195 ---- 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. -------- *************** *** 244,249 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- --- 203,206 ---- *************** *** 251,365 **** 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 \,/,$< $@) --- 208,252 ---- 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 \,/,$< $@) *************** *** 399,403 **** endif # ifdef CROSSCOMPILE else - INSTALL_HEADERS = $(addprefix $(MINGDIR_U)/,$(wildcard include/ccom/*.h)) --- 286,289 ---- *************** *** 408,414 **** ifndef CROSSCOMPILE ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif endif --- 294,300 ---- ifndef CROSSCOMPILE ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif 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 -------- # Note that this must be done with djgpp! --- 308,314 ---- 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/ccomx/misc/makefile.uni,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.uni 1 Feb 2004 18:05:11 -0000 1.2 --- makefile.uni 8 Feb 2004 11:35:09 -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,47 **** 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 --- 32,41 ---- 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 *************** *** 68,101 **** MKTEXT = $(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. -------- # This must be done right after the tests, which can generate error targets. --- 62,65 ---- *************** *** 105,166 **** _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 ! 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 --- 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 *************** *** 171,183 **** 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. -------- *************** *** 191,266 **** # 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 endif - # ifdef STATICLINK - - #gcc -s -o examples/game5 obj/unix/cgui/game5.o -Llib/unix -lcgui `allegro-config --libs release --shared` - #gcc -Wall -Wno-unused -mcpu=pentium -O2 -funroll-loops -ffast-math -fomit-frame-pointer -fno-strength-reduce -I./include -o obj/unix/cgui/game6.o -c examples/game6.c - #gcc -Wall -Wno-unused -mcpu=pentium -O2 -funroll-loops -ffast-math -fomit-frame-pointer -fno-strength-reduce examples/1_com.c -o examples/1_com - # -------- 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. -------- *************** *** 291,300 **** @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! --- 205,215 ---- @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! Index: makefile.vc =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.vc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.vc 1 Feb 2004 18:05:11 -0000 1.2 --- makefile.vc 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 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,46 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/msvc --- 37,42 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/msvc *************** *** 48,63 **** 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 --- 44,59 ---- 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 *************** *** 70,83 **** 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: --- 66,79 ---- 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: *************** *** 86,99 **** 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 --- 82,95 ---- 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 *************** *** 113,118 **** SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib - - # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) --- 109,112 ---- *************** *** 126,183 **** MKTEXT = $(subst /,\,$(MKTEXT_X)) ! # -------- 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 Allegro? You need to make the MSVC version of ! @echo Allegro before making the MSVC version of CCOM. ! @echo Alternatively, download the dimalleg.zip package from CCOM's homepage. ! endif ! endif ! ! ! ifdef NEED_MAKEDOC ! include misc/makefile.doc ! endif ! ! ! ! # -------- give a sensible default target for make without any args -------- .PHONY: _default --- 120,124 ---- MKTEXT = $(subst /,\,$(MKTEXT_X)) ! RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX) .PHONY: _default *************** *** 185,237 **** _default: default - - # -------- decide what compiler options to use -------- ifdef WARNMODE ! WFLAGS = -W3 -WX else ! WFLAGS = -W1 endif ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Gd -Zi -MDd ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall ! LFLAGS = -debug -debugtype:cv ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alld_s.lib ! else ! LIB_FLAGS = cgui.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -profile ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -release ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alleg_s.lib else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif --- 126,176 ---- _default: default # -------- decide what compiler options to use -------- ifdef WARNMODE ! WFLAGS = -W3 -WX else ! WFLAGS = -W1 endif ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Gd -Zi -MDd ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall ! LFLAGS = -debug -debugtype:cv ! ifdef STATICLINK ! LIB_FLAGS = cgui_s.lib alld_s.lib ! else ! LIB_FLAGS = cgui.lib alld.lib ! endif else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -profile ! ifdef STATICLINK ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -release ! ifdef STATICLINK ! LIB_FLAGS = cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif *************** *** 248,253 **** dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib - - # -------- List platform specific objects and programs. -------- --- 187,190 ---- *************** *** 262,337 **** - # -------- Define how to compile. -------- GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ - COMPILE_C_TO_OBJ_DEPS = $(RUNNER_DEP) define COMPILE_C_TO_OBJ $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - $(RUNNER) cl @ -nologo $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -Fo$@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = $(RUNNER_DEP) - define COMPILE_S_TO_OBJ - gcc $(GCC2MSVC) $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef - LINK_OBJ_TO_EXE_DEPS = $(RUNNER_DEP) define LINK_OBJ_TO_EXE $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) endef - LINK_OBJ_TO_EXE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_OBJ_TO_EXE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_DEPS = $(RUNNER_DEP) - define LINK_ALL_OBJ_TO_EXE - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $(filter-out $(RUNNER_DEP),$^) $(IMPLIB_NAME) $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_ALL_OBJ_TO_EXE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $(filter-out $(RUNNER_DEP),$^) $(LIB_FLAGS) - endef - - LINK_CONSOLE_DEPS = $(IMPLIB_NAME) $(RUNNER_DEP) - define LINK_CONSOLE - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) - endef - - LINK_CONSOLE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_CONSOLE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $< $(LIB_FLAGS) - endef - ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = $(RUNNER_DEP) ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = $(RUNNER_DEP) ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK - - # -------- Rules for installing and removing the library files. -------- ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 endif --- 199,230 ---- # -------- Define how to compile. -------- GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ define COMPILE_C_TO_OBJ $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< endef define LINK_OBJ_TO_EXE $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) endef ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef else ! # link as a DLL ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef endif # ifdef STATICLINK # -------- Rules for installing and removing the library files. -------- ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 endif *************** *** 378,382 **** ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif --- 271,275 ---- ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif *************** *** 392,404 **** 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. -------- --- 285,291 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! # -------- Generate automatic dependencies. -------- Index: zipup.sh =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/zipup.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zipup.sh 1 Feb 2004 18:05:11 -0000 1.2 --- zipup.sh 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 48,55 **** make texts - - echo remove old files... - rm -fv ccom.zip - echo copy default makefile... cp misc/emptymak makefile --- 48,51 ---- *************** *** 60,71 **** misc/dllsyms.lst misc/scanexp.c \ obj/*/*/*.dep lib/*/*.def \ ! readme.txt readme.html docs/readme.info \ docs/*._tx \ src/*.c src/*.h src/*.t src/*.ht \ examples/*.c examples/*.cfg \ resource/* \ ! include/*.h include/ccom/*.h \ ! misc/runner.c \ ! misc/makedoc/*.c misc/makedoc/*.h" afiles=`echo $files | sed -e"s/\([^ ][^ ]*\)/ ccom\/\1/g"` --- 56,65 ---- misc/dllsyms.lst misc/scanexp.c \ obj/*/*/*.dep lib/*/*.def \ ! docs/readme.txt docs/readme.html docs/ccom.html docs/ccom.txt \ docs/*._tx \ src/*.c src/*.h src/*.t src/*.ht \ examples/*.c examples/*.cfg \ resource/* \ ! include/*.h include/ccom/*.h afiles=`echo $files | sed -e"s/\([^ ][^ ]*\)/ ccom\/\1/g"` --- makefile.doc DELETED --- |
|
From: <ch...@us...> - 2004-02-08 11:38:21
|
Update of /cvsroot/ccomx/ccomx/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17886/docs Modified Files: ccom._tx internal._tx readme._tx readme.info thanks._tx wishlist._tx Log Message: Some more makefile cleanup/improvements Index: ccom._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/ccom._tx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ccom._tx 1 Feb 2004 18:05:10 -0000 1.2 --- ccom._tx 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 1,15 **** @#This is the source for the CCOM manual, in Shawn's special format. @#The readable documents are generated and will be found in the files: ! @#cpri.txt,cpri.rtf, cpri.htm, cpri.inf, the latter may be ! @#installed as on-line help if you are using rhide (just add cpri to the ! @#list of help files) @# @multiwordheaders @manh="version 0.9.2" "CCOM" "Manual" @document_title=CCOM Manual ! @rtfh=cpri - an add on lib to CGUI for formatted printing @$\input texinfo ! @$@setfilename cpri.inf ! @$@settitle cpri Manual @$@setchapternewpage odd @$@paragraphindent 0 --- 1,13 ---- @#This is the source for the CCOM manual, in Shawn's special format. @#The readable documents are generated and will be found in the files: ! @#ccom.txt,ccom.rtf, ccom.htm, ccom.inf, the latter may be @# @multiwordheaders @manh="version 0.9.2" "CCOM" "Manual" @document_title=CCOM Manual ! @rtfh=ccom - an add on lib to CGUI for serial port communication @$\input texinfo ! @$@setfilename ccom.inf ! @$@settitle ccom Manual @$@setchapternewpage odd @$@paragraphindent 0 *************** *** 27,31 **** @<body> <center><b>CCOM</b></center> ! <center><b>A CGUI and Allegro addon for for formatted printing</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> --- 25,29 ---- @<body> <center><b>CCOM</b></center> ! <center><b>A CGUI and Allegro addon for for serial port communication</b></center> <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> <center>Email: <email>chr...@md...</a></center> Index: internal._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/internal._tx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** internal._tx 1 Feb 2004 18:05:10 -0000 1.2 --- internal._tx 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 20,24 **** @$This is the Info version of the internals CCOM file. @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 20,24 ---- @$This is the Info version of the internals CCOM file. @$ ! @$By Christer Sandberg and Rasmus Myklebust @$@end ifinfo @$ Index: readme._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/readme._tx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme._tx 1 Feb 2004 18:05:10 -0000 1.2 --- readme._tx 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 4,15 **** @#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 *************** *** 19,27 **** @$@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 @$ *************** *** 29,39 **** @<html> @<head> ! @<title>Readme for CCOM</title> @<body> ! <center><b>A CGUI and Allegro addon for 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 readme file of CCOM</b></center> @!text @heading --- 26,38 ---- @<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 *************** *** 42,46 **** @shortcontents - @text @heading --- 41,44 ---- *************** *** 51,72 **** 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 platform, - there are only stubs present for the other platforms. - - You need to have compiled and installed Allegro v. 4 or later, as well as - CGUI v. 1.4 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.4 of CGUI. 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: *************** *** 80,96 **** 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 *************** *** 101,111 **** </pre> or alternatively put that line into your autoexec file and restart. <li> Specify the path to your CGUI installation by setting the environment ! CGUI E.g.<br> <pre> ! set CGUI=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. *************** *** 115,136 **** 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> --- 114,149 ---- 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> *************** *** 142,162 **** 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 Index: readme.info =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/readme.info,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme.info 1 Feb 2004 18:05:10 -0000 1.2 --- readme.info 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 3,18 **** START-INFO-DIR-ENTRY ! * CCOM: (CCOM). Readme file for CCOM END-INFO-DIR-ENTRY This is the Info version of the CCOM readme file. ! By Christer Sandberg File: readme.info, Node: Top, Prev: (dir), Up: (dir) ! A CGUI and Allegro addon for for serial communication by Christer Sandberg and Rasmus Myklebust Email: chr...@md... Homepage: ! http://www.idt.mdh.se/~csg/cgui/cguix The readme file of CCOM * Menu: --- 3,20 ---- START-INFO-DIR-ENTRY ! * Readme: (readme). Readme in CCOM END-INFO-DIR-ENTRY This is the Info version of the CCOM readme file. ! By Christer Sandberg and Rasmus Myklebust File: readme.info, Node: Top, Prev: (dir), Up: (dir) ! A CGUI and Allegro addon for serial port communication by Christer Sandberg and Rasmus Myklebust Email: chr...@md... Homepage: ! http://www.idt.mdh.se/~csg/cgui/cguix ! ! Readme file of CCOM * Menu: *************** *** 34,46 **** 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 platform, - there are only stubs present for the other platforms. - - You need to have compiled and installed Allegro v. 4 or later, as well - as CGUI v. 1.4 or later. - File: readme.info, Node: Requirements, Next: Installation, Prev: Introduction, Up: Top --- 36,42 ---- that lets the user modify the port settings. ! CCOM builds and operates on the following platforms: DOS/DJGPP, Linux, Windows/Mingw32 and Windows/MSVC. File: readme.info, Node: Requirements, Next: Installation, Prev: Introduction, Up: Top *************** *** 49,56 **** ************ ! You need to have compiled and installed Allegro as well as CGUI. You ! need at least version 4.0 of Allegro and 1.4 of CGUI. 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). --- 45,52 ---- ************ ! You need to have compiled and installed Allegro v.4.0.x, as well as ! CGUI v. 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). *************** *** 65,73 **** ************ ! Installation goes in three simple steps, and should be familiar since ! it is exactly the same way as you installed Allegro and CGUI: ! * Tell the installation process what platform you use. This is done ! by running one of the following: fix.bat djgpp - to compile with DOS/DJGPP --- 61,71 ---- ************ ! Installation goes in five simple steps, and should be familiar since it ! is similar to the installation procedure as of Allegro and CGUI: ! * 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 ). Choose platform ! by running one of the following commands: fix.bat djgpp - to compile with DOS/DJGPP *************** *** 75,81 **** 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 ! * * Specify the path to your allegro installation by setting the environment variable ALLEGRO. E.g. if your allegro directory is c:\allegro then you must type --- 73,79 ---- 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 ! * Specify the path to your allegro installation by setting the environment variable ALLEGRO. E.g. if your allegro directory is c:\allegro then you must type *************** *** 84,94 **** or alternatively put that line into your autoexec file and restart. * Specify the path to your CGUI installation by setting the ! environment CGUI E.g. ! set CGUI=c:\cgui ! if your cgui directory is located at c: * Compile the library. This is done by running "make" at the command --- 82,98 ---- or alternatively put that line into your autoexec file and restart. + For unix users: + + export ALLEGRO=/home/user/allegro-4.0.3 + + or whatever is the name of your allegro directory. * Specify the path to your CGUI installation by setting the ! environment CGUIDIR the same way as ALLEGRO, e.g. ! set CGUIDIR=c:\cgui ! ! export CGUIDIR=/home/user/cgui * Compile the library. This is done by running "make" at the command *************** *** 100,125 **** SYSTEM_DIR=<dir>", which will cause headers to be installed to <dir>/include and libraries to <dir>/lib. (default for <dir> is ! /usr/local) ! ! That's it! You may also want to perform some of the optional steps: ! * 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". ! * To use the debugging library, link with libccomd.a instead of ! libccom.a. ! * 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). * 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. --- 104,137 ---- 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. ! That's it! Now you are ready to run the example program in the example ! directory. ! You may also want to perform some of the optional steps during the ! installation: ! * 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". ! These debugging libraries require that you also have maked and ! installed the debugging versions of Allegro and CGUI. * 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. ! These static libraries require that you also have maked and ! installed the static versions of Allegro and CGUI. ! ! * 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). ! ! * To use the To use the debugging library, link with libccomd.a ! instead of libccom.a. *************** *** 132,149 **** the library. * 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'. ! * 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. ! * Before calling any CCOM functions you must have initialized CGUI, ! Note! CGUI! --- 144,174 ---- the library. + * Before calling any CCOM functions you must have initialized CGUI, + Note! CGUI! For infor about available functions, read the manual, + e.g. ccom.html (but the docs are also available in other formats). + * 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'. ! On linux you can use the following command to link with the default ! lib of ccom (please note the ` ) ! gcc -s -lccom -lcgui `allegro-config --libs release --shared` 1_com.o ! ! For debug libraries use -lccomd -lcguid instead and replace release ! with debug in the allegro config option. For linking a static ! application -lccom_s and -lcgui_s and replace -shared with -static. ! ! * 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. ! ! * If you use some other environment, there is probably some options ! dialog where you can enter the libraries names (e.g. -lccom -lcgui ! -lalleg). *************** *** 165,174 **** Tag Table: ! Node: Top233 ! Node: Introduction701 ! Node: Requirements1311 ! Node: Installation1846 ! Node: Usage4270 ! Node: Contact Info5207 End Tag Table --- 190,199 ---- Tag Table: ! Node: Top252 ! Node: Introduction718 ! Node: Requirements1115 ! Node: Installation1644 ! Node: Usage4843 ! Node: Contact Info6365 End Tag Table Index: thanks._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/thanks._tx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** thanks._tx 1 Feb 2004 18:05:10 -0000 1.2 --- thanks._tx 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 20,24 **** @$This is the Info version of the CCOM thanks file. @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 20,24 ---- @$This is the Info version of the CCOM thanks file. @$ ! @$By Christer Sandberg and Rasmus Myklebust @$@end ifinfo @$ Index: wishlist._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/wishlist._tx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wishlist._tx 1 Feb 2004 18:05:10 -0000 1.2 --- wishlist._tx 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 20,24 **** @$This is the Info version of the CCOM Wish List. @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 20,24 ---- @$This is the Info version of the CCOM Wish List. @$ ! @$By Christer Sandberg and Rasmus Myklebust @$@end ifinfo @$ |
|
From: <ch...@us...> - 2004-02-08 11:38:12
|
Update of /cvsroot/ccomx/ccomx/resource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17886/resource Modified Files: ccom.dat Log Message: Some more makefile cleanup/improvements Index: ccom.dat =================================================================== RCS file: /cvsroot/ccomx/ccomx/resource/ccom.dat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs8SD7yo and /tmp/cvsbXeeHy differ |
|
From: <ch...@us...> - 2004-02-08 11:38:12
|
Update of /cvsroot/ccomx/ccomx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17886/src Modified Files: labldata.c Log Message: Some more makefile cleanup/improvements Index: labldata.c =================================================================== RCS file: /cvsroot/ccomx/ccomx/src/labldata.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** labldata.c 1 Feb 2004 18:05:15 -0000 1.2 --- labldata.c 8 Feb 2004 11:35:09 -0000 1.3 *************** *** 11,15 **** static DATAFILE_PROPERTY ccom_ccomlabl_prop[] = { ! { "2-01-2004, 16:48", DAT_ID('D', 'A', 'T', 'E') }, { "CCOMLABL", DAT_ID('N', 'A', 'M', 'E') }, { "resource/ccomlabl", DAT_ID('O', 'R', 'I', 'G') }, --- 11,15 ---- static DATAFILE_PROPERTY ccom_ccomlabl_prop[] = { ! { "2-03-2004, 20:05", DAT_ID('D', 'A', 'T', 'E') }, { "CCOMLABL", DAT_ID('N', 'A', 'M', 'E') }, { "resource/ccomlabl", DAT_ID('O', 'R', 'I', 'G') }, |
Update of /cvsroot/ccomx/ccomx/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver zipup.sh Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths Index: makefile.all =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.all,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile.all 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- makefile.all 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 42,97 **** include misc/makefile.ver LIB_SOURCE = \ ! comx.c \ ! comdos.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 --- 42,86 ---- 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 \ ! dialser.c EXAMPLES_SOURCE = 1_com.c RUNNER_SOURCE = misc/runner.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 *************** *** 109,117 **** - # Tell the platform specific makefile to look for Allegro's makedoc. - NEED_MAKEDOC = 1 - - - # -------- Include platform specific makefile. -------- --- 98,101 ---- *************** *** 123,131 **** 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 \ ! readme.txt docs/readme$(INFO_SUFFIX) \ ! changes.txt docs/changes$(HTML_SUFFIX) \ ! thanks.txt docs/thanks$(HTML_SUFFIX) \ docs/wishlist.txt docs/wishlist$(HTML_SUFFIX) --- 107,115 ---- 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) \ ! docs/thanks.txt docs/thanks$(HTML_SUFFIX) \ docs/wishlist.txt docs/wishlist$(HTML_SUFFIX) *************** *** 137,146 **** 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 -------- --- 121,129 ---- 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 -------- *************** *** 179,187 **** 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 --- 162,170 ---- 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 *************** *** 195,232 **** $(LINK_OBJ_TO_LIB) - ifndef NATIVE_LINK_OBJ_TO_EXE examples/%$(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 --- 178,205 ---- $(LINK_OBJ_TO_LIB) examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) ifneq ($(RUNNER_DEP),) $(RUNNER): $(RUNNER_SOURCE) $(COMPILE_RUNNER) endif 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 *************** *** 235,239 **** -makeinfo --no-split -o $@ $< ! docs/%$(TEXI_SUFFIX): docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $< endif --- 208,212 ---- -makeinfo --no-split -o $@ $< ! docs/%$(TEXI_SUFFIX): docs/%._tx -$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $< endif *************** *** 241,245 **** # -------- 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 --- 214,218 ---- # -------- 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 *************** *** 252,264 **** 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) $(CCOM_LABELS) $(TEXT_SOURCES) # -------- Misc stuff -------- --- 225,236 ---- 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/ccomx/misc/makefile.bcc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile.bcc 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- makefile.bcc 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 51,77 **** # 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. -------- --- 51,69 ---- # 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. -------- *************** *** 113,117 **** # -------- 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)) --- 105,109 ---- # -------- 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)) *************** *** 305,310 **** 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 --- 297,301 ---- 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 Index: makefile.dj =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.dj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile.dj 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- makefile.dj 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 41,46 **** 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 --- 41,46 ---- 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 *************** *** 51,55 **** LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE5).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) --- 51,55 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) *************** *** 79,83 **** # -------- 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)) --- 79,83 ---- # -------- 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)) Index: makefile.mgw =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.mgw,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile.mgw 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- makefile.mgw 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 38,66 **** 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. -------- --- 38,58 ---- 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. -------- *************** *** 105,109 **** # -------- 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)) --- 97,101 ---- # -------- 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)) Index: makefile.uni =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.uni,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile.uni 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- makefile.uni 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 37,58 **** 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. ------------ --- 37,51 ---- 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,81 **** SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib - - # -------- Set up mktext -------- ALLEGRO_DAT = $(ALLEGRO_DAT_X) ! ALLEGRO_DAT2C = $(ALLEGRO_DAT2C_X) CCOM_DAT = $(CCOM_DAT_X) CCOM_DAT_C = $(CCOM_DAT_C_X) CCOM_DAT_H = $(CCOM_DAT_H_X) ! CCOM_LABELS = $(CCOM_LABELS) TEXT_SOURCES = $(TEXT_SOURCES_X) TEXT_HEADERS = $(TEXT_HEADERS_X) MKTEXT = $(MKTEXT_X) - # -------- Find Allegro and makedoc. -------- --- 57,71 ---- 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) # -------- Find Allegro and makedoc. -------- *************** *** 138,143 **** --- 128,135 ---- ifdef STATICLINK_ALLEGRO ALLEGRO_CONFIG_FLAGS = --static + LIB_FLAGS = -lcgui_s else ALLEGRO_CONFIG_FLAGS = --shared + LIB_FLAGS = -lcgui endif *************** *** 147,151 **** SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) LFLAGS += -g ! LIB_FLAGS = `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)` else ifdef PROFILEMODE --- 139,143 ---- SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) LFLAGS += -g ! LIB_FLAGS += `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)` else ifdef PROFILEMODE *************** *** 154,158 **** SFLAGS = $(WFLAGS) LFLAGS += -pg ! LIB_FLAGS = `allegro-config --libs profile $(ALLEGRO_CONFIG_FLAGS)` else # optimised build --- 146,150 ---- SFLAGS = $(WFLAGS) LFLAGS += -pg ! LIB_FLAGS += `allegro-config --libs profile $(ALLEGRO_CONFIG_FLAGS)` else # optimised build *************** *** 161,165 **** ifndef SYMBOLMODE LFLAGS += -s ! LIB_FLAGS = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` endif endif --- 153,157 ---- ifndef SYMBOLMODE LFLAGS += -s ! LIB_FLAGS += `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` endif endif *************** *** 264,282 **** 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 ! gcc -s -o examples/game5 obj/unix/cgui/game5.o -Llib/unix -lcgui `allegro-config --libs release --shared` ! gcc -Wall -Wno-unused -mcpu=pentium -O2 -funroll-loops -ffast-math -fomit-frame-pointer -fno-strength-reduce -I./include -o obj/unix/cgui/game6.o -c examples/game6.c ! cc -Wall -Wno-unused -mcpu=pentium -O2 -funroll-loops -ffast-math -fomit-frame-pointer -fno-strength-reduce examples/1_com.c -o examples/1_com --- 256,265 ---- endef ! endif ! # ifdef STATICLINK ! #gcc -s -o examples/game5 obj/unix/cgui/game5.o -Llib/unix -lcgui `allegro-config --libs release --shared` ! #gcc -Wall -Wno-unused -mcpu=pentium -O2 -funroll-loops -ffast-math -fomit-frame-pointer -fno-strength-reduce -I./include -o obj/unix/cgui/game6.o -c examples/game6.c ! #gcc -Wall -Wno-unused -mcpu=pentium -O2 -funroll-loops -ffast-math -fomit-frame-pointer -fno-strength-reduce examples/1_com.c -o examples/1_com *************** *** 316,329 **** @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 -------- --- 299,302 ---- Index: makefile.vc =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.vc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile.vc 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- makefile.vc 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 47,75 **** 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. -------- --- 47,67 ---- 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. -------- *************** *** 125,129 **** # -------- 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)) --- 117,121 ---- # -------- 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)) Index: makefile.ver =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/makefile.ver,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile.ver 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- makefile.ver 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 7,10 **** # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 0.9.0 shared_major_minor = 0.9 --- 7,10 ---- # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 0.9.2 shared_major_minor = 0.9 Index: zipup.sh =================================================================== RCS file: /cvsroot/ccomx/ccomx/misc/zipup.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** zipup.sh 27 Feb 2003 18:45:04 -0000 1.1.1.1 --- zipup.sh 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 12,17 **** # note: these are patched by fixver.sh script. ! zipversion=090 ! tgzversion=0.9.0 echo clean up... --- 12,17 ---- # note: these are patched by fixver.sh script. ! zipversion=092 ! tgzversion=0.9.2 echo clean up... |
Update of /cvsroot/ccomx/ccomx/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/docs Modified Files: ccom._tx changes._tx internal._tx readme._tx readme.info thanks._tx wishlist._tx Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths Index: ccom._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/ccom._tx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ccom._tx 27 Feb 2003 18:45:06 -0000 1.1.1.1 --- ccom._tx 1 Feb 2004 18:05:10 -0000 1.2 *************** *** 1,14 **** @#This is the source for the CCOM manual, in Shawn's special format. @#The readable documents are generated and will be found in the files: ! @#ccom.txt,ccom.rtf, ccom.htm, ccom.inf, the latter may be ! @#installed as on-line help if you are using rhide (just add cbarcode to the @#list of help files) @# @document_title=CCOM Manual ! @f=<p><hr><p><a href="ccom.html">Back to Contents</a><p> ! @rtfh=CCOM - an add on lib to CGUI for accessing the serial ports @$\input texinfo ! @$@setfilename ccom.inf ! @$@settitle CCOM Manual @$@setchapternewpage odd @$@paragraphindent 0 --- 1,15 ---- @#This is the source for the CCOM manual, in Shawn's special format. @#The readable documents are generated and will be found in the files: ! @#cpri.txt,cpri.rtf, cpri.htm, cpri.inf, the latter may be ! @#installed as on-line help if you are using rhide (just add cpri to the @#list of help files) @# + @multiwordheaders + @manh="version 0.9.2" "CCOM" "Manual" @document_title=CCOM Manual ! @rtfh=cpri - an add on lib to CGUI for formatted printing @$\input texinfo ! @$@setfilename cpri.inf ! @$@settitle cpri Manual @$@setchapternewpage odd @$@paragraphindent 0 *************** *** 17,36 **** @$This is the Info version of the CCOM manual @$ ! @$By Christer Sandberg @$@end ifinfo @$ @$@node Top, , (dir), (dir) @<html> ! @<pre> ! @!indent ! ! A CGUI addon Communication package ! ! API Reference ! ! by Christer Sandberg ! ! @indent ! </pre> @!text @heading --- 18,37 ---- @$This is the Info version of the CCOM manual @$ ! @$By Christer Sandberg and Rasmus Myklebust @$@end ifinfo @$ @$@node Top, , (dir), (dir) @<html> ! @<head> ! @<title>The CCOM API</title> ! @<body> ! <center><b>CCOM</b></center> ! <center><b>A CGUI and Allegro addon for for formatted printing</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 Manual of CCOM 0.9.3 ! </b></center> @!text @heading *************** *** 39,48 **** @contents - - @text @heading Using CCOM ! @xref Simple_use @xref Direct_port_setting To be able to call the functions in the CCOM lib you must first build and --- 40,47 ---- @contents @text @heading Using CCOM ! @xref Simple use of COM ports @xref Direct_port_setting To be able to call the functions in the CCOM lib you must first build and *************** *** 55,59 **** @heading ! Simple_use of COM ports @xref Direct_port_setting A "serial port" is a chip in the computer with two sides, one "speaking" to --- 54,58 ---- @heading ! Simple use of COM ports @xref Direct_port_setting A "serial port" is a chip in the computer with two sides, one "speaking" to *************** *** 181,185 **** @heading Direct_port_setting ! @xref Simple_use If you for some reason don't like the dialogue for port settings, you can make your own and instead use the direct port setting functions.<br> --- 180,184 ---- @heading Direct_port_setting ! @xref Simple use of COM ports If you for some reason don't like the dialogue for port settings, you can make your own and instead use the direct port setting functions.<br> Index: changes._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/changes._tx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** changes._tx 27 Feb 2003 18:45:06 -0000 1.1.1.1 --- changes._tx 1 Feb 2004 18:05:10 -0000 1.2 *************** *** 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,52 **** @<title>Changes in CCOM</title> @<body> ! @<pre> ! @!indent ! ! CGUI addon Communication package ! ! Changes ! ! by Christer Sandberg ! ! ! @indent ! @</pre> ! ! ! @heading Changes 0.9: <ul> --- 28,60 ---- @<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 @heading Changes + 0.9.2: + <ul> + <li> + Fixed bug 888637 "Doesn't build on Linux" + <li> + Made some minor corrections in the doc files + </ul> + + 0.9.1: + <ul> + <li> + Fixed bug: "Info for MSys user added" + <li> + Fixed bug: "Linked with wrong libs in debugmode" + <li> + Fixed bug: "WIN32 is not defined when building from commandprompt changed to _WIN32" + </ul> + 0.9: <ul> Index: internal._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/internal._tx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** internal._tx 27 Feb 2003 18:45:06 -0000 1.1.1.1 --- internal._tx 1 Feb 2004 18:05:10 -0000 1.2 *************** *** 1,30 **** ! @# ! @# 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 --- 1,22 ---- ! @# 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 *************** *** 34,52 **** @<html> @<head> ! @<title>CCOM Internal description</title> @<body> ! @<pre> ! @!indent ! ! ! CGUI addon Communication package ! ! Internal description ! ! by Christer Sandberg ! ! ! @indent ! </pre> @!text @heading --- 26,38 ---- @<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 *************** *** 55,60 **** @contents - - @text @heading --- 41,44 ---- *************** *** 68,72 **** that in DJGPP. ! @hnode Porting Future versions of CCOM is intended to re-use relevant parts of DZCOMM wich manage to do this both on DJGPP and Linux. This will imply the same --- 52,58 ---- that in DJGPP. ! ! @heading ! Porting Future versions of CCOM is intended to re-use relevant parts of DZCOMM wich manage to do this both on DJGPP and Linux. This will imply the same *************** *** 80,84 **** since many years. ! @hnode Releasing How to release a new version of CCOM: --- 66,72 ---- since many years. ! ! @heading ! Releasing How to release a new version of CCOM: Index: readme._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/readme._tx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** readme._tx 27 Feb 2003 18:45:06 -0000 1.1.1.1 --- readme._tx 1 Feb 2004 18:05:10 -0000 1.2 *************** *** 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 ---- *************** *** 32,52 **** @<title>Readme for CCOM</title> @<body> ! @<pre> ! @!indent ! ! CGUI addon Communication package ! @# note: version number patched by fixver.sh ! Version 0.9.0 ! ! Readme File ! ! http://www.mdh.se/~csg/cguix/ ! ! by Christer Sandberg ! ! ! @indent ! @</pre> ! @!text @heading --- 31,39 ---- @<title>Readme for CCOM</title> @<body> ! <center><b>A CGUI and Allegro addon for 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 readme file of CCOM</b></center> @!text @heading *************** *** 56,60 **** - @text @heading --- 43,46 ---- Index: readme.info =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/readme.info,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** readme.info 27 Feb 2003 18:45:06 -0000 1.1.1.1 --- readme.info 1 Feb 2004 18:05:10 -0000 1.2 *************** *** 1,3 **** ! This is docs/readme.info, produced by makeinfo version 4.0 from docs/readme.texi. --- 1,3 ---- ! This is docs/readme.info, produced by makeinfo version 4.6 from docs/readme.texi. *************** *** 12,24 **** File: readme.info, Node: Top, Prev: (dir), Up: (dir) ! ! CGUI addon Communication package ! Version 0.9.0 ! ! Readme File ! ! http://www.mdh.se/~csg/cguix/ ! ! by Christer Sandberg * Menu: --- 12,18 ---- File: readme.info, Node: Top, Prev: (dir), Up: (dir) ! A CGUI and Allegro addon for for serial communication by Christer ! Sandberg and Rasmus Myklebust Email: chr...@md... Homepage: ! http://www.idt.mdh.se/~csg/cgui/cguix The readme file of CCOM * Menu: *************** *** 172,180 **** Tag Table: Node: Top233 ! Node: Introduction803 ! Node: Requirements1413 ! Node: Installation1948 ! Node: Usage4372 ! Node: Contact Info5309 End Tag Table --- 166,174 ---- Tag Table: Node: Top233 ! Node: Introduction701 ! Node: Requirements1311 ! Node: Installation1846 ! Node: Usage4270 ! Node: Contact Info5207 End Tag Table Index: thanks._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/thanks._tx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** thanks._tx 27 Feb 2003 18:45:06 -0000 1.1.1.1 --- thanks._tx 1 Feb 2004 18:05:10 -0000 1.2 *************** *** 1,25 **** ! @# ! @# 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... @# - @# ...and don't read this file; read thanks.{txt|html|rtf|info|man} instead. - @# @#ignore_css @multiwordheaders ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="adime.html">Back to Contents</a><p> ! @rtfh=Adime Thanks List @$\input texinfo @$@setfilename thanks.inf ! @$@settitle CCOM Thanks List @$@setchapternewpage odd @$@paragraphindent 0 @$ @$@ifinfo @$@direntry ! @$* CCOM Thanks: (thanks). CCOM Thanks List @$@end direntry ! @$This is the Info version of the CCOM Thanks List @$ @$By Christer Sandberg --- 1,22 ---- ! @# This is the source for the CCOM "thanks file", in Allegro's custom format. @# Read allegro/docs/makedoc.c for a description of what is going on... @# @#ignore_css @multiwordheaders ! @document_title=CCOM Thanks ! @rtfh=Thanks file of CCOM @$\input texinfo @$@setfilename thanks.inf ! @$@settitle Thanks of CCOM @$@setchapternewpage odd @$@paragraphindent 0 + @$@setchapternewpage off + @# This should remain commented at the moment (dvi output) @$@finalout @$ @$@ifinfo @$@direntry ! @$* Thanks: (thanks). Thanks in CCOM @$@end direntry ! @$This is the Info version of the CCOM thanks file. @$ @$By Christer Sandberg *************** *** 29,49 **** @<html> @<head> ! @<title>CCOM Thanks List</title> @<body> ! @<pre> ! @!indent ! ! ! CGUI addon Communication package ! ! Thanks ! ! by Christer Sandberg ! ! ! @indent ! @</pre> ! ! @heading --- 26,39 ---- @<html> @<head> ! @<title>Thanks 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> ! Tanks file of CCOM ! </b></center> ! @!text @heading *************** *** 54,62 **** Wrote the code for CCOM. Is also the author of CGUI which is the base of CCOM. </ul> @heading Thanks - <ul> <li> --- 44,55 ---- Wrote the code for CCOM. Is also the author of CGUI which is the base of CCOM. + <li> + Rasmus Myklebust (<email>cs...@md...</a>). + Wrote the Windows specific code. + CCOM. </ul> @heading Thanks <ul> <li> Index: wishlist._tx =================================================================== RCS file: /cvsroot/ccomx/ccomx/docs/wishlist._tx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** wishlist._tx 27 Feb 2003 18:45:06 -0000 1.1.1.1 --- wishlist._tx 1 Feb 2004 18:05:10 -0000 1.2 *************** *** 1,15 **** ! @# ! @# This is the source for the CCOM wishlist file, in Allegro's custom format. @# Read allegro/docs/makedoc.c for a description of what is going on... @# @#ignore_css @multiwordheaders ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="wishlist.html">Back to Contents</a><p> ! @rtfh=CCOM Wish List @$\input texinfo @$@setfilename wishlist.inf ! @$@settitle CCOM Wish List @$@setchapternewpage odd @$@paragraphindent 0 --- 1,12 ---- ! @# This is the source of the wish list 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 Wish list ! @rtfh=Wish list of CCOM @$\input texinfo @$@setfilename wishlist.inf ! @$@settitle Wish list CCOM @$@setchapternewpage odd @$@paragraphindent 0 *************** *** 21,25 **** @$* Wish List: (wishlist). CCOM Wish List @$@end direntry ! @$This is the Info version of the CCOM Wish List file. @$ @$By Christer Sandberg --- 18,22 ---- @$* Wish List: (wishlist). CCOM Wish List @$@end direntry ! @$This is the Info version of the CCOM Wish List. @$ @$By Christer Sandberg *************** *** 29,48 **** @<html> @<head> ! @<title>CCOM Wish List</title> @<body> ! @<pre> ! @!indent ! ! CGUI addon Communication package ! ! Wish List ! ! by Christer Sandberg ! ! ! @indent ! @</pre> - @#!text @#heading @#Contents --- 26,40 ---- @<html> @<head> ! @<title>Wish List 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> ! Tanks file of CCOM ! </b></center> ! @!text @#heading @#Contents *************** *** 50,55 **** @#shortcontents - - @text @heading --- 42,45 ---- *************** *** 57,62 **** <ul> <li> - Add support for Win32 (at least polling). - <li> Add support for LINUX (both polling and interrupt controlled). <li> --- 47,50 ---- |
|
From: <ch...@pr...> - 2004-02-01 18:07:40
|
Update of /cvsroot/ccomx/ccomx/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/examples Modified Files: 1_com.c Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths Index: 1_com.c =================================================================== RCS file: /cvsroot/ccomx/ccomx/examples/1_com.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** 1_com.c 27 Feb 2003 18:45:07 -0000 1.1.1.1 --- 1_com.c 1 Feb 2004 18:05:11 -0000 1.2 *************** *** 1,5 **** /* This example shows how to use CCOM for accessing the serial port */ ! #include<allegro.h> #include <cgui.h> #include <cgui/mem.h> --- 1,6 ---- /* This example shows how to use CCOM for accessing the serial port */ ! #include <string.h> ! #include <allegro.h> #include <cgui.h> #include <cgui/mem.h> |
|
From: <ch...@pr...> - 2004-02-01 18:07:17
|
Update of /cvsroot/ccomx/ccomx/obj/unix/ccomd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/unix/ccomd Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:17
|
Update of /cvsroot/ccomx/ccomx/obj/msvc/ccom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/msvc/ccom Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:16
|
Update of /cvsroot/ccomx/ccomx/resource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/resource Modified Files: ccom.dat ccomlabl Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths Index: ccom.dat =================================================================== RCS file: /cvsroot/ccomx/ccomx/resource/ccom.dat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsnZxFvC and /tmp/cvsGF1Nkr differ Index: ccomlabl =================================================================== RCS file: /cvsroot/ccomx/ccomx/resource/ccomlabl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ccomlabl 27 Feb 2003 18:45:07 -0000 1.1.1.1 --- ccomlabl 1 Feb 2004 18:05:15 -0000 1.2 *************** *** 1,36 **** ! <se> ! [dialser ! "Stopp bitar ! "Antal bitar ! "Baudrate ! "Paritet ! "Paritetsbit ! "Anpassa portinställning för ! "Avbrottsstyrd ! "IRQ-nummer ! "Portadress ! "Flödesreglering ! "~Avbryt ! "~OK ! "Urkopplat ! "Inkopplat ! "Udda ! "Jämn ! <en> ! [dialser ! "Stop bits ! "No bits ! "Baudrate ! "Parity ! "Parity bit ! "Adapt port settings for ! "Interrupt controlled ! "IRQ-number ! "Port address ! "Flow control ! "~Cancel ! "~OK ! "Disabled ! "Enabled ! "Odd ! "Even --- 1,36 ---- ! <se> ! [dialser ! "Stopp bitar ! "Antal bitar ! "Baudrate ! "Paritet ! "Paritetsbit ! "Anpassa portinställning för ! "Avbrottsstyrd ! "IRQ-nummer ! "Portadress ! "Flödesreglering ! "~Avbryt ! "~OK ! "Urkopplat ! "Inkopplat ! "Udda ! "Jämn ! <en> ! [dialser ! "Stop bits ! "No bits ! "Baudrate ! "Parity ! "Parity bit ! "Adapt port settings for ! "Interrupt controlled ! "IRQ-number ! "Port address ! "Flow control ! "~Cancel ! "~OK ! "Disabled ! "Enabled ! "Odd ! "Even |
|
From: <ch...@pr...> - 2004-02-01 18:07:16
|
Update of /cvsroot/ccomx/ccomx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/src Modified Files: dialser.ht labldata.c labldata.h Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths Index: dialser.ht =================================================================== RCS file: /cvsroot/ccomx/ccomx/src/dialser.ht,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dialser.ht 27 Feb 2003 18:45:07 -0000 1.1.1.1 --- dialser.ht 1 Feb 2004 18:05:15 -0000 1.2 *************** *** 1,22 **** ! /* Generated header-file <generator=mktext.1.1> */ ! #ifndef DIALSER_HT ! #define DIALSER_HT ! #define t_stopbits 0 ! #define t_nobits 1 ! #define baud 2 ! #define parityena_lead 3 ! #define parity_lead 4 ! #define edport 5 ! #define t_intcontr 6 ! #define irqno 7 ! #define portaddr 8 ! #define flowcntr 9 ! #define T_Cancel 10 ! #define T_OK 11 ! #define parity_ena_sel 12 ! #define NR_PARITY_ENA 2 ! #define parity_sel 14 ! #define NR_PARITY_SEL 2 ! #define SIZE_dialser 16 ! ! #endif --- 1,22 ---- ! /* Generated header-file <generator=mktext.1.1> */ ! #ifndef DIALSER_HT ! #define DIALSER_HT ! #define t_stopbits 0 ! #define t_nobits 1 ! #define baud 2 ! #define parityena_lead 3 ! #define parity_lead 4 ! #define edport 5 ! #define t_intcontr 6 ! #define irqno 7 ! #define portaddr 8 ! #define flowcntr 9 ! #define T_Cancel 10 ! #define T_OK 11 ! #define parity_ena_sel 12 ! #define NR_PARITY_ENA 2 ! #define parity_sel 14 ! #define NR_PARITY_SEL 2 ! #define SIZE_dialser 16 ! ! #endif Index: labldata.c =================================================================== RCS file: /cvsroot/ccomx/ccomx/src/labldata.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** labldata.c 27 Feb 2003 18:45:07 -0000 1.1.1.1 --- labldata.c 1 Feb 2004 18:05:15 -0000 1.2 *************** *** 1,5 **** ! /* src\labldata.c ! * ! * Source for data encoded from resource\ccom.dat . * Do not hand edit. */ --- 1,5 ---- ! /* src/labldata.c ! * ! * Source for data encoded from resource/ccom.dat . * Do not hand edit. */ *************** *** 11,35 **** static DATAFILE_PROPERTY ccom_ccomlabl_prop[] = { ! { "11-16-2002, 0:16", DAT_ID('D', 'A', 'T', 'E') }, { "CCOMLABL", DAT_ID('N', 'A', 'M', 'E') }, ! { "resource\\ccomlabl", DAT_ID('O', 'R', 'I', 'G') }, { 0, DAT_END } }; ! const unsigned char ccom_ccomlabl[436] = ! "<se>\r\n[dialser\r\n\"Stopp bitar\r\n\"Antal bitar\r\n\"Baudr" ! "ate\r\n\"Paritet\r\n\"Paritetsbit\r\n\"Anpassa portinställn" ! "ing för\r\n\"Avbrottsstyrd\r\n\"IRQ-nummer\r\n\"Portadress\r" ! "\n\"Flödesreglering\r\n\"~Avbryt\r\n\"~OK\r\n\"Urkopplat\r\n\"In" ! "kopplat\r\n\"Udda\r\n\"Jämn\r\n<en>\r\n[dialser\r\n\"Stop bits\r" ! "\n\"No bits\r\n\"Baudrate\r\n\"Parity\r\n\"Parity bit\r\n\"Adapt" ! " port settings for\r\n\"Interrupt controlled\r\n\"IRQ-nu" ! "mber\r\n\"Port address\r\n\"Flow control\r\n\"~Cancel\r\n\"~OK" ! "\r\n\"Disabled\r\n\"Enabled\r\n\"Odd\r\n\"Even\r\n"; DATAFILE ccom_labels[] = { ! { &ccom_ccomlabl, DAT_ID('D', 'A', 'T', 'A'), 436, ccom_ccomlabl_prop }, { 0, DAT_END, 0, 0 } }; --- 11,34 ---- static DATAFILE_PROPERTY ccom_ccomlabl_prop[] = { ! { "2-01-2004, 16:48", DAT_ID('D', 'A', 'T', 'E') }, { "CCOMLABL", DAT_ID('N', 'A', 'M', 'E') }, ! { "resource/ccomlabl", DAT_ID('O', 'R', 'I', 'G') }, { 0, DAT_END } }; ! const unsigned char ccom_ccomlabl[400] = ! "<se>\n[dialser\n\"Stopp bitar\n\"Antal bitar\n\"Baudrate\n" ! "\"Paritet\n\"Paritetsbit\n\"Anpassa portinställning för" ! "\n\"Avbrottsstyrd\n\"IRQ-nummer\n\"Portadress\n\"Flödesreg" ! "lering\n\"~Avbryt\n\"~OK\n\"Urkopplat\n\"Inkopplat\n\"Udda\n\"" ! "Jämn\n<en>\n[dialser\n\"Stop bits\n\"No bits\n\"Baudrate\n\"" ! "Parity\n\"Parity bit\n\"Adapt port settings for\n\"Inter" ! "rupt controlled\n\"IRQ-number\n\"Port address\n\"Flow co" ! "ntrol\n\"~Cancel\n\"~OK\n\"Disabled\n\"Enabled\n\"Odd\n\"Even\n"; DATAFILE ccom_labels[] = { ! { &ccom_ccomlabl, DAT_ID('D', 'A', 'T', 'A'), 400, ccom_ccomlabl_prop }, { 0, DAT_END, 0, 0 } }; *************** *** 47,49 **** ! /* end of src\labldata.c */ --- 46,51 ---- ! /* end of src/labldata.c */ ! ! ! Index: labldata.h =================================================================== RCS file: /cvsroot/ccomx/ccomx/src/labldata.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** labldata.h 27 Feb 2003 18:45:07 -0000 1.1.1.1 --- labldata.h 1 Feb 2004 18:05:15 -0000 1.2 *************** *** 1,6 **** ! /* src\labldata.h ! * ! * Converted datafile header for resource\ccom.dat . ! * See src\labldata.c for definitions. * Do not hand edit. */ --- 1,6 ---- ! /* src/labldata.h ! * ! * Converted datafile header for resource/ccom.dat . ! * See src/labldata.c for definitions. * Do not hand edit. */ *************** *** 10,15 **** #endif ! #ifndef DAT2C_20021116_001631 ! #define DAT2C_20021116_001631 #ifdef __cplusplus --- 10,15 ---- #endif ! #ifndef SRC_LABLDATA_H ! #define SRC_LABLDATA_H #ifdef __cplusplus *************** *** 22,26 **** #define CCOM_CCOMLABL 0 ! extern const unsigned char ccom_ccomlabl[436]; #define CCOM_COUNT 1 --- 22,26 ---- #define CCOM_CCOMLABL 0 ! extern const unsigned char ccom_ccomlabl[400]; #define CCOM_COUNT 1 *************** *** 34,36 **** #endif /* include guard */ ! /* end of src\labldata.h */ --- 34,39 ---- #endif /* include guard */ ! /* end of src/labldata.h */ ! ! ! |
|
From: <ch...@pr...> - 2004-02-01 18:07:16
|
Update of /cvsroot/ccomx/ccomx/obj/unix/ccomd_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/unix/ccomd_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:16
|
Update of /cvsroot/ccomx/ccomx/obj/unix/ccom_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/unix/ccom_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:16
|
Update of /cvsroot/ccomx/ccomx/obj/unix/ccom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/unix/ccom Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:16
|
Update of /cvsroot/ccomx/ccomx/obj/mingw32/ccomd_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/mingw32/ccomd_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:16
|
Update of /cvsroot/ccomx/ccomx/obj/msvc/ccomd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/msvc/ccomd Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:15
|
Update of /cvsroot/ccomx/ccomx/obj/bcc32/ccomd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/bcc32/ccomd Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:15
|
Update of /cvsroot/ccomx/ccomx/obj/msvc/ccomd_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/msvc/ccomd_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 18:07:15
|
Update of /cvsroot/ccomx/ccomx/obj/bcc32/ccom_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19616/obj/bcc32/ccom_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Fixed bug 888637 Doesn't build on Linux Made some minor corrections in the doc files Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |