cpri-develop Mailing List for CPRI - a C printer lib (Page 4)
Brought to you by:
chrisan,
rasmusmyklebust
Menu
▾
▴
cpri-develop — development info, cvs updates etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(10) |
May
(5) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(5) |
Dec
(35) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(1) |
Feb
(37) |
Mar
|
Apr
|
May
(5) |
Jun
(9) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
(5) |
Dec
|
| 2005 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(4) |
Nov
|
Dec
|
| 2006 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(9) |
Oct
|
Nov
(1) |
Dec
|
| 2010 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ch...@pr...> - 2004-02-01 17:49:21
|
Update of /cvsroot/cpri/cpri/obj/msvc/cpri_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/msvc/cpri_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:21
|
Update of /cvsroot/cpri/cpri/obj/msvc/cpri In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/msvc/cpri Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:21
|
Update of /cvsroot/cpri/cpri/obj/unix/cpri_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/unix/cpri_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:20
|
Update of /cvsroot/cpri/cpri/obj/mingw32/cpri In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/mingw32/cpri Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:20
|
Update of /cvsroot/cpri/cpri/obj/mingw32/cpri_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/mingw32/cpri_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:19
|
Update of /cvsroot/cpri/cpri/obj/djgpp/cprid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/djgpp/cprid Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:19
|
Update of /cvsroot/cpri/cpri/obj/bcc32/cprid_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/bcc32/cprid_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:18
|
Update of /cvsroot/cpri/cpri/obj/bcc32/cpri In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/bcc32/cpri Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:18
|
Update of /cvsroot/cpri/cpri/obj/bcc32/cprid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/bcc32/cprid Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:18
|
Update of /cvsroot/cpri/cpri/obj/djgpp/cpri In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/djgpp/cpri Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:18
|
Update of /cvsroot/cpri/cpri/obj/bcc32/cpri_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/bcc32/cpri_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:11:15
|
Update of /cvsroot/cpri/cpri/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2313/examples Modified Files: ex.c Log Message: Fixed bug 888505 Doesn't build on Linux. Clearified some stuff in the readme. Removed misc/makedoc. There is already dependencies to cgui so cgui's makedoc can preferably be used (CGUIDIR is required for cpri and has so been all the time) Cleaned some other junk from makefiles. Corrected some syntactical matters in docs to avoid warnings from makedoc. Index: ex.c =================================================================== RCS file: /cvsroot/cpri/cpri/examples/ex.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ex.c 30 Mar 2003 19:59:23 -0000 1.9 --- ex.c 1 Feb 2004 17:09:16 -0000 1.10 *************** *** 7,14 **** --- 7,20 ---- #define STRMAX 50 #define NROWS 38 + #define MAXCHARS 50 /* Just to have something to print: */ static char *names[NROWS]={"Jan","Habib","Ingela","Cecilia","Anders","Anna","Kenneth","Irina","Christer","Gert","Eva","Inezia","Gottfrid","Carin","Erik","Lennart","Louise","Katarina","John","Bettan","Kristina","Gunilla","Ernst","Madara","Jonas","Henrik","Johan","Bengt","Ingvar","Carl-Oskar","Karin","Fridjon","Gertrud","Jing","Helena","Joop","Ashafir","Birgitta"}; static int points[NROWS]={2638922,2565390,932183,740937,531658,463894,181237,135953,124439,124294,123616,112878,111848,107920,91055,51227,46144,40815,40356,37179,36336,34813,33270,25256,25153,20121,17096,17000,14950,4647,4296,3357,1353,755,725,601,182,18}; + typedef struct t_target { + int dest; + char name[MAXCHARS+1]; + } t_target; + typedef struct t_freecfg { int fontsize; *************** *** 22,25 **** --- 28,32 ---- int barcx; int barcy; + t_target *t; } t_freecfg; *************** *** 35,38 **** --- 42,46 ---- int grey; int embedded; + t_target *t; } t_diagramcfg; *************** *** 88,91 **** --- 96,100 ---- t_column column[5]; int idcont; + t_target *t; } t_tabcfg; *************** *** 113,117 **** t_handle hnd; ! hnd = CpriOpenEntry(0, "Print sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); --- 122,129 ---- t_handle hnd; ! if (pr->t->dest) ! hnd = CpriOpenEntry(0, "Print sample", 0, pr->t->name); ! else ! hnd = CpriOpenEntry(0, "Print sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); *************** *** 161,171 **** } ! static void show_freepos_sample(void *data nouse) { ! static t_freecfg prcfg={14, UNIVERS, 1, 1, 40, 40, 60, 7, 100, 100}; t_freecfg *pr; pr = &prcfg; ! CpriGetTypefaceNames(); MkDialogue(ADAPTIVE, "Specify free position print out", 0); StartContainer(RIGHT, ADAPTIVE, "Font properties", CT_BORDER); --- 173,184 ---- } ! static void show_freepos_sample(void *data) { ! static t_freecfg prcfg={14, UNIVERS, 1, 1, 40, 40, 60, 7, 100, 100, NULL}; t_freecfg *pr; pr = &prcfg; ! pr->t = data; ! CpriGetTypefaceNames(); MkDialogue(ADAPTIVE, "Specify free position print out", 0); StartContainer(RIGHT, ADAPTIVE, "Font properties", CT_BORDER); *************** *** 200,204 **** char s[1000]; ! hnd = CpriOpenEntry(0, "Print diagram sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); --- 213,220 ---- char s[1000]; ! if (pr->t->dest) ! hnd = CpriOpenEntry(0, "Print diagram sample", 0, pr->t->name); ! else ! hnd = CpriOpenEntry(0, "Print diagram sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); *************** *** 233,243 **** } ! static void show_diagram_sample(void *data nouse) { ! static t_diagramcfg prcfg={14, UNIVERS, 0, 0, 10, 12, 180, 6, 30, 1}; t_diagramcfg *pr; cgui_drop_down_list_row_spacing = 4; pr = &prcfg; MkDialogue(ADAPTIVE, "Specify diagram print out", 0); StartContainer(RIGHT, ADAPTIVE, "Font properties", CT_BORDER); --- 249,260 ---- } ! static void show_diagram_sample(void *data) { ! static t_diagramcfg prcfg={14, UNIVERS, 0, 0, 10, 12, 180, 6, 30, 1, NULL}; t_diagramcfg *pr; cgui_drop_down_list_row_spacing = 4; pr = &prcfg; + pr->t = data; MkDialogue(ADAPTIVE, "Specify diagram print out", 0); StartContainer(RIGHT, ADAPTIVE, "Font properties", CT_BORDER); *************** *** 274,278 **** hdr = &pr->header; thdr = &pr->table_header; ! hnd = CpriOpenEntry(QUEUE_OPTIMALPORT, "Print table sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); --- 291,298 ---- hdr = &pr->header; thdr = &pr->table_header; ! if (pr->t->dest) ! hnd = CpriOpenEntry(QUEUE_OPTIMALPORT, "Print table sample", 0, pr->t->name); ! else ! hnd = CpriOpenEntry(QUEUE_OPTIMALPORT, "Print table sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); *************** *** 395,399 **** } ! static void show_tabular_sample(void *data nouse) { static t_tabcfg prcfg={ --- 415,419 ---- } ! static void show_tabular_sample(void *data) { static t_tabcfg prcfg={ *************** *** 413,417 **** {{"", 0}, 10, 0, 0, 0}, /* Col 4 (n.u.) */ {{"", 0}, 10, 0, 0, 0} /* Col 5 (n.u.) */ ! }, 0}; static const char *const cols[]={"2", "3", "4", "5"}; int idn; --- 433,437 ---- {{"", 0}, 10, 0, 0, 0}, /* Col 4 (n.u.) */ {{"", 0}, 10, 0, 0, 0} /* Col 5 (n.u.) */ ! }, 0, NULL}; static const char *const cols[]={"2", "3", "4", "5"}; int idn; *************** *** 422,425 **** --- 442,446 ---- pr = &prcfg; + pr->t = data; hdr = &pr->header; thdr = &pr->table_header; *************** *** 481,491 **** } ! static void show_menu(void *data nouse) { MkMenuItem(0, "Display printer queues", "", show_queue, NULL); MkMenuItem(0, "Printer settings", "", show_settings, NULL); ! MkMenuItem(0, "Print sample (table)", "", show_tabular_sample, NULL); ! MkMenuItem(0, "Print sample (free pos)", "", show_freepos_sample, NULL); ! MkMenuItem(0, "Print sample (diagram)", "", show_diagram_sample, NULL); MkMenuItem(0, "Exit", "Ctrl-Q", quit, NULL); } --- 502,535 ---- } ! static void choose_filename(void *data) ! { ! t_target *t = data; ! MkDialogue(FILLSCREEN, "Enter a file name", 0); ! AddEditBox(DOWNLEFT, 200, "File name:", FSTRING, MAXCHARS, t->name); ! AddButton(DOWNLEFT, "~OK", CloseWin, NULL); ! DisplayWin(); ! } ! ! static void choose_output(void *data) ! { ! t_target *t = data; ! MkMenuRadio(&t->dest, 2, "Default printer", "Html file"); ! MkMenuItem(0, "Choose filename", "", choose_filename, t); ! } ! ! static void show_menu(void *data) { + (void)data; + #if defined ALLEGRO_LINUX + static t_target target = {1, "default.html"}; + #else + static t_target target = {0, ""}; + #endif MkMenuItem(0, "Display printer queues", "", show_queue, NULL); MkMenuItem(0, "Printer settings", "", show_settings, NULL); ! MkMenuItem(1, "Choose output", "", choose_output, &target); ! MkMenuItem(0, "Print sample (table)", "", show_tabular_sample, &target); ! MkMenuItem(0, "Print sample (free pos)", "", show_freepos_sample, &target); ! MkMenuItem(0, "Print sample (diagram)", "", show_diagram_sample, &target); MkMenuItem(0, "Exit", "Ctrl-Q", quit, NULL); } *************** *** 494,498 **** { allegro_init(); ! #ifdef WIN32 InitCguiWindowedMode(); #endif --- 538,542 ---- { allegro_init(); ! #ifdef ALLEGRO_WINDOWS InitCguiWindowedMode(); #endif *************** *** 503,507 **** MakeMenuBar(); MkMenuBarItem("File", show_menu, NULL); ! EndMenu(); AddTextBox(DOWNLEFT, "This example shows just a few of the features of " --- 547,551 ---- MakeMenuBar(); MkMenuBarItem("File", show_menu, NULL); ! EndMenuBar(); AddTextBox(DOWNLEFT, "This example shows just a few of the features of " |
|
From: <ch...@pr...> - 2004-02-01 17:11:15
|
Update of /cvsroot/cpri/cpri/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2313/docs Modified Files: changes._tx cpri._tx readme._tx Log Message: Fixed bug 888505 Doesn't build on Linux. Clearified some stuff in the readme. Removed misc/makedoc. There is already dependencies to cgui so cgui's makedoc can preferably be used (CGUIDIR is required for cpri and has so been all the time) Cleaned some other junk from makefiles. Corrected some syntactical matters in docs to avoid warnings from makedoc. Index: changes._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/changes._tx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** changes._tx 14 Dec 2003 16:42:40 -0000 1.4 --- changes._tx 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 41,44 **** --- 41,49 ---- Changes + 0.9.4: + <ul> + <li> Fixed bug 888505 Doesn't build on Linux + <li> Clearified some stuff in the readme. + </ul> 0.9.3: <ul> Index: cpri._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/cpri._tx,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cpri._tx 14 Dec 2003 16:42:40 -0000 1.9 --- cpri._tx 1 Feb 2004 17:09:16 -0000 1.10 *************** *** 231,235 **** file. ! @@t_handle @CpriOpenEntry(int qno, const char *print_name, int option, const char *print_out_name); OpenEntry opens a queue entry for storing text to print and Cpri printer commands. The return value is a pointer to a handle to be used when --- 231,235 ---- file. ! @@t_handle @CpriOpenEntry(int qno, const char *print_name, int option, const char *destination); OpenEntry opens a queue entry for storing text to print and Cpri printer commands. The return value is a pointer to a handle to be used when *************** *** 244,251 **** <li>print_name - an optional string to label the job in the queue <li>option - no options implemented yet ! <li>filename - If you want the printout to be directed to a file rather ! than to a printer, the name of just pass the name "filename". If you want the printout to go to the printer pass the empty string ! for "filename". The file name suffix will be used to determine the type of printout, i.e. *.txt will force a textfile and *.htm and *.html will force a html file. --- 244,251 ---- <li>print_name - an optional string to label the job in the queue <li>option - no options implemented yet ! <li>destination - If you want the printout to be directed to a file rather ! than to a printer, the name of just pass the name of the file. If you want the printout to go to the printer pass the empty string ! for `destination'. The file name suffix will be used to determine the type of printout, i.e. *.txt will force a textfile and *.htm and *.html will force a html file. Index: readme._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/readme._tx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme._tx 4 Jun 2003 18:33:44 -0000 1.2 --- readme._tx 1 Feb 2004 17:09:16 -0000 1.3 *************** *** 1,3 **** - @# @# This is the source for the CPRI readme file, in Allegro's custom format. @# Read allegro/docs/makedoc.c for a description of what is going on... --- 1,2 ---- *************** *** 66,71 **** Requirements ! You need to have compiled and installed Allegro as well as CGUI. ! You need at least version 4.0 of Allegro and 1.6 of CGUI. You must set the environment variable ALLEGRO to point out your Allegro installation and set CGUIDIR to point to your CGUI installation. --- 65,69 ---- Requirements ! You need to have compiled and installed Allegro 4.o.x as well as CGUI 1.6 or later. You must set the environment variable ALLEGRO to point out your Allegro installation and set CGUIDIR to point to your CGUI installation. *************** *** 85,89 **** Installation goes in three simple steps, and should be familiar since it is ! exactly the same way as you installed Allegro and CGUI: <ul> <li> --- 83,87 ---- Installation goes in three simple steps, and should be familiar since it is ! exactly the same way as you installed CGUI: <ul> <li> *************** *** 98,115 **** </pre><li> <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. ! <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. --- 96,119 ---- </pre><li> <li> ! Specify the path to your allegro and cgui installation ! <ul> ! <li>DOS/Windows platforms. If your allegro and cgui directories are ! e.g. c:\allegro and c:\cgui respectively, then you have to type ! (at the command line): ! <br> <pre> ! set ALLEGRO=c:\allegro - ! sett CGUIDIR=c:\cgui </pre> ! or alternatively put that line into your autoexec file and restart ! your computer. ! <li>Linux/Unix platforms. If your allegro and cgui directories are ! e.g. ~/allegro-4.0.3 and ~/cgui respectively, then you have to type ! (at the command line): <pre> ! export ALLEGRO=~/allegro-4.0.3 ! export CGUIDIR=~/cgui </pre> ! </ul> <li> Compile the library. This is done by running "make" at the command line. *************** *** 117,130 **** 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) </ul> ! That's it! You may also want to perform some of the optional steps: <ul><li> You can compile a debugging library by typing "make DEBUGMODE=1". To compile both the usual and the debug library in one step, type "make all". <li> ! To use the debugging library, link with libccomd.a instead of libccom.a. <li> If you want to read the CPRI documentation with the Rhide online help --- 121,145 ---- Install the files to common directories. This is done by running "make install" at the command line.<br> ! Linux/Unix specifics:<br> ! You need to be root to succeed with the installation command i.e. type the ! command<br> ! <pre> ! su -c "make install" ! </pre> ! and enter the root password when prompted for.<br> ! Alternatively, if you cannot be root you may install cpri to some other ! location by running "make install SYSTEM_DIR=<dir>", which will cause ! headers to be installed to <dir>/include and libraries to ! <dir>/lib. Default for <dir> is /usr/local.<br> ! To be able to link your program to an installation at some other location ! than the default you need to specifiy the paths when compiling and linking. </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 link your application with the debugging lib, link with -lcprid ! instead of -lcpri. <li> If you want to read the CPRI documentation with the Rhide online help *************** *** 132,145 **** "ccom" after the existing "libc" entry (separated by a space). <li> ! If you want statically linked libraries under Unix or Windows as well as ! the default dynamically linked libraries (dll under Windows, .so under ! Unix), set the environment variable "STATICLINK=1", and repeat the ! "make install" and "make install DEBUGMODE=1". These static libraries ! require the statically linked version of Allegro and CGUI. </ul> @heading MSys ! Users of the MSys environment needs to set teh environment vaariable UNIX_TOOLS to 1 before make install is run. --- 147,158 ---- "ccom" after the existing "libc" entry (separated by a space). <li> ! If you want statically linked libraries under Unix or Windows just add ! "STATICLINK=1" at end of the make command. The static libraries ! require the statically linked versions of Allegro and CGUI. </ul> @heading MSys ! Users of the MSys environment needs to set the environment vaariable UNIX_TOOLS to 1 before make install is run. *************** *** 147,162 **** Usage <ul><li> ! #include <ccom.h> in the top of each file that uses a function from the library. <li> ! If you link on the command line, link with '-lccom -lcgui -lalleg'. It is important that you specify the libraries in that order. If you want the ! ability to debug inside CPRI's functions, or if you want the library to ! check for bad format strings (recommended for everything that is not a ! release version), then link with '-lccomd' instead of '-lccom'. <li> ! If you use RHIDE, go to the menu Options/Libraries and fill in ccom. It is ! important that ccom is above cgui and allegro. Don't forget to check the ! box to the left of the library. You have to replace ccom with ccomd to include debugging information. <li> --- 160,174 ---- Usage <ul><li> ! #include <cpri.h> in the top of each file that uses a function from the library. <li> ! If you link on the command line, link with '-lpri -lcgui -lalleg'. It is important that you specify the libraries in that order. If you want the ! ability to debug inside CPRI's functions, then link with '-lcprid' ! instead of '-lcpri'. <li> ! If you use RHIDE, go to the menu Options/Libraries and fill in cpri. It is ! important that cpri is above `cgui' and `alleg'. Don't forget to check the ! box to the left of the library. You have to replace cpri with cprid to include debugging information. <li> |
|
From: <ch...@pr...> - 2004-02-01 17:11:15
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2313/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc Log Message: Fixed bug 888505 Doesn't build on Linux. Clearified some stuff in the readme. Removed misc/makedoc. There is already dependencies to cgui so cgui's makedoc can preferably be used (CGUIDIR is required for cpri and has so been all the time) Cleaned some other junk from makefiles. Corrected some syntactical matters in docs to avoid warnings from makedoc. Index: makefile.all =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.all,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.all 23 May 2003 12:40:10 -0000 1.5 --- makefile.all 1 Feb 2004 17:09:16 -0000 1.6 *************** *** 43,47 **** --- 43,54 ---- include misc/makefile.ver + GEN_C_FILES = \ + icondata.c \ + labldata.c + + GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES))) + LIB_SOURCE = \ + $(GEN_C_FILES) \ dialpri.c \ drv_common.c \ *************** *** 50,55 **** drv_stdwin.c \ drv_txt.c \ - icondata.c \ - labldata.c \ pridrive.c \ printini.c \ --- 57,60 ---- *************** *** 57,101 **** width.c EXAMPLES_SOURCE = ex.c ! MAKEDOC_PROGRAM = $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) CLEAN_FILES = \ ! obj/*/*.o obj/*/*/*.o obj/*/*/*/*.o \ ! obj/*/*.obj obj/*/*/*.obj obj/*/*/*/*.obj \ ! lib/*/*.a lib/*/*/*.a lib/*/*/*/*.a \ ! lib/*.so* lib/*/*.so* lib/*/*/*.so* lib/*/*/*/*.so* \ ! lib/*.lib lib/*/*.lib lib/*/*/*.lib lib/*/*/*/*.lib \ ! lib/*.exp lib/*/*.exp lib/*/*/*.exp lib/*/*/*/*.exp \ ! lib/*/*.pdb lib/*/*.ilk lib/*/*.map *.pdb */*.pdb \ ! */*.ilk */*.map */*.sym gmon.out */gmon.out */*.prf \ ! lib/*.dll lib/*/*.dll lib/*/*/*.dll \ ! *.exe */*.exe \ ! $(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE) */$(EXAMPLES_SOURCE))) \ ! *.htm */*.htm *.html */*.html *.rtf */*.rtf *.inf */*.inf *.info */*.info \ ! *.txi */*.txi *.texi */*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp \ *.log */*.log */*/*.log core */core */*/core ! VERY_CLEAN_FILES = \ ! */makefile.dep */*/makefile.dep */*/*/makefile.dep */*/*/*/makefile.dep \ ! lib/*.def lib/*/*.def lib/*/*/*.def \ ! changes.txt readme.txt thanks.txt cpri.txt \ ! docs/wishlist.txt docs/internal.txt \ ! $(TEXT_HEADERS_X) VPATH = src examples docs - PACKAGE5_OPTIMIZED = cpri - PACKAGE4_OPTIMIZED = cpri - DESCRIPTION_OPTIMIZED = optimized - ifdef DEBUGMODE ! PACKAGE5 = cprid ! PACKAGE4 = cprid DESCRIPTION = debugging else ! PACKAGE5 = $(PACKAGE5_OPTIMIZED) ! PACKAGE4 = $(PACKAGE4_OPTIMIZED) ! DESCRIPTION = $(DESCRIPTION_OPTIMIZED) endif --- 62,95 ---- width.c + RUNNER_SOURCE = misc/runner.c EXAMPLES_SOURCE = ex.c ! MAKEDOC_PROGRAM := $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) CLEAN_FILES = \ ! obj/*/*/*.o obj/*/*/*.obj \ ! lib/*/*.a lib/*/*.so* lib/*/*.lib lib/*/*.exp lib/*/*.pdb \ ! lib/*/*.ilk lib/*/*.map lib/*/*.dll \ ! $(addsuffix $(EXE_SUFFIX),$(basename examples/$(EXAMPLES_SOURCE))) \ ! *.htm docs/*.htm *.html docs/*.html docs/*.rtf docs/*.inf docs/*.info \ ! docs/*.txi docs/*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp docs/*.txt \ *.log */*.log */*/*.log core */core */*/core ! VERY_CLEAN_FILES = $(CLEAN_FILES) \ ! obj/*/*/makefile.dep \ ! lib/*/*.def \ ! examples/*.html \ ! $(CPRI_LABELS) $(CPRI_DAT) $(TEXT_HEADERS) \ ! $(addprefix src/,$(GEN_C_FILES)) \ ! $(addprefix src/,$(GEN_H_FILES)) VPATH = src examples docs ifdef DEBUGMODE ! PACKAGE = cprid DESCRIPTION = debugging else ! PACKAGE = cpri ! DESCRIPTION = optimized endif *************** *** 119,131 **** DOCS = \ ! cpri.txt docs/cpri$(HTML_SUFFIX) docs/cpri$(INFO_SUFFIX) docs/cpri.rtf \ ! readme.txt docs/readme$(INFO_SUFFIX) \ ! changes.txt docs/changes$(HTML_SUFFIX) ! ! # docs/internal.txt docs/internal$(HTML_SUFFIX) docs/internal$(INFO_SUFFIX) docs/internal.rtf \ ! # readme.txt readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \ ! # changes.txt docs/changes$(HTML_SUFFIX) \ ! # thanks.txt docs/thanks$(HTML_SUFFIX) \ ! # docs/wishlist.txt docs/wishlist$(HTML_SUFFIX) ifndef HAVE_TEXINFO --- 113,119 ---- DOCS = \ ! docs/cpri.txt docs/cpri$(HTML_SUFFIX) docs/cpri$(INFO_SUFFIX) docs/cpri.rtf \ ! docs/readme.txt docs/readme$(INFO_SUFFIX) \ ! docs/changes.txt docs/changes$(HTML_SUFFIX) ifndef HAVE_TEXINFO *************** *** 177,185 **** veryclean: ! -rm -fv $(VERY_CLEAN_FILES) $(CLEAN_FILES) compress: ifdef UPX_PROGRAM ! $(UPX_PROGRAM) $(EXAMPLES_NAME) $(wildcard lib/*/$(PACKAGE4_OPTIMIZED)$(LIB_VERSION).dll) else @echo No executable compressor specified! You must set the environment variable --- 165,173 ---- veryclean: ! -rm -fv $(VERY_CLEAN_FILES) compress: ifdef UPX_PROGRAM ! $(UPX_PROGRAM) $(EXAMPLES_NAME) else @echo No executable compressor specified! You must set the environment variable *************** *** 187,195 **** endif - test: - @echo $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(SYSTEM_INCLUDE_DIR)/cgui.h - @echo $(COMPILE_C_TO_OBJ) - @echo $(LIB_OBJS) - $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(SYSTEM_INCLUDE_DIR)/cgui.h $(COMPILE_C_TO_OBJ) --- 175,178 ---- *************** *** 198,212 **** $(LINK_OBJ_TO_LIB) ! ifndef NATIVE_LINK_OBJ_TO_EXE ! */%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) - endif - chm-docs: docs/cpri.chm - %.txt: docs/%._tx - -$(MAKEDOC_PROGRAM) -ascii $@ $< - docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< --- 181,189 ---- $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) chm-docs: docs/cpri.chm docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< *************** *** 219,223 **** docs/cpri.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/cpri._tx ! $(MAKEDOC_PROGRAM) -chm docs/cpri.html docs/cpri._tx -hhc docs/cpri.hhp --- 196,200 ---- docs/cpri.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/cpri._tx ! -$(MAKEDOC_PROGRAM) -chm docs/cpri.html docs/cpri._tx -hhc docs/cpri.hhp *************** *** 232,236 **** # -------- Building the textfiles (i.e. the lables etc. used in dialogues) -------- ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat ! ALLEGRO_DAT2C_X = $(ALLEGRO)/tools/dat2c MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX) CPRI_DAT_C_X = src/labldata.c --- 209,213 ---- # -------- Building the textfiles (i.e. the lables etc. used in dialogues) -------- ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat ! CGUI_DAT2C_X = $(CGUIDIR)/tools/dat2c MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX) CPRI_DAT_C_X = src/labldata.c *************** *** 246,261 **** dat: $(CPRI_DAT_C_X) $(CPRI_ICONS_C_X) ! $(CPRI_DAT_C_X): $(CPRI_DAT_X) ! -$(ALLEGRO_DAT2C) $(CPRI_DAT) -o $(CPRI_DAT_C) -h $(CPRI_DAT_H) -p cpri -g -n labels $(CPRI_DAT_X): $(CPRI_LABELS_X) -$(ALLEGRO_DAT) $(CPRI_DAT) -a $(CPRI_LABELS) - #$(CPRI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) $(MKTEXT_X) $(CPRI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) -$(MKTEXT) -o$(CPRI_LABELS) $(TEXT_SOURCES) ! $(CPRI_ICONS_C_X): $(CPRI_ICONS_X) ! -$(ALLEGRO_DAT2C) $(CPRI_ICONS) -o $(CPRI_ICONS_C) -h $(CPRI_ICONS_H) -g -n icons # -------- Misc stuff -------- --- 223,237 ---- dat: $(CPRI_DAT_C_X) $(CPRI_ICONS_C_X) ! $(CPRI_DAT_C_X) $(CPRI_DAT_H_X): $(CPRI_DAT_X) ! -$(CGUI_DAT2C) $(CPRI_DAT) -o $(CPRI_DAT_C) -h $(CPRI_DAT_H) -p cpri -g -n labels $(CPRI_DAT_X): $(CPRI_LABELS_X) -$(ALLEGRO_DAT) $(CPRI_DAT) -a $(CPRI_LABELS) $(CPRI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) -$(MKTEXT) -o$(CPRI_LABELS) $(TEXT_SOURCES) ! $(CPRI_ICONS_C_X) $(CPRI_ICONS_H_X): $(CPRI_ICONS_X) ! -$(CGUI_DAT2C) $(CPRI_ICONS) -o $(CPRI_ICONS_C) -h $(CPRI_ICONS_H) -g -n icons # -------- Misc stuff -------- Index: makefile.bcc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 7 Dec 2003 21:09:56 -0000 1.4 --- makefile.bcc 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 47,75 **** LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 - ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(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)/cpri.def IMPDEF_NAME = $(LIB_DIR)/impcpri.def - endif # -------- Check that environment path variables are set. -------- --- 47,68 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) EXPDEF_NAME = $(LIB_DIR)/cpri.def IMPDEF_NAME = $(LIB_DIR)/impcpri.def endif + IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) + LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variables are set. -------- *************** *** 144,148 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 137,141 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 157,161 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 150,154 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) Index: makefile.dj =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.dj 7 Dec 2003 21:09:56 -0000 1.4 --- makefile.dj 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 41,46 **** OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ifndef LIB_ROOT_DIR --- 41,46 ---- OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ifndef LIB_ROOT_DIR *************** *** 51,55 **** LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE5).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) --- 51,55 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) *************** *** 113,117 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 113,117 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 126,130 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 126,130 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) Index: makefile.mgw =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.mgw 7 Dec 2003 21:09:56 -0000 1.5 --- makefile.mgw 1 Feb 2004 17:09:16 -0000 1.6 *************** *** 38,66 **** LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 - ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else - # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE5).a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) EXPDEF_NAME = $(LIB_DIR)/cpri.def - endif ! # -------- Check that environment path variable is set. -------- --- 38,58 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE).a EXPDEF_NAME = $(LIB_DIR)/cpri.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variable is set. -------- *************** *** 115,119 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 107,111 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 128,132 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 120,124 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) Index: makefile.uni =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.uni 7 Dec 2003 21:09:56 -0000 1.4 --- makefile.uni 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 37,58 **** ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else - # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! IMPLIB_BASENAME = lib$(PACKAGE5).so ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! endif ! # -------- Default system paths. ------------ --- 37,51 ---- ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a else # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Default system paths. ------------ *************** *** 97,101 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 90,94 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 245,249 **** LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) endef --- 238,242 ---- LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ endef *************** *** 273,277 **** LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) endef --- 266,270 ---- LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ endef *************** *** 315,328 **** @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - examples/ex%: $(OBJ_DIR)/ex%$(OBJ_SUFFIX) - $(LINK_OBJ_TO_EXE) - - NATIVE_LINK_OBJ_TO_EXE = 1 - - # -------- generate automatic dependencies -------- --- 308,311 ---- Index: makefile.vc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.vc 7 Dec 2003 21:09:56 -0000 1.8 --- makefile.vc 1 Feb 2004 17:09:16 -0000 1.9 *************** *** 47,75 **** LIB_DIR_D = $(LIB_ROOT_DIR)\msvc - ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else - # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) EXPDEF_NAME = $(LIB_DIR)/cpri.def - endif ! # -------- Check that environment path variables are set. -------- --- 47,67 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) EXPDEF_NAME = $(LIB_DIR)/cpri.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variables are set. -------- *************** *** 135,139 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 127,131 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 148,152 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 140,144 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) |
|
From: <ch...@pr...> - 2004-02-01 17:11:15
|
Update of /cvsroot/cpri/cpri/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2313/src Modified Files: dialpri.c spooler.c Log Message: Fixed bug 888505 Doesn't build on Linux. Clearified some stuff in the readme. Removed misc/makedoc. There is already dependencies to cgui so cgui's makedoc can preferably be used (CGUIDIR is required for cpri and has so been all the time) Cleaned some other junk from makefiles. Corrected some syntactical matters in docs to avoid warnings from makedoc. Index: dialpri.c =================================================================== RCS file: /cvsroot/cpri/cpri/src/dialpri.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dialpri.c 25 Mar 2003 07:23:42 -0000 1.4 --- dialpri.c 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 118,123 **** #ifdef ALLEGRO_DOS prilang_sel[i] = ptxt[pt_pribrands + i]; #else ! prilang_sel[i] = "Windows"; #endif dialpri->id3 = AddButton(DOWNLEFT | ALIGNRIGHT, ptxt[pt_print_test], PrintTest, dialpri); --- 118,125 ---- #ifdef ALLEGRO_DOS prilang_sel[i] = ptxt[pt_pribrands + i]; + #elseif define ALLEGRO_WINDOWS + prilang_sel[i] = "Windows"; #else ! prilang_sel[i] = "Linux"; #endif dialpri->id3 = AddButton(DOWNLEFT | ALIGNRIGHT, ptxt[pt_print_test], PrintTest, dialpri); Index: spooler.c =================================================================== RCS file: /cvsroot/cpri/cpri/src/spooler.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** spooler.c 28 Mar 2003 23:13:48 -0000 1.6 --- spooler.c 1 Feb 2004 17:09:16 -0000 1.7 *************** *** 705,709 **** } } ! static struct t_driver *DefaultInit(struct t_printerq *data nouse) {return NULL;} static void DefaultClose(struct t_driver *data nouse) {} --- 705,709 ---- } } ! static struct t_driver *DefaultInit(struct t_printerq *data nouse) {return NULL;} static void DefaultClose(struct t_driver *data nouse) {} *************** *** 721,725 **** q->vtable = _cpri_text_vtable; break; ! #ifdef DJGPP case QUEUE_OPTIMALPORT: q->vtable = &default_vtable; --- 721,725 ---- q->vtable = _cpri_text_vtable; break; ! #ifdef ALLEGRO_DOS case QUEUE_OPTIMALPORT: q->vtable = &default_vtable; *************** *** 748,754 **** break; } ! #else default: q->vtable = _cpri_stdwin_vtable; #endif break; --- 748,757 ---- break; } ! #elseif ALLEGRO_WINDOWS default: q->vtable = _cpri_stdwin_vtable; + #else + default: + q->vtable = _cpri_html_vtable; #endif break; |
|
From: SourceForge.net <no...@so...> - 2004-02-01 10:46:51
|
Bugs item #888505, was opened at 2004-02-01 10:46 Message generated for change (Settings changed) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888505&group_id=74455 Category: Linux Group: MainBranch >Status: Closed >Resolution: Fixed Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Doesn't build on Linux Initial Comment: Various broblems in makefiles. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888505&group_id=74455 |
|
From: <ch...@pr...> - 2004-01-31 21:19:42
|
Update of /cvsroot/cpri/cpri/lib/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19262/unix Log Message: Directory /cvsroot/cpri/cpri/lib/unix added to the repository |
|
From: SourceForge.net <no...@so...> - 2003-12-16 00:49:23
|
Feature Requests item #860707, was opened at 2003-12-16 01:49 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541027&aid=860707&group_id=74455 Category: None Group: None Status: Open Priority: 5 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Nobody/Anonymous (nobody) Summary: Clipping of too long texts Initial Comment: If a text is longer than the cell it is printed in, it should be clipped in some way. I suggest two modes, that can be set bt the application; 1) clipping, the text that goes outside the cell is removed. The whole text is not printed. Clipping occurs on both the left and right edge of the cell. 2) The text is wrapped into two (or more) lines. This will affect the height of the cell, and all other cells on that row. Must be remebered when entering the next line and when printing borders. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541027&aid=860707&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2003-12-15 01:49:33
|
Bugs item #715477, was opened at 2003-04-04 20:43 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=715477&group_id=74455 Category: Windows >Group: v0.9.1 Status: Closed Resolution: Fixed Priority: 5 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Orientation of paper Initial Comment: The option to set landscape doesn't work ---------------------------------------------------------------------- Comment By: Rasmus Myklebust (rasmusmyklebust) Date: 2003-04-07 01:30 Message: Logged In: YES user_id=713149 Fixed ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=715477&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2003-12-15 01:47:13
|
Bugs item #839155, was opened at 2003-11-10 12:19 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=839155&group_id=74455 Category: Windows >Group: v0.9.3 Status: Closed Resolution: Fixed Priority: 7 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: second printout is not working with some drivers Initial Comment: ResetDC returns error "Invalid handle" during second printout. If the error is ignored pages are printed but changes of orientation and feeding options are not changed. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=839155&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2003-12-15 01:47:13
|
Bugs item #859562, was opened at 2003-12-13 20:57 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=859562&group_id=74455 Category: None >Group: v0.9.3 Status: Closed Resolution: Fixed Priority: 3 Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Html-tables shows garbage when using CPRI_SUP_LALIGN Initial Comment: Html-table cells are not created or shows garbage. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=859562&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2003-12-15 01:47:12
|
Bugs item #827139, was opened at 2003-10-20 23:00 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=827139&group_id=74455 Category: Windows >Group: v0.9.3 Status: Closed Resolution: Fixed Priority: 5 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Landscape in W98 Initial Comment: In windows98 the landscape feature does not work. It works fine in 2k. No error code is returned from the system. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=827139&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2003-12-15 01:45:55
|
Bugs item #841108, was opened at 2003-11-13 01:57 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=841108&group_id=74455 Category: None >Group: v0.9.2 Status: Closed Resolution: Fixed Priority: 5 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Textfiles are not clean Initial Comment: Textfiles will get pagebrakes with formfeeds. Also unprintable characters are printed. This is not a good behavour because text-files will most likley be used for data import to 3rd party programs. It's not likley that textfiles will be sent directley to a printer. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=841108&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2003-12-15 01:45:55
|
Bugs item #841105, was opened at 2003-11-13 01:54 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=841105&group_id=74455 Category: None >Group: v0.9.2 Status: Closed Resolution: Fixed Priority: 5 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Second printout to text file prints only first row Initial Comment: When sending more then one job to the text-file driver, the second job only gets the first row printed ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=841105&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2003-12-15 01:45:54
|
Bugs item #731191, was opened at 2003-05-02 09:27 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=731191&group_id=74455 Category: None >Group: v0.9.2 Status: Closed Resolution: Fixed Priority: 9 Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Bug in the html-driver Initial Comment: The driver eats capital A:s and B:s duw to misplaced case labels for unused control commands. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=731191&group_id=74455 |
