Attachment #3730 for bug #21019

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

Lines 99-105 AUTOMAKE = @AUTOMAKE@ Link Here

(-)AssaultCube_v1.0.4/source/enet/Makefile.in.orig (-1 / +1 lines)
99	AWK = @AWK@	99	AWK = @AWK@
100	CC = @CC@	100	CC = @CC@
101	CCDEPMODE = @CCDEPMODE@	101	CCDEPMODE = @CCDEPMODE@
102	CFLAGS = @CFLAGS@	102	CFLAGS = $(OPTFLAGS)
103	CPP = @CPP@	103	CPP = @CPP@
104	CPPFLAGS = @CPPFLAGS@	104	CPPFLAGS = @CPPFLAGS@
105	CYGPATH_W = @CYGPATH_W@	105	CYGPATH_W = @CYGPATH_W@

Lines 2957-2963 if test "$ac_test_CFLAGS" = set; then Link Here

(-)AssaultCube_v1.0.4/source/enet/configure.orig (-1 / +1 lines)
2957	CFLAGS=$ac_save_CFLAGS	2957	CFLAGS=$ac_save_CFLAGS
2958	elif test $ac_cv_prog_cc_g = yes; then	2958	elif test $ac_cv_prog_cc_g = yes; then
2959	if test "$GCC" = yes; then	2959	if test "$GCC" = yes; then
2960	CFLAGS="-g -O2"	2960	CFLAGS="$OPTFLAGS"
2961	else	2961	else
2962	CFLAGS="-g"	2962	CFLAGS="-g"
2963	fi	2963	fi

Lines 60-66 AUTOMAKE = @AUTOMAKE@ Link Here

(-)AssaultCube_v1.0.4/source/enet/include/Makefile.in.orig (-1 / +1 lines)
60	AWK = @AWK@	60	AWK = @AWK@
61	CC = @CC@	61	CC = @CC@
62	CCDEPMODE = @CCDEPMODE@	62	CCDEPMODE = @CCDEPMODE@
63	CFLAGS = @CFLAGS@	63	CFLAGS = $(OPTFLAGS)
64	CPP = @CPP@	64	CPP = @CPP@
65	CPPFLAGS = @CPPFLAGS@	65	CPPFLAGS = @CPPFLAGS@
66	CYGPATH_W = @CYGPATH_W@	66	CYGPATH_W = @CYGPATH_W@

Lines 61-67 AUTOMAKE = @AUTOMAKE@ Link Here

(-)AssaultCube_v1.0.4/source/enet/include/enet/Makefile.in.orig (-1 / +1 lines)
61	AWK = @AWK@	61	AWK = @AWK@
62	CC = @CC@	62	CC = @CC@
63	CCDEPMODE = @CCDEPMODE@	63	CCDEPMODE = @CCDEPMODE@
64	CFLAGS = @CFLAGS@	64	CFLAGS = $(OPTFLAGS)
65	CPP = @CPP@	65	CPP = @CPP@
66	CPPFLAGS = @CPPFLAGS@	66	CPPFLAGS = @CPPFLAGS@
67	CYGPATH_W = @CYGPATH_W@	67	CYGPATH_W = @CYGPATH_W@




AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = $(OPTFLAGS)
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = $(OPTFLAGS)
CYGPATH_W = @CYGPATH_W@
DEBUG = @DEBUG@
DEFS = @DEFS@




AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = $(OPTFLAGS)
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = $(OPTFLAGS)
CYGPATH_W = @CYGPATH_W@
DEBUG = @DEBUG@
DEFS = @DEFS@

Lines 1-4 Link Here

(-)AssaultCube_v1.0.4/source/src/Makefile.orig (-1 / +1 lines)
1	CXXOPTFLAGS=-O3 -fomit-frame-pointer	1	CXXOPTFLAGS=$(OPTFLAGS)
2	INCLUDES1=-I/usr/X11R6/include -I../enet/include -I../src	2	INCLUDES1=-I/usr/X11R6/include -I../enet/include -I../src
3	INCLUDES2=`sdl-config --cflags`	3	INCLUDES2=`sdl-config --cflags`
4	CXXCUSTOMFLAGS=-fsigned-char -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wpointer-arith -Wwrite-strings -Wconversion -rdynamic	4	CXXCUSTOMFLAGS=-fsigned-char -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wpointer-arith -Wwrite-strings -Wconversion -rdynamic

Return to bug 21019

Lines 73-85 AUTOMAKE = @AUTOMAKE@ Link Here

(-)AssaultCube_v1.0.4/source/include/ogg/Makefile.in.orig (-2 / +2 lines)
73	AWK = @AWK@	73	AWK = @AWK@
74	CC = @CC@	74	CC = @CC@
75	CCDEPMODE = @CCDEPMODE@	75	CCDEPMODE = @CCDEPMODE@
76	CFLAGS = @CFLAGS@	76	CFLAGS = $(OPTFLAGS)
77	CPP = @CPP@	77	CPP = @CPP@
78	CPPFLAGS = @CPPFLAGS@	78	CPPFLAGS = @CPPFLAGS@
79	CXX = @CXX@	79	CXX = @CXX@
80	CXXCPP = @CXXCPP@	80	CXXCPP = @CXXCPP@
81	CXXDEPMODE = @CXXDEPMODE@	81	CXXDEPMODE = @CXXDEPMODE@
82	CXXFLAGS = @CXXFLAGS@	82	CXXFLAGS = $(OPTFLAGS)
83	CYGPATH_W = @CYGPATH_W@	83	CYGPATH_W = @CYGPATH_W@
84	DEBUG = @DEBUG@	84	DEBUG = @DEBUG@
85	DEFS = @DEFS@	85	DEFS = @DEFS@

Lines 68-80 AUTOMAKE = @AUTOMAKE@ Link Here

(-)AssaultCube_v1.0.4/source/include/vorbis/Makefile.in.orig (-2 / +2 lines)
68	AWK = @AWK@	68	AWK = @AWK@
69	CC = @CC@	69	CC = @CC@
70	CCDEPMODE = @CCDEPMODE@	70	CCDEPMODE = @CCDEPMODE@
71	CFLAGS = @CFLAGS@	71	CFLAGS = $(OPTFLAGS)
72	CPP = @CPP@	72	CPP = @CPP@
73	CPPFLAGS = @CPPFLAGS@	73	CPPFLAGS = @CPPFLAGS@
74	CXX = @CXX@	74	CXX = @CXX@
75	CXXCPP = @CXXCPP@	75	CXXCPP = @CXXCPP@
76	CXXDEPMODE = @CXXDEPMODE@	76	CXXDEPMODE = @CXXDEPMODE@
77	CXXFLAGS = @CXXFLAGS@	77	CXXFLAGS = $(OPTFLAGS)
78	CYGPATH_W = @CYGPATH_W@	78	CYGPATH_W = @CYGPATH_W@
79	DEBUG = @DEBUG@	79	DEBUG = @DEBUG@
80	DEFS = @DEFS@	80	DEFS = @DEFS@