cbar-develop Mailing List for CBAR - a bar code reader lib
Brought to you by:
chrisan,
rasmusmyklebust
Menu
▾
▴
cbar-develop — development information, cvs commits etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
(53) |
Mar
|
Apr
|
May
(6) |
Jun
(9) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(6) |
Nov
|
Dec
|
| 2009 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Christer S. <ch...@us...> - 2009-01-30 18:42:14
|
Update of /cvsroot/cbar/cbar/include In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24837/include Modified Files: cbar.h Log Message: Added features 2549684 and 2549814 Index: cbar.h =================================================================== RCS file: /cvsroot/cbar/cbar/include/cbar.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cbar.h 29 Oct 2005 18:57:56 -0000 1.9 --- cbar.h 30 Jan 2009 18:42:03 -0000 1.10 *************** *** 4,11 **** #define CBAR_VERSION_MAJOR 1 #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 4 ! #define CBAR_VERSION_STRING "1.0.4" ! #define CBAR_DATE 20051029 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Oct 29, 2005" #define CBAR_READER_NONE 0 --- 4,11 ---- #define CBAR_VERSION_MAJOR 1 #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 5 ! #define CBAR_VERSION_STRING "1.0.5" ! #define CBAR_DATE 20090130 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Jan 30, 2009" #define CBAR_READER_NONE 0 *************** *** 56,59 **** --- 56,62 ---- CBAR_FUNC(void, CbarShowErrorLog, (void)); CBAR_FUNC(void, CbarAddToErrorLog, (int reader, const char *error, const char *code)); + CBAR_FUNC(void, CbarStoreSettings, (void)); + CBAR_FUNC(char*, CbarVersionString, (void)); + CBAR_FUNC(char*, CbarDateString, (void)); #endif |
|
From: Christer S. <ch...@us...> - 2009-01-30 18:42:14
|
Update of /cvsroot/cbar/cbar/misc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24837/misc Modified Files: makefile.uni makefile.ver zipup.sh Log Message: Added features 2549684 and 2549814 Index: makefile.uni =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.uni,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.uni 8 Nov 2004 21:20:45 -0000 1.6 --- makefile.uni 30 Jan 2009 18:42:03 -0000 1.7 *************** *** 85,94 **** 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 --- 85,94 ---- ifdef PGCC ! OFLAGS = -march=pentium -O6 -ffast-math else ifdef PENTIUMONLY OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math else ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math endif endif Index: makefile.ver =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.ver 29 Oct 2005 18:57:56 -0000 1.8 --- makefile.ver 30 Jan 2009 18:42:03 -0000 1.9 *************** *** 7,10 **** # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.4 shared_major_minor = 1.0 --- 7,10 ---- # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.5 shared_major_minor = 1.0 Index: zipup.sh =================================================================== RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** zipup.sh 29 Oct 2005 18:57:56 -0000 1.9 --- zipup.sh 30 Jan 2009 18:42:03 -0000 1.10 *************** *** 12,17 **** # note: these are patched by fixver.sh script. ! zipversion=104 ! tgzversion=1.0.4 if [ "$1" != "-q" ]; then --- 12,17 ---- # note: these are patched by fixver.sh script. ! zipversion=105 ! tgzversion=1.0.5 if [ "$1" != "-q" ]; then |
|
From: Christer S. <ch...@us...> - 2009-01-30 18:42:11
|
Update of /cvsroot/cbar/cbar/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24837/docs Modified Files: cbar._tx changes._tx Log Message: Added features 2549684 and 2549814 Index: cbar._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/cbar._tx,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cbar._tx 29 Oct 2005 18:57:56 -0000 1.9 --- cbar._tx 30 Jan 2009 18:42:03 -0000 1.10 *************** *** 4,8 **** @# @multiwordheaders ! @manh="version 1.0.4" "CBAR" "Manual" @document_title=CBAR Manual @rtfh=cbar - an add on lib to CGUI for bar code reading --- 4,8 ---- @# @multiwordheaders ! @manh="version 1.0.5" "CBAR" "Manual" @document_title=CBAR Manual @rtfh=cbar - an add on lib to CGUI for bar code reading *************** *** 30,34 **** <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 CBAR 1.0.4 </b></center> @!text --- 30,34 ---- <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 CBAR 1.0.5 </b></center> @!text *************** *** 291,296 **** the barcode dialogue. <br> Pre-sets the specified reader to scan for data from the specified source. ! The connection may be either of READER_NONE, READER_COM1, READER_COM2, ! READER_COM3, READER_COM4, READER_KB. @@int @CbarMakeSound(int reader_nr, int soundtype); --- 291,296 ---- the barcode dialogue. <br> Pre-sets the specified reader to scan for data from the specified source. ! The connection may be either of CBAR_READER_NONE, CBAR_READER_COM1, CBAR_READER_COM2, ! CBAR_READER_COM3, CBAR_READER_COM4, CBAR_READER_KB. @@int @CbarMakeSound(int reader_nr, int soundtype); *************** *** 375,378 **** --- 375,387 ---- </ul> + @@void @CbarStoreSettings(void); + Stores the current settings in the current config file. + + @@char* @CbarVersionString(void); + Returns a pointer to a string telling the version of this library. + + @@char* @CbarDateString(void); + Returns a pointer to a string telling the build date of this library. + @headingnocontent Index Index: changes._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/changes._tx,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** changes._tx 29 Oct 2005 18:57:56 -0000 1.8 --- changes._tx 30 Jan 2009 18:42:03 -0000 1.9 *************** *** 39,42 **** --- 39,50 ---- @heading Changes + 1.0.5: + <ul> + <li> + Added feature "2549684 Storing settings" (function CbarStoreSettings added to the API). + <li> + Added feature "2549814 Identification functions" (functions CbarVersionString and CbarDateString added to the API). + </ul> + 1.0.4: <ul> |
|
From: Christer S. <ch...@us...> - 2009-01-30 18:42:11
|
Update of /cvsroot/cbar/cbar/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24837/src Modified Files: bcs.c Log Message: Added features 2549684 and 2549814 Index: bcs.c =================================================================== RCS file: /cvsroot/cbar/cbar/src/bcs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bcs.c 29 Mar 2003 00:43:38 -0000 1.2 --- bcs.c 30 Jan 2009 18:42:03 -0000 1.3 *************** *** 32,50 **** char *_cbc_bar_dbid_nr_digits = "Digits"; - static void StoreSettings(void) - { - int i; - - set_config_int(_cbc_bar_section_name, bar_dbid_n, barcodes.n); - set_config_int(_cbc_bar_section_name, bar_dbid_logging, barcodes.setting.logging); - set_config_int(_cbc_bar_section_name, bar_dbid_logwin_open, barcodes.setting.logwin_open); - set_config_int(_cbc_bar_section_name, _cbc_bar_dbid_nr_digits, barcodes.setting.len); - set_config_int(_cbc_bar_section_name, bar_dbid_read_check, barcodes.setting.readchk); - set_config_int(_cbc_bar_section_name, _cbc_bar_dbid_write_check, barcodes.setting.writechk); - for (i = 0; i < barcodes.n; i++) { - _CbarStoreUnitConfig(barcodes.units[i], i, _cbc_bar_section_name); - } - } - static void InstallCleanup(void) { --- 32,35 ---- *************** *** 129,132 **** --- 114,142 ---- /* Application interface (data access): */ + extern char *CbarVersionString(void) + { + return CBAR_VERSION_STRING; + } + + extern char *CbarDateString(void) + { + return CBAR_DATE_STRING; + } + + extern void CbarStoreSettings(void) + { + int i; + + set_config_int(_cbc_bar_section_name, bar_dbid_n, barcodes.n); + set_config_int(_cbc_bar_section_name, bar_dbid_logging, barcodes.setting.logging); + set_config_int(_cbc_bar_section_name, bar_dbid_logwin_open, barcodes.setting.logwin_open); + set_config_int(_cbc_bar_section_name, _cbc_bar_dbid_nr_digits, barcodes.setting.len); + set_config_int(_cbc_bar_section_name, bar_dbid_read_check, barcodes.setting.readchk); + set_config_int(_cbc_bar_section_name, _cbc_bar_dbid_write_check, barcodes.setting.writechk); + for (i = 0; i < barcodes.n; i++) { + _CbarStoreUnitConfig(barcodes.units[i], i, _cbc_bar_section_name); + } + } + extern int CbarActivate(int seqnr, void (*CallBack) (int, char *, void *), void *data, int mode) *************** *** 318,322 **** barcodes.setting = bcd->setting; CancelSettingsDialogue(bcd); ! StoreSettings(); if (logwin_open) CbarShowErrorLog(); --- 328,332 ---- barcodes.setting = bcd->setting; CancelSettingsDialogue(bcd); ! CbarStoreSettings(); if (logwin_open) CbarShowErrorLog(); |
|
From: SourceForge.net <no...@so...> - 2009-01-30 18:00:07
|
Feature Requests item #2549814, was opened at 2009-01-30 18:00 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=542627&aid=2549814&group_id=75001 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Interface Improvements (example) Group: v1.02 Status: Open Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Identification functions Initial Comment: Currently an application needs to be re-built in order to identify the version of CBAR correctly. Additional functions that returns values dynamically would be safer. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=542627&aid=2549814&group_id=75001 |
|
From: SourceForge.net <no...@so...> - 2009-01-30 17:19:14
|
Feature Requests item #2549684, was opened at 2009-01-30 17:19 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=542627&aid=2549684&group_id=75001 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Interface Improvements (example) Group: v1.02 Status: Open Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Storing settings Initial Comment: A function to store the settings explicitly. This might be useful e.g. if the user changes the config file. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=542627&aid=2549684&group_id=75001 |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:58:04
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20003/misc Modified Files: makefile.ver zipup.sh Removed Files: makefile.bcc Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: makefile.ver =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.ver 21 Sep 2005 18:29:15 -0000 1.7 --- makefile.ver 29 Oct 2005 18:57:56 -0000 1.8 *************** *** 7,10 **** # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.3 shared_major_minor = 1.0 --- 7,10 ---- # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.4 shared_major_minor = 1.0 --- makefile.bcc DELETED --- Index: zipup.sh =================================================================== RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** zipup.sh 21 Sep 2005 18:29:15 -0000 1.8 --- zipup.sh 29 Oct 2005 18:57:56 -0000 1.9 *************** *** 12,23 **** # note: these are patched by fixver.sh script. ! zipversion=103 ! tgzversion=1.0.3 if [ "$1" != "-q" ]; then echo clean up... ! ./fix.sh djgpp --dtou ! make clean # Dont generate dependencies if a parameter was given. --- 12,23 ---- # note: these are patched by fixver.sh script. ! zipversion=104 ! tgzversion=1.0.4 if [ "$1" != "-q" ]; then echo clean up... ! # Make unix line endings ! ./fix.sh unix --dtou # Dont generate dependencies if a parameter was given. *************** *** 27,46 **** if [ "$1" = "--no-depend" ]; then echo skip generating dependencies - ./fix.sh djgpp --quick else echo generate dll stuff... ./misc/fixdll.sh echo generate dependencies... ./fix.sh mingw32 --quick make depend ./fix.sh msvc --quick make depend ./fix.sh unix --quick make depend ./fix.sh djgpp --quick - # make depend - # ./fix.sh bcc32 --quick make depend - ./fix.sh djgpp --quick fi --- 27,46 ---- if [ "$1" = "--no-depend" ]; then echo skip generating dependencies else echo generate dll stuff... ./misc/fixdll.sh echo generate dependencies... + #But don't alter the line endings (--quick ensures that) ./fix.sh mingw32 --quick make depend + ./fix.sh msvc --quick make depend + ./fix.sh unix --quick make depend + ./fix.sh djgpp --quick make depend fi *************** *** 70,90 **** ############################################################################# - cd .. - echo remove old archives... ! rm -f cbar/cbar$zipversion.zip ! rm -f cbar/cbar-$tgzversion.tar.gz echo create tar.gz archives... tar -cv $afiles | gzip -9 > cbar/cbar-$tgzversion.tar.gz echo create zip archives... ! cd cbar ./fix.sh djgpp --utod ! cd ../ zip -9 cbar/cbar$zipversion.zip $afiles - cd cbar ./fix.sh unix --dtou echo all done! --- 70,108 ---- ############################################################################# echo remove old archives... ! rm -f cbar$zipversion.zip ! rm -f cbar-$tgzversion.tar.gz ! ! # Line endings are still unix in all files, including bat-files. To make the tar archive useful also for ! # Windows users, we change the line endings to DOS/Windows already before packing the tar. This should be ! # no problem for unix users since the bat file has no meaning in unix. ! cp "fix.bat" _tmpfile ! perl -p -i -e "s/([^\r]|^)\n/\1\r\n/" _tmpfile ! touch -r "fix.bat" _tmpfile ! mv _tmpfile "fix.bat" echo create tar.gz archives... + cd .. tar -cv $afiles | gzip -9 > cbar/cbar-$tgzversion.tar.gz + cd cbar echo create zip archives... ! # Change line endings from unix to DOS/Windows before packing the zip archives ./fix.sh djgpp --utod ! cd .. zip -9 cbar/cbar$zipversion.zip $afiles cd cbar + + echo "Archives finished!" + + # Restore correct unix line endings ./fix.sh unix --dtou + # fix.sh omits to change line endings in the bat-file, so we need to change it separately because we want the local + # copy to have the unix style to have the right endings when committing to cvs next time. + mv "fix.bat" _tmpfile + tr -d '\015' < _tmpfile > "fix.bat" + touch -r _tmpfile "fix.bat" + rm _tmpfile + echo all done! |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:58:04
|
Update of /cvsroot/cbar/cbar/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20003/src Modified Files: csound.c Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: csound.c =================================================================== RCS file: /cvsroot/cbar/cbar/src/csound.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** csound.c 7 Dec 2003 20:52:33 -0000 1.4 --- csound.c 29 Oct 2005 18:57:56 -0000 1.5 *************** *** 246,250 **** const char*const*txt; int nr; ! if (s->freq < 20 || s->duration < 55 || s->freq > 20000 || s->duration > 5000) { txt = LoadCompiledTexts(cbar_labels, "csound", &nr); --- 246,250 ---- const char*const*txt; int nr; ! if (s->freq < 20 || s->duration < 55 || s->freq > 20000 || s->duration > 5000) { txt = LoadCompiledTexts(cbar_labels, "csound", &nr); *************** *** 271,275 **** const char*const*txt; int nr; ! txt = LoadCompiledTexts(cbar_labels, "csound", &nr); if (nr < SIZE_csound) --- 271,275 ---- const char*const*txt; int nr; ! txt = LoadCompiledTexts(cbar_labels, "csound", &nr); if (nr < SIZE_csound) *************** *** 374,378 **** RegisterFileType("wav", NULL, ds, "", NULL, txt[SOUND_SAMPLE], SoundViewer); RegisterFileType("#SAMP", NULL, ds, "", NULL, txt[SOUND_SAMPLE], SoundViewerData); ! fn = FileSelect("*.wav;*.voc", "", FS_BROWSE_DAT|FS_SHOW_MENU, txt[LOAD_SOUND_FILE], txt[SELECT]); if (*fn) { if (s->fn) --- 374,379 ---- RegisterFileType("wav", NULL, ds, "", NULL, txt[SOUND_SAMPLE], SoundViewer); RegisterFileType("#SAMP", NULL, ds, "", NULL, txt[SOUND_SAMPLE], SoundViewerData); ! fn = FileSelect("*.wav;*.voc", "", FS_DIRECT_SELECT_BY_DOUBLE_CLICK|FS_DISABLE_EDIT_DAT|FS_SHOW_MENU|FS_NO_DRAG_DROP|FS_SHOW_DIR_TREE, ! txt[LOAD_SOUND_FILE], txt[SELECT]); if (*fn) { if (s->fn) |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:58:03
|
Update of /cvsroot/cbar/cbar/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20003/include Modified Files: cbar.h Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: cbar.h =================================================================== RCS file: /cvsroot/cbar/cbar/include/cbar.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cbar.h 21 Sep 2005 18:29:15 -0000 1.8 --- cbar.h 29 Oct 2005 18:57:56 -0000 1.9 *************** *** 4,11 **** #define CBAR_VERSION_MAJOR 1 #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 3 ! #define CBAR_VERSION_STRING "1.0.3" ! #define CBAR_DATE 20050921 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Sep 21, 2005" #define CBAR_READER_NONE 0 --- 4,11 ---- #define CBAR_VERSION_MAJOR 1 #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 4 ! #define CBAR_VERSION_STRING "1.0.4" ! #define CBAR_DATE 20051029 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Oct 29, 2005" #define CBAR_READER_NONE 0 |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:58:03
|
Update of /cvsroot/cbar/cbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20003 Modified Files: fix.sh Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: fix.sh =================================================================== RCS file: /cvsroot/cbar/cbar/fix.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fix.sh 27 Feb 2003 18:43:44 -0000 1.1.1.1 --- fix.sh 29 Oct 2005 18:57:55 -0000 1.2 *************** *** 1,5 **** #!/bin/sh # ! # Sets up the Adime package for building with the specified compiler, # and if possible converts text files to the desired target format. --- 1,5 ---- #!/bin/sh # ! # Sets up the CBAR package for building with the specified compiler, # and if possible converts text files to the desired target format. *************** *** 12,16 **** echo " mingw32 Win32/MinGW32" echo " msvc Win32/MSVC" - echo " bcc32 Win32/Borland C++" echo " unix Linux/gcc" echo "The other parameters control conversion of text files:" --- 12,15 ---- *************** *** 48,63 **** # common files. CBAR_FILELIST=`find . -type f "(" \ ! -name "*.c" -o -name "*.cfg" -o -name "*.cpp" -o -name "*.def" -o \ ! -name "*.h" -o -name "*.hin" -o -name "*.in" -o -name "*.inc" -o \ ! -name "*.m4" -o -name "*.mft" -o -name "*.s" -o -name "*.rc" -o \ ! -name "*.spec" -o -name "*.pl" -o -name "*.txt" -o -name "*._tx" -o \ ! -name "makefile*" -o -name "readme.*" -o \ ! -name "CHANGES" -o -name "AUTHORS" -o -name "THANKS" \ ")"` - # touch unix shell scripts? if [ "$1" != "omit_sh" ]; then CBAR_FILELIST="$CBAR_FILELIST `find . -type f -name '*.sh'`" fi } --- 47,61 ---- # common files. CBAR_FILELIST=`find . -type f "(" \ ! -name "*.c" -o -name "*.cfg" -o -name "*.def" -o -name "*.h" -o -name "*.t" -o -name "*.ht" -o -name "*.txt" -o -name "*._tx" -o \ ! -name "*.lst" -o -name "makefile*" -o -name "emptymak" -o -name "*.html" \ ")"` if [ "$1" != "omit_sh" ]; then CBAR_FILELIST="$CBAR_FILELIST `find . -type f -name '*.sh'`" fi + + if [ "$1" != "omit_bat" ]; then + CBAR_FILELIST="$CBAR_FILELIST `find . -type f -name '*.bat'`" + fi } *************** *** 78,82 **** { echo "Converting files from DOS/Win32 to Unix..." ! proc_filelist for file in $CBAR_FILELIST; do echo "$file" --- 76,80 ---- { echo "Converting files from DOS/Win32 to Unix..." ! proc_filelist "omit_bat" for file in $CBAR_FILELIST; do echo "$file" *************** *** 118,130 **** case "$1" in - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc";; - "beos" ) proc_noexist "BeOS" "none";; "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj";; "mingw32" ) proc_fix "Windows (Mingw32)" "makefile.mgw";; "msvc" ) proc_fix "Windows (MSVC)" "makefile.vc";; - "qnx" ) proc_fix "QNX" "none";; "unix" ) proc_fix "Unix" "makefile.uni";; - "mac" ) proc_noexist "Mac" "none";; - "watcom" ) proc_fix "DOS (Watcom)" "none";; "help" ) proc_help;; * ) proc_help;; --- 116,123 ---- |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:58:03
|
Update of /cvsroot/cbar/cbar/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20003/docs Modified Files: cbar._tx changes._tx Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: cbar._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/cbar._tx,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cbar._tx 21 Sep 2005 18:29:15 -0000 1.8 --- cbar._tx 29 Oct 2005 18:57:56 -0000 1.9 *************** *** 4,8 **** @# @multiwordheaders ! @manh="version 1.0.3" "CBAR" "Manual" @document_title=CBAR Manual @rtfh=cbar - an add on lib to CGUI for bar code reading --- 4,8 ---- @# @multiwordheaders ! @manh="version 1.0.4" "CBAR" "Manual" @document_title=CBAR Manual @rtfh=cbar - an add on lib to CGUI for bar code reading *************** *** 30,34 **** <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 CBAR 1.0.3 </b></center> @!text --- 30,34 ---- <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 CBAR 1.0.4 </b></center> @!text Index: changes._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/changes._tx,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** changes._tx 21 Sep 2005 18:29:15 -0000 1.7 --- changes._tx 29 Oct 2005 18:57:56 -0000 1.8 *************** *** 39,42 **** --- 39,51 ---- @heading Changes + 1.0.4: + <ul> + <li> + Changed file selector options to make it work more reliable on Windows (due to bugs in CGUI). + <li> + Removed trace printout from makefile.all + <li> + "Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems." + </ul> 1.0.3: |
|
From: Christer S. <ch...@us...> - 2005-10-23 08:44:58
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6618/misc Modified Files: makefile.all Log Message: removed trace printout from makefile.all Index: makefile.all =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.all 21 Sep 2005 18:29:15 -0000 1.10 --- makefile.all 23 Oct 2005 08:44:50 -0000 1.11 *************** *** 145,149 **** @echo The $(DESCRIPTION) library for $(PLATFORM) has been compiled. @echo Run make install to complete the installation. - @echo $(OBJ_DIR)/%$(OBJ_SUFFIX) --- 145,148 ---- |
|
From: Christer S. <ch...@us...> - 2005-09-21 18:29:26
|
Update of /cvsroot/cbar/cbar/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20175/docs Modified Files: cbar._tx changes._tx readme._tx Log Message: Fixed bug 1297989 Index: cbar._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/cbar._tx,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cbar._tx 8 Nov 2004 21:20:43 -0000 1.7 --- cbar._tx 21 Sep 2005 18:29:15 -0000 1.8 *************** *** 4,8 **** @# @multiwordheaders ! @manh="version 1.0.2" "CBAR" "Manual" @document_title=CBAR Manual @rtfh=cbar - an add on lib to CGUI for bar code reading --- 4,8 ---- @# @multiwordheaders ! @manh="version 1.0.3" "CBAR" "Manual" @document_title=CBAR Manual @rtfh=cbar - an add on lib to CGUI for bar code reading *************** *** 16,20 **** @$This is the Info version of the CBAR manual @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 16,20 ---- @$This is the Info version of the CBAR manual @$ ! @$By Christer Sandberg @$@end ifinfo @$ *************** *** 30,34 **** <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 CBAR 1.0.2 </b></center> @!text --- 30,34 ---- <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 CBAR 1.0.3 </b></center> @!text Index: readme._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/readme._tx,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** readme._tx 8 Nov 2004 21:20:44 -0000 1.7 --- readme._tx 21 Sep 2005 18:29:15 -0000 1.8 *************** *** 45,51 **** Introduction ! CBAR is a library with functions that let you communicate with a bar ! code reader in a simple way. It relies on CGUI for dialogs and on ! CCOM for serial communication. CBAR builds and operates on the following platforms: DOS/DJGPP, Linux, --- 45,50 ---- Introduction ! CBAR is a library with functions that let you communicate with a bar code reader ! in a simple way. It uses CGUI for dialogs and CCOM for serial communication. CBAR builds and operates on the following platforms: DOS/DJGPP, Linux, *************** *** 58,62 **** <br>Allegro version 4.0.x <br>CGUI version 1.6.7 or later ! <br>CCOM version 0.9.2 or later <br>There are also other requirements like correctly installed compilers etc. but these are already fulfilled if you succeded in making and installing --- 57,61 ---- <br>Allegro version 4.0.x <br>CGUI version 1.6.7 or later ! <br>CCOM version 0.9.3 or later <br>There are also other requirements like correctly installed compilers etc. but these are already fulfilled if you succeded in making and installing *************** *** 76,80 **** Installation goes in some simple steps, and should be familiar since it is ! similar to the installation procedure as of Allegro and CGUI: <ul> <li> --- 75,79 ---- Installation goes in some simple steps, and should be familiar since it is ! similar to the installation procedure as of CGUI: <ul> <li> *************** *** 91,95 **** 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> --- 90,94 ---- 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> *************** *** 105,109 **** 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 --- 104,113 ---- export ALLEGRO=/home/user/allegro-4.0.3 </pre> ! or whatever is the name of your allegro directory.<br> ! When CBAR is built some programs in the `tools' directory of Allegro will be ! needed, so you have to install an Allegro version built from sources (or ! alternatively obtain the required tools some other way, put them in a ! directory named `tools' and let the variable ALLEGRO point out the directory ! immediately above `tools'). <li> Specify the path to your CGUI installation by setting the environment *************** *** 135,144 **** Compile the library. This is done by running "make" at the command line. <li> ! Install the files to common directories. This is done by running "make install" at the command line.<br> ! 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. --- 139,158 ---- Compile the library. This is done by running "make" at the command line. <li> ! Install the CBAR files to common directories. This is done by running "make install" at the command line.<br> ! Linux/Unix specifics:<br> ! You need to be root to succeed with the installation command i.e. type the ! command<br> ! <pre> ! su -c "make install" ! </pre> ! and enter the root password when prompted for.<br> ! Alternatively, if you cannot be root you may install CBAR to some other ! location by running "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.<br> ! To be able to link your program to the CBAR files installed at some other ! location than the default you need to specifiy the paths to your compiler ! and linker. </ul> That's it! Now you are ready to run the example program in the example directory. *************** *** 162,166 **** 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> --- 176,180 ---- the static versions of Allegro and CGUI. <li> ! Users of the MSys environment needs to set the environment vaariable UNIX_TOOLS to 1 before make install is run. <li> *************** *** 169,177 **** and add "cbar" after the existing "libc" entry (separated by a space). <li> ! To use the ! To use the debugging library, link with libccomd.a instead of libccom.a. </ul> @heading Usage <ul><li> --- 183,196 ---- and add "cbar" after the existing "libc" entry (separated by a space). <li> ! To link your application with the debugging lib, link with -lcbard ! instead of -lcbar. </ul> @heading + MSys + Users of the MSys environment needs to set the environment variable + UNIX_TOOLS to 1 before make install is run. + + @heading Usage <ul><li> *************** *** 181,185 **** Before calling any CBAR functions you must have initialized CBAR and CGUI, Note also <b>CGUI</b>! For info about available functions, please read ! the manual, e.g. cbarm.html (but the docs are also available in other formats). <li> --- 200,204 ---- Before calling any CBAR functions you must have initialized CBAR and CGUI, Note also <b>CGUI</b>! For info about available functions, please read ! the manual, e.g. cbar.html (but the docs are also available in other formats). <li> *************** *** 203,206 **** --- 222,228 ---- check the box to the left of the library. You have to replace cbar with cbard 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. -lcbar -lcgui -lalleg). </ul> Index: changes._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/changes._tx,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** changes._tx 8 Nov 2004 21:20:44 -0000 1.6 --- changes._tx 21 Sep 2005 18:29:15 -0000 1.7 *************** *** 40,43 **** --- 40,48 ---- Changes + 1.0.3: + <ul> + <li> + Fixed bug 1297989 "Build instructions confusing" + </ul> 1.0.2: <ul> |
|
From: Christer S. <ch...@us...> - 2005-09-21 18:29:23
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20175/misc Modified Files: makefile.all makefile.ver zipup.sh Log Message: Fixed bug 1297989 Index: makefile.ver =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.ver 8 Nov 2004 21:20:45 -0000 1.6 --- makefile.ver 21 Sep 2005 18:29:15 -0000 1.7 *************** *** 7,10 **** # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.2 shared_major_minor = 1.0 --- 7,10 ---- # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.3 shared_major_minor = 1.0 Index: makefile.all =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** makefile.all 18 Sep 2005 19:50:27 -0000 1.9 --- makefile.all 21 Sep 2005 18:29:15 -0000 1.10 *************** *** 6,10 **** # See readme.txt for more information about CBAR. # - # # Available options: # --- 6,9 ---- *************** *** 18,44 **** # docs: Build only the documentation. # clean: Remove rebuildable files. ! # compress: Compress the example executable using upx. ! # uninstall: Uninstalls the header files of CBAR and all brands of the lib that has been installed. # help: Display this help. # # Developer Targets: # ! # texts: Builds the textfile and the includefile(s) *.ht from *.t # This should actually be part of the default build but ! # for the user conveniance (it needs CGUIDIR to be set) it is pre-built. ! # depend: Regenerate dependencies. # veryclean: Remove rebuildable files, including dependencies. ! # rewhisp: Reformat all text files to unix format using whisped. ! # rewhisp-dos: Reformat all text files to dos format using whisped. ! # zipupd-big: Create developer zip with additional stuff from dos. # # Variables: # # DEBUGMODE=1 Include debug info in the library. # CBAR_FORTIFY=1 Include memory debugger. Sources are not included in the distribution # c-files are assumed to be located in src and h-files in include. ## - include misc/makefile.ver --- 17,47 ---- # docs: Build only the documentation. # clean: Remove rebuildable files. ! # compress: Compress the example executable using the executable compressing program pointed to by UPX_PROGRAM. # help: Display this help. # # Developer Targets: # ! # dat: Builds the textfile and the includefile(s) *.ht from *.t # This should actually be part of the default build but ! # for the user conveniance it is pre-built. This is needed to build a lib using code ! # checked out from cvs. This target needs the environment variable CGUIDIR to point ! # to the directory of CGUI, and ALLEGRO to point to the directory of Allegro. ! # depend: Regenerate dependencies. This is needed to build a lib using code checked out from cvs. # veryclean: Remove rebuildable files, including dependencies. ! # rewhisp: Reformat all text files to unix format using whisped. This requires the whisped program to in your path. ! # rewhisp-dos: Reformat all text files to dos format using whisped. This requires the whisped program to in your path. # # Variables: # + # ALLEGRO=<directoy-of-allegro-source> See target `dat' above. + # CGUIDIR=<directoy-of-cgui> Needed by target `dat', see above. + # + # UPX_PROGRAM=<program-to-compress-with> See target `compress' above. # DEBUGMODE=1 Include debug info in the library. # CBAR_FORTIFY=1 Include memory debugger. Sources are not included in the distribution # c-files are assumed to be located in src and h-files in include. + # ## include misc/makefile.ver *************** *** 113,117 **** # -------- Compile -------- ! .PHONY: default all lib examples docs clean compress donemsg texts .PRECIOUS: docs/%$(TEXI_SUFFIX) $(OBJ_DIR)/%$(OBJ_SUFFIX) --- 116,120 ---- # -------- Compile -------- ! .PHONY: default all lib examples docs clean compress donemsg dat .PRECIOUS: docs/%$(TEXI_SUFFIX) $(OBJ_DIR)/%$(OBJ_SUFFIX) Index: zipup.sh =================================================================== RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** zipup.sh 18 Sep 2005 19:50:27 -0000 1.7 --- zipup.sh 21 Sep 2005 18:29:15 -0000 1.8 *************** *** 12,17 **** # note: these are patched by fixver.sh script. ! zipversion=102 ! tgzversion=1.0.2 if [ "$1" != "-q" ]; then --- 12,17 ---- # note: these are patched by fixver.sh script. ! zipversion=103 ! tgzversion=1.0.3 if [ "$1" != "-q" ]; then *************** *** 39,44 **** make depend ./fix.sh djgpp --quick ! make depend ! ./fix.sh bcc32 --quick make depend ./fix.sh djgpp --quick --- 39,44 ---- make depend ./fix.sh djgpp --quick ! # make depend ! # ./fix.sh bcc32 --quick make depend ./fix.sh djgpp --quick *************** *** 47,51 **** echo generate other files for the distribution... make docs "LFN=y" ! make texts fi --- 47,51 ---- echo generate other files for the distribution... make docs "LFN=y" ! make dat fi *************** *** 74,78 **** echo remove old archives... rm -f cbar/cbar$zipversion.zip ! rm -f cbar/cbar-$tgzversion.tgz echo create tar.gz archives... --- 74,78 ---- echo remove old archives... rm -f cbar/cbar$zipversion.zip ! rm -f cbar/cbar-$tgzversion.tar.gz echo create tar.gz archives... |
|
From: Christer S. <ch...@us...> - 2005-09-21 18:29:23
|
Update of /cvsroot/cbar/cbar/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20175/include Modified Files: cbar.h Log Message: Fixed bug 1297989 Index: cbar.h =================================================================== RCS file: /cvsroot/cbar/cbar/include/cbar.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cbar.h 8 Nov 2004 21:20:44 -0000 1.7 --- cbar.h 21 Sep 2005 18:29:15 -0000 1.8 *************** *** 4,11 **** #define CBAR_VERSION_MAJOR 1 #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 2 ! #define CBAR_VERSION_STRING "1.0.2" ! #define CBAR_DATE 20040612 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Jun 12, 2004" #define CBAR_READER_NONE 0 --- 4,11 ---- #define CBAR_VERSION_MAJOR 1 #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 3 ! #define CBAR_VERSION_STRING "1.0.3" ! #define CBAR_DATE 20050921 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Sep 21, 2005" #define CBAR_READER_NONE 0 |
|
From: SourceForge.net <no...@so...> - 2005-09-21 18:06:52
|
Bugs item #1297989, was opened at 2005-09-21 18:06 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=542624&aid=1297989&group_id=75001 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform indepedent Group: v1.01 Status: Open Resolution: None Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Build instructions confusing Initial Comment: The build instructions are incomplete, erroneous and inconsistent in readme and makefile.all. Minor bugs in zipup.sh. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=542624&aid=1297989&group_id=75001 |
|
From: Christer S. <ch...@us...> - 2005-09-18 19:50:35
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22158/misc Modified Files: makefile.all zipup.sh Log Message: some more build issues Index: makefile.all =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.all 8 Nov 2004 21:20:45 -0000 1.8 --- makefile.all 18 Sep 2005 19:50:27 -0000 1.9 *************** *** 18,23 **** # docs: Build only the documentation. # clean: Remove rebuildable files. - # uninstall: Uninstalls the header files of CBAR and all brands of the lib that has been installed. # compress: Compress the example executable using upx. # help: Display this help. # --- 18,23 ---- # docs: Build only the documentation. # clean: Remove rebuildable files. # compress: Compress the example executable using upx. + # uninstall: Uninstalls the header files of CBAR and all brands of the lib that has been installed. # help: Display this help. # *************** *** 43,47 **** include misc/makefile.ver ! GEN_C_FILES = labldata.c GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES))) --- 43,48 ---- include misc/makefile.ver ! GEN_C_FILES = \ ! labldata.c GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES))) *************** *** 55,58 **** --- 56,60 ---- unit.c + EXAMPLES_SOURCE = 1_bar.c *************** *** 89,97 **** include misc/$(MAKEFILE_INC) # -------- Set variables -------- DOCS = \ docs/cbar.txt docs/cbar$(HTML_SUFFIX) docs/cbar$(INFO_SUFFIX) docs/cbar.rtf \ ! docs/readme.txt docs/readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \ docs/changes.txt docs/changes$(HTML_SUFFIX) --- 91,101 ---- include misc/$(MAKEFILE_INC) + + # -------- Set variables -------- DOCS = \ docs/cbar.txt docs/cbar$(HTML_SUFFIX) docs/cbar$(INFO_SUFFIX) docs/cbar.rtf \ ! readme.txt readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \ docs/changes.txt docs/changes$(HTML_SUFFIX) *************** *** 161,165 **** $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE) --- 165,169 ---- $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE) *************** *** 172,175 **** --- 176,182 ---- -$(MAKEDOC_PROGRAM) -ascii $@ $< + %$(HTML_SUFFIX): docs/%._tx + -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< + docs/%$(HTML_SUFFIX): docs/%._tx -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< Index: zipup.sh =================================================================== RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** zipup.sh 21 Jun 2004 19:18:32 -0000 1.6 --- zipup.sh 18 Sep 2005 19:50:27 -0000 1.7 *************** *** 20,24 **** ./fix.sh djgpp --dtou make clean - make rewhisp # Dont generate dependencies if a parameter was given. --- 20,23 ---- *************** *** 51,54 **** --- 50,54 ---- fi + echo copy default makefile... cp misc/emptymak makefile *************** *** 59,71 **** misc/dllsyms.lst misc/scanexp.c \ obj/*/*/*.dep lib/*/*.def \ ! docs/readme.txt docs/readme.html docs/cbar.html docs/cbar.txt \ docs/*._tx \ src/*.c src/*.h src/*.t src/*.ht \ examples/*.c examples/*.cfg \ ! resource/* \ include/*.h include/cbar/*.h" afiles=`echo $files | sed -e"s/\([^ ][^ ]*\)/ cbar\/\1/g"` ############################################################################# cd .. --- 59,72 ---- 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/*.dat resource/cbarlabl \ include/*.h include/cbar/*.h" afiles=`echo $files | sed -e"s/\([^ ][^ ]*\)/ cbar\/\1/g"` + ############################################################################# cd .. *************** *** 76,80 **** echo create tar.gz archives... ! tar -cv --no-attributes $afiles | gzip -9 > cbar/cbar-$tgzversion.tar.gz echo create zip archives... --- 77,81 ---- echo create tar.gz archives... ! tar -cv $afiles | gzip -9 > cbar/cbar-$tgzversion.tar.gz echo create zip archives... |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 21:23:58
|
Update of /cvsroot/cbar/cbar/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3344/src Modified Files: bcs.t errorlog.t reader.t Log Message: Line endings Index: errorlog.t =================================================================== RCS file: /cvsroot/cbar/cbar/src/errorlog.t,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** errorlog.t 27 Feb 2003 18:43:45 -0000 1.1.1.1 --- errorlog.t 8 Nov 2004 21:23:44 -0000 1.2 *************** *** 1,24 **** ! <language=se> ! [errorlog] ! ERROR_LOG "Fellogg från streckkodsläsning" ! REFRESH_LOG "Uppdatera" ! CLOSE_LOG "Stäng" ! <start=LOG_COLUMNS> ! READER_NR "Läsare nr" ! ERROR_TYPE "Feltyp" ! CODE_DIGITS "Läst kod" ! TIME "Tid" ! <end=NR_LOG_COLUMNS> ! ! <language=en> ! [errorlog] ! ERROR_LOG "Error Log" ! REFRESH_LOG "Refresh" ! CLOSE_LOG "Close" ! <start=LOG_COLUMNS> ! READER_NR "Reader nr" ! ERROR_TYPE "Error type" ! CODE_DIGITS "Code" ! TIME "Time" ! <end=NR_LOG_COLUMNS> ! --- 1,24 ---- ! <language=se> ! [errorlog] ! ERROR_LOG "Fellogg från streckkodsläsning" ! REFRESH_LOG "Uppdatera" ! CLOSE_LOG "Stäng" ! <start=LOG_COLUMNS> ! READER_NR "Läsare nr" ! ERROR_TYPE "Feltyp" ! CODE_DIGITS "Läst kod" ! TIME "Tid" ! <end=NR_LOG_COLUMNS> ! ! <language=en> ! [errorlog] ! ERROR_LOG "Error Log" ! REFRESH_LOG "Refresh" ! CLOSE_LOG "Close" ! <start=LOG_COLUMNS> ! READER_NR "Reader nr" ! ERROR_TYPE "Error type" ! CODE_DIGITS "Code" ! TIME "Time" ! <end=NR_LOG_COLUMNS> ! Index: reader.t =================================================================== RCS file: /cvsroot/cbar/cbar/src/reader.t,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** reader.t 27 Feb 2003 18:43:45 -0000 1.1.1.1 --- reader.t 8 Nov 2004 21:23:44 -0000 1.2 *************** *** 1,18 **** ! <language=en> ! [reader] ! <start=LOG_ERROR_TYPES> ! LOG_ERR_CHK "Checksum error" ! LOG_ERR_FEW_DIGITS "Too few digits" ! LOG_ERR_MISSING_CR "Missing carrage return" ! LOG_ERR_OVERFLOW "Too many subsequent errors, logging is turned off" ! <end=NR_LOG_ERROR_TYPES> ! ! <language=se> ! [reader] ! <start=LOG_ERROR_TYPES> ! LOG_ERR_CHK "Checksummefel" ! LOG_ERR_FEW_DIGITS "För få siffror" ! LOG_ERR_MISSING_CR "Avslutande retur saknas" ! LOG_ERR_OVERFLOW "För många fel, loggningen stängd" ! <end=NR_LOG_ERROR_TYPES> ! --- 1,18 ---- ! <language=en> ! [reader] ! <start=LOG_ERROR_TYPES> ! LOG_ERR_CHK "Checksum error" ! LOG_ERR_FEW_DIGITS "Too few digits" ! LOG_ERR_MISSING_CR "Missing carrage return" ! LOG_ERR_OVERFLOW "Too many subsequent errors, logging is turned off" ! <end=NR_LOG_ERROR_TYPES> ! ! <language=se> ! [reader] ! <start=LOG_ERROR_TYPES> ! LOG_ERR_CHK "Checksummefel" ! LOG_ERR_FEW_DIGITS "För få siffror" ! LOG_ERR_MISSING_CR "Avslutande retur saknas" ! LOG_ERR_OVERFLOW "För många fel, loggningen stängd" ! <end=NR_LOG_ERROR_TYPES> ! Index: bcs.t =================================================================== RCS file: /cvsroot/cbar/cbar/src/bcs.t,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** bcs.t 27 Feb 2003 18:43:45 -0000 1.1.1.1 --- bcs.t 8 Nov 2004 21:23:44 -0000 1.2 *************** *** 1,26 **** ! <language=se> ! [bcs] ! ADD_UNIT "Lägg till läsare" ! READER "Läsare" ! OPTION_BAR_CODE_READER "Inställningar: streckkodsläsare" ! CANCEL_LABEL "Avbryt" ! OK_LABEL "OK" ! NO_DIGITS "Antal siffror" ! PRINTING_CHECKSUM "Lägga in kontrollsiffra" ! READING_CHECKSUM "Läsa av kontrollsiffra" ! LOG_ERRORS "Logga fel" ! SHOW_LOG_WINDOW "Visa loggfönstret" ! ! <language=en> ! [bcs] ! ADD_UNIT "Add reader unit" ! READER "Reader" ! OPTION_BAR_CODE_READER "Options: bar-code reader" ! CANCEL_LABEL "Cancel" ! OK_LABEL "OK" ! NO_DIGITS "Number of digits" ! PRINTING_CHECKSUM "Printing checksum" ! READING_CHECKSUM "Reading checksum" ! LOG_ERRORS "Log errors" ! SHOW_LOG_WINDOW "Show log window" ! --- 1,26 ---- ! <language=se> ! [bcs] ! ADD_UNIT "Lägg till läsare" ! READER "Läsare" ! OPTION_BAR_CODE_READER "Inställningar: streckkodsläsare" ! CANCEL_LABEL "Avbryt" ! OK_LABEL "OK" ! NO_DIGITS "Antal siffror" ! PRINTING_CHECKSUM "Lägga in kontrollsiffra" ! READING_CHECKSUM "Läsa av kontrollsiffra" ! LOG_ERRORS "Logga fel" ! SHOW_LOG_WINDOW "Visa loggfönstret" ! ! <language=en> ! [bcs] ! ADD_UNIT "Add reader unit" ! READER "Reader" ! OPTION_BAR_CODE_READER "Options: bar-code reader" ! CANCEL_LABEL "Cancel" ! OK_LABEL "OK" ! NO_DIGITS "Number of digits" ! PRINTING_CHECKSUM "Printing checksum" ! READING_CHECKSUM "Reading checksum" ! LOG_ERRORS "Log errors" ! SHOW_LOG_WINDOW "Show log window" ! |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 21:20:56
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2477/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver Log Message: Line endings Index: makefile.uni =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.uni,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.uni 21 Jun 2004 19:18:32 -0000 1.5 --- makefile.uni 8 Nov 2004 21:20:45 -0000 1.6 *************** *** 1,233 **** ! # makefile.uni: ! # Makefile for the CBAR library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_ICONS = $(subst \,/,$(CBAR_ICONS_X)) ! CBAR_ICONS_C = $(subst \,/,$(CBAR_ICONS_C_X)) ! CBAR_ICONS_H = $(subst \,/,$(CBAR_ICONS_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lccom_s -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lccom -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcbar $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cbar ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar_s.a $(SYSTEM_LIB_DIR)/libcbard_s.a \ ! $(SYSTEM_LIB_DIR)/libcbar.so $(SYSTEM_LIB_DIR)/libcbard.so \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar\/\1\.o:/" _depend.tmp > obj/unix/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard\/\1\.o:/" _depend.tmp > obj/unix/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar_s\/\1\.o:/" _depend.tmp > obj/unix/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard_s\/\1\.o:/" _depend.tmp > obj/unix/cbard_s/makefile.dep ! rm _depend.tmp --- 1,233 ---- ! # makefile.uni: ! # Makefile for the CBAR library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_ICONS = $(subst \,/,$(CBAR_ICONS_X)) ! CBAR_ICONS_C = $(subst \,/,$(CBAR_ICONS_C_X)) ! CBAR_ICONS_H = $(subst \,/,$(CBAR_ICONS_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lccom_s -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lccom -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcbar $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cbar ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar_s.a $(SYSTEM_LIB_DIR)/libcbard_s.a \ ! $(SYSTEM_LIB_DIR)/libcbar.so $(SYSTEM_LIB_DIR)/libcbard.so \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar\/\1\.o:/" _depend.tmp > obj/unix/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard\/\1\.o:/" _depend.tmp > obj/unix/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar_s\/\1\.o:/" _depend.tmp > obj/unix/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard_s\/\1\.o:/" _depend.tmp > obj/unix/cbard_s/makefile.dep ! rm _depend.tmp Index: makefile.ver =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.ver 21 Jun 2004 19:18:32 -0000 1.5 --- makefile.ver 8 Nov 2004 21:20:45 -0000 1.6 *************** *** 1,10 **** ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 10 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 1.0.2 ! shared_major_minor = 1.0 --- 1,10 ---- ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 10 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 1.0.2 ! shared_major_minor = 1.0 Index: makefile.bcc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.bcc 21 Jun 2004 19:18:32 -0000 1.7 --- makefile.bcc 8 Nov 2004 21:20:45 -0000 1.8 *************** *** 1,363 **** ! # makefile.bcc: ! # Makefile for the CBAR library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! IMPDEF_NAME = $(LIB_DIR)/impcbar.def ! endif ! ! # -------- Check that environment path variables are set. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = ccomd.lib cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcbar.def ! copy _impcbar.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcbar.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! ! endif # ifdef STATICLINK ! ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \ ! $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard_s/makefile.dep ! rm _depend.tmp --- 1,363 ---- ! # makefile.bcc: ! # Makefile for the CBAR library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! IMPDEF_NAME = $(LIB_DIR)/impcbar.def ! endif ! ! # -------- Check that environment path variables are set. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = ccomd.lib cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcbar.def ! copy _impcbar.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcbar.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! ! endif # ifdef STATICLINK ! ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \ ! $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard_s/makefile.dep ! rm _depend.tmp Index: makefile.dj =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.dj 21 Jun 2004 19:18:32 -0000 1.7 --- makefile.dj 8 Nov 2004 21:20:45 -0000 1.8 *************** *** 1,288 **** ! # makefile.dj: ! # Makefile for the CBAR library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # See readme.txt for more information about CBAR ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lccomd -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lccom -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lccom -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CBAR doesn't relies on Allegro ! # including some standard header. ! ifdef CBAR_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! mkdir $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! cp $(subst \,/,$< $@) ! -install-info $(subst \,/,$@) $(SYSTEM_INFO_DIR)/dir ! ! else # ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! $(CP) $(subst /,\,$< $@) ! ! endif # ifdef CROSSCOMPILE else ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar.a $(SYSTEM_LIB_DIR)/libcbard.a \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbar\/\1/" _depend.tmp > obj/djgpp/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbard\/\1/" _depend.tmp > obj/djgpp/cbard/makefile.dep ! rm _depend.tmp --- 1,288 ---- ! # makefile.dj: ! # Makefile for the CBAR library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # See readme.txt for more information about CBAR ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lccomd -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lccom -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lccom -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CBAR doesn't relies on Allegro ! # including some standard header. ! ifdef CBAR_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! mkdir $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! cp $(subst \,/,$< $@) ! -install-info $(subst \,/,$@) $(SYSTEM_INFO_DIR)/dir ! ! else # ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! $(CP) $(subst /,\,$< $@) ! ! endif # ifdef CROSSCOMPILE else ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar.a $(SYSTEM_LIB_DIR)/libcbard.a \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbar\/\1/" _depend.tmp > obj/djgpp/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbard\/\1/" _depend.tmp > obj/djgpp/cbard/makefile.dep ! rm _depend.tmp Index: makefile.vc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** makefile.vc 21 Jun 2004 19:18:32 -0000 1.9 --- makefile.vc 8 Nov 2004 21:20:45 -0000 1.10 *************** *** 1,322 **** ! # makefile.vc: ! # Makefile for the CBAR library with MSVC. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # See readme.txt for more information about CBAR. ! # See makefile.all for a list of the available targets. ! # ! # To path MSVC so it can be used from the commandline, run the ! # vcvars32.bat file which can be found in your MSVC bin directory. ! # ! # This build uses djgpp for calculating ! # source dependencies, so you'll need to have that installed as well. ! # ! # The "depend" target uses sed. ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = MSVC ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/msvc ! LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ! ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! endif ! ! # -------- Check that environment path variables are set. -------- ! ! .PHONY: badwin badmsvc badspaces ! ! ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef MSVCDIR ! MSVCDIR_U = $(subst \,/,$(MSVCDIR)) ! MSVCDIR_D = $(subst /,\,$(MSVCDIR)) ! else ! ifdef MSDEVDIR ! MSVCDIR_U = $(subst \,/,$(MSDEVDIR)) ! MSVCDIR_D = $(subst /,\,$(MSDEVDIR)) ! else ! badmsvc: ! @echo Your MSVCDIR or MSDEVDIR environment variable is not set! ! endif ! endif ! ! NULLSTRING := ! SPACE := $(NULLSTRING) # special magic to get an isolated space character ! ! ifneq ($(findstring $(SPACE),$(MSVCDIR)$(MSDEVDIR)),) ! badspaces: ! @echo There are spaces in your MSVCDIR or MSDEVDIR environment ! @echo variables: please change these to the 8.3 short filename ! @echo version, or move your compiler to a different directory. ! endif ! ! SYSTEM_INCLUDE_DIR = $(MSVCDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(MSVCDIR_D)\include ! SYSTEM_LIB_DIR = $(MSVCDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib ! ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX) ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -W3 -WX ! else ! WFLAGS = -W1 ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Gd -Zi -MDd ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall ! LFLAGS = -debug -debugtype:cv ! ! ifdef STATICLINK ! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = ccomd.lib cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -profile ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -release ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Gd -MT ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK -DCCOM_STATICLINK ! endif ! ! LIB_FLAGS += kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ ! ! define COMPILE_C_TO_OBJ ! $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< ! endef ! ! define LINK_OBJ_TO_EXE ! $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef ! else ! # link as a DLL ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(MSVCDIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) MSVC library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \ ! $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2MSVC) -MM -MG -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbar\/\1\.obj:/" _depend.tmp > obj/msvc/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbard\/\1\.obj:/" _depend.tmp > obj/msvc/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbar_s\/\1\.obj:/" _depend.tmp > obj/msvc/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cbard_s\/\1\.obj:/" _depend.tmp > obj/msvc/cbard_s/makefile.dep ! rm _depend.tmp --- 1,322 ---- ! # makefile.vc: ! # Makefile for the CBAR library with MSVC. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # See readme.txt for more information about CBAR. ! # See makefile.all for a list of the available targets. ! # ! # To path MSVC so it can be used from the commandline, run the ! # vcvars32.bat file which can be found in your MSVC bin directory. ! # ! # This build uses djgpp for calculating ! # source dependencies, so you'll need to have that installed as well. ! # ! # The "depend" target uses sed. ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = MSVC ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/msvc ! LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ! ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(... [truncated message content] |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 21:20:55
|
Update of /cvsroot/cbar/cbar/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2477/include Modified Files: cbar.h Log Message: Line endings Index: cbar.h =================================================================== RCS file: /cvsroot/cbar/cbar/include/cbar.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cbar.h 21 Jun 2004 19:18:31 -0000 1.6 --- cbar.h 8 Nov 2004 21:20:44 -0000 1.7 *************** *** 1,59 **** ! #ifndef CBAR_H ! #define CBAR_H ! ! #define CBAR_VERSION_MAJOR 1 ! #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 2 ! #define CBAR_VERSION_STRING "1.0.2" ! #define CBAR_DATE 20040612 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Jun 12, 2004" ! ! #define CBAR_READER_NONE 0 ! #define CBAR_READER_COM1 1 ! #define CBAR_READER_COM2 2 ! #define CBAR_READER_COM3 3 ! #define CBAR_READER_COM4 4 ! #define CBAR_READER_KB 5 ! ! #define CBAR_NO_SPEAKER 0 ! #define CBAR_LEFT_SPEAKER 1 ! #define CBAR_RIGHT_SPEAKER 2 ! #define CBAR_BOTH_SPEAKERS 3 ! #define CBAR_INTERNAL_SPEAKER 4 ! ! #define CBAR_LOG_OFF 1 ! #define CBAR_LOG_ON 2 ! #define CBAR_LOG_CLEAN 4 ! ! #define CBAR_NOCHECK 1 ! #define CBAR_NOSOUND_OK 2 ! #define CBAR_NOSOUND_ERROR 4 ! ! #define CBAR_SOUND_READERROR 0 ! #define CBAR_SOUND_READOK 1 ! ! #include "cbar/cbarcfg.h" ! ! CBAR_FUNC(int, CbarLoadInit, (int mode)); ! #define CBAR_NO_SAVESTATE_LOG 0 ! #define CBAR_NO_SAVESTATE_LOG_WIN 1 ! ! CBAR_FUNC(void, CbarDeInit, (void)); ! CBAR_FUNC(int, CbarAddUnit, (void)); ! CBAR_FUNC(int, CbarRemoveUnit, (int unitid)); ! CBAR_FUNC(int, CbarActivate, (int unitid, ! CBAR_METHOD(void, CallBack, (int id, char *s, void *data)), void *data, int mode)); ! CBAR_FUNC(int, CbarSetup, (int codelen, int readchk, int writechk)); ! CBAR_FUNC(int, CbarSoundInternal, (int unitid, int f1, int d1, int f2, int d2)); ! CBAR_FUNC(int, CbarSoundExternal, (int unitid, int speaker, int v1, ! const char *f1, int v2, const char *f2)); ! CBAR_FUNC(int, CbarUnitConnection, (int unitid, int connection)); ! CBAR_FUNC(int, CbarMakeSound, (int unitid, int soundstatus)); ! CBAR_FUNC(int, CbarSettingsDialogue, (int len, int check, int sound, int source, ! int errorlog, int *nrreaders)); ! CBAR_FUNC(void, CbarAdjustBarPrint, (char *result, const char *s)); ! CBAR_FUNC(void, CbarLogErrors, (int mode)); ! CBAR_FUNC(void, CbarShowErrorLog, (void)); ! CBAR_FUNC(void, CbarAddToErrorLog, (int reader, const char *error, const char *code)); ! ! #endif --- 1,59 ---- ! #ifndef CBAR_H ! #define CBAR_H ! ! #define CBAR_VERSION_MAJOR 1 ! #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 2 ! #define CBAR_VERSION_STRING "1.0.2" ! #define CBAR_DATE 20040612 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Jun 12, 2004" ! ! #define CBAR_READER_NONE 0 ! #define CBAR_READER_COM1 1 ! #define CBAR_READER_COM2 2 ! #define CBAR_READER_COM3 3 ! #define CBAR_READER_COM4 4 ! #define CBAR_READER_KB 5 ! ! #define CBAR_NO_SPEAKER 0 ! #define CBAR_LEFT_SPEAKER 1 ! #define CBAR_RIGHT_SPEAKER 2 ! #define CBAR_BOTH_SPEAKERS 3 ! #define CBAR_INTERNAL_SPEAKER 4 ! ! #define CBAR_LOG_OFF 1 ! #define CBAR_LOG_ON 2 ! #define CBAR_LOG_CLEAN 4 ! ! #define CBAR_NOCHECK 1 ! #define CBAR_NOSOUND_OK 2 ! #define CBAR_NOSOUND_ERROR 4 ! ! #define CBAR_SOUND_READERROR 0 ! #define CBAR_SOUND_READOK 1 ! ! #include "cbar/cbarcfg.h" ! ! CBAR_FUNC(int, CbarLoadInit, (int mode)); ! #define CBAR_NO_SAVESTATE_LOG 0 ! #define CBAR_NO_SAVESTATE_LOG_WIN 1 ! ! CBAR_FUNC(void, CbarDeInit, (void)); ! CBAR_FUNC(int, CbarAddUnit, (void)); ! CBAR_FUNC(int, CbarRemoveUnit, (int unitid)); ! CBAR_FUNC(int, CbarActivate, (int unitid, ! CBAR_METHOD(void, CallBack, (int id, char *s, void *data)), void *data, int mode)); ! CBAR_FUNC(int, CbarSetup, (int codelen, int readchk, int writechk)); ! CBAR_FUNC(int, CbarSoundInternal, (int unitid, int f1, int d1, int f2, int d2)); ! CBAR_FUNC(int, CbarSoundExternal, (int unitid, int speaker, int v1, ! const char *f1, int v2, const char *f2)); ! CBAR_FUNC(int, CbarUnitConnection, (int unitid, int connection)); ! CBAR_FUNC(int, CbarMakeSound, (int unitid, int soundstatus)); ! CBAR_FUNC(int, CbarSettingsDialogue, (int len, int check, int sound, int source, ! int errorlog, int *nrreaders)); ! CBAR_FUNC(void, CbarAdjustBarPrint, (char *result, const char *s)); ! CBAR_FUNC(void, CbarLogErrors, (int mode)); ! CBAR_FUNC(void, CbarShowErrorLog, (void)); ! CBAR_FUNC(void, CbarAddToErrorLog, (int reader, const char *error, const char *code)); ! ! #endif |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 21:20:54
|
Update of /cvsroot/cbar/cbar/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2477/docs Modified Files: cbar._tx changes._tx readme._tx Log Message: Line endings Index: cbar._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/cbar._tx,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cbar._tx 21 Jun 2004 19:18:31 -0000 1.6 --- cbar._tx 8 Nov 2004 21:20:43 -0000 1.7 *************** *** 1,386 **** ! @#This is the source for the CBAR manual, in Shawn's special format. ! @#The readable documents are generated and will be found in the files: ! @#cbar.txt,cbar.rtf, cbar.htm, cbar.inf, the latter may be ! @# ! @multiwordheaders ! @manh="version 1.0.2" "CBAR" "Manual" ! @document_title=CBAR Manual ! @rtfh=cbar - an add on lib to CGUI for bar code reading ! @$\input texinfo ! @$@setfilename cbar.inf ! @$@settitle cbar Manual ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$ ! @$@ifinfo ! @$This is the Info version of the CBAR manual ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>The CBAR API</title> ! @<body> ! <center><b>CBAR</b></center> ! <center><b>A CGUI and Allegro addon for for bar code reading</b></center> ! <center><b>by Christer Sandberg</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 CBAR 1.0.2 ! </b></center> ! @!text ! ! @heading ! Contents ! ! @contents ! ! @text ! @heading ! Using cbar ! To be able to call the functions in the cbar lib you must ! #include <cbar.h> in your C file(s). ! ! @heading ! Simple_use of bar-codes ! @xref CbarSettingsDialogue ! @xref CbarLoadInit ! @xref CbarDeInit ! @xref CbarActivate ! Calling the dialogue function will start a dialogue that let the user make ! all the configurations needed. Settings is saved into the current config ! file and can later be retrieved by the `CbarLoadInit' function. After the ! dialogue eventual new readers may have been added and needs to be started. ! A simple usage of the car-code reading will be like this:<br> ! <ul> ! <li> Call `CbarLoadInit(0)' at start. ! <li> Call `CbarActivate(-1, my_func, my_data, 0)' to start all readers ! <li> Make some menu-selection that calls `CbarSettingsDialogue' on user ! selection. ! <li> Immediately after `CbarSettingsDialogue', also call `CbarActivate' to ! start reading for all new readers added in the dialogue. ! </ul> ! From this follows that a yet simpler usage is to preset fixed values into ! the config file and skip the last two calls. ! ! @@int @CbarSettingsDialogue(int len, int check, int sound, int source, int errorlog, int *nrreaders); ! @xref CbarLoadInit ! @xref CbarDeInit ! @xref CbarActivate ! This functions starts a dialogue that give the user of your program the ! opportunity to customise the bar-code readers. The parameters specifies ! some data components that are optional to edit. `CbarSettingsDialogue' ! will not return until the dialogue has been finished. <br> ! <br>A number of properties of the barcode readers can be optionally ! included/excluded from the dialogue, see the parameter list below (maybe ! your program for some reason needs to hardcode e.g. the code length, and ! it therefore need to be excluded from the dialogue).<br> ! Parameters: ! <ul> ! <li> len: If set, a widget for specifying the length of the barcodes will ! be present in the dialogue. ! <li> check: If set, the selection of the property "Checksum is embedded in ! the barcode" will be present in the dialogue. ! <li> sound: If set, the widgets for configuring the sound of the bar ! code readers will be present in the dialogue (e.g the using of the ! internal and/or external speakers; the properties of these, incuding ! selection of a sound-file). ! <li> source: If set, the selection of the source of bar code readers ! (i.e. serial port number or keyboard) will be present in the dialogue. ! <li> errorlog: If set, the selection of starting error logging and opening ! a log window will be present in the dialogue. ! <li> nrreaders: The value pointed to by `nrreaders' will be updated with ! the number of readers the user has specified. ! </ul> ! Return value: 1 if the user finished with "OK" else 0. ! ! @@int @CbarActivate(int reader_nr, void (*CallBack) (int reader_nr, char *s, void *data), void *data, int mode); ! @xref CbarSettingsDialogue ! @xref CbarLoadInit ! @xref CbarDeInit ! @xref CbarMakeSound ! Starts scanning for barcodes from the source specified in config, and ! installs 'CallBack' as the recipient of successfully read barcodes. <br> ! Parameters: ! <ul> ! <li> reader_nr - The reader to activate. Pass -1 if you want to activate all at ! once. ! <li> CallBack - A pointer to your function.<br> ! Parameters to the CallBack: ! <ul> ! <li> reader_nr - The id-key of the reader ! <li> s - The string of the digits read from the barcode. ! <li> data - The data-pointer ! </ul> ! <li> data - A pointer to any data that you want to be passed to your call-back ! <li> mode - The mode to operate in. The below flags can be ored in any ! combination. ! <ul> ! <li> CBAR_NOCHECK - The reader will call `CallBack' as soon as ! either of the below events has occured. ! <ul> ! <li> "The number read of characters are the expected" ! <li> "A carrage return har been read" ! </ul> ! In the latter case the carrage reaturn will be included in the ! string.<br> ! The default mode is to perform a primary check, i.e. ! the reader will only call `CallBack' when correct strings are ! read, which means that the number of digits matches the ! specification, the checksum (and there is checksum specified) ! is correct and the digits was followed by a carrage ! return (the carrage return is however not included in the ! string passed to `CallBack'). ! <li> CBAR_NOSOUND_OK - The reader will not produce any sound when ! a string has been properly read. ! <li> CBAR_NOSOUND_ERROR - The reader will not produce any sound when ! an erroneous sequence has been read. ! <li> ! </ul> ! The deault behavior is to make sounds. You may want to turn off e.g. ! the OK-sound if your program has more constraints on the code then ! those concerning the barcode itself (like e.g. a set of codes are ! not accepted during a certain operational mode, or a limited set of ! codes are accepted) and you don't want the error-sound to be mixed ! with the OK-sound.<br> ! Another situation when you need to turn off sound, may be if you only ! need the beep from the scanner/pen itself (which means that you fully ! trusts the serial line and needs no more check). ! </ul> ! If you want the reader(s) to stop reading, just pass NULL for the callback.<br> ! Return value: 1 if sucessfull else 0. ! ! @@int @CbarLoadInit(int mode); ! @xref CbarSettingsDialogue ! @xref CbarDeInit ! @xref CbarActivate ! This function loads bar code settings from the current config-file for ! all readers found there. <br> ! Return value is the number of readers found. These can later be refered ! by sequence numbers (0...nr-1).<br> ! Alternatively (or in combination) to initialise barcode-readers with ! `CbarLoadInit' you can add individual readers by call to `CbarAddReader'. <br> ! If there are already readers inited when `CbarLoadInit' is called, these ! will be destroyed before the loading.<br> ! By default the error logging and the log-window will be set to the state ! chosed by the user (in the bar-code dialogue) last time. If you for some ! reason don't want that, but instead some specific state of these bar-code ! system properties then set the parameter `mode' to some of the values ! listed below `CbarLoadInit' (this may be useful in case you create your own ! dialogue and don't use the bar-code dialogue at all). <br> ! The parameter `mode' can be either of (pass 0 if you don't need it): ! <ul> ! <li> CBAR_NO_SAVESTATE_LOG - if the user had the error-logging turned on ! last time the program was running (by using that option in the ! bar-code dialgoue), then it will NOT be turned on by `CbarLoadInit' if ! you specifiy `CBAR_NO_SAVESTATE_LOG'. ! <li> CBAR_NO_SAVESTATE_LOG_WIN - if the user had the error log window ! opened last time the program was running (opened using that selection ! in the bar-code dialgoue), then it will NOT be opened by `CbarLoadInit' ! if you specifiy `CBAR_NO_SAVESTATE_LOG_WIN'. ! </ul> ! ! @@void @CbarDeInit(void); ! @xref CbarSettingsDialogue ! @xref CbarLoadInit ! @xref CbarActivate ! Frees all data allocated by `CbarLoadInit' and restore states as to prior ! that call. You don't need to call it - it will be called automatically ! at program exit. ! ! @heading ! Controlled_use of bar-codes ! @xref CbarAddUnit ! @xref CbarRemoveUnit ! @xref CbarSetup ! @xref CbarSoundInternal ! @xref CbarSoundExternal ! @xref CbarUnitConnection ! @xref CbarMakeSound ! In stead of (or in combination with) using the dialogoue for configuring ! the barcode readers you can set any parameter explicitly (because you want ! it to be hard coded or because you want to design your own dialogue). ! ! @@int @CbarAddUnit(void); ! @xref CbarRemoveUnit ! @xref CbarSetup ! @xref CbarSoundInternal ! @xref CbarSoundExternal ! @xref CbarUnitConnection ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Adds a reader-unit to the ones already existing. The return number is the ! sequence number that you can use if you later want to refere to that ! specific reader. ! Return value: 1 if sucessful else 0. ! ! @@int @CbarRemoveUnit(int reader_nr); ! @xref CbarAddUnit ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Removes a reader-unit previously added (either by call to `CbarLoadInit' or ! `CbarAddUnit'). ! Return value: 1 if sucessful else 0. If you want to remove all, just ! pass -1. ! ! @@int @CbarSetup(int codelen, int readchk, int writechk); ! @xref CbarAddUnit ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Set up some general properties for the barcode reading/writing.<br> ! Parameters: ! <ul> ! <li> codelen - Specify the number of digits needed for your data. The ! actual number of digits that will be used when the barcode is ! printed may be more because of a checksum-digit and/or because ! of padding to an even number of digits. The latter has to be done ! since the Interleaved 2/5 system requires an even number of digits. ! When reading the number of digits are checked against length, which ! increases the reliability of reading. Specifying a length of 0 will ! print dynamic length of codes and reading will not check the length. ! <li> writechk - Controls that a checksum will be added to the code when ! printing them later. ! <li> readchk - Expects a checksum to be present in the read data. ! NOTE! If error check is active also in the hardware (which is ! often the case) this must first be deactivated since it otherwise ! will consume the check-digit. ! </ul> ! ! @@int @CbarSoundInternal(int reader_nr, int f1, int d1, int f2, int d2); ! @xref CbarAddUnit ! @xref CbarSetup ! @xref CbarSoundExternal ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Pre-sets the specified reader's sound to be destinated to the internal ! PC-speaker and specifies the setting of it. <br> ! Parameters: ! <ul> ! <li> reader_nr - the number of the reader-unit ! <li> f1 - frequence of approved reading ! <li> d1 - duration of approved reading ! <li> f2 - frequence of rejected reading ! <li> d2 - duration of rejected reading ! </ul> ! ! @@int @CbarSoundExternal(int reader_nr, int speaker, int v1, const char *f1, int v2, const char *f2); ! @xref CbarAddUnit ! @xref CbarSetup ! @xref CbarSoundInternal ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Pre-sets the specified reader to generate sound on the external speakers. ! Parameters: ! <ul> ! <li> reader_nr - the number of the reader-unit ! <li> src - output of the sound, this may be either of BARSOUND_LEFT, ! BARSOUND_RIGHT, BARSOUND_BOTH or BARSOUND_NONE ! <li> v1 - volume of approved reading ! <li> f1 - filename of approved reading ! <li> v2 - volume of rejected reading ! <li> f2 - filename of rejected reading ! </ul> ! ! @@int @CbarUnitConnection(int reader_nr, int connection); ! @xref CbarAddUnit ! @xref CbarSetup ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Pre-sets the specified reader to scan for data from the specified source. ! The connection may be either of READER_NONE, READER_COM1, READER_COM2, ! READER_COM3, READER_COM4, READER_KB. ! ! @@int @CbarMakeSound(int reader_nr, int soundtype); ! You don't need to call this function unless you have specified ! CBAR_NOSOUND_OK or CBAR_NOSOUND_ERROR when calling `CbarActivate' ! (the default behaviour of a barcode reader is to play a sound ! automatically when a barcode has been read).<br> ! This function will play a sound as specified in the bar-code dialogue<br> ! The soundtype may be either of CBAR_SOUND_READERROR or CBAR_SOUND_READOK. ! ! @heading ! Format-bar-printout ! @xref CbarAdjustBarPrint ! @xref CbarSettingsDialogue ! Formatting a string for printing out barcodes of type interleaved 2/5 taking ! in account the user settings selected by the Bar-code settings dialogue. ! ! @@void @CbarAdjustBarPrint(char *result, const char *s); ! A function that uses the settings in the current config to justify `s' to ! a proper bar-printout string into `result'. That is, adding a check-digit ! if stated, padding to an even number of digits if necessary and padding ! up to a fixed number of digits (if stated so). ! ! @heading ! Error-logging of bar-code reading ! @xref CbarAddToErrorLog ! @xref CbarLogErrors ! @xref CbarShowErrorLog ! @xref CbarSettingsDialogue ! In case your program has problems with many errors when using bar-code ! reading, then it may be useful to log the errors. If you let the user ! control this via the bar-code dialgoue this will be done automatically. ! If not you can control it explicitly by using the error logging functions. ! ! @@void @CbarLogErrors(int mode); ! @xref CbarAddToErrorLog ! @xref CbarShowErrorLog ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! This function starts the error logging. Any error detected by the barcode ! system will be logged. The following items will be stored for each error: ! <ul> ! <li> the reader number ! <li> error type ! <li> the code string (partial or complete) ! <li> the current time ! </ul> ! You can use this to trace errors if your program misses too many readings. ! This is of course most useful during de-bugging, but it won't harm you to ! use during "sharp" bar code useing.<br> ! Parmeter:<br> ! mode (the clean flag can be ored with the other) ! <ul> ! <li> CBAR_LOG_ON - turn on logging ! <li> CBAR_LOG_OFF - turn off logging ! <li> CBAR_LOG_CLEAN - clean error log ! </ul> ! ! @@void @CbarShowErrorLog(void); ! @xref CbarAddToErrorLog ! @xref CbarLogErrors ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! This function opens a new window containing a list where all errors logged ! so far, will be displayed. The window will be a child to the current ! window and of type "floating". There will be a "close" button to let the ! user close the window. The current state of the window will be stored ! in the config file, to be used next time `CbarLoadInit' is called. ! ! @@void @CbarAddToErrorLog(int reader, const char *error, const char *code); ! @xref CbarShowErrorLog ! @xref CbarLogErrors ! This function is normally not needed. It will add any error to the error ! log (if active). It can be used by your program e.g. if it detects some ! error concerning the contents of the barcodes that the barcode system ! itself is not able to detect.<br> ! Parameters: ! <ul> ! <li> reader - the reader number ! <li> error - any string to explain the error type ! <li> code - the received erroneous bar code ! </ul> ! ! @headingnocontent ! Index ! ! @index ! ! @$@contents ! @$@bye ! ! @html ! @text --- 1,386 ---- ! @#This is the source for the CBAR manual, in Shawn's special format. ! @#The readable documents are generated and will be found in the files: ! @#cbar.txt,cbar.rtf, cbar.htm, cbar.inf, the latter may be ! @# ! @multiwordheaders ! @manh="version 1.0.2" "CBAR" "Manual" ! @document_title=CBAR Manual ! @rtfh=cbar - an add on lib to CGUI for bar code reading ! @$\input texinfo ! @$@setfilename cbar.inf ! @$@settitle cbar Manual ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$ ! @$@ifinfo ! @$This is the Info version of the CBAR manual ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>The CBAR API</title> ! @<body> ! <center><b>CBAR</b></center> ! <center><b>A CGUI and Allegro addon for for bar code reading</b></center> ! <center><b>by Christer Sandberg</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 CBAR 1.0.2 ! </b></center> ! @!text ! ! @heading ! Contents ! ! @contents ! ! @text ! @heading ! Using cbar ! To be able to call the functions in the cbar lib you must ! #include <cbar.h> in your C file(s). ! ! @heading ! Simple_use of bar-codes ! @xref CbarSettingsDialogue ! @xref CbarLoadInit ! @xref CbarDeInit ! @xref CbarActivate ! Calling the dialogue function will start a dialogue that let the user make ! all the configurations needed. Settings is saved into the current config ! file and can later be retrieved by the `CbarLoadInit' function. After the ! dialogue eventual new readers may have been added and needs to be started. ! A simple usage of the car-code reading will be like this:<br> ! <ul> ! <li> Call `CbarLoadInit(0)' at start. ! <li> Call `CbarActivate(-1, my_func, my_data, 0)' to start all readers ! <li> Make some menu-selection that calls `CbarSettingsDialogue' on user ! selection. ! <li> Immediately after `CbarSettingsDialogue', also call `CbarActivate' to ! start reading for all new readers added in the dialogue. ! </ul> ! From this follows that a yet simpler usage is to preset fixed values into ! the config file and skip the last two calls. ! ! @@int @CbarSettingsDialogue(int len, int check, int sound, int source, int errorlog, int *nrreaders); ! @xref CbarLoadInit ! @xref CbarDeInit ! @xref CbarActivate ! This functions starts a dialogue that give the user of your program the ! opportunity to customise the bar-code readers. The parameters specifies ! some data components that are optional to edit. `CbarSettingsDialogue' ! will not return until the dialogue has been finished. <br> ! <br>A number of properties of the barcode readers can be optionally ! included/excluded from the dialogue, see the parameter list below (maybe ! your program for some reason needs to hardcode e.g. the code length, and ! it therefore need to be excluded from the dialogue).<br> ! Parameters: ! <ul> ! <li> len: If set, a widget for specifying the length of the barcodes will ! be present in the dialogue. ! <li> check: If set, the selection of the property "Checksum is embedded in ! the barcode" will be present in the dialogue. ! <li> sound: If set, the widgets for configuring the sound of the bar ! code readers will be present in the dialogue (e.g the using of the ! internal and/or external speakers; the properties of these, incuding ! selection of a sound-file). ! <li> source: If set, the selection of the source of bar code readers ! (i.e. serial port number or keyboard) will be present in the dialogue. ! <li> errorlog: If set, the selection of starting error logging and opening ! a log window will be present in the dialogue. ! <li> nrreaders: The value pointed to by `nrreaders' will be updated with ! the number of readers the user has specified. ! </ul> ! Return value: 1 if the user finished with "OK" else 0. ! ! @@int @CbarActivate(int reader_nr, void (*CallBack) (int reader_nr, char *s, void *data), void *data, int mode); ! @xref CbarSettingsDialogue ! @xref CbarLoadInit ! @xref CbarDeInit ! @xref CbarMakeSound ! Starts scanning for barcodes from the source specified in config, and ! installs 'CallBack' as the recipient of successfully read barcodes. <br> ! Parameters: ! <ul> ! <li> reader_nr - The reader to activate. Pass -1 if you want to activate all at ! once. ! <li> CallBack - A pointer to your function.<br> ! Parameters to the CallBack: ! <ul> ! <li> reader_nr - The id-key of the reader ! <li> s - The string of the digits read from the barcode. ! <li> data - The data-pointer ! </ul> ! <li> data - A pointer to any data that you want to be passed to your call-back ! <li> mode - The mode to operate in. The below flags can be ored in any ! combination. ! <ul> ! <li> CBAR_NOCHECK - The reader will call `CallBack' as soon as ! either of the below events has occured. ! <ul> ! <li> "The number read of characters are the expected" ! <li> "A carrage return har been read" ! </ul> ! In the latter case the carrage reaturn will be included in the ! string.<br> ! The default mode is to perform a primary check, i.e. ! the reader will only call `CallBack' when correct strings are ! read, which means that the number of digits matches the ! specification, the checksum (and there is checksum specified) ! is correct and the digits was followed by a carrage ! return (the carrage return is however not included in the ! string passed to `CallBack'). ! <li> CBAR_NOSOUND_OK - The reader will not produce any sound when ! a string has been properly read. ! <li> CBAR_NOSOUND_ERROR - The reader will not produce any sound when ! an erroneous sequence has been read. ! <li> ! </ul> ! The deault behavior is to make sounds. You may want to turn off e.g. ! the OK-sound if your program has more constraints on the code then ! those concerning the barcode itself (like e.g. a set of codes are ! not accepted during a certain operational mode, or a limited set of ! codes are accepted) and you don't want the error-sound to be mixed ! with the OK-sound.<br> ! Another situation when you need to turn off sound, may be if you only ! need the beep from the scanner/pen itself (which means that you fully ! trusts the serial line and needs no more check). ! </ul> ! If you want the reader(s) to stop reading, just pass NULL for the callback.<br> ! Return value: 1 if sucessfull else 0. ! ! @@int @CbarLoadInit(int mode); ! @xref CbarSettingsDialogue ! @xref CbarDeInit ! @xref CbarActivate ! This function loads bar code settings from the current config-file for ! all readers found there. <br> ! Return value is the number of readers found. These can later be refered ! by sequence numbers (0...nr-1).<br> ! Alternatively (or in combination) to initialise barcode-readers with ! `CbarLoadInit' you can add individual readers by call to `CbarAddReader'. <br> ! If there are already readers inited when `CbarLoadInit' is called, these ! will be destroyed before the loading.<br> ! By default the error logging and the log-window will be set to the state ! chosed by the user (in the bar-code dialogue) last time. If you for some ! reason don't want that, but instead some specific state of these bar-code ! system properties then set the parameter `mode' to some of the values ! listed below `CbarLoadInit' (this may be useful in case you create your own ! dialogue and don't use the bar-code dialogue at all). <br> ! The parameter `mode' can be either of (pass 0 if you don't need it): ! <ul> ! <li> CBAR_NO_SAVESTATE_LOG - if the user had the error-logging turned on ! last time the program was running (by using that option in the ! bar-code dialgoue), then it will NOT be turned on by `CbarLoadInit' if ! you specifiy `CBAR_NO_SAVESTATE_LOG'. ! <li> CBAR_NO_SAVESTATE_LOG_WIN - if the user had the error log window ! opened last time the program was running (opened using that selection ! in the bar-code dialgoue), then it will NOT be opened by `CbarLoadInit' ! if you specifiy `CBAR_NO_SAVESTATE_LOG_WIN'. ! </ul> ! ! @@void @CbarDeInit(void); ! @xref CbarSettingsDialogue ! @xref CbarLoadInit ! @xref CbarActivate ! Frees all data allocated by `CbarLoadInit' and restore states as to prior ! that call. You don't need to call it - it will be called automatically ! at program exit. ! ! @heading ! Controlled_use of bar-codes ! @xref CbarAddUnit ! @xref CbarRemoveUnit ! @xref CbarSetup ! @xref CbarSoundInternal ! @xref CbarSoundExternal ! @xref CbarUnitConnection ! @xref CbarMakeSound ! In stead of (or in combination with) using the dialogoue for configuring ! the barcode readers you can set any parameter explicitly (because you want ! it to be hard coded or because you want to design your own dialogue). ! ! @@int @CbarAddUnit(void); ! @xref CbarRemoveUnit ! @xref CbarSetup ! @xref CbarSoundInternal ! @xref CbarSoundExternal ! @xref CbarUnitConnection ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Adds a reader-unit to the ones already existing. The return number is the ! sequence number that you can use if you later want to refere to that ! specific reader. ! Return value: 1 if sucessful else 0. ! ! @@int @CbarRemoveUnit(int reader_nr); ! @xref CbarAddUnit ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Removes a reader-unit previously added (either by call to `CbarLoadInit' or ! `CbarAddUnit'). ! Return value: 1 if sucessful else 0. If you want to remove all, just ! pass -1. ! ! @@int @CbarSetup(int codelen, int readchk, int writechk); ! @xref CbarAddUnit ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Set up some general properties for the barcode reading/writing.<br> ! Parameters: ! <ul> ! <li> codelen - Specify the number of digits needed for your data. The ! actual number of digits that will be used when the barcode is ! printed may be more because of a checksum-digit and/or because ! of padding to an even number of digits. The latter has to be done ! since the Interleaved 2/5 system requires an even number of digits. ! When reading the number of digits are checked against length, which ! increases the reliability of reading. Specifying a length of 0 will ! print dynamic length of codes and reading will not check the length. ! <li> writechk - Controls that a checksum will be added to the code when ! printing them later. ! <li> readchk - Expects a checksum to be present in the read data. ! NOTE! If error check is active also in the hardware (which is ! often the case) this must first be deactivated since it otherwise ! will consume the check-digit. ! </ul> ! ! @@int @CbarSoundInternal(int reader_nr, int f1, int d1, int f2, int d2); ! @xref CbarAddUnit ! @xref CbarSetup ! @xref CbarSoundExternal ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Pre-sets the specified reader's sound to be destinated to the internal ! PC-speaker and specifies the setting of it. <br> ! Parameters: ! <ul> ! <li> reader_nr - the number of the reader-unit ! <li> f1 - frequence of approved reading ! <li> d1 - duration of approved reading ! <li> f2 - frequence of rejected reading ! <li> d2 - duration of rejected reading ! </ul> ! ! @@int @CbarSoundExternal(int reader_nr, int speaker, int v1, const char *f1, int v2, const char *f2); ! @xref CbarAddUnit ! @xref CbarSetup ! @xref CbarSoundInternal ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Pre-sets the specified reader to generate sound on the external speakers. ! Parameters: ! <ul> ! <li> reader_nr - the number of the reader-unit ! <li> src - output of the sound, this may be either of BARSOUND_LEFT, ! BARSOUND_RIGHT, BARSOUND_BOTH or BARSOUND_NONE ! <li> v1 - volume of approved reading ! <li> f1 - filename of approved reading ! <li> v2 - volume of rejected reading ! <li> f2 - filename of rejected reading ! </ul> ! ! @@int @CbarUnitConnection(int reader_nr, int connection); ! @xref CbarAddUnit ! @xref CbarSetup ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! Pre-sets the specified reader to scan for data from the specified source. ! The connection may be either of READER_NONE, READER_COM1, READER_COM2, ! READER_COM3, READER_COM4, READER_KB. ! ! @@int @CbarMakeSound(int reader_nr, int soundtype); ! You don't need to call this function unless you have specified ! CBAR_NOSOUND_OK or CBAR_NOSOUND_ERROR when calling `CbarActivate' ! (the default behaviour of a barcode reader is to play a sound ! automatically when a barcode has been read).<br> ! This function will play a sound as specified in the bar-code dialogue<br> ! The soundtype may be either of CBAR_SOUND_READERROR or CBAR_SOUND_READOK. ! ! @heading ! Format-bar-printout ! @xref CbarAdjustBarPrint ! @xref CbarSettingsDialogue ! Formatting a string for printing out barcodes of type interleaved 2/5 taking ! in account the user settings selected by the Bar-code settings dialogue. ! ! @@void @CbarAdjustBarPrint(char *result, const char *s); ! A function that uses the settings in the current config to justify `s' to ! a proper bar-printout string into `result'. That is, adding a check-digit ! if stated, padding to an even number of digits if necessary and padding ! up to a fixed number of digits (if stated so). ! ! @heading ! Error-logging of bar-code reading ! @xref CbarAddToErrorLog ! @xref CbarLogErrors ! @xref CbarShowErrorLog ! @xref CbarSettingsDialogue ! In case your program has problems with many errors when using bar-code ! reading, then it may be useful to log the errors. If you let the user ! control this via the bar-code dialgoue this will be done automatically. ! If not you can control it explicitly by using the error logging functions. ! ! @@void @CbarLogErrors(int mode); ! @xref CbarAddToErrorLog ! @xref CbarShowErrorLog ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! This function starts the error logging. Any error detected by the barcode ! system will be logged. The following items will be stored for each error: ! <ul> ! <li> the reader number ! <li> error type ! <li> the code string (partial or complete) ! <li> the current time ! </ul> ! You can use this to trace errors if your program misses too many readings. ! This is of course most useful during de-bugging, but it won't harm you to ! use during "sharp" bar code useing.<br> ! Parmeter:<br> ! mode (the clean flag can be ored with the other) ! <ul> ! <li> CBAR_LOG_ON - turn on logging ! <li> CBAR_LOG_OFF - turn off logging ! <li> CBAR_LOG_CLEAN - clean error log ! </ul> ! ! @@void @CbarShowErrorLog(void); ! @xref CbarAddToErrorLog ! @xref CbarLogErrors ! You don't need to call this function if you use `CbarSettingsDialogue' for ! the barcode dialogue. <br> ! This function opens a new window containing a list where all errors logged ! so far, will be displayed. The window will be a child to the current ! window and of type "floating". There will be a "close" button to let the ! user close the window. The current state of the window will be stored ! in the config file, to be used next time `CbarLoadInit' is called. ! ! @@void @CbarAddToErrorLog(int reader, const char *error, const char *code); ! @xref CbarShowErrorLog ! @xref CbarLogErrors ! This function is normally not needed. It will add any error to the error ! log (if active). It can be used by your program e.g. if it detects some ! error concerning the contents of the barcodes that the barcode system ! itself is not able to detect.<br> ! Parameters: ! <ul> ! <li> reader - the reader number ! <li> error - any string to explain the error type ! <li> code - the received erroneous bar code ! </ul> ! ! @headingnocontent ! Index ! ! @index ! ! @$@contents ! @$@bye ! ! @html ! @text Index: readme._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/readme._tx,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** readme._tx 21 Jun 2004 19:18:31 -0000 1.6 --- readme._tx 8 Nov 2004 21:20:44 -0000 1.7 *************** *** 1,219 **** ! @# This is the source for the CBAR readme file, in Allegro's custom format. ! @# Read allegro/docs/makedoc.c for a description of what is going on... ! @# ! @#ignore_css ! @multiwordheaders ! @document_title=CBAR readme ! @rtfh=Readme file of CBAR ! @$\input texinfo ! @$@setfilename readme.inf ! @$@settitle Readme of CBAR ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Readme: (readme). Readme in CBAR ! @$@end direntry ! @$This is the Info version of the CBAR readme file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Readme file of CBAR</title> ! @<body> ! <center><b>A CGUI and Allegro addon for serial port communication</b></center> ! <center><b>by Christer Sandberg</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 CBAR ! </b></center> ! @!text ! @heading ! Contents ! ! @shortcontents ! ! @text ! @heading ! Introduction ! ! CBAR is a library with functions that let you communicate with a bar ! code reader in a simple way. It relies on CGUI for dialogs and on ! CCOM for serial communication. ! ! CBAR builds and operates on the following platforms: DOS/DJGPP, Linux, ! Windows/Mingw32 and Windows/MSVC. ! ! @heading ! Requirements ! ! You need to have compiled and installed ! <br>Allegro version 4.0.x ! <br>CGUI version 1.6.7 or later ! <br>CCOM version 0.9.2 or later ! <br>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: ! http://alleg.sourceforge.net/ ! ! You can find CGUI at: ! http://www.mdh.se/~csg/cgui/ ! ! You can find CCOM at: ! http://www.mdh.se/~csg/cgui/cguix ! ! @heading ! Installation ! ! Installation goes in some 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 cbar to you current directory ! i.e. enter the command ! <pre> ! cd c:\cbar ! </pre> ! or whatever is the name of your cbar directory. Then choose platform by ! running one of the following commands: ! <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 ! variable ALLEGRO. E.g. if your allegro directory is c:\allegro then ! you must type <br> ! <pre> ! set ALLEGRO=c:\allegro ! </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> ! or for unix users: ! <pre> ! export CGUIDIR=/home/user/cgui ! </pre> ! <li> ! Ensure that all CGUI's tools has been built: ! Make CGUI's directory to the current, e.g. type the command ! <pre> ! cd c:\cgui ! </pre> ! Build: ! <pre> ! make dat2c ! make mktext ! </pre> ! Return to the main directory of cbar, e.g.: ! <pre> ! cd c:\cbar ! </pre> ! ! <li> ! Compile the library. This is done by running "make" at the command line. ! <li> ! Install the files to common directories. This is done by running ! "make install" at the command line.<br> ! 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 CBAR documentation with the Rhide online help ! system, go to the "Help / Syntax help / Files to search" menu in Rhide, ! and add "cbar" after the existing "libc" entry (separated by a space). ! <li> ! To use the ! To use the debugging library, link with libccomd.a instead of libccom.a. ! </ul> ! ! @heading ! Usage ! <ul><li> ! #include <cbar.h> in the top of each file that uses a function from ! the library. ! <li> ! Before calling any CBAR functions you must have initialized CBAR and CGUI, ! Note also <b>CGUI</b>! For info about available functions, please read ! the manual, e.g. cbarm.html (but the docs are also available in other ! formats). ! <li> ! If you link your program on the command line, link with ! '-lcbar -lccom -lcgui -lalleg'. It is important that you specify the ! libraries in that order. If you want the ability to debug inside CBAR's ! functions, then link with '-lcbard' instead of '-lcbar'. ! <p> ! On Linux you can use the following command to link with the default ! lib of CBAR (please note the ` ) ! <pre> ! gcc -s -lcbar -lccom -lcgui `allegro-config --libs release --shared` file.o ! </pre> ! where `file' is the name of your file. <br> ! For debug libraries use -lcbard -lccomd -lcguid instead and replace release ! with debug in the allegro config option. For linking a static application ! use -lcbar_s -lccom_s -lcgui_s and replace --shared with --static. ! <li> ! If you use RHIDE, go to the menu Options/Libraries and fill in cbar. It is ! important that cbar is above ccom, cgui and allegro. Don't forget to ! check the box to the left of the library. You have to replace cbar with ! cbard to include debugging information. ! </ul> ! ! ! @heading ! Contact Info ! ! Email:<ul> ! chr...@md... ! </ul> ! Homepage:<ul> ! http://www.idt.mdh.se/~csg/cgui/cguix ! </ul> ! Telephone:<ul> ! +46.(0)21.38.10.66 ! </ul> --- 1,219 ---- ! @# This is the source for the CBAR readme file, in Allegro's custom format. ! @# Read allegro/docs/makedoc.c for a description of what is going on... ! @# ! @#ignore_css ! @multiwordheaders ! @document_title=CBAR readme ! @rtfh=Readme file of CBAR ! @$\input texinfo ! @$@setfilename readme.inf ! @$@settitle Readme of CBAR ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Readme: (readme). Readme in CBAR ! @$@end direntry ! @$This is the Info version of the CBAR readme file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Readme file of CBAR</title> ! @<body> ! <center><b>A CGUI and Allegro addon for serial port communication</b></center> ! <center><b>by Christer Sandberg</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 CBAR ! </b></center> ! @!text ! @heading ! Contents ! ! @shortcontents ! ! @text ! @heading ! Introduction ! ! CBAR is a library with functions that let you communicate with a bar ! code reader in a simple way. It relies on CGUI for dialogs and on ! CCOM for serial communication. ! ! CBAR builds and operates on the following platforms: DOS/DJGPP, Linux, ! Windows/Mingw32 and Windows/MSVC. ! ! @heading ! Requirements ! ! You need to have compiled and installed ! <br>Allegro version 4.0.x ! <br>CGUI version 1.6.7 or later ! <br>CCOM version 0.9.2 or later ! <br>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: ! http://alleg.sourceforge.net/ ! ! You can find CGUI at: ! http://www.mdh.se/~csg/cgui/ ! ! You can find CCOM at: ! http://www.mdh.se/~csg/cgui/cguix ! ! @heading ! Installation ! ! Installation goes in some 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 cbar to you current directory ! i.e. enter the command ! <pre> ! cd c:\cbar ! </pre> ! or whatever is the name of your cbar directory. Then choose platform by ! running one of the following commands: ! <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 ! variable ALLEGRO. E.g. if your allegro directory is c:\allegro then ! you must type <br> ! <pre> ! set ALLEGRO=c:\allegro ! </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> ! or for unix users: ! <pre> ! export CGUIDIR=/home/user/cgui ! </pre> ! <li> ! Ensure that all CGUI's tools has been built: ! Make CGUI's directory to the current, e.g. type the command ! <pre> ! cd c:\cgui ! </pre> ! Build: ! <pre> ! make dat2c ! make mktext ! </pre> ! Return to the main directory of cbar, e.g.: ! <pre> ! cd c:\cbar ! </pre> ! ! <li> ! Compile the library. This is done by running "make" at the command line. ! <li> ! Install the files to common directories. This is done by running ! "make install" at the command line.<br> ! 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 CBAR documentation with the Rhide online help ! system, go to the "Help / Syntax help / Files to search" menu in Rhide, ! and add "cbar" after the existing "libc" entry (separated by a space). ! <li> ! To use the ! To use the debugging library, link with libccomd.a instead of libccom.a. ! </ul> ! ! @heading ! Usage ! <ul><li> ! #include <cbar.h> in the top of each file that uses a function from ! the library. ! <li> ! Before calling any CBAR functions you must have initialized CBAR and CGUI, ! Note also <b>CGUI</b>! For info about available functions, please read ! the manual, e.g. cbarm.html (but the docs are also available in other ! formats). ! <li> ! If you link your program on the command line, link with ! '-lcbar -lccom -lcgui -lalleg'. It is important that you specify the ! libraries in that order. If you want the ability to debug inside CBAR's ! functions, then link with '-lcbard' instead of '-lcbar'. ! <p> ! On Linux you can use the following command to link with the default ! lib of CBAR (please note the ` ) ! <pre> ! gcc -s -lcbar -lccom -lcgui `allegro-config --libs release --shared` file.o ! </pre> ! where `file' is the name of your file. <br> ! For debug libraries use -lcbard -lccomd -lcguid instead and replace release ! with debug in the allegro config option. For linking a static application ! use -lcbar_s -lccom_s -lcgui_s and replace --shared with --static. ! <li> ! If you use RHIDE, go to the menu Options/Libraries and fill in cbar. It is ! important that cbar is above ccom, cgui and allegro. Don't forget to ! check the box to the left of the library. You have to replace cbar with ! cbard to include debugging information. ! </ul> ! ! ! @heading ! Contact Info ! ! Email:<ul> ! chr...@md... ! </ul> ! Homepage:<ul> ! http://www.idt.mdh.se/~csg/cgui/cguix ! </ul> ! Telephone:<ul> ! +46.(0)21.38.10.66 ! </ul> Index: changes._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/changes._tx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** changes._tx 21 Jun 2004 19:18:31 -0000 1.5 --- changes._tx 8 Nov 2004 21:20:44 -0000 1.6 *************** *** 1,72 **** ! @# This is the source for the CBAR changes file, in Allegro's custom format. ! @# Read allegro/docs/makedoc.c for a description of what is going on... ! @# ! @#ignore_css ! @multiwordheaders ! @document_title=CBAR Changes ! @rtfh=Changes in CBAR ! @$\input texinfo ! @$@setfilename changes.inf ! @$@settitle Changes in CBAR ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Changes: (changes). Changes in CBAR ! @$@end direntry ! @$This is the Info version of the Changes in CBAR file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Changes in CBAR</title> ! @<body> ! <center><b>A CGUI and Allegro addon for bar code reading</b></center> ! <center><b>by Christer Sandberg</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 CBAR ! </b></center> ! @!text ! ! @heading ! Changes ! ! 1.0.2: ! <ul> ! <li> ! Fixed bug 888698: Improved makfiles to make it possible to build on Linux. ! <li> ! Removed implicit dependency to allegro 4.1.* (dat2c) ! <li> ! Some general improvements in makefiles (e.g. uninstall, clean and ! veryclean corrected, removing of redundant code) ! <li> ! Removed makedoc, using CGUI's makedoc instead. ! <li> ! Minor bufixes and clearifications in the docs. ! </ul> ! 1.0.1: ! <ul> ! <li> ! Fixed bug #855852 "Warning text error" (confusing error messages) ! <li> ! Fixed bug #855857 "Error in error handling" (didn't set default sound file) ! <li> ! Added default sound files to the package. ! <li> ! Adapted build to Msys. ! </ul> ! ! 1.0.0: ! <ul> ! <li> ! Initial official version. ! </ul> --- 1,72 ---- ! @# This is the source for the CBAR changes file, in Allegro's custom format. ! @# Read allegro/docs/makedoc.c for a description of what is going on... ! @# ! @#ignore_css ! @multiwordheaders ! @document_title=CBAR Changes ! @rtfh=Changes in CBAR ! @$\input texinfo ! @$@setfilename changes.inf ! @$@settitle Changes in CBAR ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Changes: (changes). Changes in CBAR ! @$@end direntry ! @$This is the Info version of the Changes in CBAR file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Changes in CBAR</title> ! @<body> ! <center><b>A CGUI and Allegro addon for bar code reading</b></center> ! <center><b>by Christer Sandberg</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 CBAR ! </b></center> ! @!text ! ! @heading ! Changes ! ! 1.0.2: ! <ul> ! <li> ! Fixed bug 888698: Improved makfiles to make it possible to build on Linux. ! <li> ! Removed implicit dependency to allegro 4.1.* (dat2c) ! <li> ! Some general improvements in makefiles (e.g. uninstall, clean and ! veryclean corrected, removing of redundant code) ! <li> ! Removed makedoc, using CGUI's makedoc instead. ! <li> ! Minor bufixes and clearifications in the docs. ! </ul> ! 1.0.1: ! <ul> ! <li> ! Fixed bug #855852 "Warning text error" (confusing error messages) ! <li> ! Fixed bug #855857 "Error in error handling" (didn't set default sound file) ! <li> ! Added default sound files to the package. ! <li> ! Adapted build to Msys. ! </ul> ! ! 1.0.0: ! <ul> ! <li> ! Initial official version. ! </ul> |
|
From: Christer S. <ch...@us...> - 2004-06-22 06:27:20
|
Update of /cvsroot/cbar/cbar/lib/msvc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1944/lib/msvc Modified Files: cbar.def Log Message: linefeeds... Index: cbar.def =================================================================== RCS file: /cvsroot/cbar/cbar/lib/msvc/cbar.def,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cbar.def 21 Jun 2004 19:18:32 -0000 1.3 --- cbar.def 22 Jun 2004 06:27:12 -0000 1.4 *************** *** 1,17 **** ! ; generated by fixdll.sh ! EXPORTS ! CbarActivate @1 ! CbarAddToErrorLog @2 ! CbarAddUnit @3 ! CbarAdjustBarPrint @4 ! CbarDeInit @5 ! CbarLoadInit @6 ! CbarLogErrors @7 ! CbarMakeSound @8 ! CbarRemoveUnit @9 ! CbarSettingsDialogue @10 ! CbarSetup @11 ! CbarShowErrorLog @12 ! CbarSoundExternal @13 ! CbarSoundInternal @14 ! CbarUnitConnection @15 --- 1,17 ---- ! ; generated by fixdll.sh ! EXPORTS ! CbarActivate @1 ! CbarAddToErrorLog @2 ! CbarAddUnit @3 ! CbarAdjustBarPrint @4 ! CbarDeInit @5 ! CbarLoadInit @6 ! CbarLogErrors @7 ! CbarMakeSound @8 ! CbarRemoveUnit @9 ! CbarSettingsDialogue @10 ! CbarSetup @11 ! CbarShowErrorLog @12 ! CbarSoundExternal @13 ! CbarSoundInternal @14 ! CbarUnitConnection @15 |
|
From: Christer S. <ch...@us...> - 2004-06-22 06:27:20
|
Update of /cvsroot/cbar/cbar/lib/mingw32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1944/lib/mingw32 Modified Files: cbar.def Log Message: linefeeds... Index: cbar.def =================================================================== RCS file: /cvsroot/cbar/cbar/lib/mingw32/cbar.def,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cbar.def 21 Jun 2004 19:18:31 -0000 1.3 --- cbar.def 22 Jun 2004 06:27:11 -0000 1.4 *************** *** 1,17 **** ! ; generated by fixdll.sh ! EXPORTS ! CbarActivate @1 ! CbarAddToErrorLog @2 ! CbarAddUnit @3 ! CbarAdjustBarPrint @4 ! CbarDeInit @5 ! CbarLoadInit @6 ! CbarLogErrors @7 ! CbarMakeSound @8 ! CbarRemoveUnit @9 ! CbarSettingsDialogue @10 ! CbarSetup @11 ! CbarShowErrorLog @12 ! CbarSoundExternal @13 ! CbarSoundInternal @14 ! CbarUnitConnection @15 --- 1,17 ---- ! ; generated by fixdll.sh ! EXPORTS ! CbarActivate @1 ! CbarAddToErrorLog @2 ! CbarAddUnit @3 ! CbarAdjustBarPrint @4 ! CbarDeInit @5 ! CbarLoadInit @6 ! CbarLogErrors @7 ! CbarMakeSound @8 ! CbarRemoveUnit @9 ! CbarSettingsDialogue @10 ! CbarSetup @11 ! CbarShowErrorLog @12 ! CbarSoundExternal @13 ! CbarSoundInternal @14 ! CbarUnitConnection @15 |
|
From: Christer S. <ch...@us...> - 2004-06-22 06:27:20
|
Update of /cvsroot/cbar/cbar/lib/bcc32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1944/lib/bcc32 Modified Files: cbar.def Log Message: linefeeds... Index: cbar.def =================================================================== RCS file: /cvsroot/cbar/cbar/lib/bcc32/cbar.def,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cbar.def 21 Jun 2004 19:18:31 -0000 1.3 --- cbar.def 22 Jun 2004 06:27:11 -0000 1.4 *************** *** 1,17 **** ! ; generated by fixdll.sh ! EXPORTS ! _CbarActivate = CbarActivate ! _CbarAddToErrorLog = CbarAddToErrorLog ! _CbarAddUnit = CbarAddUnit ! _CbarAdjustBarPrint = CbarAdjustBarPrint ! _CbarDeInit = CbarDeInit ! _CbarLoadInit = CbarLoadInit ! _CbarLogErrors = CbarLogErrors ! _CbarMakeSound = CbarMakeSound ! _CbarRemoveUnit = CbarRemoveUnit ! _CbarSettingsDialogue = CbarSettingsDialogue ! _CbarSetup = CbarSetup ! _CbarShowErrorLog = CbarShowErrorLog ! _CbarSoundExternal = CbarSoundExternal ! _CbarSoundInternal = CbarSoundInternal ! _CbarUnitConnection = CbarUnitConnection --- 1,17 ---- ! ; generated by fixdll.sh ! EXPORTS ! _CbarActivate = CbarActivate ! _CbarAddToErrorLog = CbarAddToErrorLog ! _CbarAddUnit = CbarAddUnit ! _CbarAdjustBarPrint = CbarAdjustBarPrint ! _CbarDeInit = CbarDeInit ! _CbarLoadInit = CbarLoadInit ! _CbarLogErrors = CbarLogErrors ! _CbarMakeSound = CbarMakeSound ! _CbarRemoveUnit = CbarRemoveUnit ! _CbarSettingsDialogue = CbarSettingsDialogue ! _CbarSetup = CbarSetup ! _CbarShowErrorLog = CbarShowErrorLog ! _CbarSoundExternal = CbarSoundExternal ! _CbarSoundInternal = CbarSoundInternal ! _CbarUnitConnection = CbarUnitConnection |
|
From: Christer S. <ch...@us...> - 2004-06-21 19:18:43
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16370/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver zipup.sh Log Message: fixed some build issues Index: makefile.uni =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.uni,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.uni 8 Feb 2004 11:34:11 -0000 1.4 --- makefile.uni 21 Jun 2004 19:18:32 -0000 1.5 *************** *** 1,234 **** ! # makefile.uni: ! # Makefile for the CBAR library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_ICONS = $(subst \,/,$(CBAR_ICONS_X)) ! CBAR_ICONS_C = $(subst \,/,$(CBAR_ICONS_C_X)) ! CBAR_ICONS_H = $(subst \,/,$(CBAR_ICONS_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lccom_s -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lccom -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcbar $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cbar ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar_s.a $(SYSTEM_LIB_DIR)/libcbard_s.a \ ! $(SYSTEM_LIB_DIR)/libcbar.so $(SYSTEM_LIB_DIR)/libcbard.so \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^[a-zA-Z0-9_\/]*\///" -e "s/[a-zA-Z0-9_\/.:-]*version.h//" _depend.tmp > _depend2.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar\/\1\.o:/" _depend2.tmp > obj/unix/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard\/\1\.o:/" _depend2.tmp > obj/unix/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar_s\/\1\.o:/" _depend2.tmp > obj/unix/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard_s\/\1\.o:/" _depend2.tmp > obj/unix/cbard_s/makefile.dep ! rm _depend.tmp _depend2.tmp --- 1,233 ---- ! # makefile.uni: ! # Makefile for the CBAR library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_ICONS = $(subst \,/,$(CBAR_ICONS_X)) ! CBAR_ICONS_C = $(subst \,/,$(CBAR_ICONS_C_X)) ! CBAR_ICONS_H = $(subst \,/,$(CBAR_ICONS_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lccom_s -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lccom -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcbar $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cbar ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar_s.a $(SYSTEM_LIB_DIR)/libcbard_s.a \ ! $(SYSTEM_LIB_DIR)/libcbar.so $(SYSTEM_LIB_DIR)/libcbard.so \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar\/\1\.o:/" _depend.tmp > obj/unix/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard\/\1\.o:/" _depend.tmp > obj/unix/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbar_s\/\1\.o:/" _depend.tmp > obj/unix/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cbard_s\/\1\.o:/" _depend.tmp > obj/unix/cbard_s/makefile.dep ! rm _depend.tmp Index: makefile.ver =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.ver 8 Feb 2004 11:34:11 -0000 1.4 --- makefile.ver 21 Jun 2004 19:18:32 -0000 1.5 *************** *** 1,10 **** ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 10 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 1.0.2 ! shared_major_minor = 1.0 --- 1,10 ---- ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 10 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 1.0.2 ! shared_major_minor = 1.0 Index: makefile.bcc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.bcc 23 May 2004 23:07:00 -0000 1.6 --- makefile.bcc 21 Jun 2004 19:18:32 -0000 1.7 *************** *** 1,376 **** ! # makefile.bcc: ! # Makefile for the CBAR library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! IMPDEF_NAME = $(LIB_DIR)/impcbar.def ! endif ! ! # -------- Check that environment path variables are set. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! ! ifdef UNIX_TOOLS ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = ccomd.lib cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcbar.def ! copy _impcbar.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcbar.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! ! endif # ifdef STATICLINK ! ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \ ! $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^[a-zA-Z0-9_\/]*\///" -e "s/[^ ]*version\.h//" -e "s/[^ ]*djgpp\.ver//" -e "s/[^ ]*allegro[^ ]*//g" -e"/^ *\\/d" _depend.tmp > _depend2.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar\/\1\.obj:/" _depend2.tmp > obj/bcc32/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard\/\1\.obj:/" _depend2.tmp > obj/bcc32/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar_s\/\1\.obj:/" _depend2.tmp > obj/bcc32/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard_s\/\1\.obj:/" _depend2.tmp > obj/bcc32/cbard_s/makefile.dep ! rm _depend.tmp _depend2.tmp --- 1,363 ---- ! # makefile.bcc: ! # Makefile for the CBAR library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CBAR. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! IMPDEF_NAME = $(LIB_DIR)/impcbar.def ! endif ! ! # -------- Check that environment path variables are set. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = ccomd.lib cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcbar.def ! copy _impcbar.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcbar.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! ! endif # ifdef STATICLINK ! ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \ ! $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbar_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbar_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cbard_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cbard_s/makefile.dep ! rm _depend.tmp Index: makefile.dj =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.dj 24 May 2004 00:32:34 -0000 1.6 --- makefile.dj 21 Jun 2004 19:18:32 -0000 1.7 *************** *** 1,299 **** ! # makefile.dj: ! # Makefile for the CBAR library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # See readme.txt for more information about CBAR ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! ifdef UNIX_TOOLS ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lccomd -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lccom -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lccom -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CBAR doesn't relies on Allegro ! # including some standard header. ! ifdef CBAR_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! mkdir $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! cp $(subst \,/,$< $@) ! -install-info $(subst \,/,$@) $(SYSTEM_INFO_DIR)/dir ! ! else # ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! $(CP) $(subst /,\,$< $@) ! ! endif # ifdef CROSSCOMPILE else ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar.a $(SYSTEM_LIB_DIR)/libcbard.a \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^[a-zA-Z0-9_\/]*\///" -e "s/[^ ]*version\.h//" -e "s/[^ ]*djgpp\.ver//" -e "s/[^ ]*allegro[^ ]*//g" -e"/^ *\\/d" _depend.tmp > _depend2.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbar\/\1/" _depend2.tmp > obj/djgpp/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbard\/\1/" _depend2.tmp > obj/djgpp/cbard/makefile.dep ! rm _depend.tmp _depend2.tmp --- 1,288 ---- ! # makefile.dj: ! # Makefile for the CBAR library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # See readme.txt for more information about CBAR ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lccomd -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lccom -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lccom -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CBAR doesn't relies on Allegro ! # including some standard header. ! ifdef CBAR_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! mkdir $(subst \,/,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! cp $(subst \,/,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! cp $(subst \,/,$< $@) ! -install-info $(subst \,/,$@) $(SYSTEM_INFO_DIR)/dir ! ! else # ifdef CROSSCOMPILE ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! $(CP) $(subst /,\,$< $@) ! ! endif # ifdef CROSSCOMPILE else ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar.a $(SYSTEM_LIB_DIR)/libcbard.a \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INFO_DIR)/cbar$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCBAR_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbar\/\1/" _depend.tmp > obj/djgpp/cbar/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cbard\/\1/" _depend.tmp > obj/djgpp/cbard/makefile.dep ! rm _depend.tmp Index: makefile.vc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.vc 23 May 2004 20:45:05 -0000 1.8 --- makefile.vc 21 Jun 2004 19:18:32 -0000 1.9 *************** *** 1,336 **** ! # makefile.vc: ! # Makefile for the CBAR library with MSVC. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # See readme.txt for more information about CBAR. ! # See makefile.all for a list of the available targets. ! # ! # To path MSVC so it can be used from the commandline, run the ! # vcvars32.bat file which can be found in your MSVC bin directory. ! # ! # This build uses djgpp for calculating ! # source dependencies, so you'll need to have that installed as well. ! # ! # The "depend" target uses sed. ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = MSVC ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/msvc ! LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ! ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! endif ! ! # -------- Check that environment path variables are set. -------- ! ! .PHONY: badwin badmsvc badspaces ! ! ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef MSVCDIR ! MSVCDIR_U = $(subst \,/,$(MSVCDIR)) ! MSVCDIR_D = $(subst /,\,$(MSVCDIR)) ! else ! ifdef MSDEVDIR ! MSVCDIR_U = $(subst \,/,$(MSDEVDIR)) ! MSVCDIR_D = $(subst /,\,$(MSDEVDIR)) ! else ! badmsvc: ! @echo Your MSVCDIR or MSDEVDIR environment variable is not set! ! endif ! endif ! ! NULLSTRING := ! SPACE := $(NULLSTRING) # special magic to get an isolated space character ! ! ifneq ($(findstring $(SPACE),$(MSVCDIR)$(MSDEVDIR)),) ! badspaces: ! @echo There are spaces in your MSVCDIR or MSDEVDIR environment ! @echo variables: please change these to the 8.3 short filename ! @echo version, or move your compiler to a different directory. ! endif ! ! SYSTEM_INCLUDE_DIR = $(MSVCDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(MSVCDIR_D)\include ! SYSTEM_LIB_DIR = $(MSVCDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib ! ! ! ifdef UNIX_TOOLS ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst \,/,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX) ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) ! CBAR_DAT = $(subst /,\,$(CBAR_DAT_X)) ! CBAR_DAT_C = $(subst /,\,$(CBAR_DAT_C_X)) ! CBAR_DAT_H = $(subst /,\,$(CBAR_DAT_H_X)) ! CBAR_LABELS = $(subst /,\,$(CBAR_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -W3 -WX ! else ! WFLAGS = -W1 ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Gd -Zi -MDd ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall ! LFLAGS = -debug -debugtype:cv ! ! ifdef STATICLINK ! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = ccomd.lib cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -profile ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -release ! ifdef STATICLINK ! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = ccom.lib cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 ! endif ! ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Gd -MT ! ! COMPILE_FLAGS = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCBAR_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK -DCCOM_STATICLINK ! endif ! ! LIB_FLAGS += kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ ! ! define COMPILE_C_TO_OBJ ! $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< ! endef ! ! define LINK_OBJ_TO_EXE ! $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef ! else ! # link as a DLL ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(MSVCDIR_U)/,$(wildcard include/cbar/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(SYSTEM_INCLUDE_DIR)/cbar \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) MSVC library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cbar.lib $(SYSTEM_LIB_DIR)/cbar_s.lib \ ! $(SYSTEM_LIB_DIR)/cbard.lib $(SYSTEM_LIB_DIR)/cbard_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cbar.h \ ! $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbard$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $... [truncated message content] |