cbar-develop Mailing List for CBAR - a bar code reader lib (Page 2)
Brought to you by:
chrisan,
rasmusmyklebust
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...> - 2004-06-21 19:18:41
|
Update of /cvsroot/cbar/cbar/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16370/docs Modified Files: cbar._tx changes._tx readme._tx Log Message: fixed some build issues Index: cbar._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/cbar._tx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cbar._tx 8 Feb 2004 11:34:11 -0000 1.5 --- cbar._tx 21 Jun 2004 19:18:31 -0000 1.6 *************** *** 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** readme._tx 8 Feb 2004 11:34:11 -0000 1.5 --- readme._tx 21 Jun 2004 19:18:31 -0000 1.6 *************** *** 1,197 **** ! @# 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 Allegro version 4.0.x, as well as ! CGUI vesion 1.6.5 or later. ! There are also other requirements like correctly installed compilers etc. ! but these are already fulfilled if you succeded in making and installing ! Allegro and CGUI (no additional requirements are needed). ! ! You can find Allegro at: ! 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 five simple steps, and should be familiar since it is ! similar to the installation procedure as of Allegro and CGUI: ! <ul> ! <li> ! Tell the installation process what platform you use. Start a command window ! (shell) and set the main directory of cbar to you current directory ! (i.e. enter the command > cd <the path to your cbar directory>). Choose ! platform by running one of the following commands:<br> ! <pre> ! fix.bat djgpp - to compile with DOS/DJGPP ! fix.bat mingw32 - to compile with Windows/MinGW32 ! fix.bat msvc - to compile with Windows/MSVC ! ./fix.sh unix - to compile with Linux/gcc ! </pre> ! <li> ! Specify the path to your allegro installation by setting the environment ! 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> ! 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.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** changes._tx 8 Feb 2004 11:34:11 -0000 1.4 --- changes._tx 21 Jun 2004 19:18:31 -0000 1.5 *************** *** 1,70 **** ! @# 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> ! 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-21 19:18:41
|
Update of /cvsroot/cbar/cbar/lib/msvc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16370/lib/msvc Modified Files: cbar.def Log Message: fixed some build issues Index: cbar.def =================================================================== RCS file: /cvsroot/cbar/cbar/lib/msvc/cbar.def,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cbar.def 30 Mar 2003 19:57:51 -0000 1.2 --- cbar.def 21 Jun 2004 19:18:32 -0000 1.3 *************** *** 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-21 19:18:41
|
Update of /cvsroot/cbar/cbar/lib/bcc32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16370/lib/bcc32 Modified Files: cbar.def Log Message: fixed some build issues Index: cbar.def =================================================================== RCS file: /cvsroot/cbar/cbar/lib/bcc32/cbar.def,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cbar.def 30 Mar 2003 19:57:51 -0000 1.2 --- cbar.def 21 Jun 2004 19:18:31 -0000 1.3 *************** *** 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:41
|
Update of /cvsroot/cbar/cbar/lib/mingw32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16370/lib/mingw32 Modified Files: cbar.def Log Message: fixed some build issues Index: cbar.def =================================================================== RCS file: /cvsroot/cbar/cbar/lib/mingw32/cbar.def,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cbar.def 30 Mar 2003 19:57:51 -0000 1.2 --- cbar.def 21 Jun 2004 19:18:31 -0000 1.3 *************** *** 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-21 19:18:40
|
Update of /cvsroot/cbar/cbar/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16370/include Modified Files: cbar.h Log Message: fixed some build issues Index: cbar.h =================================================================== RCS file: /cvsroot/cbar/cbar/include/cbar.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cbar.h 8 Feb 2004 11:34:11 -0000 1.5 --- cbar.h 21 Jun 2004 19:18:31 -0000 1.6 *************** *** 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 20040208 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Feb 08, 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: <ben...@id...> - 2004-05-25 08:40:48
|
Dear Open Source developer I am doing a research project on "Fun and Software Development" in which I kindly invite you to participate. You will find the online survey under http://fasd.ethz.ch/qsf/. The questionnaire consists of 53 questions and you will need about 15 minutes to complete it. With the FASD project (Fun and Software Development) we want to define the motivational significance of fun when software developers decide to engage in Open Source projects. What is special about our research project is that a similar survey is planned with software developers in commercial firms. This procedure allows the immediate comparison between the involved individuals and the conditions of production of these two development models. Thus we hope to obtain substantial new insights to the phenomenon of Open Source Development. With many thanks for your participation, Benno Luthiger PS: The results of the survey will be published under http://www.isu.unizh.ch/fuehrung/blprojects/FASD/. We have set up the mailing list fa...@we... for this study. Please see http://fasd.ethz.ch/qsf/mailinglist_en.html for registration to this mailing list. _______________________________________________________________________ Benno Luthiger Swiss Federal Institute of Technology Zurich 8092 Zurich Mail: benno.luthiger(at)id.ethz.ch _______________________________________________________________________ |
|
From: Rasmus M. <ras...@us...> - 2004-05-24 00:32:44
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30345 Modified Files: makefile.dj Log Message: Fixed target name Index: makefile.dj =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.dj 24 May 2004 00:22:00 -0000 1.5 --- makefile.dj 24 May 2004 00:32:34 -0000 1.6 *************** *** 37,42 **** OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ifndef LIB_ROOT_DIR --- 37,42 ---- 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 *************** *** 47,51 **** LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE5).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) --- 47,51 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) |
|
From: Rasmus M. <ras...@us...> - 2004-05-24 00:22:12
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28081/misc Modified Files: makefile.dj makefile.mgw Log Message: Fixed the use of UNIX_TOOLS if present Index: makefile.mgw =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.mgw 23 May 2004 23:07:00 -0000 1.7 --- makefile.mgw 24 May 2004 00:22:00 -0000 1.8 *************** *** 97,100 **** --- 97,118 ---- SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib + ifdef CROSSCOMPILE + UNIX_TOOLS = 1 + endif + + 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 -------- *************** *** 294,311 **** ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! copy $(subst /,\,$< $@) endif $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! copy $(subst /,\,$< $@) endif # ifdef CROSSCOMPILE else --- 312,329 ---- ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! $(CP) $(subst /,\,$< $@) endif $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_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 /,\,$< $@) endif # ifdef CROSSCOMPILE else Index: makefile.dj =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.dj 8 Feb 2004 11:34:11 -0000 1.4 --- makefile.dj 24 May 2004 00:22:00 -0000 1.5 *************** *** 72,75 **** --- 72,88 ---- 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 *************** *** 230,246 **** $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cbar: ! md $(subst /,\,$@) $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar ! copy $(subst /,\,$< $@) endif # ifdef CROSSCOMPILE else --- 243,259 ---- $(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 |
|
From: Rasmus M. <ras...@us...> - 2004-05-23 23:07:10
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10086 Modified Files: makefile.bcc makefile.mgw Log Message: Fixed target name Index: makefile.mgw =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.mgw 23 May 2004 20:45:05 -0000 1.6 --- makefile.mgw 23 May 2004 23:07:00 -0000 1.7 *************** *** 36,50 **** ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE5).a IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) EXPDEF_NAME = $(LIB_DIR)/cbar.def --- 36,50 ---- ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a 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 = lib$(PACKAGE).a IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) EXPDEF_NAME = $(LIB_DIR)/cbar.def Index: makefile.bcc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.bcc 8 Feb 2004 11:34:11 -0000 1.5 --- makefile.bcc 23 May 2004 23:07:00 -0000 1.6 *************** *** 62,76 **** # link as a static library OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) --- 62,76 ---- # 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) |
|
From: Rasmus M. <ras...@us...> - 2004-05-23 20:45:16
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13125 Modified Files: makefile.mgw makefile.vc Log Message: Fixed reading of $(SystemRoot) and $(SYSTEMROOT) Index: makefile.vc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.vc 28 Feb 2004 00:08:19 -0000 1.7 --- makefile.vc 23 May 2004 20:45:05 -0000 1.8 *************** *** 67,85 **** 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 --- 67,81 ---- ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif Index: makefile.mgw =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.mgw 8 Feb 2004 11:34:11 -0000 1.5 --- makefile.mgw 23 May 2004 20:45:05 -0000 1.6 *************** *** 58,75 **** .PHONY: badwin badming ! 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 --- 58,73 ---- .PHONY: badwin badming ! ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif |
|
From: Rasmus M. <ras...@us...> - 2004-05-23 20:44:56
|
Update of /cvsroot/cbar/cbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13028 Modified Files: fix.bat Log Message: Line ends Index: fix.bat =================================================================== RCS file: /cvsroot/cbar/cbar/fix.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fix.bat 27 Feb 2003 18:43:44 -0000 1.1.1.1 --- fix.bat 23 May 2004 20:44:46 -0000 1.2 *************** *** 1,90 **** ! @echo off ! ! rem Sets up the CBAR package for building with the specified compiler, ! rem and if possible converting text files from LF to CR/LF format. ! ! ! rem check that number of args is ok ! if [%3] == [] goto arg2 ! goto help ! ! ! rem check if second arg is ok ! :arg2 ! if [%2] == [--quick] goto arg1 ! if [%2] == [] goto arg1 ! goto help ! ! ! rem check if first arg is ok ! :arg1 ! if [%1] == [bcc32] goto begin ! if [%1] == [djgpp] goto begin ! if [%1] == [mingw32] goto begin ! if [%1] == [msvc] goto begin ! goto help ! ! ! rem echo header to makefile, then goto platform specific section ! :begin ! echo # generated by fix.bat > makefile ! if [%1] == [bcc32] goto bcc32 ! if [%1] == [djgpp] goto djgpp ! if [%1] == [mingw32] goto mingw32 ! if [%1] == [msvc] goto msvc ! echo internal error: not reached ! goto end ! ! ! :bcc32 ! echo Configuring CBAR for Windows/BCC32... ! echo MAKEFILE_INC = makefile.bcc >> makefile ! goto finish ! ! ! :djgpp ! echo Configuring CBAR for DOS/djgpp... ! echo MAKEFILE_INC = makefile.dj >> makefile ! goto finish ! ! ! :mingw32 ! echo Configuring CBAR for Windows/Mingw32... ! echo MAKEFILE_INC = makefile.mgw >> makefile ! goto finish ! ! ! :msvc ! echo Configuring CBAR for Windows/MSVC... ! echo MAKEFILE_INC = makefile.vc >> makefile ! goto finish ! ! ! :help ! echo. ! echo Usage: fix platform [--quick] ! echo. ! echo Where platform is one of: djgpp, mingw32, msvc or bcc32. ! echo The --quick parameter is used to turn off LF to CR/LF conversion. ! echo. ! goto end ! ! ! rem write end of makefile and possibly convert end of line format ! :finish ! echo include misc/makefile.all >> makefile ! ! if [%2] == [--quick] goto done ! if [%1] == [bcc32] goto done ! if [%1] == [mingw32] goto done ! ! echo Converting CBAR files to DOS CR/LF format... ! utod *.bat .../*.c .../*.h ! utod .../*.txt .../*._tx makefile* misc/makefile.* readme.* ! ! ! :done ! echo Done! ! ! ! :end --- 1,90 ---- ! @echo off ! ! rem Sets up the CBAR package for building with the specified compiler, ! rem and if possible converting text files from LF to CR/LF format. ! ! ! rem check that number of args is ok ! if [%3] == [] goto arg2 ! goto help ! ! ! rem check if second arg is ok ! :arg2 ! if [%2] == [--quick] goto arg1 ! if [%2] == [] goto arg1 ! goto help ! ! ! rem check if first arg is ok ! :arg1 ! if [%1] == [bcc32] goto begin ! if [%1] == [djgpp] goto begin ! if [%1] == [mingw32] goto begin ! if [%1] == [msvc] goto begin ! goto help ! ! ! rem echo header to makefile, then goto platform specific section ! :begin ! echo # generated by fix.bat > makefile ! if [%1] == [bcc32] goto bcc32 ! if [%1] == [djgpp] goto djgpp ! if [%1] == [mingw32] goto mingw32 ! if [%1] == [msvc] goto msvc ! echo internal error: not reached ! goto end ! ! ! :bcc32 ! echo Configuring CBAR for Windows/BCC32... ! echo MAKEFILE_INC = makefile.bcc >> makefile ! goto finish ! ! ! :djgpp ! echo Configuring CBAR for DOS/djgpp... ! echo MAKEFILE_INC = makefile.dj >> makefile ! goto finish ! ! ! :mingw32 ! echo Configuring CBAR for Windows/Mingw32... ! echo MAKEFILE_INC = makefile.mgw >> makefile ! goto finish ! ! ! :msvc ! echo Configuring CBAR for Windows/MSVC... ! echo MAKEFILE_INC = makefile.vc >> makefile ! goto finish ! ! ! :help ! echo. ! echo Usage: fix platform [--quick] ! echo. ! echo Where platform is one of: djgpp, mingw32, msvc or bcc32. ! echo The --quick parameter is used to turn off LF to CR/LF conversion. ! echo. ! goto end ! ! ! rem write end of makefile and possibly convert end of line format ! :finish ! echo include misc/makefile.all >> makefile ! ! if [%2] == [--quick] goto done ! if [%1] == [bcc32] goto done ! if [%1] == [mingw32] goto done ! ! echo Converting CBAR files to DOS CR/LF format... ! utod *.bat .../*.c .../*.h ! utod .../*.txt .../*._tx makefile* misc/makefile.* readme.* ! ! ! :done ! echo Done! ! ! ! :end |
|
From: <ras...@us...> - 2004-02-28 01:13:37
|
Update of /cvsroot/cbar/cbar/lib/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24543/unix Added Files: tmpfile.txt Log Message: Added missing directories --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. |
|
From: <ras...@us...> - 2004-02-28 00:25:14
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16143 Modified Files: makefile.vc Log Message: Made the it build in msvc Index: makefile.vc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.vc 27 Feb 2004 23:56:05 -0000 1.6 --- makefile.vc 28 Feb 2004 00:08:19 -0000 1.7 *************** *** 47,51 **** OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) --- 47,51 ---- 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) *************** *** 54,60 **** OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) --- 54,60 ---- 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) |
|
From: <ras...@us...> - 2004-02-28 00:13:00
|
Update of /cvsroot/cbar/cbar/resource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13756/resource Added Files: tmpfile.txt Log Message: Made the it build in msvc --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. |
|
From: <ras...@us...> - 2004-02-28 00:12:58
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13756/misc Modified Files: makefile.all makefile.vc Log Message: Made the it build in msvc Index: makefile.all =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.all 16 Feb 2004 07:21:34 -0000 1.5 --- makefile.all 27 Feb 2004 23:56:04 -0000 1.6 *************** *** 204,208 **** dat: $(CBAR_DAT_C_X) ! $(CBAR_DAT_C) $(CBAR_DAT_H): $(CBAR_DAT_X) -$(CGUI_DAT2C) $(CBAR_DAT) -o $(CBAR_DAT_C) -h $(CBAR_DAT_H) -p cbar -g -n labels --- 204,208 ---- dat: $(CBAR_DAT_C_X) ! $(CBAR_DAT_C_X) $(CBAR_DAT_H): $(CBAR_DAT_X) -$(CGUI_DAT2C) $(CBAR_DAT) -o $(CBAR_DAT_C) -h $(CBAR_DAT_H) -p cbar -g -n labels Index: makefile.vc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.vc 8 Feb 2004 11:34:11 -0000 1.5 --- makefile.vc 27 Feb 2004 23:56:05 -0000 1.6 *************** *** 45,50 **** ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) --- 45,50 ---- 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 = $(PACKAGE5)_s$(LIB_SUFFIX) IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) *************** *** 52,57 **** else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) --- 52,57 ---- else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) *************** *** 125,128 **** --- 125,129 ---- 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)) *************** *** 135,138 **** --- 136,140 ---- 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)) |
|
From: <ch...@us...> - 2004-02-16 07:29:23
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2383 Modified Files: makefile.all Log Message: Minor makefile cange Index: makefile.all =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.all 8 Feb 2004 11:34:11 -0000 1.4 --- makefile.all 16 Feb 2004 07:21:34 -0000 1.5 *************** *** 57,62 **** EXAMPLES_SOURCE = 1_bar.c - RUNNER_SOURCE = misc/runner.c - CLEAN_FILES = \ obj/*/*/*.o obj/*/*/*.obj \ --- 57,60 ---- *************** *** 166,174 **** $(LINK_OBJ_TO_EXE) - ifneq ($(RUNNER_DEP),) - $(RUNNER): $(RUNNER_SOURCE) - $(COMPILE_RUNNER) - endif - chm-docs: docs/cbar.chm --- 164,167 ---- |
|
From: <ras...@us...> - 2004-02-09 21:51:36
|
Update of /cvsroot/cbar/cbar/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23403 Modified Files: reader.c unit.c Log Message: Updated to new prefixes Index: reader.c =================================================================== RCS file: /cvsroot/cbar/cbar/src/reader.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** reader.c 4 Feb 2004 06:22:06 -0000 1.4 --- reader.c 9 Feb 2004 21:48:19 -0000 1.5 *************** *** 164,168 **** InstallKBHandler(KeyBoardBarCode, r); else ! CCPStartScanning(source-1, 0, COMBarCode, r); r->CallBack = CallBack; r->data = data; --- 164,168 ---- InstallKBHandler(KeyBoardBarCode, r); else ! CcomStartScanning(source-1, 0, COMBarCode, r); r->CallBack = CallBack; r->data = data; *************** *** 178,182 **** UnInstallKBHandler(KeyBoardBarCode); else ! CCPStopScanning(r->source-1); if (r->buffer) { Release(r->buffer); --- 178,182 ---- UnInstallKBHandler(KeyBoardBarCode); else ! CcomStopScanning(r->source-1); if (r->buffer) { Release(r->buffer); Index: unit.c =================================================================== RCS file: /cvsroot/cbar/cbar/src/unit.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** unit.c 4 Feb 2004 06:22:06 -0000 1.4 --- unit.c 9 Feb 2004 21:48:19 -0000 1.5 *************** *** 328,332 **** t_dialunit *du = data; ! CCPSettingsDialogue(du->cbcu->setting.source - 1); } --- 328,332 ---- t_dialunit *du = data; ! CcomSettingsDialogue(du->cbcu->setting.source - 1); } |
|
From: <ch...@us...> - 2004-02-08 17:54:26
|
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1548 Removed Files: runner.c Log Message: removed unused file --- runner.c DELETED --- |
Update of /cvsroot/cbar/cbar/misc/makedoc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1160 Removed Files: makechm.c makechm.h makedoc.c makedoc.h makehtml.c makehtml.h makeman.c makeman.h makemisc.c makemisc.h makertf.c makertf.h maketexi.c maketexi.h maketxt.c maketxt.h Log Message: removed unused files --- makechm.c DELETED --- --- makechm.h DELETED --- --- makedoc.c DELETED --- --- makedoc.h DELETED --- --- makehtml.c DELETED --- --- makehtml.h DELETED --- --- makeman.c DELETED --- --- makeman.h DELETED --- --- makemisc.c DELETED --- --- makemisc.h DELETED --- --- makertf.c DELETED --- --- makertf.h DELETED --- --- maketexi.c DELETED --- --- maketexi.h DELETED --- --- maketxt.c DELETED --- --- maketxt.h DELETED --- |
Update of /cvsroot/cbar/cbar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17658/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver zipup.sh Log Message: Some more makefile cleanup/improvements Index: makefile.all =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.all 4 Feb 2004 06:21:59 -0000 1.3 --- makefile.all 8 Feb 2004 11:34:11 -0000 1.4 *************** *** 157,167 **** endif ! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(COMPILE_C_TO_OBJ) ! $(LIB_NAME): $(LIB_OBJS) $(LINK_OBJ_TO_LIB_DEPS) $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) --- 157,167 ---- endif ! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ) ! $(LIB_NAME): $(LIB_OBJS) $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE) Index: makefile.bcc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 4 Feb 2004 06:21:59 -0000 1.4 --- makefile.bcc 8 Feb 2004 11:34:11 -0000 1.5 *************** *** 60,88 **** ifdef STATICLINK ! ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! IMPDEF_NAME = $(LIB_DIR)/impcbar.def ! endif - - # -------- Check that environment path variables are set. -------- --- 60,82 ---- ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! IMPDEF_NAME = $(LIB_DIR)/impcbar.def endif # -------- Check that environment path variables are set. -------- *************** *** 155,169 **** - # -------- 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 -------- --- 149,152 ---- *************** *** 234,239 **** dinput.lib ddraw.lib winmm.lib dsound.lib - - # -------- List platform specific objects and programs. -------- --- 217,220 ---- *************** *** 247,252 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- --- 228,231 ---- *************** *** 257,268 **** bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - bcc32 $(COMPILE_FLAGS_NO_OPTIMIZE) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - endef - define MAKE_LIB_RSP $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp --- 236,239 ---- *************** *** 288,321 **** endif - LINK_ALL_OBJ_TO_EXE_DEPS = lib.rsp - define DO_LINK_ALL_OBJ_TO_EXE_DEPS - $(foreach objfile, $(filter %.$(OBJ_SUFFIX),$^), echo $(subst /,\\,$(objfile)) + >> obj.rsp - ) - ilink32 $(LFLAGS) /aa /Tpe c0w32 @obj.rsp,$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) - del obj.rsp - endef - ifdef DELETE_TDS_FILES - define LINK_ALL_OBJ_TO_EXE - $(DO_LINK_ALL_OBJ_TO_EXE) - @del $(subst .exe,.tds,$(subst /,\,$@)) - endef - else - LINK_ALL_OBJ_TO_EXE = $(DO_LINK_ALL_OBJ_TO_EXE) - endif - - LINK_CONSOLE_DEPS = $(IMPLIB_NAME) lib.rsp - define DO_LINK_CONSOLE - ilink32 $(LFLAGS) /ap /Tpe c0x32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) - endef - ifdef DELETE_TDS_FILES - define LINK_CONSOLE - $(DO_LINK_CONSOLE) - @del $(subst .exe,.tds,$(subst /,\,$@)) - endef - else - DO_LINK_CONSOLE = $(DO_LINK_CONSOLE) - endif - - ifdef STATICLINK # link as a static library --- 259,262 ---- *************** *** 419,431 **** uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - # this section is empty - - # -------- Generate automatic dependencies. -------- --- 360,366 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar @echo All gone! # -------- Generate automatic dependencies. -------- Index: makefile.dj =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.dj 4 Feb 2004 06:21:59 -0000 1.3 --- makefile.dj 8 Feb 2004 11:34:11 -0000 1.4 *************** *** 3,13 **** # # 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. -------- --- 3,9 ---- *************** *** 36,41 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp --- 32,37 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp *************** *** 45,50 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/djgpp --- 41,46 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/djgpp *************** *** 123,171 **** ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused else ! WFLAGS = -Wall -Wno-unused endif ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -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 --- 119,166 ---- 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 *************** *** 200,243 **** GCC2DJGPP = -DDJGPP=2 -U__unix__ - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef - - LINK_OBJ_TO_LIB_DEPS = define LINK_OBJ_TO_LIB ar rs $(LIB_NAME) $(LIB_OBJS) endef - LINK_OBJ_TO_EXE_DEPS = define LINK_OBJ_TO_EXE gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) endef - LINK_OBJ_TO_EXE_NOLIB_DEPS = - define LINK_OBJ_TO_EXE_NOLIB - gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_DEPS = - define LINK_ALL_OBJ_TO_EXE - gcc $(LFLAGS) -o $@ $^ $(LIB_NAME) $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = - define LINK_ALL_OBJ_TO_EXE_NOLIB - gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) - endef - - - # -------- Rules for installing and removing the library files. -------- --- 195,210 ---- *************** *** 298,301 **** --- 265,269 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar @echo All gone! Index: makefile.mgw =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.mgw 4 Feb 2004 06:21:59 -0000 1.4 --- makefile.mgw 8 Feb 2004 11:34:11 -0000 1.5 *************** *** 35,59 **** ! ifdef STATICLINK ! ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! else ! ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE5).a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! endif --- 35,53 ---- ! ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE5).a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) endif *************** *** 64,83 **** .PHONY: badwin badming ! 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 --- 58,75 ---- .PHONY: badwin badming ! 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 *************** *** 242,351 **** ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = $(IMPLIB_NAME) ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $< ! endef endif # ifdef STATICLINK - - # -------- Rules for installing and removing the library files. -------- --- 234,274 ---- ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef else ! # link as a DLL ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif + define LINK_OBJ_TO_EXE + gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) + endef endif # ifdef STATICLINK # -------- Rules for installing and removing the library files. -------- *************** *** 413,416 **** --- 336,340 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar @echo All gone! Index: makefile.uni =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.uni,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.uni 4 Feb 2004 06:21:59 -0000 1.3 --- makefile.uni 8 Feb 2004 11:34:11 -0000 1.4 *************** *** 8,13 **** # See makefile.all for a list of the available targets. - - # -------- Define some variables that the primary makefile may use. -------- --- 8,11 ---- *************** *** 37,47 **** 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 --- 35,45 ---- 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 *************** *** 71,75 **** 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. --- 69,72 ---- *************** *** 83,87 **** ifdef WARNMODE WFLAGS = -Wall -W -Werror - # -Wno-unused else WFLAGS = -Wall -Wno-unused --- 80,83 ---- *************** *** 89,98 **** 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 = -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 *************** *** 127,134 **** ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 endif ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY endif --- 123,130 ---- ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 endif ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY endif *************** *** 139,147 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif --- 135,143 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif *************** *** 165,237 **** GCC2UNIX = -D__UNIX__ -UDJGPP - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! define COMPILE_C_TO_OBJ_NO_OPTIMIZE ! gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< ! endef ! ! COMPILE_S_TO_OBJ_DEPS = ! define COMPILE_S_TO_OBJ ! gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< endef ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ ! endef else ! # link as a shared object ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcbar $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $^ -L$(LIB_DIR) -lcbar $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ ! endef endif # ifdef STATICLINK --- 161,186 ---- 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 Index: makefile.vc =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.vc 4 Feb 2004 06:21:59 -0000 1.4 --- makefile.vc 8 Feb 2004 11:34:11 -0000 1.5 *************** *** 36,41 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/msvc --- 36,41 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/msvc *************** *** 44,71 **** ifdef STATICLINK ! ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else ! ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def ! endif - - # -------- Check that environment path variables are set. -------- --- 44,65 ---- ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) ! EXPDEF_NAME = $(LIB_DIR)/cbar.def endif # -------- Check that environment path variables are set. -------- *************** *** 73,96 **** ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) else badwin: --- 67,90 ---- 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: *************** *** 150,160 **** endif ! # -------- Setup runner -------- ! ! RUNNER := obj/msvc/runner.exe ! RUNNER_DEP := obj/msvc/runner.exe ! define COMPILE_RUNNER ! gcc -O -Wall -Werror -o $(RUNNER) $(RUNNER_SOURCE) ! endef # -------- Set up mktext -------- --- 144,148 ---- endif ! RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX) # -------- Set up mktext -------- *************** *** 189,193 **** LFLAGS = -debug -debugtype:cv ! ifdef STATICLINK LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib else --- 177,181 ---- LFLAGS = -debug -debugtype:cv ! ifdef STATICLINK LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib else *************** *** 200,204 **** SFLAGS = -Wall LFLAGS = -profile - ifdef STATICLINK LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib --- 188,191 ---- *************** *** 207,211 **** endif else ! # -------- optimised build -------- CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD SFLAGS = -Wall --- 194,198 ---- endif else ! # -------- optimised build -------- CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD SFLAGS = -Wall *************** *** 220,227 **** ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 endif ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY endif --- 207,214 ---- ifdef CBAR_DEVELOPING ! CFLAGS += -D_CBAR_DEVELOPING=1 endif ifdef CBAR_FORTIFY ! CFLAGS += -D_CBAR_FORTIFY=1 -DFORTIFY endif *************** *** 238,243 **** dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib - - # -------- List platform specific objects and programs. -------- --- 225,228 ---- *************** *** 251,323 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ - COMPILE_C_TO_OBJ_DEPS = $(RUNNER_DEP) define COMPILE_C_TO_OBJ $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - $(RUNNER) cl @ -nologo $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -Fo$@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = $(RUNNER_DEP) - define COMPILE_S_TO_OBJ - gcc $(GCC2MSVC) $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef - LINK_OBJ_TO_EXE_DEPS = $(RUNNER_DEP) define LINK_OBJ_TO_EXE $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) endef - LINK_OBJ_TO_EXE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_OBJ_TO_EXE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_DEPS = $(RUNNER_DEP) - define LINK_ALL_OBJ_TO_EXE - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $(filter-out $(RUNNER_DEP),$^) $(IMPLIB_NAME) $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_ALL_OBJ_TO_EXE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $(filter-out $(RUNNER_DEP),$^) $(LIB_FLAGS) - endef - - LINK_CONSOLE_DEPS = $(IMPLIB_NAME) $(RUNNER_DEP) - define LINK_CONSOLE - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) - endef - - LINK_CONSOLE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_CONSOLE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $< $(LIB_FLAGS) - endef - ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = $(RUNNER_DEP) ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = $(RUNNER_DEP) ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK - - # -------- Rules for installing and removing the library files. -------- --- 236,263 ---- # 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. -------- *************** *** 382,394 **** uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - # this section is empty - - # -------- Generate automatic dependencies. -------- --- 322,328 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cbar @echo All gone! # -------- Generate automatic dependencies. -------- Index: makefile.ver =================================================================== RCS file: /cvsroot/cbar/cbar/misc/makefile.ver,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.ver 9 Dec 2003 18:48:39 -0000 1.3 --- makefile.ver 8 Feb 2004 11:34:11 -0000 1.4 *************** *** 7,10 **** # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.1 shared_major_minor = 1.0 --- 7,10 ---- # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 1.0.2 shared_major_minor = 1.0 Index: zipup.sh =================================================================== RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** zipup.sh 9 Dec 2003 18:48:39 -0000 1.4 --- zipup.sh 8 Feb 2004 11:34:11 -0000 1.5 *************** *** 12,17 **** # note: these are patched by fixver.sh script. ! zipversion=101 ! tgzversion=1.0.1 if [ "$1" != "-q" ]; then --- 12,17 ---- # note: these are patched by fixver.sh script. ! zipversion=102 ! tgzversion=1.0.2 if [ "$1" != "-q" ]; then *************** *** 59,69 **** 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/*.txt examples/*.cfg examples/*.dat \ ! include/*.h include/cbar/*.h \ ! misc/runner.c \ ! misc/makedoc/*.c misc/makedoc/*.h" afiles=`echo $files | sed -e"s/\([^ ][^ ]*\)/ cbar\/\1/g"` --- 59,68 ---- 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"` |
|
From: <ch...@us...> - 2004-02-08 11:37:13
|
Update of /cvsroot/cbar/cbar/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17658/docs Modified Files: cbar._tx changes._tx readme._tx Log Message: Some more makefile cleanup/improvements Index: cbar._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/cbar._tx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cbar._tx 4 Feb 2004 06:21:58 -0000 1.4 --- cbar._tx 8 Feb 2004 11:34:11 -0000 1.5 *************** *** 4,8 **** @# @multiwordheaders ! @manh="version 0.9.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.2" "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 0.9.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.2 </b></center> @!text Index: changes._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/changes._tx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** changes._tx 4 Feb 2004 06:21:58 -0000 1.3 --- changes._tx 8 Feb 2004 11:34:11 -0000 1.4 *************** *** 20,24 **** @$This is the Info version of the Changes in CBAR file. @$ ! @$By Christer Sandberg @$@end ifinfo @$ --- 20,24 ---- @$This is the Info version of the Changes in CBAR file. @$ ! @$By Christer Sandberg @$@end ifinfo @$ *************** *** 40,43 **** --- 40,55 ---- Changes + 1.0.2: + <ul> + <li> + Fixed bug 888698: Improved makfiles to make it possible to build on Linux. + <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> Index: readme._tx =================================================================== RCS file: /cvsroot/cbar/cbar/docs/readme._tx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** readme._tx 4 Feb 2004 06:21:58 -0000 1.4 --- readme._tx 8 Feb 2004 11:34:11 -0000 1.5 *************** *** 45,72 **** Introduction ! CBAR is a library with functions for sending and receiving data via the ! serial ports, using the event queue of CGUI. It also provides a dialogue ! that lets the user modify the port settings. ! CBAR compiles on the following platforms: DOS/DJGPP, Linux, Windows/Mingw32 and Windows/MSVC. - The current version have full functionality only on the DJGPP platform, - there are only stubs present for the other platforms. - - You need to have compiled and installed Allegro v. 4 or later, as well as - CGUI v. 1.6 or later and CCOM 0.9 or later. - - @heading Requirements ! You need to have compiled and installed Allegro as well as CGUI and CCOM. ! You need at least version 4.0 of Allegro, 1.6 of CGUI and 0.9 of CCOM. ! You must set the environment variable ALLEGRO to point out your Allegro ! installation and set CGUIDIR to point to your CGUI installation. ! There are also other requirements like correctly installed compilers etc. but ! these are already fulfilled if you succeded in making Allegro (no additional ! requirements are needed). You can find Allegro at: --- 45,63 ---- 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 Allegro version 4.0.x, as well as ! CGUI vesion 1.6.5 or later. ! There are also other requirements like correctly installed compilers etc. ! but these are already fulfilled if you succeded in making and installing ! Allegro and CGUI (no additional requirements are needed). You can find Allegro at: *************** *** 79,99 **** http://www.mdh.se/~csg/cgui/cguix - @heading Installation ! Installation goes in three simple steps, and should be familiar since it is ! exactly the same way as you installed Allegro, CGUI and CCOM: <ul> <li> ! Tell the installation process what platform you use. This is done by ! running one of the following:<br> <pre> fix.bat djgpp - to compile with DOS/DJGPP fix.bat mingw32 - to compile with Windows/MinGW32 - fix.bat bcc32 - to compile with Windows/Borland C++ fix.bat msvc - to compile with Windows/MSVC ! fix.sh unix - to compile with Linux/gcc ! </pre><li> <li> Specify the path to your allegro installation by setting the environment --- 70,90 ---- http://www.mdh.se/~csg/cgui/cguix @heading Installation ! Installation goes in five simple steps, and should be familiar since it is ! similar to the installation procedure as of Allegro and CGUI: <ul> <li> ! Tell the installation process what platform you use. Start a command window ! (shell) and set the main directory of cbar to you current directory ! (i.e. enter the command > cd <the path to your cbar directory>). Choose ! platform by running one of the following commands:<br> <pre> fix.bat djgpp - to compile with DOS/DJGPP fix.bat mingw32 - to compile with Windows/MinGW32 fix.bat msvc - to compile with Windows/MSVC ! ./fix.sh unix - to compile with Linux/gcc ! </pre> <li> Specify the path to your allegro installation by setting the environment *************** *** 104,114 **** </pre> or alternatively put that line into your autoexec file and restart. <li> Specify the path to your CGUI installation by setting the environment ! variable CGUIDIR E.g.<br> <pre> set CGUIDIR=c:\cgui </pre> ! if your cgui directory is located at c: <li> Compile the library. This is done by running "make" at the command line. --- 95,113 ---- </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> Compile the library. This is done by running "make" at the command line. *************** *** 118,147 **** Under Linux, you may want to instead run "make install SYSTEM_DIR=<dir>", which will cause headers to be installed to <dir>/include and libraries to ! <dir>/lib. (default for <dir> is /usr/local) </ul> ! That's it! You may also want to perform some of the optional steps: ! <ul><li> ! You can compile a debugging library by typing "make DEBUGMODE=1". To ! compile both the usual and the debug library in one step, type "make all". ! <li> ! To use the debugging library, link with libcbard.a instead of libcbar.a. <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, and add ! "cbar" after the existing "libc" entry (separated by a space). <li> If you want statically linked libraries under Unix or Windows as well as the default dynamically linked libraries (dll under Windows, .so under ! Unix), set the environment variable "STATICLINK=1", and repeat the ! "make install" and "make install DEBUGMODE=1". These static libraries ! require the statically linked version of Allegro and CGUI. </ul> @heading - MSys - Users of the MSys environment needs to set teh environment vaariable - UNIX_TOOLS to 1 before make install is run. - - @heading Usage <ul><li> --- 117,155 ---- 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> *************** *** 149,156 **** --- 157,179 ---- 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 *************** *** 158,173 **** check the box to the left of the library. You have to replace cbar with cbard to include debugging information. - <li> - Before calling any CBAR functions you must have initialized CBAR and CGUI, - Note also <b>CGUI<b>! </ul> - @heading Contact Info Email:<ul> ! cs...@md... </ul> Homepage:<ul> --- 181,192 ---- 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> |
|
From: <ch...@us...> - 2004-02-08 11:37:13
|
Update of /cvsroot/cbar/cbar/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17658/include Modified Files: cbar.h Log Message: Some more makefile cleanup/improvements Index: cbar.h =================================================================== RCS file: /cvsroot/cbar/cbar/include/cbar.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cbar.h 9 Dec 2003 18:48:39 -0000 1.4 --- cbar.h 8 Feb 2004 11:34:11 -0000 1.5 *************** *** 4,11 **** #define CBAR_VERSION_MAJOR 1 #define CBAR_VERSION_MINOR 0 ! #define CBAR_VERSION_PATCH 1 ! #define CBAR_VERSION_STRING "1.0.1" ! #define CBAR_DATE 20031207 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Dec 07, 2003" #define CBAR_READER_NONE 0 --- 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 20040208 /* yyyymmdd */ ! #define CBAR_DATE_STRING "Feb 08, 2004" #define CBAR_READER_NONE 0 |
|
From: <ch...@us...> - 2004-02-04 07:46:54
|
Update of /cvsroot/cbar/cbar/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2656/src Modified Files: reader.c unit.c Log Message: 888698 Doesn't build on Linux Replaced dependfiles with stubs. Cleaned up docs. Removed makedoc build stuff (changed to use cgui's makedoc) Index: reader.c =================================================================== RCS file: /cvsroot/cbar/cbar/src/reader.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** reader.c 29 Mar 2003 00:43:39 -0000 1.3 --- reader.c 4 Feb 2004 06:22:06 -0000 1.4 *************** *** 164,168 **** InstallKBHandler(KeyBoardBarCode, r); else ! CcomStartScanning(source-1, 0, COMBarCode, r); r->CallBack = CallBack; r->data = data; --- 164,168 ---- InstallKBHandler(KeyBoardBarCode, r); else ! CCPStartScanning(source-1, 0, COMBarCode, r); r->CallBack = CallBack; r->data = data; *************** *** 178,182 **** UnInstallKBHandler(KeyBoardBarCode); else ! CcomStopScanning(r->source-1); if (r->buffer) { Release(r->buffer); --- 178,182 ---- UnInstallKBHandler(KeyBoardBarCode); else ! CCPStopScanning(r->source-1); if (r->buffer) { Release(r->buffer); Index: unit.c =================================================================== RCS file: /cvsroot/cbar/cbar/src/unit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** unit.c 7 Dec 2003 18:30:50 -0000 1.3 --- unit.c 4 Feb 2004 06:22:06 -0000 1.4 *************** *** 328,332 **** t_dialunit *du = data; ! CcomSettingsDialogue(du->cbcu->setting.source - 1); } --- 328,332 ---- t_dialunit *du = data; ! CCPSettingsDialogue(du->cbcu->setting.source - 1); } |
|
From: <ch...@us...> - 2004-02-04 07:27:11
|
Update of /cvsroot/cbar/cbar/obj/unix/cbard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/unix/cbard Added Files: tmpfile.txt Log Message: 888698 Doesn't build on Linux Replaced dependfiles with stubs. Cleaned up docs. Removed makedoc build stuff (changed to use cgui's makedoc) --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. |
|
From: <ch...@us...> - 2004-02-04 07:27:11
|
Update of /cvsroot/cbar/cbar/obj/unix/cbard_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/unix/cbard_s Added Files: tmpfile.txt Log Message: 888698 Doesn't build on Linux Replaced dependfiles with stubs. Cleaned up docs. Removed makedoc build stuff (changed to use cgui's makedoc) --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. |