Update of /cvsroot/ccomx/ccom/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8749/misc Modified Files: makefile.all makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc makefile.ver zipup.sh Removed Files: makefile.doc Log Message: fixed feature 715534, fixed docs accordingly, fixed allegro.cfg Index: makefile.all =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.all,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.all 30 Mar 2003 19:50:41 -0000 1.6 --- makefile.all 8 Feb 2004 20:47:21 -0000 1.7 *************** *** 19,22 **** --- 19,23 ---- # clean: Remove rebuildable files. # compress: Compress the example executable using upx. + # uninstall: Uninstalls the header files of CCOM and all brands of the lib that has been installed. # help: Display this help. # *************** *** 42,117 **** include misc/makefile.ver LIB_SOURCE = \ ! comx.c \ ! comdos.c \ ! comwin.c \ ! dialser.c \ ! labldata.c - EXAMPLES_SOURCE = 1_com.c ! MAKEDOC_FILES = chm doc html man misc rtf texi txt ! MAKEDOC_FILES := $(addprefix misc/makedoc/make,$(MAKEDOC_FILES)) ! MAKEDOC_SOURCE := $(addsuffix .c,$(MAKEDOC_FILES)) ! MAKEDOC_FILES := $(addsuffix .h,$(MAKEDOC_FILES)) $(MAKEDOC_SOURCE) ! RUNNER_SOURCE = misc/runner.c 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 ccom.txt \ ! docs/wishlist.txt docs/internal.txt \ ! src/*.ht $(TEXT_ARCHIVE_X) VPATH = src examples docs ! PACKAGE5_OPTIMIZED = ccom ! PACKAGE4_OPTIMIZED = ccom ! DESCRIPTION_OPTIMIZED = optimized ifdef DEBUGMODE ! PACKAGE5 = ccomd ! PACKAGE4 = ccomd DESCRIPTION = debugging else ! PACKAGE5 = $(PACKAGE5_OPTIMIZED) ! PACKAGE4 = $(PACKAGE4_OPTIMIZED) ! DESCRIPTION = $(DESCRIPTION_OPTIMIZED) ! endif ! ! # By default, Allegro is linked the same way as ccom, 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 - - # Tell the platform specific makefile to look for Allegro's makedoc. - NEED_MAKEDOC = 1 - - - # -------- Include platform specific makefile. -------- --- 43,90 ---- include misc/makefile.ver + GEN_C_FILES = \ + labldata.c + + GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES))) + LIB_SOURCE = \ ! $(GEN_C_FILES) \ ! comx.c \ ! comdos.c \ ! comwin.c \ ! comunix.c \ ! dialser.c ! EXAMPLES_SOURCE = 1_com.c 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 \ ! $(CCOM_LABELS) $(CCOM_DAT) $(TEXT_HEADERS) \ ! $(addprefix src/,$(GEN_C_FILES)) \ ! $(addprefix src/,$(GEN_H_FILES)) VPATH = src examples docs ! MAKEDOC_PROGRAM := $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX) ifdef DEBUGMODE ! PACKAGE = ccomd DESCRIPTION = debugging else ! PACKAGE = ccom ! DESCRIPTION = optimized endif # -------- Include platform specific makefile. -------- *************** *** 123,130 **** DOCS = \ ! ccom.txt docs/ccom$(HTML_SUFFIX) docs/ccom$(INFO_SUFFIX) docs/ccom.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 ifndef HAVE_TEXINFO --- 96,103 ---- DOCS = \ ! docs/ccom.txt docs/ccom$(HTML_SUFFIX) docs/ccom$(INFO_SUFFIX) docs/ccom.rtf \ ! docs/internal.txt docs/internal$(HTML_SUFFIX) docs/internal$(INFO_SUFFIX) docs/internal.rtf \ ! docs/readme.txt docs/readme$(INFO_SUFFIX) \ ! docs/changes.txt docs/changes$(HTML_SUFFIX) ifndef HAVE_TEXINFO *************** *** 135,144 **** LIB_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(LIB_SOURCE)))) endif ! MAKEDOC_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(notdir $(MAKEDOC_SOURCE))))) EXAMPLES_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) EXAMPLES_NAME = $(addprefix examples/,$(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) - # -------- Compile -------- --- 108,116 ---- LIB_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(LIB_SOURCE)))) endif ! EXAMPLES_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) EXAMPLES_NAME = $(addprefix examples/,$(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE)))) # -------- Compile -------- *************** *** 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 --- 149,157 ---- 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,230 **** 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) ! ifndef NATIVE_LINK_OBJ_TO_EXE ! */%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS) $(LINK_OBJ_TO_EXE) - ifneq ($(MAKEDOC_DEP),) - $(MAKEDOC_DEP): $(MAKEDOC_OBJS) $(LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS) - $(LINK_ALL_OBJ_TO_EXE_NOLIB) - - $(OBJ_DIR)/make%$(OBJ_SUFFIX): misc/makedoc/make%.c $(COMPILE_C_TO_OBJ_DEPS) - $(COMPILE_C_TO_OBJ) - endif - - ifneq ($(RUNNER_DEP),) - $(RUNNER): $(RUNNER_SOURCE) - $(COMPILE_RUNNER) - endif - endif - chm-docs: docs/ccom.chm ! %.txt: docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%.txt: docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%$(HTML_SUFFIX): docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< ! docs/%.rtf: docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) -rtf $@ $< ! docs/ccom.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/ccom._tx $(MAKEDOC_DEP) ! $(MAKEDOC_PROGRAM) -chm docs/ccom.html docs/ccom._tx -hhc docs/ccom.hhp --- 159,187 ---- endif ! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ) ! $(LIB_NAME): $(LIB_OBJS) $(LINK_OBJ_TO_LIB) ! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE) chm-docs: docs/ccom.chm ! docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%.txt: docs/%._tx -$(MAKEDOC_PROGRAM) -ascii $@ $< ! docs/%$(HTML_SUFFIX): docs/%._tx -$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $< ! docs/%.rtf: docs/%._tx -$(MAKEDOC_PROGRAM) -rtf $@ $< ! docs/ccom.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/ccom._tx ! -$(MAKEDOC_PROGRAM) -chm docs/ccom.html docs/ccom._tx -hhc docs/ccom.hhp *************** *** 233,237 **** -makeinfo --no-split -o $@ $< ! docs/%$(TEXI_SUFFIX): docs/%._tx $(MAKEDOC_DEP) -$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $< endif --- 190,194 ---- -makeinfo --no-split -o $@ $< ! docs/%$(TEXI_SUFFIX): docs/%._tx -$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $< endif *************** *** 239,243 **** # -------- 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) CCOM_DAT_C_X = src/labldata.c --- 196,200 ---- # -------- 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) CCOM_DAT_C_X = src/labldata.c *************** *** 250,262 **** dat: $(CCOM_DAT_C_X) ! $(CCOM_DAT_C_X): $(CCOM_DAT_X) ! -$(ALLEGRO_DAT2C) $(CCOM_DAT) -o $(CCOM_DAT_C) -h $(CCOM_DAT_H) -p ccom -g -n labels $(CCOM_DAT_X): $(CCOM_LABELS_X) -$(ALLEGRO_DAT) $(CCOM_DAT) -a $(CCOM_LABELS) - #$(CCOM_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) $(MKTEXT_X) $(CCOM_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) ! $(MKTEXT) -o$(CCOM_LABELS) $(TEXT_SOURCES) # -------- Misc stuff -------- --- 207,218 ---- dat: $(CCOM_DAT_C_X) ! $(CCOM_DAT_C) $(CCOM_DAT_H): $(CCOM_DAT) ! -$(CGUI_DAT2C) $(CCOM_DAT) -o $(CCOM_DAT_C) -h $(CCOM_DAT_H) -p ccom -g -n labels $(CCOM_DAT_X): $(CCOM_LABELS_X) -$(ALLEGRO_DAT) $(CCOM_DAT) -a $(CCOM_LABELS) $(CCOM_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) ! -$(MKTEXT) -o$(CCOM_LABELS) $(TEXT_SOURCES) # -------- Misc stuff -------- Index: makefile.bcc =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.bcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.bcc 9 Dec 2003 19:03:30 -0000 1.3 --- makefile.bcc 8 Feb 2004 20:47:21 -0000 1.4 *************** *** 4,22 **** # # By Christer Sandberg (ported from Adime made by Sven Sandberg). - # # See readme.txt for more information about CCOM. - # # See makefile.all for a list of the available targets. # - # # You need to set BCC32DIR to the directory where Borland C++Builder is # located. # # This build uses djgpp for calculating source dependencies. - # # The "depend" target uses sed. - # -------- define some variables that the primary makefile will use -------- --- 4,17 ---- *************** *** 34,39 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 --- 29,34 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/bcc32 *************** *** 41,46 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/bcc32 --- 36,41 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/bcc32 *************** *** 49,77 **** 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)/ccom.def ! IMPDEF_NAME = $(LIB_DIR)/impccom.def ! endif - - # -------- Check that environment path variables are set. -------- --- 44,62 ---- 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)/ccom.def ! IMPDEF_NAME = $(LIB_DIR)/impccom.def endif # -------- Check that environment path variables are set. -------- *************** *** 79,102 **** ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) else badwin: --- 64,77 ---- ifeq ($(OS),Windows_NT) ! WINSYSDIR = $(SYSTEMROOT) ! WINSUBDIR = system32 else ! WINSYSDIR = $(windir) ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) else badwin: *************** *** 119,137 **** SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib - - ifdef UNIX_TOOLS # -------- Set up mktext -------- - ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) - ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) - CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) - CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) - CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) - CCOM_LABELS = $(subst \,/,$(CCOM_LABELS_X)) - TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) - TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) - MKTEXT = $(subst \,/,$(MKTEXT_X)) - else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) --- 94,100 ---- SYSTEM_LIB_DIR_D = $(BCC32DIR_D)\lib # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(CGUI_DAT2C_X) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) *************** *** 141,169 **** TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) - endif - - - # -------- 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 - - # -------- give a sensible default target for make without any args -------- --- 104,107 ---- *************** *** 173,226 **** _default: default - - # -------- decide what compiler options to use -------- ifdef WARNMODE ! WFLAGS = -w else ! WFLAGS = endif ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = alld_s.lib ! else ! LIB_FLAGS = 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 = allp_s.lib ! else ! LIB_FLAGS = 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 = alleg_s.lib else ! LIB_FLAGS = alleg.lib ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif --- 111,162 ---- _default: default # -------- decide what compiler options to use -------- ifdef WARNMODE ! WFLAGS = -w else ! WFLAGS = endif ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -Od -q -R -v ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = alld_s.lib ! else ! LIB_FLAGS = alld.lib ! endif else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q -R -v ! SFLAGS = $(WFLAGS) ! LFLAGS = /q /Gn /v ! ifdef STATICLINK ! LIB_FLAGS = allp_s.lib ! else ! LIB_FLAGS = allp.lib ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) -O2 -OS -q ! SFLAGS = $(WFLAGS) ! LFLAGS = /x /q /Gn ! DELETE_TDS_FILES = 1 ! ifdef STATICLINK ! LIB_FLAGS = alleg_s.lib ! else ! LIB_FLAGS = alleg.lib ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif *************** *** 231,235 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif --- 167,171 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif *************** *** 237,242 **** dinput.lib ddraw.lib winmm.lib dsound.lib - - # -------- List platform specific objects and programs. -------- --- 173,176 ---- *************** *** 250,270 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- GCC2BCC = -D__BORLANDC__ -UDJGPP - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ bcc32 $(COMPILE_FLAGS) -W -I. -I./include -c -o$(subst /,\,$@) $(subst /,\,$<) endef - define 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 --- 184,194 ---- *************** *** 291,339 **** 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 --- 215,228 ---- endif ifdef STATICLINK ! # link as a static library ! 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 *************** *** 346,363 **** del _impccom.def del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES define LINK_OBJ_TO_LIB $(DO_LINK_OBJ_TO_LIB) @del $(subst .dll,.tds,$(subst /,\,$@)) endef ! else LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif ! endif # ifdef STATICLINK - - # -------- Rules for installing and removing the library files. -------- --- 235,249 ---- del _impccom.def del _impdim2.def ! endef ! ifdef DELETE_TDS_FILES define LINK_OBJ_TO_LIB $(DO_LINK_OBJ_TO_LIB) @del $(subst .dll,.tds,$(subst /,\,$@)) endef ! else LINK_OBJ_TO_LIB = $(DO_LINK_OBJ_TO_LIB) ! endif endif # ifdef STATICLINK # -------- Rules for installing and removing the library files. -------- *************** *** 367,376 **** ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else copy $(subst /,\,$< $@) ! endif endif --- 253,262 ---- ifndef STATICLINK ! $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! ifdef HAVE_CP $(DJDIR)/bin/cp $(subst \,/,$< $@) ! else copy $(subst /,\,$< $@) ! endif endif *************** *** 399,403 **** endif - INSTALL_HEADERS = $(addprefix $(BCC32DIR_U)/,$(wildcard include/ccom/*.h)) --- 285,288 ---- *************** *** 408,412 **** ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif --- 293,297 ---- ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) endif *************** *** 422,434 **** 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. -------- --- 307,313 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! # -------- Generate automatic dependencies. -------- Index: makefile.dj =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.dj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.dj 9 Dec 2003 19:03:31 -0000 1.2 --- makefile.dj 8 Feb 2004 20:47:22 -0000 1.3 *************** *** 3,13 **** # # By Christer Sandberg (ported from Adime made by Sven Sandberg). - # # See readme.txt for more information about CCOM. - # # See makefile.all for a list of the available targets. - - # -------- Define some variables that the primary makefile may use. -------- --- 3,9 ---- *************** *** 36,59 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5) ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/djgpp LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE5).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) - - # -------- Find djgpp. -------- --- 32,53 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/djgpp OBJ_PLATFORM_ROOT_DIR_D = $(OBJ_ROOT_DIR_D)\djgpp ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/djgpp LIB_DIR_D = $(LIB_ROOT_DIR)\djgpp ! LIB_BASENAME = lib$(PACKAGE).a LIB_NAME = $(LIB_DIR)/$(LIB_BASENAME) # -------- Find djgpp. -------- *************** *** 76,94 **** SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info - - ifdef UNIX_TOOLS # -------- Set up mktext -------- - ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) - ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) - CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) - CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) - CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) - CCOM_LABELS = $(subst \,/,$(CCOM_LABELS_X)) - TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) - TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) - MKTEXT = $(subst \,/,$(MKTEXT_X)) - else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) --- 70,76 ---- SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(CGUI_DAT2C_X) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) *************** *** 98,136 **** TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) - endif - - - # -------- 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 make 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 - --- 80,83 ---- *************** *** 142,195 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused else ! WFLAGS = -Wall -Wno-unused endif ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lcgui -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 CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif --- 89,139 ---- _default: default # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror else ! WFLAGS = -Wall -Wno-unused endif ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS = -g3 ! LIB_FLAGS = -lcgui -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 CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif *************** *** 197,201 **** # including some standard header. ifdef CCOM_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 endif --- 141,145 ---- # including some standard header. ifdef CCOM_NO_ALLEGRO_STD_HEADERS ! CFLAGS += -DALLEGRO_NO_STD_HEADERS -DEDOM=1 -DERANGE=1 endif *************** *** 205,210 **** COMPILE_FLAGS_NO_OPTIMIZE = $(subst src/,-DCCOM_SRC ,$(findstring src/, $<))$(CFLAGS_NO_OPTIMIZE) - - # -------- List platform specific objects and programs. -------- --- 149,152 ---- *************** *** 218,267 **** # 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. -------- --- 160,179 ---- *************** *** 321,324 **** --- 233,237 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! Index: makefile.mgw =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.mgw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.mgw 9 Dec 2003 19:03:31 -0000 1.3 --- makefile.mgw 8 Feb 2004 20:47:22 -0000 1.4 *************** *** 8,13 **** # See makefile.all for a list of the available targets. - - # -------- Define some variables that the primary makefile may use. -------- --- 8,11 ---- *************** *** 25,30 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/mingw32 --- 23,28 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/mingw32 *************** *** 32,66 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/mingw32 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)/ccom.def ! endif ! # -------- Check that environment path variable is set. -------- --- 30,56 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/mingw32 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)/ccom.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variable is set. -------- *************** *** 69,102 **** 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 ifdef MINGDIR ! MINGDIR_U = $(subst \,/,$(MINGDIR)) ! MINGDIR_D = $(subst /,\,$(MINGDIR)) else badming: --- 59,90 ---- ifeq ($(OS),Windows_NT) ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 else ! 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 ifdef MINGDIR ! MINGDIR_U = $(subst \,/,$(MINGDIR)) ! MINGDIR_D = $(subst /,\,$(MINGDIR)) else badming: *************** *** 111,129 **** SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib - - ifdef UNIX_TOOLS # -------- Set up mktext -------- - ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) - ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) - CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) - CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) - CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) - CCOM_LABELS = $(subst \,/,$(CCOM_LABELS_X)) - TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) - TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) - MKTEXT = $(subst \,/,$(MKTEXT_X)) - else ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X)) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) --- 99,105 ---- SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib # -------- Set up mktext -------- ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X)) ! CGUI_DAT2C = $(CGUI_DAT2C_X) CCOM_DAT = $(subst /,\,$(CCOM_DAT_X)) CCOM_DAT_C = $(subst /,\,$(CCOM_DAT_C_X)) *************** *** 133,169 **** TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X)) MKTEXT = $(subst /,\,$(MKTEXT_X)) - endif - - - # -------- 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. -------- --- 109,112 ---- *************** *** 174,248 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused else ! WFLAGS = -Wall -Wno-unused endif ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = -lcguid_s -lalld_s ! else ! LIB_FLAGS = -lcguid -lalld ! endif ! else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = -lcgui_s -lallp_s ! else ! LIB_FLAGS = -lcgui -lallp ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS += -s ! endif ! ifdef STATICLINK_ALLEGRO ! LIB_FLAGS = -lcgui_s -lalleg_s else ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif LFLAGS += -L$(SYSTEM_LIB_DIR) ! ifdef STATICLINK_ALLEGRO ! CFLAGS += -DALLEGRO_STATICLINK ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -DALLEGRO_STATICLINK else ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) endif --- 117,188 ---- _default: default # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror else ! WFLAGS = -Wall -Wno-unused endif ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ifdef DEBUGMODE ! # -------- debugging build -------- ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! ifdef STATICLINK ! LIB_FLAGS = -lcguid_s -lalld_s ! else ! LIB_FLAGS = -lcguid -lalld ! endif else ! ifdef PROFILEMODE ! # -------- profiling build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! ifdef STATICLINK ! LIB_FLAGS = -lcgui_s -lallp_s ! else ! LIB_FLAGS = -lcgui -lallp ! endif ! else ! # -------- optimised build -------- ! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce ! SFLAGS = $(WFLAGS) ! ifndef SYMBOLMODE ! LFLAGS += -s ! endif ! ifdef STATICLINK ! LIB_FLAGS = -lcgui_s -lalleg_s ! else ! LIB_FLAGS = -lcgui -lalleg ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif LFLAGS += -L$(SYSTEM_LIB_DIR) ! ifdef STATICLINK ! CFLAGS += -DALLEGRO_STATICLINK ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -DALLEGRO_STATICLINK else ! CFLAGS_NO_OPTIMIZE = $(WFLAGS) endif *************** *** 251,265 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK ! LIB_FLAGS += -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lole32 -ldinput \ -lddraw -ldxguid -lwinmm -ldsound endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif - - # -------- List platform specific objects and programs. -------- --- 191,203 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK ! LIB_FLAGS += -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lole32 -ldinput \ -lddraw -ldxguid -lwinmm -ldsound endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif # -------- List platform specific objects and programs. -------- *************** *** 273,278 **** # myprogram: path/myprogram$(EXE_SUFFIX) - - # -------- Define how to compile. -------- --- 211,214 ---- *************** *** 280,394 **** ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif - COMPILE_C_TO_OBJ_DEPS = define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef - define COMPILE_C_TO_OBJ_NO_OPTIMIZE - gcc $(COMPILE_FLAGS_NO_OPTIMIZE) -I./include -o $@ -c $< - endef - - COMPILE_S_TO_OBJ_DEPS = - define COMPILE_S_TO_OBJ - gcc $(SFLAGS) -I./include -x assembler-with-cpp -o $@ -c $< - endef ifdef STATICLINK ! # link as a static library ! ! LINK_OBJ_TO_LIB_DEPS = ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS) ! endef ! ! else ! # link as a DLL ! LINK_OBJ_TO_LIB_DEPS = ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif ! ! LINK_OBJ_TO_EXE_DEPS = ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $< $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS = ! define LINK_ALL_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $^ $(IMPLIB_NAME) $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_DEPS_NOLIB = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -mwindows -o $@ $^ $(LIB_FLAGS) ! endef ! ! LINK_CONSOLE_DEPS = $(IMPLIB_NAME) ! define LINK_CONSOLE ! gcc $(LFLAGS) -o $@ $< $(IMPLIB_NAME) ! endef ! ! LINK_CONSOLE_NOLIB_DEPS = ! define LINK_CONSOLE_NOLIB ! gcc $(LFLAGS) -o $@ $< ! endef endif # ifdef STATICLINK - - # -------- Rules for installing and removing the library files. -------- ifdef CROSSCOMPILE ! ! ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) cp $(subst \,/,$< $@) --- 216,260 ---- ifdef CROSSCOMPILE ! DLLWRAP = i386-mingw32msvc-dllwrap ! WINDRES = windres else ! DLLWRAP = dllwrap ! WINDRES = i386-mingw32msvc-windres endif define COMPILE_C_TO_OBJ gcc $(COMPILE_FLAGS) -I./include -o $@ -c $< endef ifdef STATICLINK ! # link as a static library ! define LINK_OBJ_TO_LIB ! ar rs $(LIB_NAME) $(LIB_OBJS) ! endef ! define LINK_OBJ_TO_EXE ! gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) ! endef else ! # link as a DLL ! ifdef FASTDLL ! define LINK_OBJ_TO_LIB ! gcc $(LFLAGS) -shared -Wl,--out-implib,$(IMPLIB_NAME),--just-symbols,$(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) ! endef ! else ! define LINK_OBJ_TO_LIB ! dllwrap --def $(EXPDEF_NAME) -o $(DLL_NAME) $(LIB_OBJS) $(LIB_FLAGS) --output-lib $(IMPLIB_NAME) ! endef ! endif + define LINK_OBJ_TO_EXE + gcc $(LFLAGS) -mwindows -o $@ $< $(IMPLIB_NAME) $(LIB_FLAGS) + endef endif # ifdef STATICLINK # -------- Rules for installing and removing the library files. -------- ifdef CROSSCOMPILE ! ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) cp $(subst \,/,$< $@) *************** *** 428,432 **** endif # ifdef CROSSCOMPILE else - INSTALL_HEADERS = $(addprefix $(MINGDIR_U)/,$(wildcard include/ccom/*.h)) --- 294,297 ---- *************** *** 437,443 **** ifndef CROSSCOMPILE ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif endif --- 302,308 ---- ifndef CROSSCOMPILE ! ifndef STATICLINK ! INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME) ! endif endif *************** *** 451,463 **** 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 -------- # Note that this must be done with djgpp! --- 316,322 ---- uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! # -------- generate automatic dependencies -------- # Note that this must be done with djgpp! Index: makefile.uni =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.uni,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.uni 9 Dec 2003 19:03:32 -0000 1.2 --- makefile.uni 8 Feb 2004 20:47:22 -0000 1.3 *************** *** 3,13 **** # # By Christer Sandberg (copied from ADIME made by Sven Sandberg) - # # See readme.txt for more information about CCOM. - # # See makefile.all for a list of the available targets. - - # -------- Define some variables that the primary makefile may use. -------- --- 3,9 ---- *************** *** 30,34 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib endif LIB_DIR = $(LIB_ROOT_DIR)/unix --- 26,30 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib endif LIB_DIR = $(LIB_ROOT_DIR)/unix *************** *** 36,59 **** HAVE_TEXINFO = 1 ! 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. ------------ --- 32,46 ---- HAVE_TEXINFO = 1 ! ifdef STATICLINK # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! IMPLIB_BASENAME = lib$(PACKAGE)_s.a ! else # link as a shared object ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! IMPLIB_BASENAME = lib$(PACKAGE).so ! endif IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) # -------- Default system paths. ------------ *************** *** 64,109 **** SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib - # -------- Set up mktext -------- ! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X)) ! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X)) ! CCOM_DAT = $(subst \,/,$(CCOM_DAT_X)) ! CCOM_DAT_C = $(subst \,/,$(CCOM_DAT_C_X)) ! CCOM_DAT_H = $(subst \,/,$(CCOM_DAT_H_X)) ! CCOM_LABELS = $(subst \,/,$(CCOM_LABELS_X)) ! TEXT_SOURCES = $(subst \,/,$(TEXT_SOURCES_X)) ! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X)) ! MKTEXT = $(subst \,/,$(MKTEXT_X)) ! ! ! # -------- 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 ! # -------- Give a sensible default target for make without any args. -------- --- 51,64 ---- SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib # -------- Set up mktext -------- ! ALLEGRO_DAT = $(ALLEGRO_DAT_X) ! CGUI_DAT2C = $(CGUI_DAT2C_X) ! CCOM_DAT = $(CCOM_DAT_X) ! CCOM_DAT_C = $(CCOM_DAT_C_X) ! CCOM_DAT_H = $(CCOM_DAT_H_X) ! CCOM_LABELS = $(CCOM_LABELS_X) ! TEXT_SOURCES = $(TEXT_SOURCES_X) ! TEXT_HEADERS = $(TEXT_HEADERS_X) ! MKTEXT = $(MKTEXT_X) # -------- Give a sensible default target for make without any args. -------- *************** *** 114,173 **** _default: default - - # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror ! # -Wno-unused else ! WFLAGS = -Wall -Wno-unused endif ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math ! else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ! ifdef STATICLINK_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 = `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)` ! else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! LIB_FLAGS = `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 = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif --- 69,127 ---- _default: default # -------- Decide what compiler options and libraries to use. -------- ifdef WARNMODE ! WFLAGS = -Wall -W -Werror else ! WFLAGS = -Wall -Wno-unused endif ifdef PGCC ! OFLAGS = -mcpu=pentium -O6 -ffast-math else ! ifdef PENTIUMONLY ! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math ! else ! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math ! endif endif ! ifdef STATICLINK ! ALLEGRO_CONFIG_FLAGS = --static ! LIB_FLAGS = -lcgui_s else ! ALLEGRO_CONFIG_FLAGS = --shared ! LIB_FLAGS = -lcgui endif ifdef DEBUGMODE ! # debugging build ! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g ! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) ! LFLAGS += -g ! LIB_FLAGS += `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)` else ! ifdef PROFILEMODE ! # profiling build ! CFLAGS = $(WFLAGS) $(OFLAGS) -pg ! SFLAGS = $(WFLAGS) ! LFLAGS += -pg ! LIB_FLAGS += `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 += `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` ! endif ! endif endif ifdef CCOM_DEVELOPING ! CFLAGS += -D_CCOM_DEVELOPING=1 endif ifdef CCOM_FORTIFY ! CFLAGS += -D_CCOM_FORTIFY=1 -DFORTIFY endif *************** *** 178,190 **** ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif - - # -------- List platform specific objects and programs. -------- --- 132,142 ---- ifdef STATICLINK ! COMPILE_FLAGS += -DCCOM_STATICLINK endif ifdef PROFILEMODE ! LIB_FLAGS += -lgmon endif # -------- List platform specific objects and programs. -------- *************** *** 198,279 **** # 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 $@ $^ $(LIB_FLAGS) ! 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) -lccom $(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) -lccom $(LIB_FLAGS) ! endef ! ! LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS = ! define LINK_ALL_OBJ_TO_EXE_NOLIB ! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS) ! endef ! ! endif # ifdef STATICLINK ! # -------- Rules for installing and removing the library files. -------- --- 150,180 ---- # 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) -lccom $(LIB_FLAGS) + endef + endif # -------- Rules for installing and removing the library files. -------- *************** *** 304,325 **** @echo The $(DESCRIPTION) UNIX library has been installed. ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libccom.a $(SYSTEM_LIB_DIR)/libccomd.a \ $(SYSTEM_INCLUDE_DIR)/ccom.h - # $(WINDIR_U)/ccom$(LIB_VERSION).dll $(WINDIR_U)/ccom$(LIB_VERSION).dll uninstall: -rm -fv $(UNINSTALL_FILES) @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 -------- --- 205,217 ---- @echo The $(DESCRIPTION) UNIX library has been installed. ! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libccom_s.a $(SYSTEM_LIB_DIR)/libccomd_s.a \ ! $(SYSTEM_LIB_DIR)/libccom.so $(SYSTEM_LIB_DIR)/libccomd.so \ $(SYSTEM_INCLUDE_DIR)/ccom.h uninstall: -rm -fv $(UNINSTALL_FILES) + -rm -frv $(SYSTEM_INCLUDE_DIR)/ccom @echo All gone! # -------- generate automatic dependencies -------- Index: makefile.vc =================================================================== RCS file: /cvsroot/ccomx/ccom/misc/makefile.vc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.vc 9 Dec 2003 19:03:32 -0000 1.5 --- makefile.vc 8 Feb 2004 20:47:22 -0000 1.6 *************** *** 3,9 **** # # By Christer Sandberg (ported from Adime made by Sven Sandberg). - # # See readme.txt for more information about CCOM. - # # See makefile.all for a list of the available targets. # --- 3,7 ---- *************** *** 17,22 **** # The "depend" target uses sed. - - # -------- define some variables that the primary makefile will use -------- --- 15,18 ---- *************** *** 34,39 **** ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc --- 30,35 ---- ifndef OBJ_ROOT_DIR ! OBJ_ROOT_DIR = obj ! OBJ_ROOT_DIR_D = obj endif OBJ_PLATFORM_ROOT_DIR = $(OBJ_ROOT_DIR)/msvc *************** *** 41,75 **** ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/msvc LIB_DIR_D = $(LIB_ROOT_DIR)\msvc - ifdef STATICLINK ! ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(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)/ccom.def ! endif ! # -------- Check that environment path variables are set. -------- --- 37,63 ---- ifndef LIB_ROOT_DIR ! LIB_ROOT_DIR = lib ! LIB_ROOT_DIR_D = lib endif LIB_DIR = $(LIB_ROOT_DIR)/msvc LIB_DIR_D = $(LIB_ROOT_DIR)\msvc ifdef STATICLINK ! # link as a static library ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s ! IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX) else ! # link as a DLL ! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE) ! OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE) ! DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll ! DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME) ! IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX) ! EXPDEF_NAME = $(LIB_DIR)/ccom.def endif ! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) ! LIB_NAME = $(IMPLIB_NAME) # -------- Check that environment path variables are set. -------- *************** *** 78,101 **** ifeq ($(OS),Windows_NT) ! # true 32 bit OS: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 ! else ! # DOS based windows: ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) else badwin: --- 66,87 ---- ifeq ($(OS),Windows_NT) ! ifeq ($(TERM),msys) ! WINSYSDIR = $(SYSTEMROOT) ! else ! WINSYSDIR = $(SystemRoot) ! endif ! WINSUBDIR = system32 else ! ifeq ($(TERM),msys) ! WINSYSDIR = $(WINDIR) ! else ! WINSYSDIR = $(windir) ! endif ! WINSUBDIR = system endif ifneq ($(WINSYSDIR),) ! WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR)) ! WINDIR_D = $(subst /,\,$(WINSYSDIR)/$(WINSUBDIR)) else badwin: *************** *** 104,117 **** 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 --- 90,103 ---- 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 *************** *** 131,135 **** SYSTEM_LIB_DIR_D = $(MSVCDIR_D)\lib - ifdef UNIX_TOOLS # -------- Set up mktext -------- --- 117,120 ---- *************** *** 155,213 **** 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 ! ! ! ifneq ($(wildcard $(RUNNER_SOURCE)),) ! RUNNER := obj/msvc/runner.exe ! RUNNER_DEP := obj/msvc/runner.exe ! define COMPILE_RUNNER ! gcc -O -Wall -Werror -o $(RUNNER) $(RUNNER_SOURCE) ! endef ! else ! RUNNER := $(wildcard $(ALLEGRODIR_U)/obj/msvc/runner.exe) ! RUNNER_DEP := ! ifeq ($(RUNNER),) ! .PHONY: badrunner ! badrunner: ! @echo Couldnt find Allegros runner utility. ! @echo Have you forgotten to make Al... [truncated message content] |