From 0db322e4a091723989b969f236945d0c20e65dfb Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Tue, 21 Jul 2015 00:09:06 +0200
Subject: [PATCH] fix & clean up build

---
 CMakeLists.txt                   | 12 ++++--------
 build-toolchain.sh               |  2 +-
 cmake/intree.toolchain.cmake.in  | 31 +++++++++++++++++++++++++++++++
 cmake/retro68.toolchain.cmake.in |  4 +---
 4 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 cmake/intree.toolchain.cmake.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 566a907086..53aca87cf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,24 +20,18 @@ project(Retro)
 
 if(CMAKE_SYSTEM_NAME MATCHES Retro68)
 
-list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
 include(add_application)
 
 configure_file(cmake/retro68.toolchain.cmake.in cmake/retro68.toolchain.cmake @ONLY)
 install(DIRECTORY cmake/ DESTINATION cmake FILES_MATCHING PATTERN "*.cmake")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/retro68.toolchain.cmake DESTINATION cmake)
 
-set(MAKE_APPL ${CMAKE_CURRENT_BINARY_DIR}/../build-host/MakeAPPL/MakeAPPL)
-set(REZ ${CMAKE_CURRENT_BINARY_DIR}/../build-host/Rez/Rez)
-set( REZ_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libretro:${CMAKE_INSTALL_PREFIX}/RIncludes" )
-
-
 add_subdirectory(libretro)
 
 # add library path so that GCC picks up the freshly-built libretro
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/libretro)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libretro)
-
+set(REZ_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libretro:${CMAKE_INSTALL_PREFIX}/RIncludes" )
 
 add_subdirectory(Console)
 add_subdirectory(TestApps)
@@ -46,13 +40,15 @@ add_subdirectory(Samples/Raytracer)
 add_subdirectory(Samples/Launcher)
 add_subdirectory(Samples/Dialog)
 add_subdirectory(Samples/SystemExtension)
+
 else()
 
 set(RETRO68_ROOT ${CMAKE_INSTALL_PREFIX})
-configure_file(cmake/retro68.toolchain.cmake.in cmake/retro68.toolchain.cmake @ONLY)
+configure_file(cmake/intree.toolchain.cmake.in cmake/intree.toolchain.cmake @ONLY)
 
 add_subdirectory(ResourceFiles)
 add_subdirectory(MakeAPPL)
 add_subdirectory(ASFilter)
 add_subdirectory(Rez)
+
 endif()
diff --git a/build-toolchain.sh b/build-toolchain.sh
index a3e12edc66..de1322104c 100644
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -84,7 +84,7 @@ $PREFIX/bin/m68k-unknown-elf-ar cqs $PREFIX/m68k-unknown-elf/lib/libretrocrt.a
 
 mkdir -p build-target
 cd build-target
-cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/retro68.toolchain.cmake \
+cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/intree.toolchain.cmake \
 			 -DIN_RETRO68_TREE=True	\
 			 -DCMAKE_BUILD_TYPE=Release
 cd ..
diff --git a/cmake/intree.toolchain.cmake.in b/cmake/intree.toolchain.cmake.in
new file mode 100644
index 0000000000..63f18f3a17
--- /dev/null
+++ b/cmake/intree.toolchain.cmake.in
@@ -0,0 +1,31 @@
+#   Copyright 2012 Wolfgang Thaller.
+#
+#   This file is part of Retro68.
+#
+#   Retro68 is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Retro68 is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Retro68.  If not, see <http://www.gnu.org/licenses/>.
+
+set( CMAKE_SYSTEM_NAME Retro68 )
+set( CMAKE_SYSTEM_VERSION 1)
+
+set( RETRO68_ROOT "@RETRO68_ROOT@" CACHE PATH "path to root of Retro68 Toolchain" )
+set( CMAKE_INSTALL_PREFIX "${RETRO68_ROOT}/m68k-unknown-elf/" CACHE PATH "installation prefix" )
+
+set( MAKE_APPL "@CMAKE_BINARY_DIR@/MakeAPPL/MakeAPPL" )
+set( REZ "@CMAKE_BINARY_DIR@/Rez/Rez" )
+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++" )
+
+list( APPEND CMAKE_MODULE_PATH "@CMAKE_SOURCE_DIR@/cmake" )
diff --git a/cmake/retro68.toolchain.cmake.in b/cmake/retro68.toolchain.cmake.in
index dbabe7cc0f..7c2c793a23 100644
--- a/cmake/retro68.toolchain.cmake.in
+++ b/cmake/retro68.toolchain.cmake.in
@@ -23,12 +23,10 @@ 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 "${CMAKE_INSTALL_PREFIX}/RIncludes" )
+set( REZ_INCLUDE_PATH "${RETRO68_ROOT}/m68k-unknown-elf/RIncludes" )
 
 set( CMAKE_C_COMPILER "${RETRO68_ROOT}/bin/m68k-unknown-elf-gcc" )
 set( CMAKE_CXX_COMPILER "${RETRO68_ROOT}/bin/m68k-unknown-elf-g++" )
 
-if( NOT @IN_RETRO68_TREE@ )
 list( APPEND CMAKE_MODULE_PATH "${RETRO68_ROOT}/cmake" )
 include(add_application)
-endif()