cpri-develop Mailing List for CPRI - a C printer lib (Page 2)
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: Christer S. <ch...@us...> - 2005-10-29 18:57:38
|
Update of /cvsroot/cpri/cpri/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19916/docs Modified Files: changes._tx cpri._tx Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: cpri._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/cpri._tx,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** cpri._tx 8 Nov 2004 21:27:23 -0000 1.12 --- cpri._tx 29 Oct 2005 18:57:29 -0000 1.13 *************** *** 6,10 **** @# @multiwordheaders ! @manh="version 0.9.4" "CPRI" "Manual" @document_title=CPRI Manual @rtfh=cpri - an add on lib to CGUI for formatted printing --- 6,10 ---- @# @multiwordheaders ! @manh="version 0.9.5" "CPRI" "Manual" @document_title=CPRI Manual @rtfh=cpri - an add on lib to CGUI for formatted printing *************** *** 32,36 **** <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> <center><b> ! The Manual of CPRI 0.9.4 </b></center> @!text --- 32,36 ---- <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> <center><b> ! The Manual of CPRI 0.9.5 </b></center> @!text Index: changes._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/changes._tx,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** changes._tx 8 Nov 2004 21:27:23 -0000 1.7 --- changes._tx 29 Oct 2005 18:57:29 -0000 1.8 *************** *** 41,44 **** --- 41,48 ---- Changes + 0.9.5: + <ul> + <li> + "Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems." 0.9.4: <ul> |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:57:37
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19916/misc Modified Files: makefile.ver zipup.sh Removed Files: makefile.bcc Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: makefile.ver =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.ver,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.ver 8 Nov 2004 21:26:38 -0000 1.8 --- makefile.ver 29 Oct 2005 18:57:29 -0000 1.9 *************** *** 7,10 **** # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 0.9.4 shared_major_minor = 0.9 --- 7,10 ---- # Shared library versions for Unix # todo: this is unused at the moment ! shared_version = 0.9.5 shared_major_minor = 0.9 --- makefile.bcc DELETED --- Index: zipup.sh =================================================================== RCS file: /cvsroot/cpri/cpri/misc/zipup.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** zipup.sh 21 Sep 2005 18:39:34 -0000 1.9 --- zipup.sh 29 Oct 2005 18:57:29 -0000 1.10 *************** *** 12,24 **** # note: these are patched by fixver.sh script. ! zipversion=094 ! tgzversion=0.9.4 if [ "$1" != "-q" ]; then echo clean up... ! ./fix.sh djgpp --dtou ! #make clean ! # make rewhisp # Dont generate dependencies if a parameter was given. --- 12,23 ---- # note: these are patched by fixver.sh script. ! zipversion=095 ! tgzversion=0.9.5 if [ "$1" != "-q" ]; then echo clean up... ! # Make unix line endings ! ./fix.sh unix --dtou # Dont generate dependencies if a parameter was given. *************** *** 28,47 **** if [ "$1" = "--no-depend" ]; then echo skip generating dependencies - ./fix.sh djgpp --quick else echo generate dll stuff... ./misc/fixdll.sh echo generate dependencies... ./fix.sh mingw32 --quick make depend ./fix.sh msvc --quick make depend ./fix.sh unix --quick make depend ./fix.sh djgpp --quick make depend - # ./fix.sh bcc32 --quick - # make depend - ./fix.sh djgpp --quick fi --- 27,47 ---- if [ "$1" = "--no-depend" ]; then echo skip generating dependencies else echo generate dll stuff... ./misc/fixdll.sh + echo generate dependencies... + #But don't alter the line endings (--quick ensures that) ./fix.sh mingw32 --quick make depend + ./fix.sh msvc --quick make depend + ./fix.sh unix --quick make depend + ./fix.sh djgpp --quick make depend fi *************** *** 71,91 **** ############################################################################# - cd .. echo remove old archives... ! rm -f cpri/cpri$zipversion.zip ! rm -f cpri/cpri-$tgzversion.tar.gz echo create tar.gz archives... tar -cv $afiles | gzip -9 > cpri/cpri-$tgzversion.tar.gz echo create zip archives... ! cd cpri ./fix.sh djgpp --utod ! cd ../ zip -9 cpri/cpri$zipversion.zip $afiles - cd cpri ./fix.sh unix --dtou echo all done! --- 71,110 ---- ############################################################################# echo remove old archives... ! rm -f cpri$zipversion.zip ! rm -f cpri-$tgzversion.tar.gz ! ! # Line endings are still unix in all files, including bat-files. To make the tar archive useful also for ! # Windows users, we change the line endings to DOS/Windows already before packing the tar. This should be ! # no problem for unix users since the bat file has no meaning in unix. ! cp "fix.bat" _tmpfile ! perl -p -i -e "s/([^\r]|^)\n/\1\r\n/" _tmpfile ! touch -r "fix.bat" _tmpfile ! mv _tmpfile "fix.bat" echo create tar.gz archives... + cd .. tar -cv $afiles | gzip -9 > cpri/cpri-$tgzversion.tar.gz + cd cpri echo create zip archives... ! # Change line endings from unix to DOS/Windows before packing the zip archives ./fix.sh djgpp --utod ! cd .. zip -9 cpri/cpri$zipversion.zip $afiles cd cpri + + echo "Archives finished!" + + # Restore correct unix line endings ./fix.sh unix --dtou + # fix.sh omits to change line endings in the bat-file, so we need to change it separately because we want the local + # copy to have the unix style to have the right endings when committing to cvs next time. + mv "fix.bat" _tmpfile + tr -d '\015' < _tmpfile > "fix.bat" + touch -r _tmpfile "fix.bat" + rm _tmpfile + echo all done! |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:57:37
|
Update of /cvsroot/cpri/cpri In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19916 Modified Files: fix.sh Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: fix.sh =================================================================== RCS file: /cvsroot/cpri/cpri/fix.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fix.sh 1 Mar 2003 10:26:24 -0000 1.1.1.1 --- fix.sh 29 Oct 2005 18:57:29 -0000 1.2 *************** *** 1,5 **** #!/bin/sh # ! # Sets up the Adime package for building with the specified compiler, # and if possible converts text files to the desired target format. --- 1,5 ---- #!/bin/sh # ! # Sets up the CPRI package for building with the specified compiler, # and if possible converts text files to the desired target format. *************** *** 12,16 **** echo " mingw32 Win32/MinGW32" echo " msvc Win32/MSVC" - echo " bcc32 Win32/Borland C++" echo " unix Linux/gcc" echo "The other parameters control conversion of text files:" --- 12,15 ---- *************** *** 39,43 **** proc_noexist() { ! echo "Sorry, Cpri has not been ported to $1." echo "Want to help?" CPRI_NOCONV="1" --- 38,42 ---- proc_noexist() { ! echo "Sorry, CPRI has not been ported to $1." echo "Want to help?" CPRI_NOCONV="1" *************** *** 48,63 **** # common files. CPRI_FILELIST=`find . -type f "(" \ ! -name "*.c" -o -name "*.cfg" -o -name "*.cpp" -o -name "*.def" -o \ ! -name "*.h" -o -name "*.hin" -o -name "*.in" -o -name "*.inc" -o \ ! -name "*.m4" -o -name "*.mft" -o -name "*.s" -o -name "*.rc" -o \ ! -name "*.spec" -o -name "*.pl" -o -name "*.txt" -o -name "*._tx" -o \ ! -name "makefile*" -o -name "readme.*" -o \ ! -name "CHANGES" -o -name "AUTHORS" -o -name "THANKS" \ ")"` - # touch unix shell scripts? if [ "$1" != "omit_sh" ]; then CPRI_FILELIST="$CPRI_FILELIST `find . -type f -name '*.sh'`" fi } --- 47,61 ---- # common files. CPRI_FILELIST=`find . -type f "(" \ ! -name "*.c" -o -name "*.cfg" -o -name "*.def" -o -name "*.h" -o -name "*.t" -o -name "*.ht" -o -name "*.txt" -o -name "*._tx" -o \ ! -name "*.lst" -o -name "makefile*" -o -name "emptymak" -o -name "*.html" \ ")"` if [ "$1" != "omit_sh" ]; then CPRI_FILELIST="$CPRI_FILELIST `find . -type f -name '*.sh'`" fi + + if [ "$1" != "omit_bat" ]; then + CPRI_FILELIST="$CPRI_FILELIST `find . -type f -name '*.bat'`" + fi } *************** *** 78,82 **** { echo "Converting files from DOS/Win32 to Unix..." ! proc_filelist for file in $CPRI_FILELIST; do echo "$file" --- 76,80 ---- { echo "Converting files from DOS/Win32 to Unix..." ! proc_filelist "omit_bat" for file in $CPRI_FILELIST; do echo "$file" *************** *** 118,130 **** case "$1" in - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc";; - "beos" ) proc_noexist "BeOS" "none";; "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj";; "mingw32" ) proc_fix "Windows (Mingw32)" "makefile.mgw";; "msvc" ) proc_fix "Windows (MSVC)" "makefile.vc";; - "qnx" ) proc_fix "QNX" "none";; "unix" ) proc_fix "Unix" "makefile.uni";; - "mac" ) proc_noexist "Mac" "none";; - "watcom" ) proc_fix "DOS (Watcom)" "none";; "help" ) proc_help;; * ) proc_help;; --- 116,123 ---- |
|
From: Christer S. <ch...@us...> - 2005-10-29 18:57:37
|
Update of /cvsroot/cpri/cpri/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19916/include Modified Files: cpri.h Log Message: Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems. Index: cpri.h =================================================================== RCS file: /cvsroot/cpri/cpri/include/cpri.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** cpri.h 8 Nov 2004 21:26:21 -0000 1.12 --- cpri.h 29 Oct 2005 18:57:29 -0000 1.13 *************** *** 4,11 **** #define CPRI_VERSION_MAJOR 0 #define CPRI_VERSION_MINOR 9 ! #define CPRI_VERSION_PATCH 4 ! #define CPRI_VERSION_STRING "0.9.4" ! #define CPRI_DATE 20040612 /* yyyymmdd */ ! #define CPRI_DATE_STRING "Jun 12, 2004" #include "cpri/cpricfg.h" --- 4,11 ---- #define CPRI_VERSION_MAJOR 0 #define CPRI_VERSION_MINOR 9 ! #define CPRI_VERSION_PATCH 5 ! #define CPRI_VERSION_STRING "0.9.5" ! #define CPRI_DATE 20051029 /* yyyymmdd */ ! #define CPRI_DATE_STRING "Oct 29, 2005" #include "cpri/cpricfg.h" |
|
From: Christer S. <ch...@us...> - 2005-09-21 18:39:54
|
Update of /cvsroot/cpri/cpri/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22040/src Modified Files: spooler.c Log Message: Fixed some build issues Index: spooler.c =================================================================== RCS file: /cvsroot/cpri/cpri/src/spooler.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** spooler.c 24 May 2004 00:28:23 -0000 1.8 --- spooler.c 21 Sep 2005 18:39:34 -0000 1.9 *************** *** 101,105 **** { char *s; ! s = GetMem(char, strlen(_cpri_spool_dir) + strlen(spoolname) + 2); sprintf(s, "%s/%s", _cpri_spool_dir, spoolname); --- 101,105 ---- { char *s; ! s = GetMem(char, strlen(_cpri_spool_dir) + strlen(spoolname) + 2); sprintf(s, "%s/%s", _cpri_spool_dir, spoolname); *************** *** 182,191 **** { char *s; ! if (q->el) { if (q->el->buffer) q->inbuf = q->el->buffer; else { ! if (q->sf) rewind(q->sf); else { --- 182,191 ---- { char *s; ! if (q->el) { if (q->el->buffer) q->inbuf = q->el->buffer; else { ! if (q->sf) rewind(q->sf); else { *************** *** 216,220 **** { char *s; ! if (q->inbuf) { if (*q->inbuf==0) { --- 216,220 ---- { char *s; ! if (q->inbuf) { if (*q->inbuf==0) { *************** *** 446,450 **** } ! extern t_handle CpriOpenEntry(int qno, const char *print_out_name, int options nouse, const char *dfn) { --- 446,450 ---- } ! extern t_handle CpriOpenEntry(int qno, const char *print_out_name, int options nouse, const char *dfn) { *************** *** 684,688 **** { t_printerq *q = data; ! q->vtable->Driver(q->drv); } --- 684,688 ---- { t_printerq *q = data; ! q->vtable->Driver(q->drv); } *************** *** 693,697 **** t_printerq *q; int i; ! for (i = 0; i < 3; i++) { q = printerqs + i; --- 693,697 ---- t_printerq *q; int i; ! for (i = 0; i < 3; i++) { q = printerqs + i; *************** *** 757,761 **** break; } ! #ifdef DJGPP switch (q->qno) { --- 757,761 ---- break; } ! #ifdef DJGPP switch (q->qno) { |
|
From: Christer S. <ch...@us...> - 2005-09-21 18:39:48
|
Update of /cvsroot/cpri/cpri/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22040/docs Modified Files: readme._tx Log Message: Fixed some build issues Index: readme._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/readme._tx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** readme._tx 8 Nov 2004 21:27:23 -0000 1.5 --- readme._tx 21 Sep 2005 18:39:34 -0000 1.6 *************** *** 6,11 **** @#multiplefiles @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="readme.html">Back to Contents</a><p> @rtfh=Readme for CPRI @$\input texinfo --- 6,10 ---- @#multiplefiles @#locale=latin1 ! @document_title=CPRI readme @rtfh=Readme for CPRI @$\input texinfo *************** *** 48,54 **** CPRI is a library with functions for pretty printing of tables or table-like ! printouts using the event queue of CGUI. It also provides a dialogue ! that lets the user modify the printer settings, and one for administration of ! the printer queues for the DJGPP platform. CPRI compiles on the following platforms: DOS/DJGPP, Linux, --- 47,53 ---- CPRI is a library with functions for pretty printing of tables or table-like ! printouts. It also provides a dialogue that lets the user modify the printer ! settings, and one for administration of the printer queues for the DJGPP ! platform. CPRI depends on some features in the lib CGUI. CPRI compiles on the following platforms: DOS/DJGPP, Linux, *************** *** 56,64 **** The current version have full functionality only on the DJGPP and Windows ! platforms, there are only stubs present for the other platforms. ! ! You need to have compiled and installed Allegro version 4.0 or later, as ! well as CGUI version 1.6 or later. ! @heading --- 55,59 ---- The current version have full functionality only on the DJGPP and Windows ! platforms, there is only a stub present for the Linux platform. @heading *************** *** 66,70 **** You need to have compiled and installed Allegro 4.0.x as well as CGUI 1.6.7 or later. ! 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. --- 61,65 ---- You need to have compiled and installed Allegro 4.0.x as well as CGUI 1.6.7 or later. ! You have to 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. *************** *** 83,98 **** 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. 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 --- 78,99 ---- Installation goes in some simple steps, and should be familiar since it is ! similar to the installation procedure as of CGUI: <ul> <li> ! Tell the installation process what platform you use. Start a command window ! (shell) and set the main directory of CPRI to you current directory ! i.e. enter the command ! <pre> ! cd c:\cpri ! </pre> ! or whatever is the name of your CPRI 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 *************** *** 107,111 **** 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 --- 108,117 ---- export ALLEGRO=/home/user/allegro-4.0.3 </pre> ! or whatever is the name of your allegro directory.<br> ! When CPRI is built some programs in the `tools' directory of Allegro will be ! needed, so you have to install an Allegro version built from sources (or ! alternatively obtain the required tools some other way, put them in a ! directory named `tools' and let the variable ALLEGRO point out the directory ! immediately above `tools'). <li> Specify the path to your CGUI installation by setting the environment *************** *** 128,139 **** make mktext </pre> ! Return to the main directory of cbar, e.g.: <pre> cd c:\cpri </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> Linux/Unix specifics:<br> --- 134,145 ---- make mktext </pre> ! Return to the main directory of CPRI, e.g.: <pre> cd c:\cpri </pre> <li> ! Compile the CPRI library. This is done by running "make" at the command line. <li> ! Install the CPRI files to common directories. This is done by running "make install" at the command line.<br> Linux/Unix specifics:<br> *************** *** 144,174 **** </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 ! system, go to the "Help / Syntax help / Files to search" menu, and add ! "ccom" after the existing "libc" entry (separated by a space). <li> ! If you want statically linked libraries under Unix or Windows 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. --- 150,195 ---- </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 the CPRI files installed at some other ! location than the default you need to specifiy the paths to your compiler ! and linker. </ul> ! That's it! Now you are ready to run the example program in the example directory. ! <hr> ! 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 the environment vaariable ! UNIX_TOOLS to 1 before make install is run. <li> If you want to read the CPRI documentation with the Rhide online help ! system, go to the "Help / Syntax help / Files to search" menu in Rhide, ! and add "cpri" after the existing "libc" entry (separated by a space). <li> ! To link your application with the debugging lib, link with -lcprid ! instead of -lcpri. </ul> @heading MSys ! Users of the MSys environment needs to set the environment variable UNIX_TOOLS to 1 before make install is run. *************** *** 179,189 **** 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. --- 200,225 ---- the library. <li> ! Before calling any CPRI functions you must have initialized CPRI and CGUI, ! Note also <b>CGUI</b>! For info about available functions, please read ! the manual, e.g. cpri.html (but the docs are also available in other ! formats). <li> ! If you link your program on the command line, link with ! '-lcpri -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'. ! <p> ! On Linux you can use the following command to link with the default ! lib of CPRI (please note the ` ) ! <pre> ! gcc -s -lcpri -lcgui `allegro-config --libs release --shared` file.o ! </pre> ! where `file' is the name of your file. <br> ! For debug libraries use -lcprid -lcguid instead and replace release ! with debug in the allegro config option. For linking a static application ! use -lcpri_s -lcgui_s and replace --shared with --static. ! <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. *************** *** 194,198 **** - @heading Contact Info --- 230,233 ---- |
|
From: Christer S. <ch...@us...> - 2005-09-21 18:39:48
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22040/misc Modified Files: makefile.all zipup.sh Log Message: Fixed some build issues Index: makefile.all =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.all,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.all 8 Nov 2004 22:01:24 -0000 1.11 --- makefile.all 21 Sep 2005 18:39:34 -0000 1.12 *************** *** 6,10 **** # See readme.txt for more information about CPRI. # - # # Available options: # --- 6,9 ---- *************** *** 18,41 **** # docs: Build only the documentation. # clean: Remove rebuildable files. ! # compress: Compress the example executable using upx. # help: Display this help. # # Developer Targets: # ! # dat: Builds the compiled datafiles and the includefile(s) ! # *.ht from *.t # This should actually be part of the default build but ! # for the user conveniance (it needs CGUIDIR to be set) it is pre-built. ! # depend: Regenerate dependencies. # veryclean: Remove rebuildable files, including dependencies. ! # rewhisp: Reformat all text files to unix format using whisped. ! # rewhisp-dos: Reformat all text files to dos format using whisped. ! # zipupd-big: Create developer zip with additional stuff from dos. # # Variables: # # DEBUGMODE=1 Include debug info in the library. # CPRI_FORTIFY=1 Include memory debugger. Sources are not included in the distribution # c-files are assumed to be located in src and h-files in include. ## --- 17,45 ---- # docs: Build only the documentation. # clean: Remove rebuildable files. ! # compress: Compress the example executable using the executable compressing program pointed to by UPX_PROGRAM. # help: Display this help. # # Developer Targets: # ! # dat: Builds the textfile and the includefile(s) *.ht from *.t # This should actually be part of the default build but ! # for the user conveniance it is pre-built. This is needed to build a lib using code ! # checked out from cvs. This target needs the environment variable CGUIDIR to point ! # to the directory of CGUI, and ALLEGRO to point to the directory of Allegro. ! # depend: Regenerate dependencies. This is needed to build a lib using code checked out from cvs. # veryclean: Remove rebuildable files, including dependencies. ! # rewhisp: Reformat all text files to unix format using whisped. This requires the whisped program to in your path. ! # rewhisp-dos: Reformat all text files to dos format using whisped. This requires the whisped program to in your path. # # Variables: # + # ALLEGRO=<directoy-of-allegro-source> See target `dat' above. + # CGUIDIR=<directoy-of-cgui> Needed by target `dat', see above. + # + # UPX_PROGRAM=<program-to-compress-with> See target `compress' above. # DEBUGMODE=1 Include debug info in the library. # CPRI_FORTIFY=1 Include memory debugger. Sources are not included in the distribution # c-files are assumed to be located in src and h-files in include. + # ## *************** *** 113,117 **** 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) --- 117,121 ---- DOCS = \ docs/cpri.txt docs/cpri$(HTML_SUFFIX) docs/cpri$(INFO_SUFFIX) docs/cpri.rtf \ ! readme.txt readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \ docs/changes.txt docs/changes$(HTML_SUFFIX) *************** *** 183,189 **** --- 187,199 ---- chm-docs: docs/cpri.chm + %.txt: docs/%._tx + -$(MAKEDOC_PROGRAM) -ascii $@ $< + docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< + %$(HTML_SUFFIX): docs/%._tx + -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< + docs/%$(HTML_SUFFIX): docs/%._tx -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< Index: zipup.sh =================================================================== RCS file: /cvsroot/cpri/cpri/misc/zipup.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** zipup.sh 21 Jun 2004 19:16:02 -0000 1.8 --- zipup.sh 21 Sep 2005 18:39:34 -0000 1.9 *************** *** 20,24 **** ./fix.sh djgpp --dtou #make clean ! make rewhisp # Dont generate dependencies if a parameter was given. --- 20,24 ---- ./fix.sh djgpp --dtou #make clean ! # make rewhisp # Dont generate dependencies if a parameter was given. *************** *** 41,46 **** ./fix.sh djgpp --quick make depend ! ./fix.sh bcc32 --quick ! make depend ./fix.sh djgpp --quick fi --- 41,46 ---- ./fix.sh djgpp --quick make depend ! # ./fix.sh bcc32 --quick ! # make depend ./fix.sh djgpp --quick fi *************** *** 48,52 **** echo generate other files for the distribution... make docs "LFN=y" ! make texts fi --- 48,52 ---- echo generate other files for the distribution... make docs "LFN=y" ! make dat fi *************** *** 59,63 **** fix* misc/*.sh \ obj/*/*/*.dep lib/*/*.def \ ! docs/readme.txt docs/readme.html docs/cpri.html docs/cpri.txt \ resource/cprilabl resource/icons.dat \ docs/*._tx \ --- 59,63 ---- fix* misc/*.sh \ obj/*/*/*.dep lib/*/*.def \ ! readme.txt readme.html docs/cpri.html docs/cpri.txt \ resource/cprilabl resource/icons.dat \ docs/*._tx \ *************** *** 75,82 **** echo remove old archives... rm -f cpri/cpri$zipversion.zip ! rm -f cpri/cpri-$tgzversion.tgz echo create tar.gz archives... ! tar -cv --no-attributes $afiles | gzip -9 > cpri/cpri-$tgzversion.tar.gz echo create zip archives... --- 75,82 ---- echo remove old archives... rm -f cpri/cpri$zipversion.zip ! rm -f cpri/cpri-$tgzversion.tar.gz echo create tar.gz archives... ! tar -cv $afiles | gzip -9 > cpri/cpri-$tgzversion.tar.gz echo create zip archives... |
|
From: Rasmus M. <ras...@us...> - 2005-01-22 18:19:06
|
Update of /cvsroot/cpri/cpri/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30459 Modified Files: drv_html.c Log Message: Improved description of fonts Index: drv_html.c =================================================================== RCS file: /cvsroot/cpri/cpri/src/drv_html.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** drv_html.c 13 Dec 2003 20:04:08 -0000 1.6 --- drv_html.c 22 Jan 2005 18:18:57 -0000 1.7 *************** *** 72,83 **** p += sprintf(p, " %s", align_texts[align]); p += sprintf(p, ">"); ! if (size) { ! if (face) ! p += sprintf(p, "<font size=\"%+d\" face=\"%s\">", size, faces[face]); ! else ! p += sprintf(p, "<font size=\"%+d\">", size); ! } else if (face) { ! p += sprintf(p, "<font face=\"%s\">", faces[face]); ! } if (bold) p += sprintf(p, "<b>"); --- 72,79 ---- p += sprintf(p, " %s", align_texts[align]); p += sprintf(p, ">"); ! if (face) ! p += sprintf(p, "<span style=\"font-size:%d; font-family:%s\">", size, faces[face]); ! else ! p += sprintf(p, "<span style=\"font-size:%d\">", size); if (bold) p += sprintf(p, "<b>"); *************** *** 106,111 **** if (italic) p += sprintf(p, "</i>"); ! if (face||size) ! p += sprintf(p, "</font>"); p += sprintf(p, "</td>\n"); *celltext = 0; --- 102,107 ---- if (italic) p += sprintf(p, "</i>"); ! if (face) ! p += sprintf(p, "</span>"); p += sprintf(p, "</td>\n"); *celltext = 0; *************** *** 144,153 **** "Albertus,Times", "Antique,Times", ! "Times New Roman,Times", "Verdana,Arial,Helvetica", ! "Universe condensed,Arial,Helvetica", ! "Coronet, Courier New,Courier", ! "Courier,Courier New,Courier", ! "Gothic,Courier New,Courier", }; char link[MAXLINKLEN+1], celltext[1000]; --- 140,149 ---- "Albertus,Times", "Antique,Times", ! "'Times New Roman',Times", "Verdana,Arial,Helvetica", ! "'Universe condensed',Arial,Helvetica", ! "Coronet, 'Courier New',Courier", ! "Courier,'Courier New'", ! "Gothic,'Courier New',Courier", }; char link[MAXLINKLEN+1], celltext[1000]; *************** *** 182,188 **** if (underline) strcat(celltext, "</u>"); ! strcat(celltext, "<sup><font size=\"-1\">"); strcat(celltext, s); ! strcat(celltext, "</sup></font>"); if (underline) strcat(celltext, "<u>"); --- 178,184 ---- if (underline) strcat(celltext, "</u>"); ! strcat(celltext, "<sup><span style=\"font-size:smaller\">"); strcat(celltext, s); ! strcat(celltext, "</sup></span>"); if (underline) strcat(celltext, "<u>"); *************** *** 257,261 **** case EPC_FONT_SIZE: _CpriGetIntParam(q, ¶m); ! size = (param - 12) / 2; if (size > 1) { size /= 2; --- 253,258 ---- case EPC_FONT_SIZE: _CpriGetIntParam(q, ¶m); ! size = param; ! /* size = (param - 12) / 2; if (size > 1) { size /= 2; *************** *** 263,267 **** size = 3; } ! } break; case EPC_END_START_SEQUENCE: --- 260,264 ---- size = 3; } ! }*/ break; case EPC_END_START_SEQUENCE: *************** *** 331,335 **** if (embedded) sprintf(celltext, "<table width=%d bgcolor=\"%s\"><tr><td>" ! "<font size=\"%+d\" face=\"%s\">%s%s%s%s%s%s%s</font>" "</td></tr></table>", barw, colors[pattern], size, htmlfaces[face], bold?"<b>":"",underline?"<u>":"",italic?"<i>":"", --- 328,332 ---- if (embedded) sprintf(celltext, "<table width=%d bgcolor=\"%s\"><tr><td>" ! "<span style=\"font-size:%d; font-family:%s>%s%s%s%s%s%s%s</span>" "</td></tr></table>", barw, colors[pattern], size, htmlfaces[face], bold?"<b>":"",underline?"<u>":"",italic?"<i>":"", |
|
From: SourceForge.net <no...@so...> - 2004-11-17 23:57:51
|
Bugs item #1068361, was opened at 2004-11-18 00:57 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=1068361&group_id=74455 Category: Windows Group: None Status: Open Resolution: None Priority: 5 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Formatting reset on second page Initial Comment: When printing a document that spans more than one page, the formatting of the text is lost. This doesnot occur on all platforms. Affected system: W98, HP6L, Empty header macro, mingw build. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=1068361&group_id=74455 |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 22:01:42
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11710 Modified Files: makefile.all Log Message: Fixed error when building examples with STATICLINK=1 Index: makefile.all =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.all,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.all 8 Nov 2004 21:26:38 -0000 1.10 --- makefile.all 8 Nov 2004 22:01:24 -0000 1.11 *************** *** 93,96 **** --- 93,108 ---- endif + # By default, Allegro is linked the same way as cgui, but this can be + # overridden. + # Note that it is not a good idea to do anything particular with the + # STATICLINK_ALLEGRO or NO_STATICLINK_ALLEGRO variables, since it would be + # bad to have two dlls around with the same name that link differently to + # Allegro. + ifdef STATICLINK + ifndef NO_STATICLINK_ALLEGRO + STATICLINK_ALLEGRO=1 + endif + endif + # -------- Include platform specific makefile. -------- |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 21:27:38
|
Update of /cvsroot/cpri/cpri/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4589 Modified Files: changes._tx cpri._tx readme._tx Log Message: Line endings Index: cpri._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/cpri._tx,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cpri._tx 21 Jun 2004 19:15:47 -0000 1.11 --- cpri._tx 8 Nov 2004 21:27:23 -0000 1.12 *************** *** 1,794 **** ! @#This is the source for the CPRI manual, in Shawn's special format. ! @#The readable documents are generated and will be found in the files: ! @#cpri.txt,cpri.rtf, cpri.htm, cpri.inf, the latter may be ! @#installed as on-line help if you are using rhide (just add cpri to the ! @#list of help files) ! @# ! @multiwordheaders ! @manh="version 0.9.4" "CPRI" "Manual" ! @document_title=CPRI Manual ! @rtfh=cpri - an add on lib to CGUI for formatted printing [...1559 lines suppressed...] ! The "scaling" command changes the current scaling. Some measurements like ! positions and sizes are interpreted according to the current scaling.<br> ! Parameter: 0- sizes should be expressed in nr of "character boxes" in ! the default fix text size 1-(default) sizes should be expressed in mm ! ! @@const char* @CPRI_RESET ! The "reset" command resets the driver state to the initial state, and if ! possible, send a reset command to the driver <br> ! Parameter: none ! ! @headingnocontent ! Index ! ! @index ! ! @$@contents ! @$@bye ! ! @html ! @text Index: readme._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/readme._tx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** readme._tx 21 Jun 2004 19:15:47 -0000 1.4 --- readme._tx 8 Nov 2004 21:27:23 -0000 1.5 *************** *** 1,208 **** ! @# 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... ! @# ! @#ignore_css ! @multiwordheaders ! @#multiplefiles ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="readme.html">Back to Contents</a><p> ! @rtfh=Readme for CPRI ! @$\input texinfo ! @$@setfilename readme.inf ! @$@settitle Readme for CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* CPRI: (CPRI). Readme file for CPRI ! @$@end direntry ! @$This is the Info version of the CPRI readme file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Readme for CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b>The readme file of CPRI</b></center> ! ! @!text ! @heading ! Contents ! ! @shortcontents ! ! @text ! @heading ! Introduction ! ! CPRI is a library with functions for pretty printing of tables or table-like ! printouts using the event queue of CGUI. It also provides a dialogue ! that lets the user modify the printer settings, and one for administration of ! the printer queues for the DJGPP platform. ! ! CPRI compiles on the following platforms: DOS/DJGPP, Linux, ! Windows/Mingw32 and Windows/MSVC. ! ! The current version have full functionality only on the DJGPP and Windows ! platforms, there are only stubs present for the other platforms. ! ! You need to have compiled and installed Allegro version 4.0 or later, as ! well as CGUI version 1.6 or later. ! ! ! @heading ! Requirements ! ! You need to have compiled and installed Allegro 4.0.x as well as CGUI 1.6.7 or later. ! 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: ! http://alleg.sourceforge.net/ ! ! You can find CGUI at: ! http://www.mdh.se/~csg/cgui/ ! ! ! @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. 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 ! 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> ! <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:\cpri ! </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> ! 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 ! system, go to the "Help / Syntax help / Files to search" menu, and add ! "ccom" after the existing "libc" entry (separated by a space). ! <li> ! If you want statically linked libraries under Unix or Windows 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. ! ! @heading ! 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> ! Before passing any printing commands you must have initialized both CGUI ! and CPRI. ! </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,208 ---- ! @# 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... ! @# ! @#ignore_css ! @multiwordheaders ! @#multiplefiles ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="readme.html">Back to Contents</a><p> ! @rtfh=Readme for CPRI ! @$\input texinfo ! @$@setfilename readme.inf ! @$@settitle Readme for CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* CPRI: (CPRI). Readme file for CPRI ! @$@end direntry ! @$This is the Info version of the CPRI readme file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Readme for CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b>The readme file of CPRI</b></center> ! ! @!text ! @heading ! Contents ! ! @shortcontents ! ! @text ! @heading ! Introduction ! ! CPRI is a library with functions for pretty printing of tables or table-like ! printouts using the event queue of CGUI. It also provides a dialogue ! that lets the user modify the printer settings, and one for administration of ! the printer queues for the DJGPP platform. ! ! CPRI compiles on the following platforms: DOS/DJGPP, Linux, ! Windows/Mingw32 and Windows/MSVC. ! ! The current version have full functionality only on the DJGPP and Windows ! platforms, there are only stubs present for the other platforms. ! ! You need to have compiled and installed Allegro version 4.0 or later, as ! well as CGUI version 1.6 or later. ! ! ! @heading ! Requirements ! ! You need to have compiled and installed Allegro 4.0.x as well as CGUI 1.6.7 or later. ! 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: ! http://alleg.sourceforge.net/ ! ! You can find CGUI at: ! http://www.mdh.se/~csg/cgui/ ! ! ! @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. 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 ! 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> ! <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:\cpri ! </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> ! 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 ! system, go to the "Help / Syntax help / Files to search" menu, and add ! "ccom" after the existing "libc" entry (separated by a space). ! <li> ! If you want statically linked libraries under Unix or Windows 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. ! ! @heading ! 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> ! Before passing any printing commands you must have initialized both CGUI ! and CPRI. ! </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/cpri/cpri/docs/changes._tx,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** changes._tx 21 Jun 2004 19:15:47 -0000 1.6 --- changes._tx 8 Nov 2004 21:27:23 -0000 1.7 *************** *** 1,95 **** ! @# ! @# This is the source for the CPRI 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=CPRI Changes ! @rtfh=Changes in CPRI ! @$\input texinfo ! @$@setfilename changes.inf ! @$@settitle Changes in CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Changes: (changes). Changes in CPRI ! @$@end direntry ! @$This is the Info version of the Changes in CPRI file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Changes in CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b> ! The changes log of CPRI ! </b></center> ! @!text ! ! @heading ! Changes ! ! 0.9.4: ! <ul> ! <li> ! Fixed bug 888505 Doesn't build on Linux ! <li> ! Clearified some stuff in the readme. ! <li> ! Removed implicit dependency to allegro 4.1.* (dat2c) ! </ul> ! 0.9.3: ! <ul> ! <li> Fixed bug #859562 "Html-tables shows garbage when using CPRI_SUP_LALIGN" - added case for CPRI_SUP_LALIGN ! </ul> ! 0.9.2: ! <ul> ! <li> ! The application will not exit in release-mode when resetDC fails. ! <li> ! Fixed bug #841108 "Textfiles are not clean" (unprintable chars like form feed in the files) ! <li> ! Fixed bug #841105 "Second printout to text file prints only first row" ! <li> ! Fixed bug "Fixed textfile printing" (various fixes to the text file driver) ! <li> ! Fixed a bug with alligned index printing in the driver for standard windows printing. ! <li> ! Fixed bug #827139 "Landscape in W98". ! <li> ! Adapted to build under Msys ! <li> ! Fixed bug #742863 "Linux build" ! <li> ! Fixed bug #731192 "Bug in width calculation" (some drivers) ! <li> ! Fixed bug #731191 "Bug in the html-driver" ! <li> ! Fixed bug #727717 "Build problem -mingw32" ! </ul> ! ! 0.9.1: ! <ul> ! <li> ! Bug fixed: A line could be dropped between two pages in table print outs (windows) ! <li> ! Added some features that were lacking in the windows version: manuel feed, ! selection of orientation, adjustable bar-code width and height ! </ul> ! ! 0.9.0: ! <ul> ! <li> ! Initial official version. ! </ul> --- 1,95 ---- ! @# ! @# This is the source for the CPRI 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=CPRI Changes ! @rtfh=Changes in CPRI ! @$\input texinfo ! @$@setfilename changes.inf ! @$@settitle Changes in CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Changes: (changes). Changes in CPRI ! @$@end direntry ! @$This is the Info version of the Changes in CPRI file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Changes in CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b> ! The changes log of CPRI ! </b></center> ! @!text ! ! @heading ! Changes ! ! 0.9.4: ! <ul> ! <li> ! Fixed bug 888505 Doesn't build on Linux ! <li> ! Clearified some stuff in the readme. ! <li> ! Removed implicit dependency to allegro 4.1.* (dat2c) ! </ul> ! 0.9.3: ! <ul> ! <li> Fixed bug #859562 "Html-tables shows garbage when using CPRI_SUP_LALIGN" - added case for CPRI_SUP_LALIGN ! </ul> ! 0.9.2: ! <ul> ! <li> ! The application will not exit in release-mode when resetDC fails. ! <li> ! Fixed bug #841108 "Textfiles are not clean" (unprintable chars like form feed in the files) ! <li> ! Fixed bug #841105 "Second printout to text file prints only first row" ! <li> ! Fixed bug "Fixed textfile printing" (various fixes to the text file driver) ! <li> ! Fixed a bug with alligned index printing in the driver for standard windows printing. ! <li> ! Fixed bug #827139 "Landscape in W98". ! <li> ! Adapted to build under Msys ! <li> ! Fixed bug #742863 "Linux build" ! <li> ! Fixed bug #731192 "Bug in width calculation" (some drivers) ! <li> ! Fixed bug #731191 "Bug in the html-driver" ! <li> ! Fixed bug #727717 "Build problem -mingw32" ! </ul> ! ! 0.9.1: ! <ul> ! <li> ! Bug fixed: A line could be dropped between two pages in table print outs (windows) ! <li> ! Added some features that were lacking in the windows version: manuel feed, ! selection of orientation, adjustable bar-code width and height ! </ul> ! ! 0.9.0: ! <ul> ! <li> ! Initial official version. ! </ul> |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 21:26:48
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4326 Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver Log Message: Line endings Index: makefile.uni =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** makefile.uni 21 Jun 2004 19:16:02 -0000 1.9 --- makefile.uni 8 Nov 2004 21:26:38 -0000 1.10 *************** *** 1,230 **** ! # makefile.uni: ! # Makefile for the CPRI library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # See readme.txt for more information about CPRI. ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcpri $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cpri ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri_s.a $(SYSTEM_LIB_DIR)/libcprid_s.a \ ! $(SYSTEM_LIB_DIR)/libcpri.so $(SYSTEM_LIB_DIR)/libcprid.so \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri\/\1\.o:/" _depend.tmp > obj/unix/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid\/\1\.o:/" _depend.tmp > obj/unix/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri_s\/\1\.o:/" _depend.tmp > obj/unix/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid_s\/\1\.o:/" _depend.tmp > obj/unix/cprid_s/makefile.dep ! rm _depend.tmp --- 1,230 ---- ! # makefile.uni: ! # Makefile for the CPRI library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # See readme.txt for more information about CPRI. ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcpri $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cpri ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri_s.a $(SYSTEM_LIB_DIR)/libcprid_s.a \ ! $(SYSTEM_LIB_DIR)/libcpri.so $(SYSTEM_LIB_DIR)/libcprid.so \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri\/\1\.o:/" _depend.tmp > obj/unix/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid\/\1\.o:/" _depend.tmp > obj/unix/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri_s\/\1\.o:/" _depend.tmp > obj/unix/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid_s\/\1\.o:/" _depend.tmp > obj/unix/cprid_s/makefile.dep ! rm _depend.tmp Index: makefile.ver =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.ver,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.ver 21 Jun 2004 19:16:02 -0000 1.7 --- makefile.ver 8 Nov 2004 21:26:38 -0000 1.8 *************** *** 1,10 **** ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 09 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 0.9.4 ! shared_major_minor = 0.9 --- 1,10 ---- ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 09 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 0.9.4 ! shared_major_minor = 0.9 Index: makefile.bcc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.bcc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.bcc 21 Jun 2004 19:16:02 -0000 1.7 --- makefile.bcc 8 Nov 2004 21:26:38 -0000 1.8 *************** *** 1,374 **** ! # makefile.bcc: ! # Makefile for the CPRI library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(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. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcpri.def ! copy _impcpri.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcpri.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cpri.lib $(SYSTEM_LIB_DIR)/cpri_s.lib \ ! $(SYSTEM_LIB_DIR)/cprid.lib $(SYSTEM_LIB_DIR)/cprid_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(WINDIR_U)/cpri$(LIB_VERSION).dll $(WINDIR_U)/cprid$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri\/\1\.obj:/" _depend.tmp > obj/bcc32/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid\/\1\.obj:/" _depend.tmp > obj/bcc32/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cprid_s/makefile.dep ! rm _depend.tmp --- 1,374 ---- ! # makefile.bcc: ! # Makefile for the CPRI library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(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. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcpri.def ! copy _impcpri.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcpri.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cpri.lib $(SYSTEM_LIB_DIR)/cpri_s.lib \ ! $(SYSTEM_LIB_DIR)/cprid.lib $(SYSTEM_LIB_DIR)/cprid_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(WINDIR_U)/cpri$(LIB_VERSION).dll $(WINDIR_U)/cprid$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri\/\1\.obj:/" _depend.tmp > obj/bcc32/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid\/\1\.obj:/" _depend.tmp > obj/bcc32/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cprid_s/makefile.dep ! rm _depend.tmp Index: makefile.dj =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.dj 21 Jun 2004 19:16:02 -0000 1.8 --- makefile.dj 8 Nov 2004 21:26:38 -0000 1.9 *************** *** 1,265 **** ! # makefile.dj: ! # Makefile for the CPRI library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CPRI doesn't relies on Allegro ! # including some standard header. ! ifdef CPRI_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri.a $(SYSTEM_LIB_DIR)/libcprid.a \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cpri\/\1/" _depend.tmp > obj/djgpp/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cprid\/\1/" _depend.tmp > obj/djgpp/cprid/makefile.dep ! rm _depend.tmp --- 1,265 ---- ! # makefile.dj: ! # Makefile for the CPRI library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CPRI doesn't relies on Allegro ! # including some standard header. ! ifdef CPRI_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri.a $(SYSTEM_LIB_DIR)/libcprid.a \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cpri\/\1/" _depend.tmp > obj/djgpp/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cprid\/\1/" _depend.tmp > obj/djgpp/cprid/makefile.dep ! rm _depend.tmp Index: makefile.vc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.vc 21 Jun 2004 19:16:02 -0000 1.12 --- makefile.vc 8 Nov 2004 21:26:38 -0000 1.13 *************** *** 1,328 **** ! # makefile.vc: ! # Makefile for the CPRI library with MSVC. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # To path MSVC so it can be used from the commandline, run the ! # vcvars32.bat file which can be found in your MSVC bin directory. ! # ! # This build uses djgpp for calculating ! # source dependencies, so you'll need to have that installed as well. ! # ! # The "depend" target uses sed. ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = MSVC ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/msvc ! LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! 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. -------- ! ! .PHONY: badwin badmsvc badspaces ! ! ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef MSVCDIR ! MSVCDIR_U = $(subst \,/,$(MSVCDIR)) ! MSVCDIR_D = $(subst /,\,$(MSVCDIR)) ! else ! ifdef MSDEVDIR ! MSVCDIR_U = $(subst \,/,$(MSDEVDIR)) ! MSVCDIR_D = $(subst /,\,$(MSDEVDIR)) ! else ! badmsvc: ! @echo Your MSVCDIR or MSDEVDIR environment variable is not set! ! endif ! endif ! ! NULLSTRING := ! SPACE := $(NULLSTRING) # special magic to get an isolated space character ! ! ifneq ($(findstring $(SPACE),$(MSVCDIR)$(MSDEVDIR)),) ! badspaces: ! @echo There are spaces in your MSVCDIR or MSDEVDIR environment ! @echo variables: please change these to the 8.3 short filename ! @echo version, or move your compiler to a different directory. ! endif ! ! SYSTEM_INCLUDE_DIR = $(MSVCDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(MSVCDIR_D)\include ! SYSTEM_LIB_DIR = $(MSVCDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! .PHONY: badalleg ! ! RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX) ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -W3 -WX ! else ! WFLAGS = -W1 ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Gd -Zi -MDd ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall ! LFLAGS = -debug -debugtype:cv ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -profile ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -release ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Gd -MD ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! LIB_FLAGS += kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ ! ! define COMPILE_C_TO_OBJ ! $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< ! endef ! ! define LINK_OBJ_TO_EXE ! $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef ! else ! # link as a DLL ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! INSTALL_HEADERS = $(addprefix $(MSVCDIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) MSVC library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cpri.lib $(SYSTEM_LIB_DIR)/cpri_s.lib \ ! $(SYSTEM_LIB_DIR)/cprid.lib $(SYSTEM_LIB_DIR)/cprid_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(WINDIR_U)/cpri$(LIB_VERSION).dll $(WINDIR_U)/cprid$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2MSVC) -MM -MG -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cpri\/\1\.obj:/" _depend.tmp > obj/msvc/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cprid\/\1\.obj:/" _depend.tmp > obj/msvc/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cpri_s\/\1\.obj:/" _depend.tmp > obj/msvc/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cprid_s\/\1\.obj:/" _depend.tmp > obj/msvc/cprid_s/makefile.dep ! rm _depend.tmp --- 1,328 ---- ! # makefile.vc: ! # Makefile for the CPRI library with MSVC. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # To path MSVC so it can be used from the commandline, run the ! # vcvars32.bat file which can be found in your MSVC bin directory. ! # ! # This build uses djgpp for calculating ! # source dependencies, so you'll need to have that installed as well. ! # ! # The "depend" target uses sed. ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = MSVC ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT... [truncated message content] |
|
From: Rasmus M. <ras...@us...> - 2004-11-08 21:26:34
|
Update of /cvsroot/cpri/cpri/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4248 Modified Files: cpri.h Log Message: Line endings Index: cpri.h =================================================================== RCS file: /cvsroot/cpri/cpri/include/cpri.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cpri.h 21 Jun 2004 19:15:47 -0000 1.11 --- cpri.h 8 Nov 2004 21:26:21 -0000 1.12 *************** *** 1,234 **** ! #ifndef CPRI_H ! #define CPRI_H ! ! #define CPRI_VERSION_MAJOR 0 ! #define CPRI_VERSION_MINOR 9 ! #define CPRI_VERSION_PATCH 4 ! #define CPRI_VERSION_STRING "0.9.4" ! #define CPRI_DATE 20040612 /* yyyymmdd */ ! #define CPRI_DATE_STRING "Jun 12, 2004" ! ! #include "cpri/cpricfg.h" ! ! /* Printer commands ====================== */ ! #define CPRI_MANUAL_FEED "\033A" ! #define EPC_MANUAL_FEED 'A' ! ! #define CPRI_CASETTE_FEED "\033B" ! #define EPC_CASSETTE_FEED 'B' ! ! #define CPRI_STRIKE "\033C%s\33" ! #define EPC_STRIKE 'C' ! ! #define CPRI_NEW_LINE "\033D" ! #define EPC_NEW_LINE 'D' ! ! #define CPRI_NEW_PAGE "\033E" ! #define EPC_NEW_PAGE 'E' ! ! #define CPRI_BEGIN_TO_BE_REPEATED "\033F" ! #define EPC_BEGIN_TO_BE_REPEATED 'F' ! ! #define CPRI_END_TO_BE_REPEATED "\033G" ! #define EPC_END_TO_BE_REPEATED 'G' ! ! #define CPRI_TABLE "\033H%d\33%d\33%d\33" ! #define EPC_TABLE 'H' ! ! #define CPRI_END_TABLE "\033I" ! #define EPC_END_TABLE 'I' ! ! #define CPRI_LINE_HEIGHT "\033J%d\33" ! #define EPC_LINE_HEIGHT 'J' ! ! #define CPRI_MERGE_ALL_COLUMNS "\033K" ! #define EPC_MERGE_ALL_COLUMNS 'K' ! ! #define CPRI_TEXT_TO_VLINE_SPACE "\033L%d\33" ! #define EPC_TEXT_TO_VLINE_SPACE 'L' ! #define CPRI_TEXT_TO_HLINE_SPACE "\033M%d\33" ! #define EPC_TEXT_TO_HLINE_SPACE 'M' ! ! #define CPRI_PORTRAIT "\033N" ! #define EPC_PORTRAIT 'N' ! ! #define CPRI_LANDSCAPE "\033O" ! #define EPC_LANDSCAPE 'O' ! ! #define CPRI_SUP "\033P%s\33" ! #define EPC_SUP 'P' ! #define CPRI_SUP_RALIGN_CELL "\033Q%s\33" ! #define EPC_SUP_RALIGN_CELL 'Q' ! #define CPRI_SUP_RALIGN "\033R%s\33" ! #define EPC_SUP_RALIGN 'R' ! #define CPRI_SUP_LALIGN "\033S%s\33" ! #define EPC_SUP_LALIGN 'S' ! ! #define CPRI_RESET "\033T" ! #define EPC_RESET 'T' ! ! #define CPRI_PUSH_POS "\033U" ! #define EPC_PUSH_POS 'U' ! #define CPRI_POP_POS "\033V" ! #define EPC_POP_POS 'V' ! ! #define CPRI_FONT_SIZE "\033X%d\33" ! #define EPC_FONT_SIZE 'X' ! ! #define CPRI_FONT_TYPEFACE "\033Y%d\33%d\33%d\33" ! #define EPC_FONT_TYPEFACE 'Y' ! #define ALBERTUS 0 ! #define ANTIQUE 1 ! #define TIMES 2 ! #define UNIVERS 3 ! #define CONDENSED 4 ! #define FONT5 5 ! #define COURIER 6 ! #define GOTHIC 7 ! #define SCRIPT 8 ! #define FONT10 9 ! #define FONT11 10 ! #define NOTYPEFACES 11 ! ! #define CPRI_UNDERLINE "\033Z%d\33" ! #define EPC_UNDERLINE 'Z' ! ! #define CPRI_START_RECORD_MACRO "\033a" ! #define EPC_START_RECORD_MACRO 'a' ! #define CPRI_STOP_RECORD_MACRO "\033b" ! #define EPC_STOP_RECORD_MACRO 'b' ! ! #define CPRI_EXECUTE_MACRO "\033c" ! #define EPC_EXECUTE_MACRO 'c' ! ! #define CPRI_DELETE_MACROS "\033d" ! #define EPC_DELETE_MACROS 'd' ! ! #define CPRI_MACROID "\033e%d\33" ! #define EPC_MACROID 'e' ! ! #define CPRI_CREATE_COLUMN "\033f%d\33" ! #define EPC_CREATE_COLUMN 'f' ! ! #define CPRI_MOVE_TO_NEXT_COLUMN "\033g" ! #define EPC_MOVE_TO_NEXT_COLUMN 'g' ! ! #define CPRI_REMOVE_COLUMNS "\033h" ! #define EPC_REMOVE_COLUMNS 'h' ! ! #define CPRI_DEACTIVATE_COLUMN "\033i%d\33" ! #define EPC_DEACTIVATE_COLUMN 'i' ! ! #define CPRI_ACTIVATE_COLUMNS "\033j" ! #define EPC_ACTIVATE_COLUMNS 'j' ! ! #define CPRI_HORIZONTAL_BAR "\033k%d\33%d\33%d\33%d\33%d\33" ! #define EPC_HORIZONTAL_BAR 'k' ! #define BAR_PATTERN_BACKW_DIAGONAL_LINES 0 ! #define BAR_PATTERN_DIAGONAL_LINES 1 ! #define BAR_PATTERN_HLINES 2 ! #define BAR_PATTERN_SQUARES 3 ! #define BAR_PATTERN_VLINES 4 ! #define BAR_PATTERN_DIAGONAL_SQUARES 5 ! #define BAR_PATTERN_GRAY 6 ! #define BAR_PATTERN_NR 7 ! #define CPRI_END_BAR_LABEL "\033l" ! #define EPC_END_BAR_LABEL 'l' ! ! #define CPRI_DOSTEXT "\033m%d\33" ! #define EPC_DOSTEXT 'm' ! ! #define CPRI_HTML_TAG "\033n%s\33" ! #define EPC_HTML_TAG 'n' ! ! #define CPRI_END_HTML_TAG "\033o" ! #define EPC_END_HTML_TAG 'o' ! ! #define CPRI_CHECK "\033p" ! #define EPC_CHECK 'p' ! ! #define CPRI_START_GRID "\033q" ! #define EPC_START_GRID 'q' ! ! #define CPRI_END_GRID "\033r" ! #define EPC_END_GRID 'r' ! ! #define CPRI_END_START_SEQUENCE "\033s" ! #define EPC_END_START_SEQUENCE 's' ! ! #define CPRI_ALIGN "\033t%d\33%s\33" ! #define EPC_ALIGN 't' ! #define ALIGN_LEFT 0 ! #define ALIGN_CENTER 1 ! #define ALIGN_RIGHT 2 ! #define ALIGN_RIGHTHE 3 ! #define ALIGN_RIGHTDP 4 ! ! #define CPRI_ABS_MOVEX "\033u%d\33" ! #define EPC_ABS_MOVEX 'u' ! #define CPRI_ABS_MOVEY "\033v%d\33" ! #define EPC_ABS_MOVEY 'v' ! #define CPRI_REL_MOVEX "\033x%d\33" ! #define EPC_REL_MOVEX 'x' ! #define CPRI_REL_MOVEY "\033y%d\33" ! #define EPC_REL_MOVEY 'y' ! ! #define CPRI_RECTANGLE "\033z%d\33%d\33" ! #define EPC_RECTANGLE 'z' ! ! #define CPRI_NR_OF_COPIES "\0330%d\33" ! #define EPC_NR_OF_COPIES '0' ! ! #define CPRI_BAR_CODE "\0331%s\33" ! #define EPC_BAR_CODE '1' ! ! #define CPRI_BAR_CODE_W "\0332%d\33" ! #define EPC_BAR_CODE_W '2' ! ! #define CPRI_BAR_CODE_H "\0333%d\33" ! #define EPC_BAR_CODE_H '3' ! ! #define CPRI_SCALING "\0334%d\33" ! #define EPC_SCALING '4' ! ! #define CPRI_FIX_ROW_HEIGHT "\0335%d\33" ! #define EPC_FIX_ROW_HEIGHT '5' ! ! /* Printer functions ====================== */ ! ! struct t_handle; ! typedef struct t_handle* t_handle; ! typedef const char* t_command; ! ! CPRI_FUNC(int, CpriCommand, (t_handle hnd, t_command cmd, ...)); ! CPRI_FUNC(int, CpriText, (t_handle hnd, const char *string)); ! CPRI_FUNC(t_handle, CpriOpenEntry, (int q, const char *p_name, int, const char *fn)); ! CPRI_FUNC(int, CpriCloseEntry, (t_handle hnd)); ! CPRI_FUNC(void, CpriPrinterPortDialogue, (void)); ! CPRI_FUNC(void, CpriPrinterQueueMonitor, (void)); ! CPRI_FUNC(void, CpriInitPrinter, (void)); ! CPRI_FUNC(void, CpriDeInitPrinter, (void)); ! CPRI_FUNC(void, CpriPrintingProperties, (int port, int use, int brand, const char *cmd1, const char *cmd2)); ! CPRI_FUNC(int, CpriIsSpooling, (void)); ! CPRI_FUNC(const char *const*, CpriGetQueueNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetDriverNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetTypefaceNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetBarIcons, (void)); ! ! #define QUEUE_LPT1 0 ! #define QUEUE_LPT2 1 ! #define QUEUE_LPT3 2 ! #define QUEUE_DOSPRINT 3 ! #define QUEUE_NETPORT 4 ! #define QUEUE_OPTIMALPORT 5 ! #define QUEUE_REQUEST 6 ! #define NR_OF_QUEUES 7 ! ! #define BRAND_HP 0 ! #define BRAND_NEC 1 ! #define BRAND_KYOCERA 2 ! #define BRAND_BROTHER 3 ! #define BRAND_UNKNOWN 4 ! #define NODRIVERS 5 ! ! #endif --- 1,234 ---- ! #ifndef CPRI_H ! #define CPRI_H ! ! #define CPRI_VERSION_MAJOR 0 ! #define CPRI_VERSION_MINOR 9 ! #define CPRI_VERSION_PATCH 4 ! #define CPRI_VERSION_STRING "0.9.4" ! #define CPRI_DATE 20040612 /* yyyymmdd */ ! #define CPRI_DATE_STRING "Jun 12, 2004" ! ! #include "cpri/cpricfg.h" ! ! /* Printer commands ====================== */ ! #define CPRI_MANUAL_FEED "\033A" ! #define EPC_MANUAL_FEED 'A' ! ! #define CPRI_CASETTE_FEED "\033B" ! #define EPC_CASSETTE_FEED 'B' ! ! #define CPRI_STRIKE "\033C%s\33" ! #define EPC_STRIKE 'C' ! ! #define CPRI_NEW_LINE "\033D" ! #define EPC_NEW_LINE 'D' ! ! #define CPRI_NEW_PAGE "\033E" ! #define EPC_NEW_PAGE 'E' ! ! #define CPRI_BEGIN_TO_BE_REPEATED "\033F" ! #define EPC_BEGIN_TO_BE_REPEATED 'F' ! ! #define CPRI_END_TO_BE_REPEATED "\033G" ! #define EPC_END_TO_BE_REPEATED 'G' ! ! #define CPRI_TABLE "\033H%d\33%d\33%d\33" ! #define EPC_TABLE 'H' ! ! #define CPRI_END_TABLE "\033I" ! #define EPC_END_TABLE 'I' ! ! #define CPRI_LINE_HEIGHT "\033J%d\33" ! #define EPC_LINE_HEIGHT 'J' ! ! #define CPRI_MERGE_ALL_COLUMNS "\033K" ! #define EPC_MERGE_ALL_COLUMNS 'K' ! ! #define CPRI_TEXT_TO_VLINE_SPACE "\033L%d\33" ! #define EPC_TEXT_TO_VLINE_SPACE 'L' ! #define CPRI_TEXT_TO_HLINE_SPACE "\033M%d\33" ! #define EPC_TEXT_TO_HLINE_SPACE 'M' ! ! #define CPRI_PORTRAIT "\033N" ! #define EPC_PORTRAIT 'N' ! ! #define CPRI_LANDSCAPE "\033O" ! #define EPC_LANDSCAPE 'O' ! ! #define CPRI_SUP "\033P%s\33" ! #define EPC_SUP 'P' ! #define CPRI_SUP_RALIGN_CELL "\033Q%s\33" ! #define EPC_SUP_RALIGN_CELL 'Q' ! #define CPRI_SUP_RALIGN "\033R%s\33" ! #define EPC_SUP_RALIGN 'R' ! #define CPRI_SUP_LALIGN "\033S%s\33" ! #define EPC_SUP_LALIGN 'S' ! ! #define CPRI_RESET "\033T" ! #define EPC_RESET 'T' ! ! #define CPRI_PUSH_POS "\033U" ! #define EPC_PUSH_POS 'U' ! #define CPRI_POP_POS "\033V" ! #define EPC_POP_POS 'V' ! ! #define CPRI_FONT_SIZE "\033X%d\33" ! #define EPC_FONT_SIZE 'X' ! ! #define CPRI_FONT_TYPEFACE "\033Y%d\33%d\33%d\33" ! #define EPC_FONT_TYPEFACE 'Y' ! #define ALBERTUS 0 ! #define ANTIQUE 1 ! #define TIMES 2 ! #define UNIVERS 3 ! #define CONDENSED 4 ! #define FONT5 5 ! #define COURIER 6 ! #define GOTHIC 7 ! #define SCRIPT 8 ! #define FONT10 9 ! #define FONT11 10 ! #define NOTYPEFACES 11 ! ! #define CPRI_UNDERLINE "\033Z%d\33" ! #define EPC_UNDERLINE 'Z' ! ! #define CPRI_START_RECORD_MACRO "\033a" ! #define EPC_START_RECORD_MACRO 'a' ! #define CPRI_STOP_RECORD_MACRO "\033b" ! #define EPC_STOP_RECORD_MACRO 'b' ! ! #define CPRI_EXECUTE_MACRO "\033c" ! #define EPC_EXECUTE_MACRO 'c' ! ! #define CPRI_DELETE_MACROS "\033d" ! #define EPC_DELETE_MACROS 'd' ! ! #define CPRI_MACROID "\033e%d\33" ! #define EPC_MACROID 'e' ! ! #define CPRI_CREATE_COLUMN "\033f%d\33" ! #define EPC_CREATE_COLUMN 'f' ! ! #define CPRI_MOVE_TO_NEXT_COLUMN "\033g" ! #define EPC_MOVE_TO_NEXT_COLUMN 'g' ! ! #define CPRI_REMOVE_COLUMNS "\033h" ! #define EPC_REMOVE_COLUMNS 'h' ! ! #define CPRI_DEACTIVATE_COLUMN "\033i%d\33" ! #define EPC_DEACTIVATE_COLUMN 'i' ! ! #define CPRI_ACTIVATE_COLUMNS "\033j" ! #define EPC_ACTIVATE_COLUMNS 'j' ! ! #define CPRI_HORIZONTAL_BAR "\033k%d\33%d\33%d\33%d\33%d\33" ! #define EPC_HORIZONTAL_BAR 'k' ! #define BAR_PATTERN_BACKW_DIAGONAL_LINES 0 ! #define BAR_PATTERN_DIAGONAL_LINES 1 ! #define BAR_PATTERN_HLINES 2 ! #define BAR_PATTERN_SQUARES 3 ! #define BAR_PATTERN_VLINES 4 ! #define BAR_PATTERN_DIAGONAL_SQUARES 5 ! #define BAR_PATTERN_GRAY 6 ! #define BAR_PATTERN_NR 7 ! #define CPRI_END_BAR_LABEL "\033l" ! #define EPC_END_BAR_LABEL 'l' ! ! #define CPRI_DOSTEXT "\033m%d\33" ! #define EPC_DOSTEXT 'm' ! ! #define CPRI_HTML_TAG "\033n%s\33" ! #define EPC_HTML_TAG 'n' ! ! #define CPRI_END_HTML_TAG "\033o" ! #define EPC_END_HTML_TAG 'o' ! ! #define CPRI_CHECK "\033p" ! #define EPC_CHECK 'p' ! ! #define CPRI_START_GRID "\033q" ! #define EPC_START_GRID 'q' ! ! #define CPRI_END_GRID "\033r" ! #define EPC_END_GRID 'r' ! ! #define CPRI_END_START_SEQUENCE "\033s" ! #define EPC_END_START_SEQUENCE 's' ! ! #define CPRI_ALIGN "\033t%d\33%s\33" ! #define EPC_ALIGN 't' ! #define ALIGN_LEFT 0 ! #define ALIGN_CENTER 1 ! #define ALIGN_RIGHT 2 ! #define ALIGN_RIGHTHE 3 ! #define ALIGN_RIGHTDP 4 ! ! #define CPRI_ABS_MOVEX "\033u%d\33" ! #define EPC_ABS_MOVEX 'u' ! #define CPRI_ABS_MOVEY "\033v%d\33" ! #define EPC_ABS_MOVEY 'v' ! #define CPRI_REL_MOVEX "\033x%d\33" ! #define EPC_REL_MOVEX 'x' ! #define CPRI_REL_MOVEY "\033y%d\33" ! #define EPC_REL_MOVEY 'y' ! ! #define CPRI_RECTANGLE "\033z%d\33%d\33" ! #define EPC_RECTANGLE 'z' ! ! #define CPRI_NR_OF_COPIES "\0330%d\33" ! #define EPC_NR_OF_COPIES '0' ! ! #define CPRI_BAR_CODE "\0331%s\33" ! #define EPC_BAR_CODE '1' ! ! #define CPRI_BAR_CODE_W "\0332%d\33" ! #define EPC_BAR_CODE_W '2' ! ! #define CPRI_BAR_CODE_H "\0333%d\33" ! #define EPC_BAR_CODE_H '3' ! ! #define CPRI_SCALING "\0334%d\33" ! #define EPC_SCALING '4' ! ! #define CPRI_FIX_ROW_HEIGHT "\0335%d\33" ! #define EPC_FIX_ROW_HEIGHT '5' ! ! /* Printer functions ====================== */ ! ! struct t_handle; ! typedef struct t_handle* t_handle; ! typedef const char* t_command; ! ! CPRI_FUNC(int, CpriCommand, (t_handle hnd, t_command cmd, ...)); ! CPRI_FUNC(int, CpriText, (t_handle hnd, const char *string)); ! CPRI_FUNC(t_handle, CpriOpenEntry, (int q, const char *p_name, int, const char *fn)); ! CPRI_FUNC(int, CpriCloseEntry, (t_handle hnd)); ! CPRI_FUNC(void, CpriPrinterPortDialogue, (void)); ! CPRI_FUNC(void, CpriPrinterQueueMonitor, (void)); ! CPRI_FUNC(void, CpriInitPrinter, (void)); ! CPRI_FUNC(void, CpriDeInitPrinter, (void)); ! CPRI_FUNC(void, CpriPrintingProperties, (int port, int use, int brand, const char *cmd1, const char *cmd2)); ! CPRI_FUNC(int, CpriIsSpooling, (void)); ! CPRI_FUNC(const char *const*, CpriGetQueueNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetDriverNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetTypefaceNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetBarIcons, (void)); ! ! #define QUEUE_LPT1 0 ! #define QUEUE_LPT2 1 ! #define QUEUE_LPT3 2 ! #define QUEUE_DOSPRINT 3 ! #define QUEUE_NETPORT 4 ! #define QUEUE_OPTIMALPORT 5 ! #define QUEUE_REQUEST 6 ! #define NR_OF_QUEUES 7 ! ! #define BRAND_HP 0 ! #define BRAND_NEC 1 ! #define BRAND_KYOCERA 2 ! #define BRAND_BROTHER 3 ! #define BRAND_UNKNOWN 4 ! #define NODRIVERS 5 ! ! #endif |
|
From: SourceForge.net <no...@so...> - 2004-08-31 06:52:50
|
Bugs item #1019406, was opened at 2004-08-31 06:51 Message generated for change (Settings changed) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=1019406&group_id=74455 Category: Platform independent >Group: MainBranch >Status: Closed >Resolution: Fixed Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Example does not build Initial Comment: In the example there is a reference to a CGUI function (EndMenu) that is not present in the latest versions of CGUI. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=1019406&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2004-08-31 06:51:48
|
Bugs item #1019406, was opened at 2004-08-31 06:51 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=1019406&group_id=74455 Category: Platform independent Group: v0.9.3 Status: Open Resolution: None Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Example does not build Initial Comment: In the example there is a reference to a CGUI function (EndMenu) that is not present in the latest versions of CGUI. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=1019406&group_id=74455 |
|
From: Christer S. <ch...@us...> - 2004-06-22 06:23:33
|
Update of /cvsroot/cpri/cpri/lib/msvc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30894/lib/msvc Modified Files: cpri.def Log Message: linefeeds... Index: cpri.def =================================================================== RCS file: /cvsroot/cpri/cpri/lib/msvc/cpri.def,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cpri.def 21 Jun 2004 19:16:02 -0000 1.3 --- cpri.def 22 Jun 2004 06:23:24 -0000 1.4 *************** *** 1,16 **** ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 --- 1,16 ---- ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 |
|
From: Christer S. <ch...@us...> - 2004-06-22 06:23:32
|
Update of /cvsroot/cpri/cpri/lib/mingw32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30894/lib/mingw32 Modified Files: cpri.def Log Message: linefeeds... Index: cpri.def =================================================================== RCS file: /cvsroot/cpri/cpri/lib/mingw32/cpri.def,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cpri.def 21 Jun 2004 19:16:01 -0000 1.3 --- cpri.def 22 Jun 2004 06:23:23 -0000 1.4 *************** *** 1,16 **** ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 --- 1,16 ---- ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 |
|
From: Christer S. <ch...@us...> - 2004-06-22 06:23:32
|
Update of /cvsroot/cpri/cpri/lib/bcc32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30894/lib/bcc32 Modified Files: cpri.def Log Message: linefeeds... Index: cpri.def =================================================================== RCS file: /cvsroot/cpri/cpri/lib/bcc32/cpri.def,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cpri.def 21 Jun 2004 19:16:01 -0000 1.3 --- cpri.def 22 Jun 2004 06:23:22 -0000 1.4 *************** *** 1,16 **** ! ; generated by fixdll.sh ! EXPORTS ! _CpriCloseEntry = CpriCloseEntry ! _CpriCommand = CpriCommand ! _CpriDeInitPrinter = CpriDeInitPrinter ! _CpriGetBarIcons = CpriGetBarIcons ! _CpriGetDriverNames = CpriGetDriverNames ! _CpriGetQueueNames = CpriGetQueueNames ! _CpriGetTypefaceNames = CpriGetTypefaceNames ! _CpriInitPrinter = CpriInitPrinter ! _CpriIsSpooling = CpriIsSpooling ! _CpriOpenEntry = CpriOpenEntry ! _CpriPrinterPortDialogue = CpriPrinterPortDialogue ! _CpriPrinterQueueMonitor = CpriPrinterQueueMonitor ! _CpriPrintingProperties = CpriPrintingProperties ! _CpriText = CpriText --- 1,16 ---- ! ; generated by fixdll.sh ! EXPORTS ! _CpriCloseEntry = CpriCloseEntry ! _CpriCommand = CpriCommand ! _CpriDeInitPrinter = CpriDeInitPrinter ! _CpriGetBarIcons = CpriGetBarIcons ! _CpriGetDriverNames = CpriGetDriverNames ! _CpriGetQueueNames = CpriGetQueueNames ! _CpriGetTypefaceNames = CpriGetTypefaceNames ! _CpriInitPrinter = CpriInitPrinter ! _CpriIsSpooling = CpriIsSpooling ! _CpriOpenEntry = CpriOpenEntry ! _CpriPrinterPortDialogue = CpriPrinterPortDialogue ! _CpriPrinterQueueMonitor = CpriPrinterQueueMonitor ! _CpriPrintingProperties = CpriPrintingProperties ! _CpriText = CpriText |
|
From: Christer S. <ch...@us...> - 2004-06-21 19:16:43
|
Update of /cvsroot/cpri/cpri/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14503/include Modified Files: cpri.h Log Message: fixed some build issues Index: cpri.h =================================================================== RCS file: /cvsroot/cpri/cpri/include/cpri.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** cpri.h 14 Dec 2003 16:42:40 -0000 1.10 --- cpri.h 21 Jun 2004 19:15:47 -0000 1.11 *************** *** 1,234 **** ! #ifndef CPRI_H ! #define CPRI_H ! ! #define CPRI_VERSION_MAJOR 0 ! #define CPRI_VERSION_MINOR 9 ! #define CPRI_VERSION_PATCH 3 ! #define CPRI_VERSION_STRING "0.9.3" ! #define CPRI_DATE 20031214 /* yyyymmdd */ ! #define CPRI_DATE_STRING "Dec 14, 2003" ! ! #include "cpri/cpricfg.h" ! ! /* Printer commands ====================== */ ! #define CPRI_MANUAL_FEED "\033A" ! #define EPC_MANUAL_FEED 'A' ! ! #define CPRI_CASETTE_FEED "\033B" ! #define EPC_CASSETTE_FEED 'B' ! ! #define CPRI_STRIKE "\033C%s\33" ! #define EPC_STRIKE 'C' ! ! #define CPRI_NEW_LINE "\033D" ! #define EPC_NEW_LINE 'D' ! ! #define CPRI_NEW_PAGE "\033E" ! #define EPC_NEW_PAGE 'E' ! ! #define CPRI_BEGIN_TO_BE_REPEATED "\033F" ! #define EPC_BEGIN_TO_BE_REPEATED 'F' ! ! #define CPRI_END_TO_BE_REPEATED "\033G" ! #define EPC_END_TO_BE_REPEATED 'G' ! ! #define CPRI_TABLE "\033H%d\33%d\33%d\33" ! #define EPC_TABLE 'H' ! ! #define CPRI_END_TABLE "\033I" ! #define EPC_END_TABLE 'I' ! ! #define CPRI_LINE_HEIGHT "\033J%d\33" ! #define EPC_LINE_HEIGHT 'J' ! ! #define CPRI_MERGE_ALL_COLUMNS "\033K" ! #define EPC_MERGE_ALL_COLUMNS 'K' ! ! #define CPRI_TEXT_TO_VLINE_SPACE "\033L%d\33" ! #define EPC_TEXT_TO_VLINE_SPACE 'L' ! #define CPRI_TEXT_TO_HLINE_SPACE "\033M%d\33" ! #define EPC_TEXT_TO_HLINE_SPACE 'M' ! ! #define CPRI_PORTRAIT "\033N" ! #define EPC_PORTRAIT 'N' ! ! #define CPRI_LANDSCAPE "\033O" ! #define EPC_LANDSCAPE 'O' ! ! #define CPRI_SUP "\033P%s\33" ! #define EPC_SUP 'P' ! #define CPRI_SUP_RALIGN_CELL "\033Q%s\33" ! #define EPC_SUP_RALIGN_CELL 'Q' ! #define CPRI_SUP_RALIGN "\033R%s\33" ! #define EPC_SUP_RALIGN 'R' ! #define CPRI_SUP_LALIGN "\033S%s\33" ! #define EPC_SUP_LALIGN 'S' ! ! #define CPRI_RESET "\033T" ! #define EPC_RESET 'T' ! ! #define CPRI_PUSH_POS "\033U" ! #define EPC_PUSH_POS 'U' ! #define CPRI_POP_POS "\033V" ! #define EPC_POP_POS 'V' ! ! #define CPRI_FONT_SIZE "\033X%d\33" ! #define EPC_FONT_SIZE 'X' ! ! #define CPRI_FONT_TYPEFACE "\033Y%d\33%d\33%d\33" ! #define EPC_FONT_TYPEFACE 'Y' ! #define ALBERTUS 0 ! #define ANTIQUE 1 ! #define TIMES 2 ! #define UNIVERS 3 ! #define CONDENSED 4 ! #define FONT5 5 ! #define COURIER 6 ! #define GOTHIC 7 ! #define SCRIPT 8 ! #define FONT10 9 ! #define FONT11 10 ! #define NOTYPEFACES 11 ! ! #define CPRI_UNDERLINE "\033Z%d\33" ! #define EPC_UNDERLINE 'Z' ! ! #define CPRI_START_RECORD_MACRO "\033a" ! #define EPC_START_RECORD_MACRO 'a' ! #define CPRI_STOP_RECORD_MACRO "\033b" ! #define EPC_STOP_RECORD_MACRO 'b' ! ! #define CPRI_EXECUTE_MACRO "\033c" ! #define EPC_EXECUTE_MACRO 'c' ! ! #define CPRI_DELETE_MACROS "\033d" ! #define EPC_DELETE_MACROS 'd' ! ! #define CPRI_MACROID "\033e%d\33" ! #define EPC_MACROID 'e' ! ! #define CPRI_CREATE_COLUMN "\033f%d\33" ! #define EPC_CREATE_COLUMN 'f' ! ! #define CPRI_MOVE_TO_NEXT_COLUMN "\033g" ! #define EPC_MOVE_TO_NEXT_COLUMN 'g' ! ! #define CPRI_REMOVE_COLUMNS "\033h" ! #define EPC_REMOVE_COLUMNS 'h' ! ! #define CPRI_DEACTIVATE_COLUMN "\033i%d\33" ! #define EPC_DEACTIVATE_COLUMN 'i' ! ! #define CPRI_ACTIVATE_COLUMNS "\033j" ! #define EPC_ACTIVATE_COLUMNS 'j' ! ! #define CPRI_HORIZONTAL_BAR "\033k%d\33%d\33%d\33%d\33%d\33" ! #define EPC_HORIZONTAL_BAR 'k' ! #define BAR_PATTERN_BACKW_DIAGONAL_LINES 0 ! #define BAR_PATTERN_DIAGONAL_LINES 1 ! #define BAR_PATTERN_HLINES 2 ! #define BAR_PATTERN_SQUARES 3 ! #define BAR_PATTERN_VLINES 4 ! #define BAR_PATTERN_DIAGONAL_SQUARES 5 ! #define BAR_PATTERN_GRAY 6 ! #define BAR_PATTERN_NR 7 ! #define CPRI_END_BAR_LABEL "\033l" ! #define EPC_END_BAR_LABEL 'l' ! ! #define CPRI_DOSTEXT "\033m%d\33" ! #define EPC_DOSTEXT 'm' ! ! #define CPRI_HTML_TAG "\033n%s\33" ! #define EPC_HTML_TAG 'n' ! ! #define CPRI_END_HTML_TAG "\033o" ! #define EPC_END_HTML_TAG 'o' ! ! #define CPRI_CHECK "\033p" ! #define EPC_CHECK 'p' ! ! #define CPRI_START_GRID "\033q" ! #define EPC_START_GRID 'q' ! ! #define CPRI_END_GRID "\033r" ! #define EPC_END_GRID 'r' ! ! #define CPRI_END_START_SEQUENCE "\033s" ! #define EPC_END_START_SEQUENCE 's' ! ! #define CPRI_ALIGN "\033t%d\33%s\33" ! #define EPC_ALIGN 't' ! #define ALIGN_LEFT 0 ! #define ALIGN_CENTER 1 ! #define ALIGN_RIGHT 2 ! #define ALIGN_RIGHTHE 3 ! #define ALIGN_RIGHTDP 4 ! ! #define CPRI_ABS_MOVEX "\033u%d\33" ! #define EPC_ABS_MOVEX 'u' ! #define CPRI_ABS_MOVEY "\033v%d\33" ! #define EPC_ABS_MOVEY 'v' ! #define CPRI_REL_MOVEX "\033x%d\33" ! #define EPC_REL_MOVEX 'x' ! #define CPRI_REL_MOVEY "\033y%d\33" ! #define EPC_REL_MOVEY 'y' ! ! #define CPRI_RECTANGLE "\033z%d\33%d\33" ! #define EPC_RECTANGLE 'z' ! ! #define CPRI_NR_OF_COPIES "\0330%d\33" ! #define EPC_NR_OF_COPIES '0' ! ! #define CPRI_BAR_CODE "\0331%s\33" ! #define EPC_BAR_CODE '1' ! ! #define CPRI_BAR_CODE_W "\0332%d\33" ! #define EPC_BAR_CODE_W '2' ! ! #define CPRI_BAR_CODE_H "\0333%d\33" ! #define EPC_BAR_CODE_H '3' ! ! #define CPRI_SCALING "\0334%d\33" ! #define EPC_SCALING '4' ! ! #define CPRI_FIX_ROW_HEIGHT "\0335%d\33" ! #define EPC_FIX_ROW_HEIGHT '5' ! ! /* Printer functions ====================== */ ! ! struct t_handle; ! typedef struct t_handle* t_handle; ! typedef const char* t_command; ! ! CPRI_FUNC(int, CpriCommand, (t_handle hnd, t_command cmd, ...)); ! CPRI_FUNC(int, CpriText, (t_handle hnd, const char *string)); ! CPRI_FUNC(t_handle, CpriOpenEntry, (int q, const char *p_name, int, const char *fn)); ! CPRI_FUNC(int, CpriCloseEntry, (t_handle hnd)); ! CPRI_FUNC(void, CpriPrinterPortDialogue, (void)); ! CPRI_FUNC(void, CpriPrinterQueueMonitor, (void)); ! CPRI_FUNC(void, CpriInitPrinter, (void)); ! CPRI_FUNC(void, CpriDeInitPrinter, (void)); ! CPRI_FUNC(void, CpriPrintingProperties, (int port, int use, int brand, const char *cmd1, const char *cmd2)); ! CPRI_FUNC(int, CpriIsSpooling, (void)); ! CPRI_FUNC(const char *const*, CpriGetQueueNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetDriverNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetTypefaceNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetBarIcons, (void)); ! ! #define QUEUE_LPT1 0 ! #define QUEUE_LPT2 1 ! #define QUEUE_LPT3 2 ! #define QUEUE_DOSPRINT 3 ! #define QUEUE_NETPORT 4 ! #define QUEUE_OPTIMALPORT 5 ! #define QUEUE_REQUEST 6 ! #define NR_OF_QUEUES 7 ! ! #define BRAND_HP 0 ! #define BRAND_NEC 1 ! #define BRAND_KYOCERA 2 ! #define BRAND_BROTHER 3 ! #define BRAND_UNKNOWN 4 ! #define NODRIVERS 5 ! ! #endif --- 1,234 ---- ! #ifndef CPRI_H ! #define CPRI_H ! ! #define CPRI_VERSION_MAJOR 0 ! #define CPRI_VERSION_MINOR 9 ! #define CPRI_VERSION_PATCH 4 ! #define CPRI_VERSION_STRING "0.9.4" ! #define CPRI_DATE 20040612 /* yyyymmdd */ ! #define CPRI_DATE_STRING "Jun 12, 2004" ! ! #include "cpri/cpricfg.h" ! ! /* Printer commands ====================== */ ! #define CPRI_MANUAL_FEED "\033A" ! #define EPC_MANUAL_FEED 'A' ! ! #define CPRI_CASETTE_FEED "\033B" ! #define EPC_CASSETTE_FEED 'B' ! ! #define CPRI_STRIKE "\033C%s\33" ! #define EPC_STRIKE 'C' ! ! #define CPRI_NEW_LINE "\033D" ! #define EPC_NEW_LINE 'D' ! ! #define CPRI_NEW_PAGE "\033E" ! #define EPC_NEW_PAGE 'E' ! ! #define CPRI_BEGIN_TO_BE_REPEATED "\033F" ! #define EPC_BEGIN_TO_BE_REPEATED 'F' ! ! #define CPRI_END_TO_BE_REPEATED "\033G" ! #define EPC_END_TO_BE_REPEATED 'G' ! ! #define CPRI_TABLE "\033H%d\33%d\33%d\33" ! #define EPC_TABLE 'H' ! ! #define CPRI_END_TABLE "\033I" ! #define EPC_END_TABLE 'I' ! ! #define CPRI_LINE_HEIGHT "\033J%d\33" ! #define EPC_LINE_HEIGHT 'J' ! ! #define CPRI_MERGE_ALL_COLUMNS "\033K" ! #define EPC_MERGE_ALL_COLUMNS 'K' ! ! #define CPRI_TEXT_TO_VLINE_SPACE "\033L%d\33" ! #define EPC_TEXT_TO_VLINE_SPACE 'L' ! #define CPRI_TEXT_TO_HLINE_SPACE "\033M%d\33" ! #define EPC_TEXT_TO_HLINE_SPACE 'M' ! ! #define CPRI_PORTRAIT "\033N" ! #define EPC_PORTRAIT 'N' ! ! #define CPRI_LANDSCAPE "\033O" ! #define EPC_LANDSCAPE 'O' ! ! #define CPRI_SUP "\033P%s\33" ! #define EPC_SUP 'P' ! #define CPRI_SUP_RALIGN_CELL "\033Q%s\33" ! #define EPC_SUP_RALIGN_CELL 'Q' ! #define CPRI_SUP_RALIGN "\033R%s\33" ! #define EPC_SUP_RALIGN 'R' ! #define CPRI_SUP_LALIGN "\033S%s\33" ! #define EPC_SUP_LALIGN 'S' ! ! #define CPRI_RESET "\033T" ! #define EPC_RESET 'T' ! ! #define CPRI_PUSH_POS "\033U" ! #define EPC_PUSH_POS 'U' ! #define CPRI_POP_POS "\033V" ! #define EPC_POP_POS 'V' ! ! #define CPRI_FONT_SIZE "\033X%d\33" ! #define EPC_FONT_SIZE 'X' ! ! #define CPRI_FONT_TYPEFACE "\033Y%d\33%d\33%d\33" ! #define EPC_FONT_TYPEFACE 'Y' ! #define ALBERTUS 0 ! #define ANTIQUE 1 ! #define TIMES 2 ! #define UNIVERS 3 ! #define CONDENSED 4 ! #define FONT5 5 ! #define COURIER 6 ! #define GOTHIC 7 ! #define SCRIPT 8 ! #define FONT10 9 ! #define FONT11 10 ! #define NOTYPEFACES 11 ! ! #define CPRI_UNDERLINE "\033Z%d\33" ! #define EPC_UNDERLINE 'Z' ! ! #define CPRI_START_RECORD_MACRO "\033a" ! #define EPC_START_RECORD_MACRO 'a' ! #define CPRI_STOP_RECORD_MACRO "\033b" ! #define EPC_STOP_RECORD_MACRO 'b' ! ! #define CPRI_EXECUTE_MACRO "\033c" ! #define EPC_EXECUTE_MACRO 'c' ! ! #define CPRI_DELETE_MACROS "\033d" ! #define EPC_DELETE_MACROS 'd' ! ! #define CPRI_MACROID "\033e%d\33" ! #define EPC_MACROID 'e' ! ! #define CPRI_CREATE_COLUMN "\033f%d\33" ! #define EPC_CREATE_COLUMN 'f' ! ! #define CPRI_MOVE_TO_NEXT_COLUMN "\033g" ! #define EPC_MOVE_TO_NEXT_COLUMN 'g' ! ! #define CPRI_REMOVE_COLUMNS "\033h" ! #define EPC_REMOVE_COLUMNS 'h' ! ! #define CPRI_DEACTIVATE_COLUMN "\033i%d\33" ! #define EPC_DEACTIVATE_COLUMN 'i' ! ! #define CPRI_ACTIVATE_COLUMNS "\033j" ! #define EPC_ACTIVATE_COLUMNS 'j' ! ! #define CPRI_HORIZONTAL_BAR "\033k%d\33%d\33%d\33%d\33%d\33" ! #define EPC_HORIZONTAL_BAR 'k' ! #define BAR_PATTERN_BACKW_DIAGONAL_LINES 0 ! #define BAR_PATTERN_DIAGONAL_LINES 1 ! #define BAR_PATTERN_HLINES 2 ! #define BAR_PATTERN_SQUARES 3 ! #define BAR_PATTERN_VLINES 4 ! #define BAR_PATTERN_DIAGONAL_SQUARES 5 ! #define BAR_PATTERN_GRAY 6 ! #define BAR_PATTERN_NR 7 ! #define CPRI_END_BAR_LABEL "\033l" ! #define EPC_END_BAR_LABEL 'l' ! ! #define CPRI_DOSTEXT "\033m%d\33" ! #define EPC_DOSTEXT 'm' ! ! #define CPRI_HTML_TAG "\033n%s\33" ! #define EPC_HTML_TAG 'n' ! ! #define CPRI_END_HTML_TAG "\033o" ! #define EPC_END_HTML_TAG 'o' ! ! #define CPRI_CHECK "\033p" ! #define EPC_CHECK 'p' ! ! #define CPRI_START_GRID "\033q" ! #define EPC_START_GRID 'q' ! ! #define CPRI_END_GRID "\033r" ! #define EPC_END_GRID 'r' ! ! #define CPRI_END_START_SEQUENCE "\033s" ! #define EPC_END_START_SEQUENCE 's' ! ! #define CPRI_ALIGN "\033t%d\33%s\33" ! #define EPC_ALIGN 't' ! #define ALIGN_LEFT 0 ! #define ALIGN_CENTER 1 ! #define ALIGN_RIGHT 2 ! #define ALIGN_RIGHTHE 3 ! #define ALIGN_RIGHTDP 4 ! ! #define CPRI_ABS_MOVEX "\033u%d\33" ! #define EPC_ABS_MOVEX 'u' ! #define CPRI_ABS_MOVEY "\033v%d\33" ! #define EPC_ABS_MOVEY 'v' ! #define CPRI_REL_MOVEX "\033x%d\33" ! #define EPC_REL_MOVEX 'x' ! #define CPRI_REL_MOVEY "\033y%d\33" ! #define EPC_REL_MOVEY 'y' ! ! #define CPRI_RECTANGLE "\033z%d\33%d\33" ! #define EPC_RECTANGLE 'z' ! ! #define CPRI_NR_OF_COPIES "\0330%d\33" ! #define EPC_NR_OF_COPIES '0' ! ! #define CPRI_BAR_CODE "\0331%s\33" ! #define EPC_BAR_CODE '1' ! ! #define CPRI_BAR_CODE_W "\0332%d\33" ! #define EPC_BAR_CODE_W '2' ! ! #define CPRI_BAR_CODE_H "\0333%d\33" ! #define EPC_BAR_CODE_H '3' ! ! #define CPRI_SCALING "\0334%d\33" ! #define EPC_SCALING '4' ! ! #define CPRI_FIX_ROW_HEIGHT "\0335%d\33" ! #define EPC_FIX_ROW_HEIGHT '5' ! ! /* Printer functions ====================== */ ! ! struct t_handle; ! typedef struct t_handle* t_handle; ! typedef const char* t_command; ! ! CPRI_FUNC(int, CpriCommand, (t_handle hnd, t_command cmd, ...)); ! CPRI_FUNC(int, CpriText, (t_handle hnd, const char *string)); ! CPRI_FUNC(t_handle, CpriOpenEntry, (int q, const char *p_name, int, const char *fn)); ! CPRI_FUNC(int, CpriCloseEntry, (t_handle hnd)); ! CPRI_FUNC(void, CpriPrinterPortDialogue, (void)); ! CPRI_FUNC(void, CpriPrinterQueueMonitor, (void)); ! CPRI_FUNC(void, CpriInitPrinter, (void)); ! CPRI_FUNC(void, CpriDeInitPrinter, (void)); ! CPRI_FUNC(void, CpriPrintingProperties, (int port, int use, int brand, const char *cmd1, const char *cmd2)); ! CPRI_FUNC(int, CpriIsSpooling, (void)); ! CPRI_FUNC(const char *const*, CpriGetQueueNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetDriverNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetTypefaceNames, (void)); ! CPRI_FUNC(const char *const*, CpriGetBarIcons, (void)); ! ! #define QUEUE_LPT1 0 ! #define QUEUE_LPT2 1 ! #define QUEUE_LPT3 2 ! #define QUEUE_DOSPRINT 3 ! #define QUEUE_NETPORT 4 ! #define QUEUE_OPTIMALPORT 5 ! #define QUEUE_REQUEST 6 ! #define NR_OF_QUEUES 7 ! ! #define BRAND_HP 0 ! #define BRAND_NEC 1 ! #define BRAND_KYOCERA 2 ! #define BRAND_BROTHER 3 ! #define BRAND_UNKNOWN 4 ! #define NODRIVERS 5 ! ! #endif |
|
From: Christer S. <ch...@us...> - 2004-06-21 19:16:43
|
Update of /cvsroot/cpri/cpri/lib/bcc32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14503/lib/bcc32 Modified Files: cpri.def Log Message: fixed some build issues Index: cpri.def =================================================================== RCS file: /cvsroot/cpri/cpri/lib/bcc32/cpri.def,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpri.def 30 Mar 2003 19:59:23 -0000 1.2 --- cpri.def 21 Jun 2004 19:16:01 -0000 1.3 *************** *** 1,16 **** ! ; generated by fixdll.sh ! EXPORTS ! _CpriCloseEntry = CpriCloseEntry ! _CpriCommand = CpriCommand ! _CpriDeInitPrinter = CpriDeInitPrinter ! _CpriGetBarIcons = CpriGetBarIcons ! _CpriGetDriverNames = CpriGetDriverNames ! _CpriGetQueueNames = CpriGetQueueNames ! _CpriGetTypefaceNames = CpriGetTypefaceNames ! _CpriInitPrinter = CpriInitPrinter ! _CpriIsSpooling = CpriIsSpooling ! _CpriOpenEntry = CpriOpenEntry ! _CpriPrinterPortDialogue = CpriPrinterPortDialogue ! _CpriPrinterQueueMonitor = CpriPrinterQueueMonitor ! _CpriPrintingProperties = CpriPrintingProperties ! _CpriText = CpriText --- 1,16 ---- ! ; generated by fixdll.sh ! EXPORTS ! _CpriCloseEntry = CpriCloseEntry ! _CpriCommand = CpriCommand ! _CpriDeInitPrinter = CpriDeInitPrinter ! _CpriGetBarIcons = CpriGetBarIcons ! _CpriGetDriverNames = CpriGetDriverNames ! _CpriGetQueueNames = CpriGetQueueNames ! _CpriGetTypefaceNames = CpriGetTypefaceNames ! _CpriInitPrinter = CpriInitPrinter ! _CpriIsSpooling = CpriIsSpooling ! _CpriOpenEntry = CpriOpenEntry ! _CpriPrinterPortDialogue = CpriPrinterPortDialogue ! _CpriPrinterQueueMonitor = CpriPrinterQueueMonitor ! _CpriPrintingProperties = CpriPrintingProperties ! _CpriText = CpriText |
|
From: Christer S. <ch...@us...> - 2004-06-21 19:16:42
|
Update of /cvsroot/cpri/cpri/lib/mingw32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14503/lib/mingw32 Modified Files: cpri.def Log Message: fixed some build issues Index: cpri.def =================================================================== RCS file: /cvsroot/cpri/cpri/lib/mingw32/cpri.def,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpri.def 30 Mar 2003 19:59:23 -0000 1.2 --- cpri.def 21 Jun 2004 19:16:01 -0000 1.3 *************** *** 1,16 **** ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 --- 1,16 ---- ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 |
|
From: Christer S. <ch...@us...> - 2004-06-21 19:16:42
|
Update of /cvsroot/cpri/cpri/lib/msvc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14503/lib/msvc Modified Files: cpri.def Log Message: fixed some build issues Index: cpri.def =================================================================== RCS file: /cvsroot/cpri/cpri/lib/msvc/cpri.def,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpri.def 30 Mar 2003 19:59:23 -0000 1.2 --- cpri.def 21 Jun 2004 19:16:02 -0000 1.3 *************** *** 1,16 **** ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 --- 1,16 ---- ! ; generated by fixdll.sh ! EXPORTS ! CpriCloseEntry @1 ! CpriCommand @2 ! CpriDeInitPrinter @3 ! CpriGetBarIcons @4 ! CpriGetDriverNames @5 ! CpriGetQueueNames @6 ! CpriGetTypefaceNames @7 ! CpriInitPrinter @8 ! CpriIsSpooling @9 ! CpriOpenEntry @10 ! CpriPrinterPortDialogue @11 ! CpriPrinterQueueMonitor @12 ! CpriPrintingProperties @13 ! CpriText @14 |
|
From: Christer S. <ch...@us...> - 2004-06-21 19:16:26
|
Update of /cvsroot/cpri/cpri/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14503/docs Modified Files: changes._tx cpri._tx readme._tx Log Message: fixed some build issues Index: cpri._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/cpri._tx,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** cpri._tx 1 Feb 2004 17:09:16 -0000 1.10 --- cpri._tx 21 Jun 2004 19:15:47 -0000 1.11 *************** *** 1,794 **** ! @#This is the source for the CPRI manual, in Shawn's special format. ! @#The readable documents are generated and will be found in the files: ! @#cpri.txt,cpri.rtf, cpri.htm, cpri.inf, the latter may be ! @#installed as on-line help if you are using rhide (just add cpri to the ! @#list of help files) ! @# ! @multiwordheaders ! @manh="version 0.9.3" "CPRI" "Manual" ! @document_title=CPRI Manual ! @rtfh=cpri - an add on lib to CGUI for formatted printing [...1559 lines suppressed...] ! The "scaling" command changes the current scaling. Some measurements like ! positions and sizes are interpreted according to the current scaling.<br> ! Parameter: 0- sizes should be expressed in nr of "character boxes" in ! the default fix text size 1-(default) sizes should be expressed in mm ! ! @@const char* @CPRI_RESET ! The "reset" command resets the driver state to the initial state, and if ! possible, send a reset command to the driver <br> ! Parameter: none ! ! @headingnocontent ! Index ! ! @index ! ! @$@contents ! @$@bye ! ! @html ! @text Index: readme._tx =================================================================== RCS file: /cvsroot/cpri/cpri/docs/readme._tx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme._tx 1 Feb 2004 17:09:16 -0000 1.3 --- readme._tx 21 Jun 2004 19:15:47 -0000 1.4 *************** *** 1,192 **** ! @# 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... ! @# ! @#ignore_css ! @multiwordheaders ! @#multiplefiles ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="readme.html">Back to Contents</a><p> ! @rtfh=Readme for CPRI ! @$\input texinfo ! @$@setfilename readme.inf ! @$@settitle Readme for CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* CPRI: (CPRI). Readme file for CPRI ! @$@end direntry ! @$This is the Info version of the CPRI readme file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Readme for CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b>The readme file of CPRI</b></center> ! ! @!text ! @heading ! Contents ! ! @shortcontents ! ! @text ! @heading ! Introduction ! ! CPRI is a library with functions for pretty printing of tables or table-like ! printouts using the event queue of CGUI. It also provides a dialogue ! that lets the user modify the printer settings, and one for administration of ! the printer queues for the DJGPP platform. ! ! CPRI compiles on the following platforms: DOS/DJGPP, Linux, ! Windows/Mingw32 and Windows/MSVC. ! ! The current version have full functionality only on the DJGPP and Windows ! platforms, there are only stubs present for the other platforms. ! ! You need to have compiled and installed Allegro version 4.0 or later, as ! well as CGUI version 1.6 or later. ! ! ! @heading ! Requirements ! ! You need to have compiled and installed Allegro 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. ! 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: ! http://alleg.sourceforge.net/ ! ! You can find CGUI at: ! http://www.mdh.se/~csg/cgui/ ! ! ! @heading ! Installation ! ! Installation goes in three simple steps, and should be familiar since it is ! exactly the same way as you installed CGUI: ! <ul> ! <li> ! Tell the installation process what platform you use. This is done by ! running one of the following:<br> ! <pre> ! fix.bat djgpp - to compile with DOS/DJGPP ! fix.bat mingw32 - to compile with Windows/MinGW32 ! fix.bat bcc32 - to compile with Windows/Borland C++ ! fix.bat msvc - to compile with Windows/MSVC ! fix.sh unix - to compile with Linux/gcc ! </pre><li> ! <li> ! Specify the path to your allegro 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. ! <li> ! 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 ! system, go to the "Help / Syntax help / Files to search" menu, and add ! "ccom" after the existing "libc" entry (separated by a space). ! <li> ! If you want statically linked libraries under Unix or Windows 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. ! ! @heading ! 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> ! Before passing any printing commands you must have initialized both CGUI ! and CPRI. ! </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,208 ---- ! @# 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... ! @# ! @#ignore_css ! @multiwordheaders ! @#multiplefiles ! @#locale=latin1 ! @h=<html><head><title>#</title><body> ! @f=<p><hr><p><a href="readme.html">Back to Contents</a><p> ! @rtfh=Readme for CPRI ! @$\input texinfo ! @$@setfilename readme.inf ! @$@settitle Readme for CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* CPRI: (CPRI). Readme file for CPRI ! @$@end direntry ! @$This is the Info version of the CPRI readme file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Readme for CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b>The readme file of CPRI</b></center> ! ! @!text ! @heading ! Contents ! ! @shortcontents ! ! @text ! @heading ! Introduction ! ! CPRI is a library with functions for pretty printing of tables or table-like ! printouts using the event queue of CGUI. It also provides a dialogue ! that lets the user modify the printer settings, and one for administration of ! the printer queues for the DJGPP platform. ! ! CPRI compiles on the following platforms: DOS/DJGPP, Linux, ! Windows/Mingw32 and Windows/MSVC. ! ! The current version have full functionality only on the DJGPP and Windows ! platforms, there are only stubs present for the other platforms. ! ! You need to have compiled and installed Allegro version 4.0 or later, as ! well as CGUI version 1.6 or later. ! ! ! @heading ! Requirements ! ! You need to have compiled and installed Allegro 4.0.x as well as CGUI 1.6.7 or later. ! 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: ! http://alleg.sourceforge.net/ ! ! You can find CGUI at: ! http://www.mdh.se/~csg/cgui/ ! ! ! @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. 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 ! 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> ! <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:\cpri ! </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> ! 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 ! system, go to the "Help / Syntax help / Files to search" menu, and add ! "ccom" after the existing "libc" entry (separated by a space). ! <li> ! If you want statically linked libraries under Unix or Windows 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. ! ! @heading ! 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> ! Before passing any printing commands you must have initialized both CGUI ! and CPRI. ! </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/cpri/cpri/docs/changes._tx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** changes._tx 1 Feb 2004 17:09:16 -0000 1.5 --- changes._tx 21 Jun 2004 19:15:47 -0000 1.6 *************** *** 1,91 **** ! @# ! @# This is the source for the CPRI 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=CPRI Changes ! @rtfh=Changes in CPRI ! @$\input texinfo ! @$@setfilename changes.inf ! @$@settitle Changes in CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Changes: (changes). Changes in CPRI ! @$@end direntry ! @$This is the Info version of the Changes in CPRI file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Changes in CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b> ! The changes log of CPRI ! </b></center> ! @!text ! ! @heading ! 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> ! <li> Fixed bug #859562 "Html-tables shows garbage when using CPRI_SUP_LALIGN" - added case for CPRI_SUP_LALIGN ! </ul> ! 0.9.2: ! <ul> ! <li> ! The application will not exit in release-mode when resetDC fails. ! <li> ! Fixed bug #841108 "Textfiles are not clean" (unprintable chars like form feed in the files) ! <li> ! Fixed bug #841105 "Second printout to text file prints only first row" ! <li> ! Fixed bug "Fixed textfile printing" (various fixes to the text file driver) ! <li> ! Fixed a bug with alligned index printing in the driver for standard windows printing. ! <li> ! Fixed bug #827139 "Landscape in W98". ! <li> ! Adapted to build under Msys ! <li> ! Fixed bug #742863 "Linux build" ! <li> ! Fixed bug #731192 "Bug in width calculation" (some drivers) ! <li> ! Fixed bug #731191 "Bug in the html-driver" ! <li> ! Fixed bug #727717 "Build problem -mingw32" ! </ul> ! ! 0.9.1: ! <ul> ! <li> ! Bug fixed: A line could be dropped between two pages in table print outs (windows) ! <li> ! Added some features that were lacking in the windows version: manuel feed, ! selection of orientation, adjustable bar-code width and height ! </ul> ! ! 0.9.0: ! <ul> ! <li> ! Initial official version. ! </ul> --- 1,95 ---- ! @# ! @# This is the source for the CPRI 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=CPRI Changes ! @rtfh=Changes in CPRI ! @$\input texinfo ! @$@setfilename changes.inf ! @$@settitle Changes in CPRI ! @$@setchapternewpage odd ! @$@paragraphindent 0 ! @$@setchapternewpage off ! @# This should remain commented at the moment (dvi output) @$@finalout ! @$ ! @$@ifinfo ! @$@direntry ! @$* Changes: (changes). Changes in CPRI ! @$@end direntry ! @$This is the Info version of the Changes in CPRI file. ! @$ ! @$By Christer Sandberg ! @$@end ifinfo ! @$ ! @$@node Top, , (dir), (dir) ! @<html> ! @<head> ! @<title>Changes in CPRI</title> ! @<body> ! <center><b>A CGUI and Allegro addon for formatted printing</b></center> ! <center><b>by Christer Sandberg and Rasmus Myklebust</b></center> ! <center>Email: <email>chr...@md...</a></center> ! <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center> ! <center><b> ! The changes log of CPRI ! </b></center> ! @!text ! ! @heading ! Changes ! ! 0.9.4: ! <ul> ! <li> ! Fixed bug 888505 Doesn't build on Linux ! <li> ! Clearified some stuff in the readme. ! <li> ! Removed implicit dependency to allegro 4.1.* (dat2c) ! </ul> ! 0.9.3: ! <ul> ! <li> Fixed bug #859562 "Html-tables shows garbage when using CPRI_SUP_LALIGN" - added case for CPRI_SUP_LALIGN ! </ul> ! 0.9.2: ! <ul> ! <li> ! The application will not exit in release-mode when resetDC fails. ! <li> ! Fixed bug #841108 "Textfiles are not clean" (unprintable chars like form feed in the files) ! <li> ! Fixed bug #841105 "Second printout to text file prints only first row" ! <li> ! Fixed bug "Fixed textfile printing" (various fixes to the text file driver) ! <li> ! Fixed a bug with alligned index printing in the driver for standard windows printing. ! <li> ! Fixed bug #827139 "Landscape in W98". ! <li> ! Adapted to build under Msys ! <li> ! Fixed bug #742863 "Linux build" ! <li> ! Fixed bug #731192 "Bug in width calculation" (some drivers) ! <li> ! Fixed bug #731191 "Bug in the html-driver" ! <li> ! Fixed bug #727717 "Build problem -mingw32" ! </ul> ! ! 0.9.1: ! <ul> ! <li> ! Bug fixed: A line could be dropped between two pages in table print outs (windows) ! <li> ! Added some features that were lacking in the windows version: manuel feed, ! selection of orientation, adjustable bar-code width and height ! </ul> ! ! 0.9.0: ! <ul> ! <li> ! Initial official version. ! </ul> |
|
From: Christer S. <ch...@us...> - 2004-06-21 19:16:18
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14503/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver zipup.sh Log Message: fixed some build issues Index: makefile.uni =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.uni 8 Feb 2004 11:35:56 -0000 1.8 --- makefile.uni 21 Jun 2004 19:16:02 -0000 1.9 *************** *** 1,231 **** ! # makefile.uni: ! # Makefile for the CPRI library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # See readme.txt for more information about CPRI. ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcpri $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cpri ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri_s.a $(SYSTEM_LIB_DIR)/libcprid_s.a \ ! $(SYSTEM_LIB_DIR)/libcpri.so $(SYSTEM_LIB_DIR)/libcprid.so \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^[a-zA-Z0-9_\/]*\///" -e "s/[a-zA-Z0-9_\/.:-]*version.h//" _depend.tmp > _depend2.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri\/\1\.o:/" _depend2.tmp > obj/unix/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid\/\1\.o:/" _depend2.tmp > obj/unix/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri_s\/\1\.o:/" _depend2.tmp > obj/unix/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid_s\/\1\.o:/" _depend2.tmp > obj/unix/cprid_s/makefile.dep ! rm _depend.tmp _depend2.tmp --- 1,230 ---- ! # makefile.uni: ! # Makefile for the CPRI library with Unix. Should not be used directly! ! # ! # By Christer Sandberg (copied from ADIME made by Sven Sandberg) ! # See readme.txt for more information about CPRI. ! # See makefile.all for a list of the available targets. ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = UNIX ! ! EXE_SUFFIX = ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/unix ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/unix ! ! HAVE_TEXINFO = 1 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif ! ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! ! # -------- Default system paths. ------------ ! ! ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local ! endif ! SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include ! SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib ! ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef STATICLINK ! AL_CONF_OPTION = --static ! LIB_FLAGS = -lcgui_s ! else ! AL_CONF_OPTION = --shared ! LIB_FLAGS = -lcgui ! endif ! ! ifdef DEBUGMODE ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! AL_CONF_LIB = debug ! else ! ifdef PROFILEMODE ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! AL_CONF_LIB = profile ! else # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! AL_CONF_LIB = release ! endif ! endif # DEBUGMODE ! ! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)` ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! ifdef PROFILEMODE ! LIB_FLAGS += -lgmon ! endif ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2UNIX = -D__UNIX__ -UDJGPP ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! else ! # link as a shared object ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcpri $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! # If you don't have the install command, you may use cp and mkdir, but ! # this will not set permissions. ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! install -m 755 -d $(SYSTEM_LIB_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! install -m 755 -d $(SYSTEM_INCLUDE_DIR) ! install -m 644 $< $@ ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! install -m 755 -d $(SYSTEM_INCLUDE_DIR)/cpri ! install -m 644 $< $@ ! ! ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(INSTALL_HEADERS) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) UNIX library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri_s.a $(SYSTEM_LIB_DIR)/libcprid_s.a \ ! $(SYSTEM_LIB_DIR)/libcpri.so $(SYSTEM_LIB_DIR)/libcprid.so \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! # -------- generate automatic dependencies -------- ! ! DEPEND_PARAMS = $(GCC2UNIX) -MM -MG -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri\/\1\.o:/" _depend.tmp > obj/unix/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid\/\1\.o:/" _depend.tmp > obj/unix/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cpri_s\/\1\.o:/" _depend.tmp > obj/unix/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/unix\/cprid_s\/\1\.o:/" _depend.tmp > obj/unix/cprid_s/makefile.dep ! rm _depend.tmp Index: makefile.ver =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.ver,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.ver 14 Dec 2003 16:42:40 -0000 1.6 --- makefile.ver 21 Jun 2004 19:16:02 -0000 1.7 *************** *** 1,10 **** ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 09 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 0.9.3 ! shared_major_minor = 0.9 --- 1,10 ---- ! # version numbers included by the main makefile ! # this file is patched by fixver.sh ! ! # DLL filename number for Windows ! LIB_VERSION = 09 ! ! # Shared library versions for Unix ! # todo: this is unused at the moment ! shared_version = 0.9.4 ! shared_major_minor = 0.9 Index: makefile.bcc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.bcc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.bcc 8 Feb 2004 11:35:56 -0000 1.6 --- makefile.bcc 21 Jun 2004 19:16:02 -0000 1.7 *************** *** 1,375 **** ! # makefile.bcc: ! # Makefile for the CPRI library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(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. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! ifdef UNIX_TOOLS ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcpri.def ! copy _impcpri.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcpri.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cpri.lib $(SYSTEM_LIB_DIR)/cpri_s.lib \ ! $(SYSTEM_LIB_DIR)/cprid.lib $(SYSTEM_LIB_DIR)/cprid_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(WINDIR_U)/cpri$(LIB_VERSION).dll $(WINDIR_U)/cprid$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^[a-zA-Z0-9_\/]*\///" -e "s/[^ ]*version\.h//" -e "s/[^ ]*djgpp\.ver//" -e "s/[^ ]*allegro[^ ]*//g" -e"/^ *\\/d" _depend.tmp > _depend2.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri\/\1\.obj:/" _depend2.tmp > obj/bcc32/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid\/\1\.obj:/" _depend2.tmp > obj/bcc32/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri_s\/\1\.obj:/" _depend2.tmp > obj/bcc32/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid_s\/\1\.obj:/" _depend2.tmp > obj/bcc32/cprid_s/makefile.dep ! rm _depend.tmp _depend2.tmp --- 1,374 ---- ! # makefile.bcc: ! # Makefile for the CPRI library with Borland C++Builder. ! # Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # You need to set BCC32DIR to the directory where Borland C++Builder is ! # located. ! # ! # This build uses djgpp for calculating source dependencies. ! # ! # The "depend" target uses sed. ! ! ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = BCC32 ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\bcc32 ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/bcc32 ! LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(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. -------- ! ! .PHONY: badwin badbcc32 ! ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef BCC32DIR ! BCC32DIR_U = $(subst \,/,$(BCC32DIR)) ! BCC32DIR_D = $(subst /,\,$(BCC32DIR)) ! else ! badbcc32: ! @echo You need to set BCC32DIR to the directory where Borland C++Builder is ! @echo located. ! endif ! ! SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include ! SYSTEM_LIB_DIR = $(BCC32DIR_U)/lib ! SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -w ! else ! WFLAGS = ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Od -q ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! LIB_FLAGS += cw32.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib winmm.lib dsound.lib ! ! ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! ! ! # -------- Define how to compile. -------- ! ! GCC2BCC = -D__BORLANDC__ -UDJGPP ! ! COMPILE_C_TO_OBJ_DEPS = ! define COMPILE_C_TO_OBJ ! bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) ! endef ! ! define MAKE_LIB_RSP ! $(foreach lib, $(LIB_FLAGS), echo $(subst /,\\,$(lib)) + >> lib.rsp ! ) ! endef ! ! lib.rsp: ! $(MAKE_LIB_RSP) ! ! CLEAN_FILES += lib.rsp ! ! LINK_OBJ_TO_EXE_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_EXE ! ilink32 $(LFLAGS) /aa /Tpe c0w32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_EXE ! $(DO_LINK_OBJ_TO_EXE) ! @del $(subst .exe,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_EXE = $(DO_LINK_OBJ_TO_EXE) ! endif ! ! ifdef STATICLINK ! # link as a static library ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ! ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB ! -del libobj.rsp ! $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp ! ) ! ilink32 $(LFLAGS) /Tpd c0s32 @libobj.rsp,$(subst /,\,$(DLL_NAME)),,@lib.rsp,$(subst /,\,$(EXPDEF_NAME)) ! del libobj.rsp ! echo LIBRARY $(DLL_BASENAME) > _impcpri.def ! copy _impcpri.def + $(subst /,\,$(IMPDEF_NAME)) _impdim2.def ! implib $(subst /,\,$(IMPLIB_NAME)) _impdim2.def ! del _impcpri.def ! del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES ! define LINK_OBJ_TO_LIB ! $(DO_LINK_OBJ_TO_LIB) ! @del $(subst .dll,.tds,$(subst /,\,$@)) ! endef ! else ! LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! endif # ifdef STATICLINK ! ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! ! INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) BCC32 library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cpri.lib $(SYSTEM_LIB_DIR)/cpri_s.lib \ ! $(SYSTEM_LIB_DIR)/cprid.lib $(SYSTEM_LIB_DIR)/cprid_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(WINDIR_U)/cpri$(LIB_VERSION).dll $(WINDIR_U)/cprid$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! ! # -------- Compile anything that can't be done in makefile.all. -------- ! ! # this section is empty ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2BCC) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri\/\1\.obj:/" _depend.tmp > obj/bcc32/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid\/\1\.obj:/" _depend.tmp > obj/bcc32/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cpri_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/bcc32\/cprid_s\/\1\.obj:/" _depend.tmp > obj/bcc32/cprid_s/makefile.dep ! rm _depend.tmp Index: makefile.dj =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.dj 24 May 2004 00:27:52 -0000 1.7 --- makefile.dj 21 Jun 2004 19:16:02 -0000 1.8 *************** *** 1,266 **** ! # makefile.dj: ! # Makefile for the CPRI library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! ifdef UNIX_TOOLS ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CPRI doesn't relies on Allegro ! # including some standard header. ! ifdef CPRI_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri.a $(SYSTEM_LIB_DIR)/libcprid.a \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^[a-zA-Z0-9_\/]*\///" -e "s/[^ ]*version\.h//" -e "s/[^ ]*djgpp\.ver//" -e "s/[^ ]*allegro[^ ]*//g" -e"/^ *\\/d" _depend.tmp > _depend2.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cpri\/\1/" _depend2.tmp > obj/djgpp/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cprid\/\1/" _depend2.tmp > obj/djgpp/cprid/makefile.dep ! rm _depend.tmp _depend2.tmp --- 1,265 ---- ! # makefile.dj: ! # Makefile for the CPRI library with DJGPP. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! ! ! # -------- Define some variables that the primary makefile may use. -------- ! ! PLATFORM = djgpp ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .o ! LIB_SUFFIX = .a ! ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ifndef CROSSCOMPILE ! ifneq ($(LFN),y) ! HTML_SUFFIX = .htm ! INFO_SUFFIX = .inf ! TEXI_SUFFIX = .txi ! _TX_HTML_FLAG = -htm ! _TX_TEXI_FLAG = -txi ! endif ! endif ! ! HAVE_TEXINFO = 1 ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/djgpp ! LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! ! LIB_BASENAME = lib$(PACKAGE).a ! LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) ! ! ! ! # -------- Find djgpp. -------- ! ! .PHONY: baddjgpp ! ! ifndef DJDIR ! baddjgpp: ! @echo DJDIR variable not set! ! @echo You must set the environment variable DJDIR to point to your djgpp ! @echo directory, e.g. "set DJDIR=c:\djgpp" ! endif ! DJGPPDIR_U = $(subst \,/,$(DJDIR)) ! DJGPPDIR_D = $(subst /,\,$(DJDIR)) ! ! SYSTEM_INCLUDE_DIR = $(DJGPPDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(DJGPPDIR_D)\include ! SYSTEM_LIB_DIR = $(DJGPPDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(DJGPPDIR_D)/lib ! SYSTEM_INFO_DIR = $(DJGPPDIR_U)/info ! SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info ! ! ifneq (,$(findstring /sh.exe,$(SHELL))) ! UNIX_TOOLS = 1 ! endif ! ! ifdef UNIX_TOOLS ! CP = cp ! RM = rm ! MKDIR = mkdir ! else ! CP = copy ! RM = del ! MKDIR = md ! endif ! ! # -------- Set up mktext -------- ! ifdef UNIX_TOOLS ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! ! # -------- Give a sensible default target for make without any args. -------- ! # This must be done right after the tests, which can generate error targets. ! ! .PHONY: _default ! ! _default: default ! ! ! ! # -------- Decide what compiler options and libraries to use. -------- ! ! ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! else ! WFLAGS = -Wall -Wno-unused ! endif ! ! ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif ! endif ! ! ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lcguid -lalld ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS = -pg ! LIB_FLAGS = -lcgui -lallp ! else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS = -s ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! # This is just so that we can test that CPRI doesn't relies on Allegro ! # including some standard header. ! ifdef CPRI_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2DJGPP = -DDJGPP=2 -U__unix__ ! ! define COMPILE_C_TO_OBJ ! gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< ! endef ! ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) ! endef ! ! # -------- Rules for installing and removing the library files. -------- ! ! $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! $(MKDIR) $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! $(CP) $(subst /,\,$< $@) ! ! $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) ! install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir ! ! ! INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(LIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) djgpp library has been installed. ! ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri.a $(SYSTEM_LIB_DIR)/libcprid.a \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INFO_DIR)/cpri$(INFO_SUFFIX) ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2DJGPP) -MM -MG -I. -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cpri\/\1/" _depend.tmp > obj/djgpp/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\.o:\)/obj\/djgpp\/cprid\/\1/" _depend.tmp > obj/djgpp/cprid/makefile.dep ! rm _depend.tmp Index: makefile.vc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.vc 23 May 2004 20:54:27 -0000 1.11 --- makefile.vc 21 Jun 2004 19:16:02 -0000 1.12 *************** *** 1,329 **** ! # makefile.vc: ! # Makefile for the CPRI library with MSVC. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # To path MSVC so it can be used from the commandline, run the ! # vcvars32.bat file which can be found in your MSVC bin directory. ! # ! # This build uses djgpp for calculating ! # source dependencies, so you'll need to have that installed as well. ! # ! # The "depend" target uses sed. ! ! # -------- define some variables that the primary makefile will use -------- ! ! PLATFORM = MSVC ! ! EXE_SUFFIX = .exe ! OBJ_SUFFIX = .obj ! LIB_SUFFIX = .lib ! HTML_SUFFIX = .html ! INFO_SUFFIX = .info ! TEXI_SUFFIX = .texi ! ! _TX_HTML_FLAG = -html ! _TX_TEXI_FLAG = -texi ! ! ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj ! endif ! OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc ! OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\msvc ! ! ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib ! endif ! LIB_DIR = $(LIB_ROOT_DIR)/msvc ! LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ! ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) ! 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. -------- ! ! .PHONY: badwin badmsvc badspaces ! ! ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system ! endif ! ! ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) ! else ! badwin: ! @echo Your SYSTEMROOT or windir environment variable is not set! ! endif ! ! ifdef MSVCDIR ! MSVCDIR_U = $(subst \,/,$(MSVCDIR)) ! MSVCDIR_D = $(subst /,\,$(MSVCDIR)) ! else ! ifdef MSDEVDIR ! MSVCDIR_U = $(subst \,/,$(MSDEVDIR)) ! MSVCDIR_D = $(subst /,\,$(MSDEVDIR)) ! else ! badmsvc: ! @echo Your MSVCDIR or MSDEVDIR environment variable is not set! ! endif ! endif ! ! NULLSTRING := ! SPACE := $(NULLSTRING) # special magic to get an isolated space character ! ! ifneq ($(findstring $(SPACE),$(MSVCDIR)$(MSDEVDIR)),) ! badspaces: ! @echo There are spaces in your MSVCDIR or MSDEVDIR environment ! @echo variables: please change these to the 8.3 short filename ! @echo version, or move your compiler to a different directory. ! endif ! ! SYSTEM_INCLUDE_DIR = $(MSVCDIR_U)/include ! SYSTEM_INCLUDE_DIR_D = $(MSVCDIR_D)\include ! SYSTEM_LIB_DIR = $(MSVCDIR_U)/lib ! SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib ! ! ifdef UNIX_TOOLS ! # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! else ! ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) ! CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) ! CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) ! CPRI_DAT_H = $(subst /,\,$(CPRI_DAT_H_X)) ! CPRI_ICONS = $(subst /,\,$(CPRI_ICONS_X)) ! CPRI_ICONS_C = $(subst /,\,$(CPRI_ICONS_C_X)) ! CPRI_ICONS_H = $(subst /,\,$(CPRI_ICONS_H_X)) ! CPRI_LABELS = $(subst /,\,$(CPRI_LABELS_X)) ! TEXT_SOURCES = $(subst /,\,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst /,\,$(MKTEXT_X)) ! endif ! ! .PHONY: badalleg ! ! RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX) ! ! # -------- give a sensible default target for make without any args -------- ! ! .PHONY: _default ! ! _default: default ! ! # -------- decide what compiler options to use -------- ! ! ifdef WARNMODE ! WFLAGS = -W3 -WX ! else ! WFLAGS = -W1 ! endif ! ! ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Gd -Zi -MDd ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall ! LFLAGS = -debug -debugtype:cv ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cguid_s.lib alld_s.lib ! else ! LIB_FLAGS = cguid.lib alld.lib ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -profile ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib allp_s.lib ! else ! LIB_FLAGS = cgui.lib allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD ! SFLAGS = -Wall ! LFLAGS = -release ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = cgui_s.lib alleg_s.lib ! else ! LIB_FLAGS = cgui.lib alleg.lib ! endif ! endif ! endif ! ! ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 ! endif ! ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY ! endif ! ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -Gd -MD ! ! COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) ! COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ! ! ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK ! endif ! ! LIB_FLAGS += kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib \ ! dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib ! ! # -------- List platform specific objects and programs. -------- ! ! VPATH += ! ! OBJ_LIST = $(COMMON_OBJS) ! ! # Insert names of targets to build platform specific programs here. ! PROGRAMS = ! # Insert targets to build platform specific programs here. ! # myprogram: path/myprogram$(EXE_SUFFIX) ! ! # -------- Define how to compile. -------- ! ! GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ ! ! define COMPILE_C_TO_OBJ ! $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< ! endef ! ! define LINK_OBJ_TO_EXE ! $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef ! else ! # link as a DLL ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK ! ! # -------- Rules for installing and removing the library files. -------- ! ! ifneq ($(wildcard $(DJDIR)/bin/cp.exe),) ! HAVE_CP = 1 ! endif ! ! ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! endif ! ! $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) ! ! $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! ifdef HAVE_CP ! $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else ! copy $(subst /,\,$< $@) ! endif ! ! INSTALL_HEADERS = $(addprefix $(MSVCDIR_U)/,$(wildcard include/cpri/*.h)) ! ! INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(SYSTEM_INCLUDE_DIR)/cpri \ ! $(INSTALL_HEADERS) ! ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif ! ! install: $(INSTALL_FILES) ! @echo The $(DESCRIPTION) MSVC library has been installed. ! ! UNINSTALL_FILES = \ ! $(SYSTEM_LIB_DIR)/cpri.lib $(SYSTEM_LIB_DIR)/cpri_s.lib \ ! $(SYSTEM_LIB_DIR)/cprid.lib $(SYSTEM_LIB_DIR)/cprid_s.lib \ ! $(SYSTEM_INCLUDE_DIR)/cpri.h \ ! $(WINDIR_U)/cpri$(LIB_VERSION).dll $(WINDIR_U)/cprid$(LIB_VERSION).dll ! ! uninstall: ! -rm -fv $(UNINSTALL_FILES) ! -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri ! @echo All gone! ! ! # -------- Generate automatic dependencies. -------- ! ! DEPEND_PARAMS = $(GCC2MSVC) -MM -MG -I./include -DCPRI_SCAN_DEPEND ! ! depend: ! gcc $(DEPEND_PARAMS) src/*.c examples/*.c $(wildcard docs/*.c src/misc/*.c) > _depend.tmp ! sed -e "s/^[a-zA-Z0-9_\/]*\///" -e "s/[^ ]*version\.h//" -e "s/[^ ]*djgpp\.ver//" -e "s/[^ ]*allegro[^ ]*//g" -e"/^ *\\/d" _depend.tmp > _depend2.tmp ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cpri\/\1\.obj:/" _depend2.tmp > obj/msvc/cpri/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cprid\/\1\.obj:/" _depend2.tmp > obj/msvc/cprid/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cpri_s\/\1\.obj:/" _depend2.tmp > obj/msvc/cpri_s/makefile.dep ! sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/msvc\/cprid_s\/\1\.obj:/" _depend2.tmp > obj/msvc/cprid_s/makefile.dep ! rm _depend.tmp _depend2.tmp --- 1,328 ---- ! # makefile.vc: ! # Makefile for the CPRI library with MSVC. Should not be used directly! ! # ! # By Christer Sandberg (ported from Adime made by Sven Sandberg). ! # ! # See readme.txt for more information about CPRI. ! # ! # See makefile.all for a list of the available targets. ! # ! # ! # To path MSVC so it can be used from the commandline, run the ! # vcvars32.bat file which can be found in your MSVC bin directory. ! # ! # This build uses djgpp for calculating ! # source depe... [truncated message content] |
|
From: Rasmus M. <ras...@us...> - 2004-05-24 00:28:34
|
Update of /cvsroot/cpri/cpri/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29490 Modified Files: dialpri.c spooler.c Log Message: Fixed invalig preprocessors Index: dialpri.c =================================================================== RCS file: /cvsroot/cpri/cpri/src/dialpri.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dialpri.c 1 Feb 2004 17:09:16 -0000 1.5 --- dialpri.c 24 May 2004 00:28:23 -0000 1.6 *************** *** 118,122 **** #ifdef ALLEGRO_DOS prilang_sel[i] = ptxt[pt_pribrands + i]; ! #elseif define ALLEGRO_WINDOWS prilang_sel[i] = "Windows"; #else --- 118,122 ---- #ifdef ALLEGRO_DOS prilang_sel[i] = ptxt[pt_pribrands + i]; ! #elif defined ALLEGRO_WINDOWS prilang_sel[i] = "Windows"; #else Index: spooler.c =================================================================== RCS file: /cvsroot/cpri/cpri/src/spooler.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** spooler.c 1 Feb 2004 17:09:16 -0000 1.7 --- spooler.c 24 May 2004 00:28:23 -0000 1.8 *************** *** 748,752 **** break; } ! #elseif ALLEGRO_WINDOWS default: q->vtable = _cpri_stdwin_vtable; --- 748,752 ---- break; } ! #elif defined ALLEGRO_WINDOWS default: q->vtable = _cpri_stdwin_vtable; |
