Attachment #3191 for bug #6676

View | Details | Raw Unified | Return to bug 6676
Collapse All | Expand All

Lines 12-17 Link Here

(-)./CS/mk/nasm.mak.orig (+6 lines)
12	override NASM.INSTALLED = no	12	override NASM.INSTALLED = no
13	endif	13	endif
14		14
		15	# CS doesn't work with Gentoo NAsm at the moment, It's easier to
		16	# disable than fix (optimizations should still be there through gcc)
		17	ifeq ($(NASM.INSTALLED),yes)
		18	override NASM.INSTALLED = no
		19	endif
		20
15	ifeq ($(NASM.INSTALLED),yes)	21	ifeq ($(NASM.INSTALLED),yes)
16		22
17	# The executable name	23	# The executable name

Lines 89-97 Link Here

(-)./CS/libs/cssys/unix/linux.mak.orig (-2 / +2 lines)
89		89
90	# Flags for the compiler which are used when optimizing.	90	# Flags for the compiler which are used when optimizing.
91	ifeq ($(PROC),X86)	91	ifeq ($(PROC),X86)
92	CFLAGS.optimize=-O2 -fomit-frame-pointer -ffast-math	92	CFLAGS.optimize=$(CFLAGS_GENTOO)
93	else	93	else
94	CFLAGS.optimize=-O -fomit-frame-pointer	94	CFLAGS.optimize=$(CFLAGS_GENTOO)
95	endif	95	endif
96		96
97	# Flags for the compiler which are used when debugging.	97	# Flags for the compiler which are used when debugging.

Lines 34-40 Link Here

(-)./CS/mk/unix.mak.orig (-1 / +1 lines)
34	# Command sequence for creating a directory.	34	# Command sequence for creating a directory.
35	# Note that directories will have forward slashes. Please	35	# Note that directories will have forward slashes. Please
36	# make sure that this command accepts that (or use 'subst' first).	36	# make sure that this command accepts that (or use 'subst' first).
37	MKDIR=mkdir $(@:/=)	37	MKDIR=mkdir -p $(@:/=)
38		38
39	# The command to remove all specified files.	39	# The command to remove all specified files.
40	RM=rm -f	40	RM=rm -f




ifneq ($(findstring defines,$(MAKESECTION)),)

ifeq (,$(strip $(INSTALL_DIR)))
INSTALL_DIR = $(DESTDIR)/usr/crystalspace
endif

ifeq (,$(strip $(DOCS_INSTALL_DIR)))
DOCS_INSTALL_DIR = $(DESTDIR)/usr/share/doc/$(P)
endif

