Merge
This commit is contained in:
commit
cd0b60ad4e
22 changed files with 3 additions and 3 deletions
0
code/nel/autogen.sh
Normal file → Executable file
0
code/nel/autogen.sh
Normal file → Executable file
0
code/nel/doc/make_all_dox.sh
Normal file → Executable file
0
code/nel/doc/make_all_dox.sh
Normal file → Executable file
0
code/nel/doc/make_nel_dox.sh
Normal file → Executable file
0
code/nel/doc/make_nel_dox.sh
Normal file → Executable file
0
code/nel/doc/make_nelns_dox.sh
Normal file → Executable file
0
code/nel/doc/make_nelns_dox.sh
Normal file → Executable file
0
code/nel/doc/make_neltools_dox.sh
Normal file → Executable file
0
code/nel/doc/make_neltools_dox.sh
Normal file → Executable file
0
code/nel/doc/make_packages_doc.sh
Normal file → Executable file
0
code/nel/doc/make_packages_doc.sh
Normal file → Executable file
0
code/nel/nelDashBuild.sh
Normal file → Executable file
0
code/nel/nelDashBuild.sh
Normal file → Executable file
0
code/nel/src/gen_deps.sh
Normal file → Executable file
0
code/nel/src/gen_deps.sh
Normal file → Executable file
0
code/nelns/autogen.sh
Normal file → Executable file
0
code/nelns/autogen.sh
Normal file → Executable file
0
code/ryzom/gen_deps.sh
Normal file → Executable file
0
code/ryzom/gen_deps.sh
Normal file → Executable file
0
code/ryzom/server/src/gen_deps.sh
Normal file → Executable file
0
code/ryzom/server/src/gen_deps.sh
Normal file → Executable file
6
code/ryzom/tools/scripts/linux/build
Normal file → Executable file
6
code/ryzom/tools/scripts/linux/build
Normal file → Executable file
|
@ -298,8 +298,8 @@ then
|
||||||
else
|
else
|
||||||
BUILD_DIR=$BUILD_RELEASE
|
BUILD_DIR=$BUILD_RELEASE
|
||||||
INSTALL_DIR=$INSTALL_RELEASE
|
INSTALL_DIR=$INSTALL_RELEASE
|
||||||
BUILD_CFLAGS="$BUILD_CFLAGS -march=pentium"
|
BUILD_CFLAGS="$BUILD_CFLAGS"
|
||||||
BUILD_CXXFLAGS="$BUILD_CXXFLAGS -march=pentium"
|
BUILD_CXXFLAGS="$BUILD_CXXFLAGS"
|
||||||
PATH="$INSTALL_RELEASE/bin:$PATH"
|
PATH="$INSTALL_RELEASE/bin:$PATH"
|
||||||
LD_LIBRARY_PATH="$INSTALL_RELEASE/lib:$LD_LIBRARY_PATH"
|
LD_LIBRARY_PATH="$INSTALL_RELEASE/lib:$LD_LIBRARY_PATH"
|
||||||
fi
|
fi
|
||||||
|
@ -410,7 +410,7 @@ echo CFLAGS="$BUILD_CFLAGS" CXXFLAGS="$BUILD_CXXFLAGS"
|
||||||
|
|
||||||
# Copy the headers
|
# Copy the headers
|
||||||
mkdir -p $BUILD_DIR/nel \
|
mkdir -p $BUILD_DIR/nel \
|
||||||
&& cp -Rfdp $NEL_SRC/include $BUILD_DIR/nel
|
&& cp -RfPp $NEL_SRC/include $BUILD_DIR/nel
|
||||||
|
|
||||||
# Remove from the compilation directory the useless CVS
|
# Remove from the compilation directory the useless CVS
|
||||||
# informations
|
# informations
|
||||||
|
|
0
code/ryzom/tools/scripts/linux/buildmode
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/buildmode
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/clean_log.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/clean_log.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/generate_packed_sheets.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/generate_packed_sheets.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/loop_aes.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/loop_aes.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/make_all
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/make_all
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/ryzom_domain_screen_wrapper.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/ryzom_domain_screen_wrapper.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/service_launcher.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/service_launcher.sh
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/shard
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/shard
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/utilities
Normal file → Executable file
0
code/ryzom/tools/scripts/linux/utilities
Normal file → Executable file
0
code/snowballs2/autogen.sh
Normal file → Executable file
0
code/snowballs2/autogen.sh
Normal file → Executable file
Loading…
Reference in a new issue