Changeset 14
- Timestamp:
- 06/06/08 15:09:04 (1 year ago)
- Files:
-
- trunk/llmozlib2/README-linux-linden.txt (modified) (1 diff)
- trunk/llmozlib2/build-linux-llmozlib.sh (modified) (2 diffs)
- trunk/llmozlib2/build_mozilla/linux-libxul-bits/lljpeg (deleted)
- trunk/llmozlib2/build_mozilla/linux-libxul-bits/mozconfig (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/llmozlib2/README-linux-linden.txt
r8 r14 15 15 ========== 16 16 17 Linden Lab should NOT NEED TO CHANGE THIS by default, so they can skip this 18 section. 19 20 We use a specific configuration of x86 libjpeg for Mozilla because, sadly, 21 the libjpeg ABI isn't very stable across distributions. If you want to 22 AVOID this custom build of libjpeg and defer to the system libjpeg, 23 perform these steps: 24 25 1. Edit build_mozilla/linux-libxul-bits/mozconfig: 26 * remove the 'ac_add_options --with-system-jpeg=...' line 17 <special instructions no longer applicable> 27 18 28 19 2. GTK AND FRIENDS trunk/llmozlib2/build-linux-llmozlib.sh
r8 r14 3 3 # mozilla has been built and copy_products_linux.sh has been run. 4 4 5 CXX='g++- 3.4'5 CXX='g++-4.1' 6 6 MOZARCH='i686-linux' 7 7 SRCS='llembeddedbrowser.cpp llembeddedbrowserwindow.cpp llmozlib2.cpp' … … 13 13 INCS_LINE="`find libraries/${MOZARCH}/include -type d | sed s/^/-I/`" 14 14 DEFS='-DMOZILLA_INTERNAL_API -DLL_LINUX=1' 15 OPTS='-ggdb '15 OPTS='-ggdb -fvisibility=hidden' 16 16 17 17 rm -f ${LIBNAME}.a ${OBJS} trunk/llmozlib2/build_mozilla/linux-libxul-bits/mozconfig
r8 r14 44 44 TARGET_CPU=$MOZ_BUILD_APP 45 45 46 GCC_VERSION= 3.446 GCC_VERSION=4.1 47 47 48 48 CC="gcc-$GCC_VERSION" … … 111 111 #ac_add_options --disable-xft 112 112 113 ac_add_options --with-system-jpeg=${CURRENTDIR}/../linux-libxul-bits/lljpeg113 #ac_add_options --with-system-jpeg=${CURRENTDIR}/../linux-libxul-bits/lljpeg 114 114