endif # ifneq ($(findstring defines,$(MAKESECTION)),)

  docs/html/*/*.jpg docs/html/*/*.gif docs/html/*/*.png  \
  docs/html/*/*/*.jpg docs/html/*/*/*.gif docs/html/*/*/*.png \
  docs/pubapi/*.html docs/pubapi/*.gif docs/pubapi/*.css )
INSTALL_DOCS.DIR1 = $(addprefix $(DOCS_INSTALL_DIR)/, \
  $(patsubst %/,%,$(sort $(dir $(INSTALL_DOCS.FILES)))))

# Also include parent dirs in dirlist, for tutorial/mapcs 
INSTALL_DOCS.DIR = $(subst /docs/,/,$(filter-out $(DOCS_INSTALL_DIR) $(DOCS_INSTALL_DIR)/docs, \
  $(sort $(INSTALL_DOCS.DIR1) $(patsubst %/,%,$(dir $(INSTALL_DOCS.DIR1))))))
INSTALL_DOCS.DESTFILES = \
  $(subst /docs/,/,$(addprefix $(DOCS_INSTALL_DIR)/,$(sort $(INSTALL_DOCS.FILES))))

# Files to install for scripts, includes parent dirs (for scripts/).
INSTALL_SCRIPTS.FILES = $(wildcard scripts/python/*.py)


# Rules for creating installation directories.
$(INSTALL_DIR) $(INSTALL_DIR)/bin $(INSTALL_LIB.DIR) $(INSTALL_INCLUDE.DIR) \
$(INSTALL_DIR)/data $(INSTALL_DIR)/data/config $(DOCS_INSTALL_DIR):
	$(MKDIR)

ifneq ($(strip $(OUTDLL)),)

	$(MKDIR)
	@echo $@/deleteme.dir >> $(INSTALL_LOG)

$(INSTALL_DOCS.DESTFILES): $(DOCS_INSTALL_DIR)/% : docs/%
	$(CP) $< $@
	@echo $@ >> $(INSTALL_LOG)

install_docs: $(DOCS_INSTALL_DIR) $(INSTALL_DOCS.DIR) \
  $(INSTALL_DOCS.DESTFILES)

# Install Scripts




PLUGINS.DYNAMIC += mesh/impexp/obj
PLUGINS.DYNAMIC += mesh/impexp/pov
PLUGINS.DYNAMIC += mesh/impexp/spr
PLUGINS.DYNAMIC += mesh/impexp/3ds
PLUGINS.DYNAMIC += font/server/fontplex
#PLUGINS.DYNAMIC += font/server/freefont
#PLUGINS.DYNAMIC += font/server/freefnt2
PLUGINS.DYNAMIC += aws
PLUGINS.DYNAMIC += sound/loader/ogg
#PLUGINS.DYNAMIC += sound/loader/mp3
#PLUGINS.DYNAMIC += sound/loader/mod



# If 'yes' include assembly optimizations in Crystal Space.  On systems that
# don't support this, setting this option to 'yes' does nothing.
DO_ASM=no

# If "yes" include MMX support in software renderer
DO_MMX=yes

Return to bug 6676

Lines 24-30 Link Here

(-)./CS/mk/install.mak.orig (-8 / +12 lines)
24	ifneq ($(findstring defines,$(MAKESECTION)),)	24	ifneq ($(findstring defines,$(MAKESECTION)),)
25		25
26	ifeq (,$(strip $(INSTALL_DIR)))	26	ifeq (,$(strip $(INSTALL_DIR)))
27	INSTALL_DIR = /usr/local/crystal	27	INSTALL_DIR = $(DESTDIR)/usr/crystalspace
		28	endif
		29
		30	ifeq (,$(strip $(DOCS_INSTALL_DIR)))
		31	DOCS_INSTALL_DIR = $(DESTDIR)/usr/share/doc/$(P)
28	endif	32	endif
29		33
30	endif # ifneq ($(findstring defines,$(MAKESECTION)),)	34	endif # ifneq ($(findstring defines,$(MAKESECTION)),)
Lines 87-100 Link Here
87	docs/html//.jpg docs/html//.gif docs/html//.png \	91	docs/html//.jpg docs/html//.gif docs/html//.png \
88	docs/html///.jpg docs/html///.gif docs/html///*.png \	92	docs/html///.jpg docs/html///.gif docs/html///*.png \
89	docs/pubapi/.html docs/pubapi/.gif docs/pubapi/*.css )	93	docs/pubapi/.html docs/pubapi/.gif docs/pubapi/*.css )
90	INSTALL_DOCS.DIR1 = $(addprefix $(INSTALL_DIR)/, \	94	INSTALL_DOCS.DIR1 = $(addprefix $(DOCS_INSTALL_DIR)/, \
91	$(patsubst %/,%,$(sort $(dir $(INSTALL_DOCS.FILES)))))	95	$(patsubst %/,%,$(sort $(dir $(INSTALL_DOCS.FILES)))))
92		96
93	# Also include parent dirs in dirlist, for tutorial/mapcs	97	# Also include parent dirs in dirlist, for tutorial/mapcs
94	INSTALL_DOCS.DIR = $(filter-out $(INSTALL_DIR), \	98	INSTALL_DOCS.DIR = $(subst /docs/,/,$(filter-out $(DOCS_INSTALL_DIR) $(DOCS_INSTALL_DIR)/docs, \
95	$(sort $(INSTALL_DOCS.DIR1) $(patsubst %/,%,$(dir $(INSTALL_DOCS.DIR1)))))	99	$(sort $(INSTALL_DOCS.DIR1) $(patsubst %/,%,$(dir $(INSTALL_DOCS.DIR1))))))
96	INSTALL_DOCS.DESTFILES = \	100	INSTALL_DOCS.DESTFILES = \
97	$(addprefix $(INSTALL_DIR)/,$(sort $(INSTALL_DOCS.FILES)))	101	$(subst /docs/,/,$(addprefix $(DOCS_INSTALL_DIR)/,$(sort $(INSTALL_DOCS.FILES))))
98		102
99	# Files to install for scripts, includes parent dirs (for scripts/).	103	# Files to install for scripts, includes parent dirs (for scripts/).
100	INSTALL_SCRIPTS.FILES = $(wildcard scripts/python/*.py)	104	INSTALL_SCRIPTS.FILES = $(wildcard scripts/python/*.py)
Lines 131-137 Link Here
131		135
132	# Rules for creating installation directories.	136	# Rules for creating installation directories.
133	$(INSTALL_DIR) $(INSTALL_DIR)/bin $(INSTALL_LIB.DIR) $(INSTALL_INCLUDE.DIR) \	137	$(INSTALL_DIR) $(INSTALL_DIR)/bin $(INSTALL_LIB.DIR) $(INSTALL_INCLUDE.DIR) \
134	$(INSTALL_DIR)/data $(INSTALL_DIR)/data/config:	138	$(INSTALL_DIR)/data $(INSTALL_DIR)/data/config $(DOCS_INSTALL_DIR):
135	$(MKDIR)	139	$(MKDIR)
136		140
137	ifneq ($(strip $(OUTDLL)),)	141	ifneq ($(strip $(OUTDLL)),)
Lines 194-204 Link Here
194	$(MKDIR)	198	$(MKDIR)
195	@echo $@/deleteme.dir >> $(INSTALL_LOG)	199	@echo $@/deleteme.dir >> $(INSTALL_LOG)
196		200
197	$(INSTALL_DOCS.DESTFILES): $(INSTALL_DIR)/docs/% : docs/%	201	$(INSTALL_DOCS.DESTFILES): $(DOCS_INSTALL_DIR)/% : docs/%
198	$(CP) $< $@	202	$(CP) $< $@
199	@echo $@ >> $(INSTALL_LOG)	203	@echo $@ >> $(INSTALL_LOG)
200		204
201	install_docs: $(INSTALL_DIR)/docs $(INSTALL_DOCS.DIR) \	205	install_docs: $(DOCS_INSTALL_DIR) $(INSTALL_DOCS.DIR) \
202	$(INSTALL_DOCS.DESTFILES)	206	$(INSTALL_DOCS.DESTFILES)
203		207
204	# Install Scripts	208	# Install Scripts

Lines 85-96 Link Here

(-)./CS/mk/user.mak.orig (-3 / +3 lines)
85	PLUGINS.DYNAMIC += mesh/impexp/obj	85	PLUGINS.DYNAMIC += mesh/impexp/obj
86	PLUGINS.DYNAMIC += mesh/impexp/pov	86	PLUGINS.DYNAMIC += mesh/impexp/pov
87	PLUGINS.DYNAMIC += mesh/impexp/spr	87	PLUGINS.DYNAMIC += mesh/impexp/spr
88	#PLUGINS.DYNAMIC += mesh/impexp/3ds	88	PLUGINS.DYNAMIC += mesh/impexp/3ds
89	PLUGINS.DYNAMIC += font/server/fontplex	89	PLUGINS.DYNAMIC += font/server/fontplex
90	#PLUGINS.DYNAMIC += font/server/freefont	90	#PLUGINS.DYNAMIC += font/server/freefont
91	#PLUGINS.DYNAMIC += font/server/freefnt2	91	#PLUGINS.DYNAMIC += font/server/freefnt2
92	PLUGINS.DYNAMIC += aws	92	PLUGINS.DYNAMIC += aws
93	#PLUGINS.DYNAMIC += sound/loader/ogg	93	PLUGINS.DYNAMIC += sound/loader/ogg
94	#PLUGINS.DYNAMIC += sound/loader/mp3	94	#PLUGINS.DYNAMIC += sound/loader/mp3
95	#PLUGINS.DYNAMIC += sound/loader/mod	95	#PLUGINS.DYNAMIC += sound/loader/mod
96		96
Lines 157-163 Link Here
157		157
158	# If 'yes' include assembly optimizations in Crystal Space. On systems that	158	# If 'yes' include assembly optimizations in Crystal Space. On systems that
159	# don't support this, setting this option to 'yes' does nothing.	159	# don't support this, setting this option to 'yes' does nothing.
160	DO_ASM=yes	160	DO_ASM=no
161		161
162	# If "yes" include MMX support in software renderer	162	# If "yes" include MMX support in software renderer
163	DO_MMX=yes	163	DO_MMX=yes