move RIncludes install location, convert line endings

This commit is contained in:
Wolfgang Thaller 2015-07-20 03:29:25 +02:00
parent ada5fc9146
commit 2bcf3e226d
3 changed files with 13 additions and 2 deletions

View File

@ -62,7 +62,7 @@ cd ..
sh "$SRC/prepare-headers.sh" "$SRC/CIncludes" toolchain/m68k-unknown-elf/include
mkdir -p toolchain/RIncludes
cp $SRC/RIncludes/*.r toolchain/RIncludes/
sh "$SRC/prepare-rincludes.sh" "$SRC/RIncludes" toolchain/m68k-unknown-elf/RIncludes
mkdir -p build-host
cd build-host

View File

@ -23,7 +23,7 @@ set( CMAKE_INSTALL_PREFIX "${RETRO68_ROOT}/m68k-unknown-elf/" CACHE PATH "instal
set( MAKE_APPL "${RETRO68_ROOT}/bin/MakeAPPL" )
set( REZ "${RETRO68_ROOT}/bin/Rez" )
set( REZ_INCLUDE_PATH "${RETRO68_ROOT}/RIncludes" )
set( REZ_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/RIncludes" )
set( CMAKE_C_COMPILER "${RETRO68_ROOT}/bin/m68k-unknown-elf-gcc" )
set( CMAKE_CXX_COMPILER "${RETRO68_ROOT}/bin/m68k-unknown-elf-g++" )

11
prepare-rincludes.sh Normal file
View File

@ -0,0 +1,11 @@
IN=$1
OUT=$2
# Make Mac OS X's tr and sed not complain that the files are not UTF-8
export LANG=en
# cp $IN/[A-Z]*.r $OUT/
for file in $(cd $IN; ls [A-Z]*.r); do
tr '\r' '\n' < $IN/$file > $OUT/$file
done