cpri-develop Mailing List for CPRI - a C printer lib (Page 3)
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: Rasmus M. <ras...@us...> - 2004-05-24 00:28:02
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29376 Modified Files: makefile.dj makefile.mgw Log Message: Fixed the use of UNIX_TOOLS if present Index: makefile.mgw =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.mgw 23 May 2004 20:54:27 -0000 1.8 --- makefile.mgw 24 May 2004 00:27:52 -0000 1.9 *************** *** 97,100 **** --- 97,113 ---- SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib + 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 *************** *** 282,299 **** ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! copy $(subst /,\,$< $@) endif $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! copy $(subst /,\,$< $@) --- 295,312 ---- ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! $(CP) $(subst /,\,$< $@) endif $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_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 /,\,$< $@) Index: makefile.dj =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.dj 8 Feb 2004 11:35:56 -0000 1.6 --- makefile.dj 24 May 2004 00:27:52 -0000 1.7 *************** *** 75,78 **** --- 75,91 ---- 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 *************** *** 205,221 **** $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! copy $(subst /,\,$< $@) $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! copy $(subst /,\,$< $@) install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir --- 218,234 ---- $(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 |
|
From: Rasmus M. <ras...@us...> - 2004-05-23 20:54:59
|
Update of /cvsroot/cpri/cpri In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15152 Modified Files: fix.bat Log Message: Line ends Index: fix.bat =================================================================== RCS file: /cvsroot/cpri/cpri/fix.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fix.bat 1 Mar 2003 10:26:24 -0000 1.1.1.1 --- fix.bat 23 May 2004 20:54:45 -0000 1.2 *************** *** 1,90 **** ! @echo off ! ! rem Sets up the Cpri package for building with the specified compiler, ! rem and if possible converting text files from LF to CR/LF format. ! ! ! rem check that number of args is ok ! if [%3] == [] goto arg2 ! goto help ! ! ! rem check if second arg is ok ! :arg2 ! if [%2] == [--quick] goto arg1 ! if [%2] == [] goto arg1 ! goto help ! ! ! rem check if first arg is ok ! :arg1 ! if [%1] == [bcc32] goto begin ! if [%1] == [djgpp] goto begin ! if [%1] == [mingw32] goto begin ! if [%1] == [msvc] goto begin ! goto help ! ! ! rem echo header to makefile, then goto platform specific section ! :begin ! echo # generated by fix.bat > makefile ! if [%1] == [bcc32] goto bcc32 ! if [%1] == [djgpp] goto djgpp ! if [%1] == [mingw32] goto mingw32 ! if [%1] == [msvc] goto msvc ! echo internal error: not reached ! goto end ! ! ! :bcc32 ! echo Configuring Cpri for Windows/BCC32... ! echo MAKEFILE_INC = makefile.bcc >> makefile ! goto finish ! ! ! :djgpp ! echo Configuring Cpri for DOS/djgpp... ! echo MAKEFILE_INC = makefile.dj >> makefile ! goto finish ! ! ! :mingw32 ! echo Configuring Cpri for Windows/Mingw32... ! echo MAKEFILE_INC = makefile.mgw >> makefile ! goto finish ! ! ! :msvc ! echo Configuring Cpri for Windows/MSVC... ! echo MAKEFILE_INC = makefile.vc >> makefile ! goto finish ! ! ! :help ! echo. ! echo Usage: fix platform [--quick] ! echo. ! echo Where platform is one of: djgpp, mingw32, msvc or bcc32. ! echo The --quick parameter is used to turn off LF to CR/LF conversion. ! echo. ! goto end ! ! ! rem write end of makefile and possibly convert end of line format ! :finish ! echo include misc/makefile.all >> makefile ! ! if [%2] == [--quick] goto done ! if [%1] == [bcc32] goto done ! if [%1] == [mingw32] goto done ! ! echo Converting Cpri files to DOS CR/LF format... ! utod *.bat .../*.c .../*.h ! utod .../*.txt .../*._tx makefile* misc/makefile.* readme.* ! ! ! :done ! echo Done! ! ! ! :end --- 1,90 ---- ! @echo off ! ! rem Sets up the Cpri package for building with the specified compiler, ! rem and if possible converting text files from LF to CR/LF format. ! ! ! rem check that number of args is ok ! if [%3] == [] goto arg2 ! goto help ! ! ! rem check if second arg is ok ! :arg2 ! if [%2] == [--quick] goto arg1 ! if [%2] == [] goto arg1 ! goto help ! ! ! rem check if first arg is ok ! :arg1 ! if [%1] == [bcc32] goto begin ! if [%1] == [djgpp] goto begin ! if [%1] == [mingw32] goto begin ! if [%1] == [msvc] goto begin ! goto help ! ! ! rem echo header to makefile, then goto platform specific section ! :begin ! echo # generated by fix.bat > makefile ! if [%1] == [bcc32] goto bcc32 ! if [%1] == [djgpp] goto djgpp ! if [%1] == [mingw32] goto mingw32 ! if [%1] == [msvc] goto msvc ! echo internal error: not reached ! goto end ! ! ! :bcc32 ! echo Configuring Cpri for Windows/BCC32... ! echo MAKEFILE_INC = makefile.bcc >> makefile ! goto finish ! ! ! :djgpp ! echo Configuring Cpri for DOS/djgpp... ! echo MAKEFILE_INC = makefile.dj >> makefile ! goto finish ! ! ! :mingw32 ! echo Configuring Cpri for Windows/Mingw32... ! echo MAKEFILE_INC = makefile.mgw >> makefile ! goto finish ! ! ! :msvc ! echo Configuring Cpri for Windows/MSVC... ! echo MAKEFILE_INC = makefile.vc >> makefile ! goto finish ! ! ! :help ! echo. ! echo Usage: fix platform [--quick] ! echo. ! echo Where platform is one of: djgpp, mingw32, msvc or bcc32. ! echo The --quick parameter is used to turn off LF to CR/LF conversion. ! echo. ! goto end ! ! ! rem write end of makefile and possibly convert end of line format ! :finish ! echo include misc/makefile.all >> makefile ! ! if [%2] == [--quick] goto done ! if [%1] == [bcc32] goto done ! if [%1] == [mingw32] goto done ! ! echo Converting Cpri files to DOS CR/LF format... ! utod *.bat .../*.c .../*.h ! utod .../*.txt .../*._tx makefile* misc/makefile.* readme.* ! ! ! :done ! echo Done! ! ! ! :end |
|
From: Rasmus M. <ras...@us...> - 2004-05-23 20:54:37
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15095 Modified Files: makefile.mgw makefile.vc Log Message: Fixed reading of $(SystemRoot) and $(SYSTEMROOT) Index: makefile.vc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.vc 8 Feb 2004 11:35:56 -0000 1.10 --- makefile.vc 23 May 2004 20:54:27 -0000 1.11 *************** *** 68,86 **** 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 --- 68,82 ---- ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif Index: makefile.mgw =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.mgw 8 Feb 2004 11:35:56 -0000 1.7 --- makefile.mgw 23 May 2004 20:54:27 -0000 1.8 *************** *** 57,76 **** .PHONY: badwin badming ! ifeq ($(OS),Windows_NT) # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) --- 57,75 ---- .PHONY: badwin badming ! ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! WINSYSDIR = $(WINDIR) ! ifeq ($(WINSYSDIR),) ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif + ifneq ($(WINSYSDIR),) WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) |
|
From: <ben...@id...> - 2004-05-22 12:46:02
|
Dear Open Source developer I am doing a research project on "Fun and Software Development" in which I kindly invite you to participate. You will find the online survey under http://fasd.ethz.ch/qsf/. The questionnaire consists of 53 questions and you will need about 15 minutes to complete it. With the FASD project (Fun and Software Development) we want to define the motivational significance of fun when software developers decide to engage in Open Source projects. What is special about our research project is that a similar survey is planned with software developers in commercial firms. This procedure allows the immediate comparison between the involved individuals and the conditions of production of these two development models. Thus we hope to obtain substantial new insights to the phenomenon of Open Source Development. With many thanks for your participation, Benno Luthiger PS: The results of the survey will be published under http://www.isu.unizh.ch/fuehrung/blprojects/FASD/. We have set up the mailing list fa...@we... for this study. Please see http://fasd.ethz.ch/qsf/mailinglist_en.html for registration to this mailing list. _______________________________________________________________________ Benno Luthiger Swiss Federal Institute of Technology Zurich 8092 Zurich Mail: benno.luthiger(at)id.ethz.ch _______________________________________________________________________ |
|
From: <ras...@us...> - 2004-02-28 01:16:42
|
Update of /cvsroot/cpri/cpri/lib/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24953 Added Files: tmpfile.txt Log Message: Added missing directories --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. |
|
From: <ras...@us...> - 2004-02-28 00:16:51
|
Update of /cvsroot/cpri/cpri/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14679/examples Modified Files: 1_pri.c Log Message: Made the it build in msvc Index: 1_pri.c =================================================================== RCS file: /cvsroot/cpri/cpri/examples/1_pri.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 1_pri.c 8 Feb 2004 11:35:56 -0000 1.1 --- 1_pri.c 27 Feb 2004 23:59:57 -0000 1.2 *************** *** 520,524 **** static void show_menu(void *data) { - (void)data; #if defined ALLEGRO_LINUX static t_target target = {1, "default.html"}; --- 520,523 ---- *************** *** 526,529 **** --- 525,530 ---- static t_target target = {0, ""}; #endif + (void)data; + MkMenuItem(0, "Display printer queues", "", show_queue, NULL); MkMenuItem(0, "Printer settings", "", show_settings, NULL); |
|
From: <ch...@us...> - 2004-02-16 07:31:06
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2699 Modified Files: makefile.all Log Message: Minor makefile cange Index: makefile.all =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.all,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.all 8 Feb 2004 11:35:56 -0000 1.7 --- makefile.all 16 Feb 2004 07:23:17 -0000 1.8 *************** *** 62,66 **** width.c - RUNNER_SOURCE = misc/runner.c EXAMPLES_SOURCE = 1_pri.c --- 62,65 ---- |
|
From: SourceForge.net <no...@so...> - 2004-02-15 23:00:32
|
Feature Requests item #897676, was opened at 2004-02-15 23:56 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541027&aid=897676&group_id=74455 Category: Windows Group: None Status: Open Priority: 5 Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Nobody/Anonymous (nobody) Summary: Threaded printouts Initial Comment: Use threads for the printerdriver. As it is today it takes too long form some larger printouts to process, causing lockups in the main application. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541027&aid=897676&group_id=74455 |
Update of /cvsroot/cpri/cpri/misc/makedoc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29234 Removed Files: makechm.c makechm.h makedevh.c makedevh.h makedoc.c makedoc.h makehtml.c makehtml.h makeman.c makeman.h makemisc.c makemisc.h makertf.c makertf.h maketexi.c maketexi.h maketxt.c maketxt.h Log Message: removed --- makechm.c DELETED --- --- makechm.h DELETED --- --- makedevh.c DELETED --- --- makedevh.h DELETED --- --- makedoc.c DELETED --- --- makedoc.h DELETED --- --- makehtml.c DELETED --- --- makehtml.h DELETED --- --- makeman.c DELETED --- --- makeman.h DELETED --- --- makemisc.c DELETED --- --- makemisc.h DELETED --- --- makertf.c DELETED --- --- makertf.h DELETED --- --- maketexi.c DELETED --- --- maketexi.h DELETED --- --- maketxt.c DELETED --- --- maketxt.h DELETED --- |
|
From: <ch...@us...> - 2004-02-08 17:19:26
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26460/misc Removed Files: runner.c Log Message: Removed unused files --- runner.c DELETED --- |
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18127/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc zipup.sh Removed Files: makefile.doc Log Message: Some more makefile cleanup/improvements Index: makefile.all =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.all,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.all 1 Feb 2004 17:09:16 -0000 1.6 --- makefile.all 8 Feb 2004 11:35:56 -0000 1.7 *************** *** 63,67 **** RUNNER_SOURCE = misc/runner.c ! EXAMPLES_SOURCE = ex.c MAKEDOC_PROGRAM := $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) --- 63,67 ---- RUNNER_SOURCE = misc/runner.c ! EXAMPLES_SOURCE = 1_pri.c MAKEDOC_PROGRAM := $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) *************** *** 94,109 **** endif - # By default, Allegro is linked the same way as cpri, 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. -------- --- 94,97 ---- *************** *** 127,132 **** EXAMPLES_NAME = $(addprefix examples/,$(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) - - # -------- Compile -------- --- 115,118 ---- *************** *** 165,169 **** veryclean: ! -rm -fv $(VERY_CLEAN_FILES) compress: --- 151,155 ---- veryclean: ! -rm -fv $(VERY_CLEAN_FILES) compress: *************** *** 175,185 **** endif ! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(SYSTEM_INCLUDE_DIR)/cgui.h $(COMPILE_C_TO_OBJ) ! $(LIB_NAME): $(LIB_OBJS) $(LINK_OBJ_TO_LIB_DEPS) $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) --- 161,171 ---- endif ! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(SYSTEM_INCLUDE_DIR)/cgui.h $(COMPILE_C_TO_OBJ) ! $(LIB_NAME): $(LIB_OBJS) $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE) *************** *** 256,261 **** whisped -f3t3olke1d misc/makefile.* misc/emptymak - - # -------- Dependencies. -------- - - -include $(OBJ_DIR)/makefile.dep --- 242,243 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.bcc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.bcc 1 Feb 2004 17:09:16 -0000 1.5 --- makefile.bcc 8 Feb 2004 11:35:56 -0000 1.6 *************** *** 48,64 **** 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 --- 48,64 ---- 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 *************** *** 71,89 **** 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 --- 71,89 ---- 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 *************** *** 105,109 **** endif - SYSTEM_INCLUDE_DIR = $(BCC32DIR_U)/include SYSTEM_INCLUDE_DIR_D = $(BCC32DIR_D)\include --- 105,108 ---- *************** *** 111,137 **** SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib - - # -------- Find Allegro, runner and makedoc. -------- - - NEED_ALLEGRO = 1 - - .PHONY: badalleg - - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives, e.g. - @echo "set ALLEGRO=c:\allegro". - endif - - - ifdef NEED_MAKEDOC - include misc/makefile.doc - endif - - ifdef UNIX_TOOLS # -------- Set up mktext -------- --- 110,113 ---- *************** *** 171,175 **** - # -------- decide what compiler options to use -------- --- 147,150 ---- *************** *** 181,223 **** 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 --- 156,198 ---- 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 *************** *** 228,232 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif --- 203,207 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif *************** *** 257,267 **** bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - bcc32 $(COMPILE_FLAGS_NO_OPTIMIZE) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - endef define MAKE_LIB_RSP --- 232,235 ---- *************** *** 288,336 **** endif - LINK_ALL_OBJ_TO_EXE_DEPS = lib.rsp - define DO_LINK_ALL_OBJ_TO_EXE_DEPS - $(foreach objfile, $(filter %.$(OBJ_SUFFIX),$^), echo $(subst /,\\,$(objfile)) + >> obj.rsp - ) - ilink32 $(LFLAGS) /aa /Tpe c0w32 @obj.rsp,$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) - del obj.rsp - endef - ifdef DELETE_TDS_FILES - define LINK_ALL_OBJ_TO_EXE - $(DO_LINK_ALL_OBJ_TO_EXE) - @del $(subst .exe,.tds,$(subst /,\,$@)) - endef - else - LINK_ALL_OBJ_TO_EXE = $(DO_LINK_ALL_OBJ_TO_EXE) - endif - - LINK_CONSOLE_DEPS = $(IMPLIB_NAME) lib.rsp - define DO_LINK_CONSOLE - ilink32 $(LFLAGS) /ap /Tpe c0x32 $(subst /,\,$<),$(subst /,\,$@),,$(subst /,\,$(IMPLIB_NAME) @lib.rsp) - endef - ifdef DELETE_TDS_FILES - define LINK_CONSOLE - $(DO_LINK_CONSOLE) - @del $(subst .exe,.tds,$(subst /,\,$@)) - endef - else - DO_LINK_CONSOLE = $(DO_LINK_CONSOLE) - endif - - ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! $(foreach objfile, $(LIB_OBJS), tlib /P32 $(subst /,\,$(LIB_NAME) + $(objfile)) ) ! @del $(subst /,\,$(subst .lib,.BAK,$(LIB_NAME))) ! endef ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = lib.rsp ! define DO_LINK_OBJ_TO_LIB -del libobj.rsp $(foreach libobjfile, $(LIB_OBJS), echo $(subst /,\\,$(libobjfile)) + >> libobj.rsp --- 256,271 ---- 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 *************** *** 352,360 **** LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) endif - endif # ifdef STATICLINK - # -------- Rules for installing and removing the library files. -------- --- 287,293 ---- *************** *** 419,422 **** --- 352,356 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri @echo All gone! Index: makefile.dj =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.dj 1 Feb 2004 17:09:16 -0000 1.5 --- makefile.dj 8 Feb 2004 11:35:56 -0000 1.6 *************** *** 9,13 **** - # -------- Define some variables that the primary makefile may use. -------- --- 9,12 ---- *************** *** 77,113 **** - # -------- Find Allegro and makedoc. -------- - - ifdef NEED_MAKEDOC - ifndef NEED_ALLEGRO - ifeq ($(wildcard $(MAKEDOC_SOURCE)),) - NEED_ALLEGRO = 1 - endif - endif - endif - - ifdef NEED_ALLEGRO - .PHONY: badalleg - - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives, e.g. c:\djgpp\allegro. Run - @echo set ALLEGRO=c:\djgpp\allegro - @echo (or whatever the location of Allegro is). - @echo See also readme.txt - endif - - endif # ifdef NEED_ALLEGRO - - - ifdef NEED_MAKEDOC - include misc/makefile.doc - endif - - ifdef UNIX_TOOLS # -------- Set up mktext -------- --- 76,79 ---- *************** *** 153,157 **** ifdef WARNMODE WFLAGS = -Wall -W -Werror - # -Wno-unused else WFLAGS = -Wall -Wno-unused --- 119,122 ---- *************** *** 169,200 **** 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 --- 134,165 ---- 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 *************** *** 210,215 **** COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) - - # -------- List platform specific objects and programs. -------- --- 175,178 ---- *************** *** 223,294 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- GCC2DJGPP = -DDJGPP=2 -U__unix__ - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef - - LINK_OBJ_TO_LIB_DEPS = define LINK_OBJ_TO_LIB ar rs $(LIB_NAME) $(LIB_OBJS) endef - LINK_OBJ_TO_EXE_DEPS = define LINK_OBJ_TO_EXE gcc $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIB_FLAGS) endef - LINK_OBJ_TO_EXE_NOLIB_DEPS = - define LINK_OBJ_TO_EXE_NOLIB - gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_DEPS = - define LINK_ALL_OBJ_TO_EXE - gcc $(LFLAGS) -o $@ $^ $(LIB_NAME) $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = - define LINK_ALL_OBJ_TO_EXE_NOLIB - gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) - endef - - - # -------- Rules for installing and removing the library files. -------- - ifdef CROSSCOMPILE - - $(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 - - else # ifdef CROSSCOMPILE - $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) copy $(subst /,\,$< $@) --- 186,207 ---- *************** *** 307,312 **** install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir - endif # ifdef CROSSCOMPILE else - INSTALL_HEADERS = $(addprefix $(DJGPPDIR_U)/,$(wildcard include/cpri/*.h)) --- 220,223 ---- *************** *** 327,339 **** uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! - - # -------- Compile anything that can't be done in makefile.all. -------- - - # this section is empty - - # -------- Generate automatic dependencies. -------- --- 238,245 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri @echo All gone! # -------- Generate automatic dependencies. -------- Index: makefile.mgw =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.mgw 1 Feb 2004 17:09:16 -0000 1.6 --- makefile.mgw 8 Feb 2004 11:35:56 -0000 1.7 *************** *** 9,13 **** - # -------- Define some variables that the primary makefile may use. -------- --- 9,12 ---- *************** *** 38,54 **** LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 ! ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE).a ! EXPDEF_NAME = $(LIB_DIR)/cpri.def endif --- 37,51 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 ! ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE).a ! EXPDEF_NAME = $(LIB_DIR)/cpri.def endif *************** *** 60,89 **** .PHONY: badwin badming ! ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)\$(WINSUBDIR)) else ! ifndef CROSSCOMPILE badwin: @echo Your SYSTEMROOT or WINDIR environment variable is not set! ! endif endif --- 57,84 ---- .PHONY: badwin badming ! ifeq ($(OS),Windows_NT) # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)\$(WINSUBDIR)) else ! ifndef CROSSCOMPILE badwin: @echo Your SYSTEMROOT or WINDIR environment variable is not set! ! endif endif *************** *** 134,168 **** - # -------- Find Allegro and makedoc. -------- - - ifdef NEED_MAKEDOC - ifndef NEED_ALLEGRO - ifeq ($(wildcard $(MAKEDOC_SOURCE)),) - NEED_ALLEGRO = 1 - endif - endif - endif - - ifdef NEED_ALLEGRO - .PHONY: badalleg - - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives, e.g. c:\mingw32\allegro. - endif - - endif # ifdef NEED_ALLEGRO - - - ifdef NEED_MAKEDOC - include misc/makefile.doc - endif - - - # -------- Give a sensible default target for make without any args. -------- # This must be done right after the tests, which can generate error targets. --- 129,132 ---- *************** *** 172,177 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- --- 136,139 ---- *************** *** 246,250 **** COMPILE_FLAGS = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS) - COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCPRI_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) ifdef STATICLINK --- 208,211 ---- *************** *** 280,412 **** ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) ! endef ! ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) -lwinspool -lgdi32 $(LIB_FLAGS) ! endef else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) -lwinspool -lgdi32 $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = $(IMPLIB_NAME) ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $^ ! endef endif # ifdef STATICLINK - # -------- Rules for installing and removing the library files. -------- - ifdef CROSSCOMPILE - - ifndef STATICLINK - $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) - cp $(subst \,/,$< $@) - endif - - $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_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 \,/,$< $@) - - else # ifdef CROSSCOMPILE - ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) --- 241,284 ---- ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef else ! # link as a DLL ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) -lwinspool -lgdi32 $(LIB_FLAGS) ! endef ! else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) -lwinspool -lgdi32 $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif + define LINK_OBJ_TO_EXE + gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) + endef endif # ifdef STATICLINK # -------- Rules for installing and removing the library files. -------- ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) *************** *** 426,431 **** copy $(subst /,\,$< $@) - endif # ifdef CROSSCOMPILE else - INSTALL_HEADERS = $(addprefix $(MINGDIR_U)/,$(wildcard include/cpri/*.h)) --- 298,301 ---- *************** *** 436,444 **** $(INSTALL_HEADERS) - ifndef CROSSCOMPILE ifndef STATICLINK INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif - endif install: $(INSTALL_FILES) --- 306,312 ---- *************** *** 451,454 **** --- 319,323 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri @echo All gone! Index: makefile.uni =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.uni 1 Feb 2004 20:04:44 -0000 1.7 --- makefile.uni 8 Feb 2004 11:35:56 -0000 1.8 *************** *** 3,13 **** # # 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. -------- --- 3,9 ---- *************** *** 37,47 **** ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a else ! # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so endif --- 33,43 ---- 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 *************** *** 52,56 **** ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local endif SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include --- 48,52 ---- ifndef SYSTEM_DIR ! SYSTEM_DIR = /usr/local endif SYSTEM_INCLUDE_DIR = $(SYSTEM_DIR)/include *************** *** 127,134 **** ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 endif ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY endif --- 123,130 ---- ifdef CPRI_DEVELOPING ! CFLAGS += -D_CPRI_DEVELOPING=1 endif ifdef CPRI_FORTIFY ! CFLAGS += -D_CPRI_FORTIFY=1 -DFORTIFY endif *************** *** 139,151 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif - - # -------- List platform specific objects and programs. -------- --- 135,145 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif # -------- List platform specific objects and programs. -------- *************** *** 159,241 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- GCC2UNIX = -D__UNIX__ -UDJGPP - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ ! endef else ! # link as a shared object ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $< -L$(LIB_DIR) -lcpri $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -o $@ $^ -L$(LIB_DIR) -lcpri $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ ! endef endif # ifdef STATICLINK - # -------- Rules for installing and removing the library files. -------- --- 153,185 ---- # 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. -------- *************** *** 265,274 **** @echo The $(DESCRIPTION) UNIX library has been installed. ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcpri.a $(SYSTEM_LIB_DIR)/libcprid.a \ $(SYSTEM_INCLUDE_DIR)/cpri.h - # $(WINDIR_U)/cpri$(LIB_VERSION).dll $(WINDIR_U)/cpri$(LIB_VERSION).dll uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! --- 209,219 ---- @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! Index: makefile.vc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** makefile.vc 1 Feb 2004 17:09:16 -0000 1.9 --- makefile.vc 8 Feb 2004 11:35:56 -0000 1.10 *************** *** 17,22 **** # The "depend" target uses sed. - - # -------- define some variables that the primary makefile will use -------- --- 17,20 ---- *************** *** 48,63 **** ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! EXPDEF_NAME = $(LIB_DIR)/cpri.def endif --- 46,61 ---- 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 *************** *** 70,88 **** 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 --- 68,86 ---- 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 *************** *** 96,109 **** 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 --- 94,107 ---- 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 *************** *** 123,127 **** SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib - ifdef UNIX_TOOLS # -------- Set up mktext -------- --- 121,124 ---- *************** *** 153,183 **** endif - - # -------- Find Allegro, runner and makedoc. -------- - - ifndef NEED_ALLEGRO - ifeq ($(wildcard docs/makedoc.c),) - NEED_ALLEGRO = 1 - else - ifeq ($(wildcard src/misc/runner.c),) - NEED_ALLEGRO = 1 - endif - endif - endif - .PHONY: badalleg - ifdef NEED_ALLEGRO - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives, e.g. - @echo "set ALLEGRO=c:\msvc\allegro". - endif - endif - RUNNER = $(CGUIDIR)/obj/msvc/runner$(EXE_SUFFIX) --- 150,155 ---- *************** *** 188,193 **** _default: default - - # -------- decide what compiler options to use -------- --- 160,163 ---- *************** *** 199,233 **** 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 --- 169,203 ---- 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 *************** *** 245,249 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif --- 215,219 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCPRI_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK endif *************** *** 251,256 **** dinput.lib ddraw.lib dxguid.lib winmm.lib dsound.lib - - # -------- List platform specific objects and programs. -------- --- 221,224 ---- *************** *** 264,336 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- GCC2MSVC = -D_MSC_VER -D_WIN32 -D_M_IX86 -U__GNUC__ -UDJGPP -U__unix__ - COMPILE_C_TO_OBJ_DEPS = $(RUNNER_DEP) define COMPILE_C_TO_OBJ $(RUNNER) cl @ -nologo $(COMPILE_FLAGS) -I./include -Fo$@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - $(RUNNER) cl @ -nologo $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -Fo$@ -c $< - endef - COMPILE_S_TO_OBJ_DEPS = $(RUNNER_DEP) - define COMPILE_S_TO_OBJ - gcc $(GCC2MSVC) $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef - - LINK_OBJ_TO_EXE_DEPS = $(RUNNER_DEP) define LINK_OBJ_TO_EXE $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) endef - LINK_OBJ_TO_EXE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_OBJ_TO_EXE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $< $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_DEPS = $(RUNNER_DEP) - define LINK_ALL_OBJ_TO_EXE - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $(filter-out $(RUNNER_DEP),$^) $(IMPLIB_NAME) $(LIB_FLAGS) - endef - - LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_ALL_OBJ_TO_EXE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:windows -out:$@ $(filter-out $(RUNNER_DEP),$^) $(LIB_FLAGS) - endef - - LINK_CONSOLE_DEPS = $(IMPLIB_NAME) $(RUNNER_DEP) - define LINK_CONSOLE - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $< $(IMPLIB_NAME) $(LIB_FLAGS) - endef - - LINK_CONSOLE_NOLIB_DEPS = $(RUNNER_DEP) - define LINK_CONSOLE_NOLIB - $(RUNNER) link @ -nologo $(LFLAGS) -subsystem:console -out:$@ $^ $(LIB_FLAGS) - endef - ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = $(RUNNER_DEP) ! define LINK_OBJ_TO_LIB ! $(RUNNER) lib @ -nologo -out:$(LIB_NAME) $(LIB_OBJS) ! endef ! else ! # link as a DLL ! ! LINK_OBJ_TO_LIB_DEPS = $(RUNNER_DEP) ! define LINK_OBJ_TO_LIB ! $(RUNNER) link @ -nologo $(LFLAGS) -dll -def:$(EXPDEF_NAME) -out:$(DLL_NAME) -implib:$(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! endif # ifdef STATICLINK - - # -------- Rules for installing and removing the library files. -------- --- 232,259 ---- # 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. -------- *************** *** 372,376 **** endif - INSTALL_HEADERS = $(addprefix $(MSVCDIR_U)/,$(wildcard include/cpri/*.h)) --- 295,298 ---- *************** *** 395,407 **** uninstall: -rm -fv $(UNINSTALL_FILES) @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - # this section is empty - - # -------- Generate automatic dependencies. -------- --- 317,323 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/cpri @echo All gone! # -------- Generate automatic dependencies. -------- Index: zipup.sh =================================================================== RCS file: /cvsroot/cpri/cpri/misc/zipup.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** zipup.sh 14 Dec 2003 16:42:40 -0000 1.6 --- zipup.sh 8 Feb 2004 11:35:56 -0000 1.7 *************** *** 59,67 **** fix* misc/*.sh \ obj/*/*/*.dep lib/*/*.def \ ! readme.txt \ resource/cprilabl resource/icons.dat \ docs/*._tx \ src/*.c src/*.h src/*.inc src/*.t src/*.ht \ examples/*.c examples/*.cfg \ include/*.h include/cpri/*.h" --- 59,68 ---- 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 \ src/*.c src/*.h src/*.inc src/*.t src/*.ht \ examples/*.c examples/*.cfg \ + resource/* \ include/*.h include/cpri/*.h" --- makefile.doc DELETED --- |
|
From: <ch...@us...> - 2004-02-08 11:38:58
|
Update of /cvsroot/cpri/cpri/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18127/examples Added Files: 1_pri.c Removed Files: ex.c Log Message: Some more makefile cleanup/improvements --- NEW FILE: 1_pri.c --- /* Simple example program that prints a rectangle and some text. */ #include<allegro.h> #include <cgui.h> #include "cpri.h" #define STRMAX 50 #define NROWS 38 #define MAXCHARS 50 /* Just to have something to print: */ static char *names[NROWS]={"Jan","Habib","Ingela","Cecilia","Anders","Anna","Kenneth","Irina","Christer","Gert","Eva","Inezia","Gottfrid","Carin","Erik","Lennart","Louise","Katarina","John","Bettan","Kristina","Gunilla","Ernst","Madara","Jonas","Henrik","Johan","Bengt","Ingvar","Carl-Oskar","Karin","Fridjon","Gertrud","Jing","Helena","Joop","Ashafir","Birgitta"}; static int points[NROWS]={2638922,2565390,932183,740937,531658,463894,181237,135953,124439,124294,123616,112878,111848,107920,91055,51227,46144,40815,40356,37179,36336,34813,33270,25256,25153,20121,17096,17000,14950,4647,4296,3357,1353,755,725,601,182,18}; typedef struct t_target { int dest; char name[MAXCHARS+1]; } t_target; typedef struct t_freecfg { int fontsize; int font; int stroke; int style; int boxx; int boxy; int boxw; int boxh; int barcx; int barcy; t_target *t; } t_freecfg; typedef struct t_diagramcfg { int fontsize; int font; int stroke; int style; int h; int rh; int w; int pattern; int grey; int embedded; t_target *t; } t_diagramcfg; typedef struct t_header { char text[STRMAX]; int fontsize; int font; int stroke; int style; int outline; int repeat; } t_header; typedef struct t_table_header { int fontsize; int font; int stroke; int style; int outline; int repeat; } t_table_header; typedef struct t_table { int fontsize; int font; int stroke; int style; int outline; } t_table; typedef struct t_label { char text[STRMAX]; int join; } t_label; typedef struct t_column { t_label label; int w; int stroke; int style; int i; } t_column; typedef struct t_tabcfg { int x; int y; int bottom_margin; int lineheight; t_table table; t_header header; t_table_header table_header; int nrcols; t_column column[5]; int idcont; t_target *t; } t_tabcfg; static void quit(void *data nouse) { if (CpriIsSpooling()) if (Req("Warning!", "CPRI is still processing a print out. Exitting now may give an incomplete printout.|E~xit|Keep processing")==1) return; StopProcessEvents(); } static void show_queue(void *data nouse) { CpriPrinterQueueMonitor(); } static void show_settings(void *data nouse) { CpriPrinterPortDialogue(); } static void print_freepos_sample(void *data) { t_freecfg *pr = data; t_handle hnd; if (pr->t->dest) hnd = CpriOpenEntry(0, "Print sample", 0, pr->t->name); else hnd = CpriOpenEntry(0, "Print sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); return; } CpriCommand(hnd, CPRI_PORTRAIT); CpriCommand(hnd, CPRI_CASETTE_FEED); CpriCommand(hnd, CPRI_END_START_SEQUENCE); /* Prepare font */ CpriCommand(hnd, CPRI_FONT_SIZE, pr->fontsize); CpriCommand(hnd, CPRI_FONT_TYPEFACE, pr->font, pr->stroke, pr->style); /* We print a simple box with a text in. The upper left corner of the box will be printed at current position. After the box has been printed the current position has advanced to the upper right corner. When printing text, the text will be printed at current position but using the base line of characters as reference point of the printing. So if the current y-position is e.g. 100 the major part of the text will be drawn ABOVE 100 and a minor part below. You have to take that in accout whe printing i free position mode. Therefore: if you need to print text in cells in a tabular way, it will be a lot easier to use the tabular mode, in which case the driver will carry such platform dependent details. */ CpriCommand(hnd, CPRI_ABS_MOVEX, pr->boxx); CpriCommand(hnd, CPRI_ABS_MOVEY, pr->boxy); CpriCommand(hnd, CPRI_RECTANGLE, pr->boxw, pr->boxh); CpriCommand(hnd, CPRI_ABS_MOVEX, pr->boxx + 2); CpriCommand(hnd, CPRI_REL_MOVEY, pr->fontsize*2/9 + 2); CpriText(hnd, "Hello folks"); /* We also like to print a barcode at some other location. If you like to really make the code acceptable you have to either change this example so that it ends with a proper check sum digit or re-program the barcode reader for "no checksum when reading interleaved 2/5 codes", which normally can be done with all barcode readers - see the manual. */ CpriCommand(hnd, CPRI_ABS_MOVEX, pr->barcx); CpriCommand(hnd, CPRI_ABS_MOVEY, pr->barcy); CpriCommand(hnd, CPRI_BAR_CODE_W, 15); CpriCommand(hnd, CPRI_BAR_CODE, "0123456789"); CpriCloseEntry(hnd); } static void show_freepos_sample(void *data) { static t_freecfg prcfg={14, UNIVERS, 1, 1, 40, 40, 60, 7, 100, 100, NULL}; t_freecfg *pr; pr = &prcfg; pr->t = data; CpriGetTypefaceNames(); MkDialogue(ADAPTIVE, "Specify free position print out", 0); StartContainer(RIGHT, ADAPTIVE, "Font properties", CT_BORDER); AddEditBox(DOWNLEFT, 50, "Size", FINT, 300, &pr->fontsize); AddDropDownS(DOWNLEFT, 0, "Typeface", &pr->font, CpriGetTypefaceNames(), NOTYPEFACES); AddCheck(DOWNLEFT, "Bold", &pr->stroke); AddCheck(DOWNLEFT, "Italic", &pr->style); EndContainer(); StartContainer(RIGHT, ADAPTIVE, "Text box", CT_BORDER); AddEditBox(DOWNLEFT, 50, "X-position", FINT, 10, &pr->boxx); AddEditBox(DOWNLEFT, 50, "Y-position", FINT, 10, &pr->boxy); AddEditBox(DOWNLEFT, 50, "Width", FINT, 10, &pr->boxw); AddEditBox(DOWNLEFT, 50, "Height", FINT, 10, &pr->boxh); EndContainer(); StartContainer(RIGHT, ADAPTIVE, "Bar code", CT_BORDER); AddEditBox(DOWNLEFT, 50, "X-position", FINT, 10, &pr->barcx); AddEditBox(DOWNLEFT, 50, "Y-position", FINT, 10, &pr->barcy); EndContainer(); AddButton(DOWNLEFT, "\33Close", CloseWin, NULL); AddButton(RIGHT|ALIGNRIGHT, "Print", print_freepos_sample, pr); DisplayWin(); } static void print_diagram_sample(void *data) { t_diagramcfg *pr = data; int row; t_handle hnd; char s[1000]; if (pr->t->dest) hnd = CpriOpenEntry(0, "Print diagram sample", 0, pr->t->name); else hnd = CpriOpenEntry(0, "Print diagram sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); return; } CpriCommand(hnd, CPRI_PORTRAIT); CpriCommand(hnd, CPRI_CASETTE_FEED); CpriCommand(hnd, CPRI_END_START_SEQUENCE); /* Set up table */ CpriCommand(hnd, CPRI_TABLE, 10, 10, 10); CpriCommand(hnd, CPRI_FIX_ROW_HEIGHT, pr->rh); CpriCommand(hnd, CPRI_CREATE_COLUMN, 200); /* Set up font */ CpriCommand(hnd, CPRI_FONT_SIZE, pr->fontsize); CpriCommand(hnd, CPRI_FONT_TYPEFACE, pr->font, pr->stroke, pr->style); /* Draw rows */ for (row = 0; row < 10; row++) { CpriCommand(hnd, CPRI_MOVE_TO_NEXT_COLUMN); CpriCommand(hnd, CPRI_HORIZONTAL_BAR, pr->w * points[row] / points[0], pr->h, pr->pattern, pr->grey, pr->embedded); sprintf(s, "%s (%d)", names[row], points[row]); CpriText(hnd, s); CpriCommand(hnd, CPRI_END_BAR_LABEL); CpriCommand(hnd, CPRI_NEW_LINE); } CpriCommand(hnd, CPRI_END_TABLE); CpriCloseEntry(hnd); } static void show_diagram_sample(void *data) { static t_diagramcfg prcfg={14, UNIVERS, 0, 0, 10, 12, 180, 6, 30, 1, NULL}; t_diagramcfg *pr; cgui_drop_down_list_row_spacing = 4; pr = &prcfg; pr->t = data; MkDialogue(ADAPTIVE, "Specify diagram print out", 0); StartContainer(RIGHT, ADAPTIVE, "Font properties", CT_BORDER); AddEditBox(DOWNLEFT, 50, "Size", FINT, 300, &pr->fontsize); AddDropDownS(DOWNLEFT, 0, "Typeface", &pr->font, CpriGetTypefaceNames(), NOTYPEFACES); AddCheck(DOWNLEFT, "Bold", &pr->stroke); AddCheck(DOWNLEFT, "Italic", &pr->style); EndContainer(); StartContainer(RIGHT, ADAPTIVE, "Diagram bars", CT_BORDER); AddEditBox(DOWNLEFT, 50, "Height", FINT, 10, &pr->h); AddEditBox(DOWNLEFT, 50, "Row height", FINT, 10, &pr->rh); AddEditBox(DOWNLEFT, 50, "Max width", FINT, 10, &pr->w); AddDropDownS(DOWNLEFT, 0, "Pattern type", &pr->pattern, CpriGetBarIcons(), BAR_PATTERN_NR); AddEditBox(DOWNLEFT, 50, "Grey tone", FINT, 10, &pr->grey); AddTag(RIGHT, "%"); AddCheck(DOWNLEFT, "Embedded labels", &pr->embedded); EndContainer(); AddButton(DOWNLEFT, "\33Close", CloseWin, NULL); AddButton(RIGHT|ALIGNRIGHT, "Print", print_diagram_sample, pr); DisplayWin(); } static void print_tabular_sample(void *data) { t_tabcfg *pr = data; t_header *hdr; t_table_header *thdr; t_handle hnd; int i, row; char s[1000]; hdr = &pr->header; thdr = &pr->table_header; if (pr->t->dest) hnd = CpriOpenEntry(QUEUE_OPTIMALPORT, "Print table sample", 0, pr->t->name); else hnd = CpriOpenEntry(QUEUE_OPTIMALPORT, "Print table sample", 0, ""); if (hnd==NULL) { Req("Error!", "Print error| ~OK "); return; } CpriCommand(hnd, CPRI_PORTRAIT); CpriCommand(hnd, CPRI_CASETTE_FEED); CpriCommand(hnd, CPRI_END_START_SEQUENCE); CpriCommand(hnd, CPRI_TABLE, pr->x, pr->y, pr->bottom_margin); CpriCommand(hnd, CPRI_LINE_HEIGHT, pr->lineheight); for (i=0; i<pr->nrcols+2; i++) CpriCommand(hnd, CPRI_CREATE_COLUMN, pr->column[i].w); if (hdr->outline) CpriCommand(hnd, CPRI_START_GRID); if (hdr->repeat) CpriCommand(hnd, CPRI_BEGIN_TO_BE_REPEATED); CpriCommand(hnd, CPRI_FONT_SIZE, hdr->fontsize); CpriCommand(hnd, CPRI_FONT_TYPEFACE, hdr->font, hdr->stroke, hdr->style); CpriCommand(hnd, CPRI_MERGE_ALL_COLUMNS); CpriCommand(hnd, CPRI_MOVE_TO_NEXT_COLUMN); CpriCommand(hnd, CPRI_ALIGN,ALIGN_CENTER,hdr->text); CpriCommand(hnd, CPRI_NEW_LINE); CpriCommand(hnd, CPRI_ACTIVATE_COLUMNS); if (hdr->repeat && !thdr->repeat) CpriCommand(hnd, CPRI_END_TO_BE_REPEATED); if (thdr->outline) CpriCommand(hnd, CPRI_START_GRID); if (thdr->repeat && !hdr->repeat) CpriCommand(hnd, CPRI_BEGIN_TO_BE_REPEATED); CpriCommand(hnd, CPRI_FONT_SIZE, thdr->fontsize); CpriCommand(hnd, CPRI_FONT_TYPEFACE, thdr->font, thdr->stroke, thdr->style); for (i=1; i<pr->nrcols+2; i++) if (pr->column[i].label.join) CpriCommand(hnd, CPRI_DEACTIVATE_COLUMN, i); for (i=0; i<pr->nrcols+2; i++) { if (!pr->column[i].label.join) CpriCommand(hnd, CPRI_MOVE_TO_NEXT_COLUMN); CpriCommand(hnd,CPRI_ALIGN,ALIGN_CENTER,pr->column[i].label.text); } CpriCommand(hnd, CPRI_NEW_LINE); CpriCommand(hnd, CPRI_ACTIVATE_COLUMNS); if (thdr->repeat) CpriCommand(hnd, CPRI_END_TO_BE_REPEATED); if (pr->table.outline) CpriCommand(hnd, CPRI_START_GRID); CpriCommand(hnd, CPRI_FONT_SIZE, pr->table.fontsize); CpriCommand(hnd, CPRI_FONT_TYPEFACE, pr->table.font, pr->table.stroke, pr->table.style); for (row = 0; row < NROWS; row++) { for (i=0; i<pr->nrcols+2; i++) { CpriCommand(hnd, CPRI_MOVE_TO_NEXT_COLUMN); CpriCommand(hnd, CPRI_FONT_TYPEFACE, pr->table.font, pr->column[i].stroke, pr->column[i].style); switch (i) { case 0: sprintf(s, "%d", row+1); CpriCommand(hnd, CPRI_ALIGN, ALIGN_RIGHT, s); break; case 1: sprintf(s, "%s", names[row]); CpriText(hnd, s); break; case 2: sprintf(s, "%d", points[row]); CpriCommand(hnd, CPRI_ALIGN, ALIGN_RIGHT, s); break; default: sprintf(s, "asdf"); CpriText(hnd, s); } } CpriCommand(hnd, CPRI_NEW_LINE); } CpriCommand(hnd, CPRI_END_TABLE); CpriCloseEntry(hnd); } static void make_column_tab(void *data, int id nouse) { t_column *col = data; t_label *lab; lab = &col->label; StartContainer(TOPLEFT, ADAPTIVE, "Label", CT_BORDER); AddEditBox(DOWNLEFT, 200, "Text", FSTRING, STRMAX, lab->text); if (col->i > 0) AddCheck(DOWNLEFT,"Join left cell", &lab->join); EndContainer(); StartContainer(RIGHT, ADAPTIVE, "Column", CT_BORDER); AddEditBox(TOPLEFT, 50, "Width", FINT, 10, &col->w); AddCheck(DOWNLEFT,"Bold column", &col->stroke); AddCheck(DOWNLEFT,"Italic column", &col->style); EndContainer(); } static void create_tabs(t_tabcfg *pr) { int i, id; static int tabsel; id = CreateTabWindow(DOWNLEFT, ADAPTIVE, &tabsel); for (i=0; i<pr->nrcols+2; i++) { char s[100]; sprintf(s, "Column %d", i+1); pr->column[i].i = i; AddTab(id, make_column_tab, pr->column + i, s); } } static void updated_nr(void *data) { t_tabcfg *pr = data; EmptyContainer(pr->idcont); SelectContainer(pr->idcont); create_tabs(pr); ReBuildContainer(pr->idcont); } static void show_tabular_sample(void *data) { static t_tabcfg prcfg={ /* General table info */ 20, 30, 50, 130, /* Table body */ {14, TIMES, 0, 0, 1}, /* Page header: */ {"High score list", 24, TIMES, 0, 0, 1, 0}, /* Table header: */ {16, TIMES, 1, 0, 1, 1}, /* Column specification: */ 1,{ {{"", 0}, 8, 0, 0, 0}, /* Col 1 (place) */ {{"The players", 1}, 100, 0, 0, 0}, /* Col 2 (name) */ {{"Points", 0}, 20, 0, 0, 0}, /* Col 3 (points) */ {{"", 0}, 10, 0, 0, 0}, /* Col 4 (n.u.) */ {{"", 0}, 10, 0, 0, 0} /* Col 5 (n.u.) */ }, 0, NULL}; static const char *const cols[]={"2", "3", "4", "5"}; int idn; t_tabcfg *pr; t_header *hdr; t_table_header *thdr; t_table *tab; pr = &prcfg; pr->t = data; hdr = &pr->header; thdr = &pr->table_header; tab = &pr->table; MkDialogue(ADAPTIVE, "Specify table print out", 0); AutoHotKeys(0); StartContainer(TOPLEFT, ADAPTIVE, "", 0); StartContainer(TOPLEFT, ADAPTIVE, "General", CT_BORDER); AddEditBox(DOWNLEFT, 50, "Start x", FINT, 10, &pr->x); AddEditBox(RIGHT, 50, "Start y", FINT, 10, &pr->y); AddEditBox(RIGHT, 50, "Bottom margin", FINT, 10, &pr->bottom_margin); AddEditBox(DOWNLEFT, 50, "Relative row height", FINT, 10, &pr->lineheight); AddTag(RIGHT, "%"); idn = AddDropDownS(DOWNLEFT, 0, "Number of columns", &pr->nrcols, cols, 4); AddHandler(idn, updated_nr, pr); EndContainer(); pr->idcont = StartContainer(DOWNLEFT, ADAPTIVE, "", 0); create_tabs(pr); EndContainer(); EndContainer(); StartContainer(RIGHT, ADAPTIVE, "", 0); StartContainer(TOPLEFT, ADAPTIVE, "Page header", CT_BORDER); AddEditBox(DOWNLEFT, 200, "Text", FSTRING, STRMAX, hdr->text); AddEditBox(DOWNLEFT, 50, "Size", FINT, 300, &hdr->fontsize); AddDropDownS(DOWNLEFT, 0, "Typeface", &hdr->font, CpriGetTypefaceNames(), NOTYPEFACES); AddCheck(DOWNLEFT, "Outline", &hdr->outline); AddCheck(DOWNLEFT, "Bold", &hdr->stroke); AddCheck(RIGHT, "Italic", &hdr->style); AddCheck(DOWNLEFT, "Repeat", &hdr->repeat); EndContainer(); StartContainer(DOWNLEFT, ADAPTIVE, "Table header", CT_BORDER); AddEditBox(DOWNLEFT, 50, "Size", FINT, 300, &thdr->fontsize); AddDropDownS(DOWNLEFT, 0, "Typeface", &thdr->font, CpriGetTypefaceNames(), NOTYPEFACES); AddCheck(DOWNLEFT,"Bold", &thdr->stroke); AddCheck(RIGHT,"Italic", &thdr->style); AddCheck(DOWNLEFT,"Outlined", &thdr->outline); AddCheck(DOWNLEFT,"Repeat", &thdr->repeat); EndContainer(); StartContainer(DOWNLEFT, ADAPTIVE, "Table body", CT_BORDER); AddEditBox(DOWNLEFT, 50, "Size", FINT, 300, &tab->fontsize); AddDropDownS(DOWNLEFT, 0, "Typeface", &tab->font, CpriGetTypefaceNames(), NOTYPEFACES); AddCheck(DOWNLEFT, "Outline", &tab->outline); AddCheck(DOWNLEFT, "Bold", &tab->stroke); AddCheck(RIGHT, "Italic", &tab->style); EndContainer(); EndContainer(); AddButton(DOWNLEFT, "\33Close", CloseWin, NULL); AddButton(RIGHT|ALIGNRIGHT, "~Print", print_tabular_sample, pr); AutoHotKeys(1); SetWindowPosition(5, 5); DisplayWin(); } static void choose_filename(void *data) { t_target *t = data; MkDialogue(FILLSCREEN, "Enter a file name", 0); AddEditBox(DOWNLEFT, 200, "File name:", FSTRING, MAXCHARS, t->name); AddButton(DOWNLEFT, "~OK", CloseWin, NULL); DisplayWin(); } static void choose_output(void *data) { t_target *t = data; MkMenuRadio(&t->dest, 2, "Default printer", "Html file"); MkMenuItem(0, "Choose filename", "", choose_filename, t); } static void show_menu(void *data) { (void)data; #if defined ALLEGRO_LINUX static t_target target = {1, "default.html"}; #else static t_target target = {0, ""}; #endif MkMenuItem(0, "Display printer queues", "", show_queue, NULL); MkMenuItem(0, "Printer settings", "", show_settings, NULL); MkMenuItem(1, "Choose output", "", choose_output, &target); MkMenuItem(0, "Print sample (table)", "", show_tabular_sample, &target); MkMenuItem(0, "Print sample (free pos)", "", show_freepos_sample, &target); MkMenuItem(0, "Print sample (diagram)", "", show_diagram_sample, &target); MkMenuItem(0, "Exit", "Ctrl-Q", quit, NULL); } int main(void) { allegro_init(); #ifdef ALLEGRO_WINDOWS InitCguiWindowedMode(); #endif InitCgui(800, 600, 15); CpriInitPrinter(); MkDialogue(FILLSCREEN, "Print out testing", 0); MakeMenuBar(); MkMenuBarItem("File", show_menu, NULL); EndMenuBar(); AddTextBox(DOWNLEFT, "This example shows just a few of the features of " "the CPRI function, please read the docs for full understanding._ _" "Only the table printing is meaningful for html and text files. Also " "the table printing will have some necessary limitation, e.g. since " "the tables are implemented as table in html, the table cells will be " "either outlined with a border or not (i.e. the option to exclude table " "rows from outlining when printing to paper is not present in html)._" "As this exemple program is implemented you have to check the outlining " "option for the page header to make the entire table outlined._" "All integer values should be entered in mm._ _" "The values not possible to modify for the user in this example " "can of course be varied (like printing orienteation etc). Specially " "arbitrary cells may be joined, and also the font properties may be " "varied at arbitrary points in the table._ _" "If you like to inspect the code how to print you should look at the " "functions that actyally prints, the print__* funtions, the other stuff " "are just code to make the dialogs which is not really related to the " "printing._ _" "Also note: none of the data structures defined in this examples are " "needed for the actual printing. They are only part of the example, I " "made them just for convenience.", 500, 0, TB_FRAMESINK|TB_LINEFEED_); SetHotKey(0, quit, NULL, 0, KEY_Q); DisplayWin(); ProcessEvents(); DeInitCgui(); return 0; } END_OF_MAIN(); --- ex.c DELETED --- |
|
From: SourceForge.net <no...@so...> - 2004-02-01 20:45:55
|
Bugs item #888505, was opened at 2004-02-01 10:46 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=888505&group_id=74455 Category: Linux Group: MainBranch Status: Open Resolution: None Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Doesn't build on Linux Initial Comment: Various broblems in makefiles. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888505&group_id=74455 |
|
From: <ch...@pr...> - 2004-02-01 20:06:40
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24696/misc Modified Files: makefile.uni Log Message: Fixed more build/install probs (didn't install headers properly) Index: makefile.uni =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.uni 1 Feb 2004 19:50:32 -0000 1.6 --- makefile.uni 1 Feb 2004 20:04:44 -0000 1.7 *************** *** 256,260 **** ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/ccpri/*.h)) INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ --- 256,260 ---- ! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cpri/*.h)) INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \ |
|
From: SourceForge.net <no...@so...> - 2004-02-01 19:52:41
|
Bugs item #888646, was opened at 2004-02-01 18:26 Message generated for change (Settings changed) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888646&group_id=74455 Category: Linux Group: MainBranch >Status: Closed >Resolution: Fixed Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Nobody/Anonymous (nobody) Summary: Can't execute static built example on Linux Initial Comment: The example crashes if linked static. The linker reports a huge number of warnings like: /usr//bin/ld: warning: type and size of dynamic symbol `_poly_zbuf_atex_trans8' are not defined /usr//bin/ld: warning: type and size of dynamic symbol `_poly_scanline_atex_mask_lit32' are not defined The mentioned identifiers are from allegro. However, if using the same command line and the same compiler on an allegro examle gives no warnings. Also when linked with shared objects there is one warning, but the example runs without problems. This bug indicates that any application may have the same problem. ---------------------------------------------------------------------- Comment By: Christer Sandberg (chrisan) Date: 2004-02-01 18:29 Message: Logged In: YES user_id=713645 Correction: Also the allegro examples fails if the same command line is used (i.e. linked with cgui). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888646&group_id=74455 |
|
From: <ch...@pr...> - 2004-02-01 19:52:28
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12319/misc Modified Files: makefile.uni Log Message: 888646 Can't execute static built example on Linux Index: makefile.uni =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.uni 1 Feb 2004 17:09:16 -0000 1.5 --- makefile.uni 1 Feb 2004 19:50:32 -0000 1.6 *************** *** 57,91 **** SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib - - # -------- Find Allegro and makedoc. -------- - - ifdef NEED_MAKEDOC - ifndef NEED_ALLEGRO - ifeq ($(wildcard $(MAKEDOC_SOURCE)),) - NEED_ALLEGRO = 1 - endif - endif - endif - - ifdef NEED_ALLEGRO - .PHONY: badalleg - - ifdef ALLEGRO - ALLEGRODIR_U = $(subst \,/,$(ALLEGRO)) - else - badalleg: - @echo Couldnt find Allegro! - @echo Is your ALLEGRO environment variable set correctly? It should - @echo point to the place where Allegro lives. - endif - - endif # ifdef NEED_ALLEGRO - - - ifdef NEED_MAKEDOC - include misc/makefile.doc - endif - - # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) --- 57,60 ---- *************** *** 110,115 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- --- 79,82 ---- *************** *** 124,163 **** OFLAGS = -mcpu=pentium -O6 -ffast-math else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ! ifdef STATICLINK_ALLEGRO ! ALLEGRO_CONFIG_FLAGS = --static else ! ALLEGRO_CONFIG_FLAGS = --shared endif ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! LIB_FLAGS = -lcguid `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)` ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! LIB_FLAGS = -lcgui `allegro-config --libs profile $(ALLEGRO_CONFIG_FLAGS)` else ! # optimised build ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS += -s ! LIB_FLAGS = -lcgui `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` ! endif ! endif ! endif ifdef CPRI_DEVELOPING --- 91,128 ---- 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 |
|
From: SourceForge.net <no...@so...> - 2004-02-01 18:29:02
|
Bugs item #888646, was opened at 2004-02-01 18:26 Message generated for change (Comment added) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888646&group_id=74455 Category: Linux Group: MainBranch Status: Open Resolution: None Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Nobody/Anonymous (nobody) Summary: Can't execute static built example on Linux Initial Comment: The example crashes if linked static. The linker reports a huge number of warnings like: /usr//bin/ld: warning: type and size of dynamic symbol `_poly_zbuf_atex_trans8' are not defined /usr//bin/ld: warning: type and size of dynamic symbol `_poly_scanline_atex_mask_lit32' are not defined The mentioned identifiers are from allegro. However, if using the same command line and the same compiler on an allegro examle gives no warnings. Also when linked with shared objects there is one warning, but the example runs without problems. This bug indicates that any application may have the same problem. ---------------------------------------------------------------------- >Comment By: Christer Sandberg (chrisan) Date: 2004-02-01 18:29 Message: Logged In: YES user_id=713645 Correction: Also the allegro examples fails if the same command line is used (i.e. linked with cgui). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888646&group_id=74455 |
|
From: SourceForge.net <no...@so...> - 2004-02-01 18:26:25
|
Bugs item #888646, was opened at 2004-02-01 18:26 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=888646&group_id=74455 Category: Linux Group: MainBranch Status: Open Resolution: None Priority: 5 Submitted By: Christer Sandberg (chrisan) Assigned to: Nobody/Anonymous (nobody) Summary: Can't execute static built example on Linux Initial Comment: The example crashes if linked static. The linker reports a huge number of warnings like: /usr//bin/ld: warning: type and size of dynamic symbol `_poly_zbuf_atex_trans8' are not defined /usr//bin/ld: warning: type and size of dynamic symbol `_poly_scanline_atex_mask_lit32' are not defined The mentioned identifiers are from allegro. However, if using the same command line and the same compiler on an allegro examle gives no warnings. Also when linked with shared objects there is one warning, but the example runs without problems. This bug indicates that any application may have the same problem. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=541024&aid=888646&group_id=74455 |
|
From: <ch...@pr...> - 2004-02-01 17:49:23
|
Update of /cvsroot/cpri/cpri/obj/unix/cprid_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/unix/cprid_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:23
|
Update of /cvsroot/cpri/cpri/obj/mingw32/cprid_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/mingw32/cprid_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:23
|
Update of /cvsroot/cpri/cpri/obj/unix/cpri In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/unix/cpri Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:22
|
Update of /cvsroot/cpri/cpri/obj/msvc/cprid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/msvc/cprid Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:22
|
Update of /cvsroot/cpri/cpri/obj/unix/cprid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/unix/cprid Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:22
|
Update of /cvsroot/cpri/cpri/obj/mingw32/cprid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/mingw32/cprid Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
|
From: <ch...@pr...> - 2004-02-01 17:49:22
|
Update of /cvsroot/cpri/cpri/obj/msvc/cprid_s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3893/msvc/cprid_s Added Files: tmpfile.txt Removed Files: makefile.dep Log Message: Replaced depend files by stubs in the repository, to get rid of the preblem with differences with the local paths --- NEW FILE: tmpfile.txt --- This file is needed because some unzip programs skip empty directories. --- makefile.dep DELETED --- |
