|
From: <ch...@pr...> - 2004-02-01 17:11:15
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2313/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc Log Message: Fixed bug 888505 Doesn't build on Linux. Clearified some stuff in the readme. Removed misc/makedoc. There is already dependencies to cgui so cgui's makedoc can preferably be used (CGUIDIR is required for cpri and has so been all the time) Cleaned some other junk from makefiles. Corrected some syntactical matters in docs to avoid warnings from makedoc. Index: makefile.all =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.all,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.all 23 May 2003 12:40:10 -0000 1.5 --- makefile.all 1 Feb 2004 17:09:16 -0000 1.6 *************** *** 43,47 **** --- 43,54 ---- include misc/makefile.ver + GEN_C_FILES = \ + icondata.c \ + labldata.c + + GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES))) + LIB_SOURCE = \ + $(GEN_C_FILES) \ dialpri.c \ drv_common.c \ *************** *** 50,55 **** drv_stdwin.c \ drv_txt.c \ - icondata.c \ - labldata.c \ pridrive.c \ printini.c \ --- 57,60 ---- *************** *** 57,101 **** width.c EXAMPLES_SOURCE = ex.c ! MAKEDOC_PROGRAM = $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) CLEAN_FILES = \ ! obj/*/*.o obj/*/*/*.o obj/*/*/*/*.o \ ! obj/*/*.obj obj/*/*/*.obj obj/*/*/*/*.obj \ ! lib/*/*.a lib/*/*/*.a lib/*/*/*/*.a \ ! lib/*.so* lib/*/*.so* lib/*/*/*.so* lib/*/*/*/*.so* \ ! lib/*.lib lib/*/*.lib lib/*/*/*.lib lib/*/*/*/*.lib \ ! lib/*.exp lib/*/*.exp lib/*/*/*.exp lib/*/*/*/*.exp \ ! lib/*/*.pdb lib/*/*.ilk lib/*/*.map *.pdb */*.pdb \ ! */*.ilk */*.map */*.sym gmon.out */gmon.out */*.prf \ ! lib/*.dll lib/*/*.dll lib/*/*/*.dll \ ! *.exe */*.exe \ ! $(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE) */$(EXAMPLES_SOURCE))) \ ! *.htm */*.htm *.html */*.html *.rtf */*.rtf *.inf */*.inf *.info */*.info \ ! *.txi */*.txi *.texi */*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp \ *.log */*.log */*/*.log core */core */*/core ! VERY_CLEAN_FILES = \ ! */makefile.dep */*/makefile.dep */*/*/makefile.dep */*/*/*/makefile.dep \ ! lib/*.def lib/*/*.def lib/*/*/*.def \ ! changes.txt readme.txt thanks.txt cpri.txt \ ! docs/wishlist.txt docs/internal.txt \ ! $(TEXT_HEADERS_X) VPATH = src examples docs - PACKAGE5_OPTIMIZED = cpri - PACKAGE4_OPTIMIZED = cpri - DESCRIPTION_OPTIMIZED = optimized - ifdef DEBUGMODE ! PACKAGE5 = cprid ! PACKAGE4 = cprid DESCRIPTION = debugging else ! PACKAGE5 = $(PACKAGE5_OPTIMIZED) ! PACKAGE4 = $(PACKAGE4_OPTIMIZED) ! DESCRIPTION = $(DESCRIPTION_OPTIMIZED) endif --- 62,95 ---- width.c + RUNNER_SOURCE = misc/runner.c EXAMPLES_SOURCE = ex.c ! MAKEDOC_PROGRAM := $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) CLEAN_FILES = \ ! obj/*/*/*.o obj/*/*/*.obj \ ! lib/*/*.a lib/*/*.so* lib/*/*.lib lib/*/*.exp lib/*/*.pdb \ ! lib/*/*.ilk lib/*/*.map lib/*/*.dll \ ! $(addsuffix $(EXE_SUFFIX),$(basename examples/$(EXAMPLES_SOURCE))) \ ! *.htm docs/*.htm *.html docs/*.html docs/*.rtf docs/*.inf docs/*.info \ ! docs/*.txi docs/*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp docs/*.txt \ *.log */*.log */*/*.log core */core */*/core ! VERY_CLEAN_FILES = $(CLEAN_FILES) \ ! obj/*/*/makefile.dep \ ! lib/*/*.def \ ! examples/*.html \ ! $(CPRI_LABELS) $(CPRI_DAT) $(TEXT_HEADERS) \ ! $(addprefix src/,$(GEN_C_FILES)) \ ! $(addprefix src/,$(GEN_H_FILES)) VPATH = src examples docs ifdef DEBUGMODE ! PACKAGE = cprid DESCRIPTION = debugging else ! PACKAGE = cpri ! DESCRIPTION = optimized endif *************** *** 119,131 **** DOCS = \ ! cpri.txt docs/cpri$(HTML_SUFFIX) docs/cpri$(INFO_SUFFIX) docs/cpri.rtf \ ! readme.txt docs/readme$(INFO_SUFFIX) \ ! changes.txt docs/changes$(HTML_SUFFIX) ! ! # docs/internal.txt docs/internal$(HTML_SUFFIX) docs/internal$(INFO_SUFFIX) docs/internal.rtf \ ! # readme.txt readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \ ! # changes.txt docs/changes$(HTML_SUFFIX) \ ! # thanks.txt docs/thanks$(HTML_SUFFIX) \ ! # docs/wishlist.txt docs/wishlist$(HTML_SUFFIX) ifndef HAVE_TEXINFO --- 113,119 ---- DOCS = \ ! docs/cpri.txt docs/cpri$(HTML_SUFFIX) docs/cpri$(INFO_SUFFIX) docs/cpri.rtf \ ! docs/readme.txt docs/readme$(INFO_SUFFIX) \ ! docs/changes.txt docs/changes$(HTML_SUFFIX) ifndef HAVE_TEXINFO *************** *** 177,185 **** veryclean: ! -rm -fv $(VERY_CLEAN_FILES) $(CLEAN_FILES) compress: ifdef UPX_PROGRAM ! $(UPX_PROGRAM) $(EXAMPLES_NAME) $(wildcard lib/*/$(PACKAGE4_OPTIMIZED)$(LIB_VERSION).dll) else @echo No executable compressor specified! You must set the environment variable --- 165,173 ---- veryclean: ! -rm -fv $(VERY_CLEAN_FILES) compress: ifdef UPX_PROGRAM ! $(UPX_PROGRAM) $(EXAMPLES_NAME) else @echo No executable compressor specified! You must set the environment variable *************** *** 187,195 **** endif - test: - @echo $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(SYSTEM_INCLUDE_DIR)/cgui.h - @echo $(COMPILE_C_TO_OBJ) - @echo $(LIB_OBJS) - $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(SYSTEM_INCLUDE_DIR)/cgui.h $(COMPILE_C_TO_OBJ) --- 175,178 ---- *************** *** 198,212 **** $(LINK_OBJ_TO_LIB) ! ifndef NATIVE_LINK_OBJ_TO_EXE ! */%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) - endif - chm-docs: docs/cpri.chm - %.txt: docs/%._tx - -$(MAKEDOC_PROGRAM) -ascii $@ $< - docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< --- 181,189 ---- $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) chm-docs: docs/cpri.chm docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< *************** *** 219,223 **** docs/cpri.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/cpri._tx ! $(MAKEDOC_PROGRAM) -chm docs/cpri.html docs/cpri._tx -hhc docs/cpri.hhp --- 196,200 ---- docs/cpri.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/cpri._tx ! -$(MAKEDOC_PROGRAM) -chm docs/cpri.html docs/cpri._tx -hhc docs/cpri.hhp *************** *** 232,236 **** # -------- Building the textfiles (i.e. the lables etc. used in dialogues) -------- ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat ! ALLEGRO_DAT2C_X = $(ALLEGRO)/tools/dat2c MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX) CPRI_DAT_C_X = src/labldata.c --- 209,213 ---- # -------- Building the textfiles (i.e. the lables etc. used in dialogues) -------- ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat ! CGUI_DAT2C_X = $(CGUIDIR)/tools/dat2c MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX) CPRI_DAT_C_X = src/labldata.c *************** *** 246,261 **** dat: $(CPRI_DAT_C_X) $(CPRI_ICONS_C_X) ! $(CPRI_DAT_C_X): $(CPRI_DAT_X) ! -$(ALLEGRO_DAT2C) $(CPRI_DAT) -o $(CPRI_DAT_C) -h $(CPRI_DAT_H) -p cpri -g -n labels $(CPRI_DAT_X): $(CPRI_LABELS_X) -$(ALLEGRO_DAT) $(CPRI_DAT) -a $(CPRI_LABELS) - #$(CPRI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) $(MKTEXT_X) $(CPRI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) -$(MKTEXT) -o$(CPRI_LABELS) $(TEXT_SOURCES) ! $(CPRI_ICONS_C_X): $(CPRI_ICONS_X) ! -$(ALLEGRO_DAT2C) $(CPRI_ICONS) -o $(CPRI_ICONS_C) -h $(CPRI_ICONS_H) -g -n icons # -------- Misc stuff -------- --- 223,237 ---- dat: $(CPRI_DAT_C_X) $(CPRI_ICONS_C_X) ! $(CPRI_DAT_C_X) $(CPRI_DAT_H_X): $(CPRI_DAT_X) ! -$(CGUI_DAT2C) $(CPRI_DAT) -o $(CPRI_DAT_C) -h $(CPRI_DAT_H) -p cpri -g -n labels $(CPRI_DAT_X): $(CPRI_LABELS_X) -$(ALLEGRO_DAT) $(CPRI_DAT) -a $(CPRI_LABELS) $(CPRI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) -$(MKTEXT) -o$(CPRI_LABELS) $(TEXT_SOURCES) ! $(CPRI_ICONS_C_X) $(CPRI_ICONS_H_X): $(CPRI_ICONS_X) ! -$(CGUI_DAT2C) $(CPRI_ICONS) -o $(CPRI_ICONS_C) -h $(CPRI_ICONS_H) -g -n icons # -------- Misc stuff -------- Index: makefile.bcc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 7 Dec 2003 21:09:56 -0000 1.4 --- makefile.bcc 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 47,75 **** LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 - ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else - # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) EXPDEF_NAME = $(LIB_DIR)/cpri.def IMPDEF_NAME = $(LIB_DIR)/impcpri.def - endif # -------- Check that environment path variables are set. -------- --- 47,68 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\bcc32 ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) EXPDEF_NAME = $(LIB_DIR)/cpri.def IMPDEF_NAME = $(LIB_DIR)/impcpri.def endif + IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) + LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variables are set. -------- *************** *** 144,148 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 137,141 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 157,161 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 150,154 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) Index: makefile.dj =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.dj 7 Dec 2003 21:09:56 -0000 1.4 --- makefile.dj 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 41,46 **** OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ifndef LIB_ROOT_DIR --- 41,46 ---- OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ifndef LIB_ROOT_DIR *************** *** 51,55 **** LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE5).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) --- 51,55 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) *************** *** 113,117 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 113,117 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 126,130 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 126,130 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) Index: makefile.mgw =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.mgw 7 Dec 2003 21:09:56 -0000 1.5 --- makefile.mgw 1 Feb 2004 17:09:16 -0000 1.6 *************** *** 38,66 **** LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 - ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else - # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE5).a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) EXPDEF_NAME = $(LIB_DIR)/cpri.def - endif ! # -------- Check that environment path variable is set. -------- --- 38,58 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\mingw32 ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = lib$(PACKAGE).a EXPDEF_NAME = $(LIB_DIR)/cpri.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variable is set. -------- *************** *** 115,119 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 107,111 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 128,132 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 120,124 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) Index: makefile.uni =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.uni 7 Dec 2003 21:09:56 -0000 1.4 --- makefile.uni 1 Feb 2004 17:09:16 -0000 1.5 *************** *** 37,58 **** ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else - # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! IMPLIB_BASENAME = lib$(PACKAGE5).so ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! endif ! # -------- Default system paths. ------------ --- 37,51 ---- ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a else # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Default system paths. ------------ *************** *** 97,101 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 90,94 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 245,249 **** LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) endef --- 238,242 ---- LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ endef *************** *** 273,277 **** LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) endef --- 266,270 ---- LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ endef *************** *** 315,328 **** @echo All gone! - - - # -------- Compile anything that can't be done in makefile.all. -------- - - examples/ex%: $(OBJ_DIR)/ex%$(OBJ_SUFFIX) - $(LINK_OBJ_TO_EXE) - - NATIVE_LINK_OBJ_TO_EXE = 1 - - # -------- generate automatic dependencies -------- --- 308,311 ---- Index: makefile.vc =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.vc 7 Dec 2003 21:09:56 -0000 1.8 --- makefile.vc 1 Feb 2004 17:09:16 -0000 1.9 *************** *** 47,75 **** LIB_DIR_D = $(LIB_ROOT_DIR)\msvc - ifdef STATICLINK - # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s ! IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) ! else - # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ! DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX) ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME) EXPDEF_NAME = $(LIB_DIR)/cpri.def - endif ! # -------- Check that environment path variables are set. -------- --- 47,67 ---- LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) else # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) EXPDEF_NAME = $(LIB_DIR)/cpri.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variables are set. -------- *************** *** 135,139 **** # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) --- 127,131 ---- # -------- Set up mktext -------- ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst \,/,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X)) *************** *** 148,152 **** else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) --- 140,144 ---- else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(subst /,\,$(CGUI_DAT2C_X)) CPRI_DAT = $(subst /,\,$(CPRI_DAT_X)) CPRI_DAT_C = $(subst /,\,$(CPRI_DAT_C_X)) |
