Attachment #429444 for bug #567230




  DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
  INCLUDES  += -I../../src/host/lua-5.1.4/src
  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
  CFLAGS    += $(CPPFLAGS) -Wall
  CXXFLAGS  += $(CPPFLAGS) -Wall
  LDFLAGS   += -rdynamic
  LIBS      += -lm -ldl
  RESFLAGS  += $(DEFINES) $(INCLUDES)
  LDDEPS    +=
  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)
  define PREBUILDCMDS
  endef

  DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
  INCLUDES  += -I../../src/host/lua-5.1.4/src
  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
  CFLAGS    += $(CFLAGS) $(CPPFLAGS) -Wall
  CXXFLAGS  += $(CXXFLAGS) $(CPPFLAGS) -Wall
  LDFLAGS   += -rdynamic
  LIBS      += -lm -ldl
  RESFLAGS  += $(DEFINES) $(INCLUDES)
  LDDEPS    +=
  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)
  define PREBUILDCMDS
  endef

Lines 136-143 Link Here

(-)0ad-0.0.20-alpha.old/build/premake/premake4/src/tools/gcc.lua (-2 lines)
136	if not cfg.flags.Symbols then	136	if not cfg.flags.Symbols then
137	if cfg.system == "macosx" then	137	if cfg.system == "macosx" then
138	table.insert(result, "-Wl,-x")	138	table.insert(result, "-Wl,-x")
139	else
140	table.insert(result, "-s")
141	end	139	end
142	end	140	end
143		141

Lines 9-17 Link Here

(-)0ad-0.0.20-alpha.old/libraries/source/fcollada/src/Makefile (-3 / +3 lines)
9		9
10	CXX ?= g++	10	CXX ?= g++
11	CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)	11	CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
12	CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL	12	CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
13	CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL	13	CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
14	CXXFLAGS_TEST := -O0 -g -D_DEBUG	14	CXXFLAGS_TEST := -D_DEBUG
15	LIBS += `pkg-config libxml-2.0 --libs`	15	LIBS += `pkg-config libxml-2.0 --libs`
16	INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`	16	INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
17	INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)	17	INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)




cd js/src

# Clean up data generated by previous builds that could cause problems
rm -rf build-debug
rm -rf build-release

# We want separate debug/release versions of the library, so we have to change
# the LIBRARY_NAME for each build.
# (We use perl instead of sed so that it works with MozillaBuild on Windows,
# which has an ancient sed.)
perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-debug'\''/' moz.build
mkdir -p build-debug
cd build-debug
CXXFLAGS="${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal # --enable-root-analysis
${MAKE} ${MAKE_OPTS}
cd ..

perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build
mkdir -p build-release
cd build-release

mkdir -p ${INCLUDE_DIR_DEBUG}
mkdir -p ${INCLUDE_DIR_RELEASE}
cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
cp -R -L mozjs31/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/

mkdir -p lib/
cp -L mozjs31/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_DST_SUFFIX}
cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX}
cp -L mozjs31/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs31-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-debug${DLL_DST_SUFFIX}
cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX}

# Flag that it's already been built successfully so we can skip it next time

Return to bug 567230

Lines 26-37 Link Here

(-)0ad-0.0.20-alpha.old/build/premake/premake4/build/gmake.unix/Premake4.make (-11 / +11 lines)
26	DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN	26	DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
27	INCLUDES += -I../../src/host/lua-5.1.4/src	27	INCLUDES += -I../../src/host/lua-5.1.4/src
28	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)	28	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
29	CFLAGS += $(CPPFLAGS) -Wall -Os	29	CFLAGS += $(CPPFLAGS) -Wall
30	CXXFLAGS += $(CPPFLAGS) -Wall -Os	30	CXXFLAGS += $(CPPFLAGS) -Wall
31	LDFLAGS += -s -rdynamic	31	LDFLAGS += -rdynamic
32	LIBS += -lm -ldl	32	LIBS += -lm -ldl
33	RESFLAGS += $(DEFINES) $(INCLUDES)	33	RESFLAGS += $(DEFINES) $(INCLUDES)
34	LDDEPS +=	34	LDDEPS +=
35	LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)	35	LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)
36	define PREBUILDCMDS	36	define PREBUILDCMDS
37	endef	37	endef
Lines 48-59 Link Here
48	DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN	48	DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
49	INCLUDES += -I../../src/host/lua-5.1.4/src	49	INCLUDES += -I../../src/host/lua-5.1.4/src
50	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)	50	CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
51	CFLAGS += $(CPPFLAGS) -Wall -g	51	CFLAGS += $(CFLAGS) $(CPPFLAGS) -Wall
52	CXXFLAGS += $(CPPFLAGS) -Wall -g	52	CXXFLAGS += $(CXXFLAGS) $(CPPFLAGS) -Wall
53	LDFLAGS += -rdynamic	53	LDFLAGS += -rdynamic
54	LIBS += -lm -ldl	54	LIBS += -lm -ldl
55	RESFLAGS += $(DEFINES) $(INCLUDES)	55	RESFLAGS += $(DEFINES) $(INCLUDES)
56	LDDEPS +=	56	LDDEPS +=
57	LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)	57	LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)
58	define PREBUILDCMDS	58	define PREBUILDCMDS
59	endef	59	endef

Lines 79-98 Link Here

(-)0ad-0.0.20-alpha.old/libraries/source/spidermonkey/build.sh (-15 lines)
79	cd js/src	79	cd js/src
80		80
81	# Clean up data generated by previous builds that could cause problems	81	# Clean up data generated by previous builds that could cause problems
82	rm -rf build-debug
83	rm -rf build-release	82	rm -rf build-release
84		83
85	# We want separate debug/release versions of the library, so we have to change
86	# the LIBRARY_NAME for each build.
87	# (We use perl instead of sed so that it works with MozillaBuild on Windows,
88	# which has an ancient sed.)
89	perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-debug'\''/' moz.build
90	mkdir -p build-debug
91	cd build-debug
92	CXXFLAGS="${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal # --enable-root-analysis
93	${MAKE} ${MAKE_OPTS}
94	cd ..
95
96	perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build	84	perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build
97	mkdir -p build-release	85	mkdir -p build-release
98	cd build-release	86	cd build-release
Lines 134-145 Link Here
134	mkdir -p ${INCLUDE_DIR_DEBUG}	122	mkdir -p ${INCLUDE_DIR_DEBUG}
135	mkdir -p ${INCLUDE_DIR_RELEASE}	123	mkdir -p ${INCLUDE_DIR_RELEASE}
136	cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/	124	cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
137	cp -R -L mozjs31/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/
138		125
139	mkdir -p lib/	126	mkdir -p lib/
140	cp -L mozjs31/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_DST_SUFFIX}
141	cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX}	127	cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX}
142	cp -L mozjs31/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs31-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-debug${DLL_DST_SUFFIX}
143	cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX}	128	cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX}
144		129
145	# Flag that it's already been built successfully so we can skip it next time	130	# Flag that it's already been built successfully so we can skip it next time