From 774dce1a85f356a2d4c746fd601e946c56dfd012 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Tue, 28 Oct 2014 22:28:03 +0100 Subject: [PATCH] move ResourceFiles to separate library --- CMakeLists.txt | 1 + MakeAPPL/CMakeLists.txt | 4 +-- {MakeAPPL => ResourceFiles}/BinaryIO.cc | 0 {MakeAPPL => ResourceFiles}/BinaryIO.h | 0 ResourceFiles/CMakeLists.txt | 27 +++++++++++++++++++++ {MakeAPPL => ResourceFiles}/ResType.cc | 0 {MakeAPPL => ResourceFiles}/ResType.h | 0 {MakeAPPL => ResourceFiles}/ResourceFork.cc | 0 {MakeAPPL => ResourceFiles}/ResourceFork.h | 0 9 files changed, 29 insertions(+), 3 deletions(-) rename {MakeAPPL => ResourceFiles}/BinaryIO.cc (100%) rename {MakeAPPL => ResourceFiles}/BinaryIO.h (100%) create mode 100644 ResourceFiles/CMakeLists.txt rename {MakeAPPL => ResourceFiles}/ResType.cc (100%) rename {MakeAPPL => ResourceFiles}/ResType.h (100%) rename {MakeAPPL => ResourceFiles}/ResourceFork.cc (100%) rename {MakeAPPL => ResourceFiles}/ResourceFork.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f46cdec399..23ecc05892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ add_subdirectory(TestApps) add_subdirectory(Raytracer) add_subdirectory(Launcher) else() +add_subdirectory(ResourceFiles) add_subdirectory(MakeAPPL) add_subdirectory(ASFilter) add_subdirectory(Rez) diff --git a/MakeAPPL/CMakeLists.txt b/MakeAPPL/CMakeLists.txt index 503d507c65..bf2745c948 100644 --- a/MakeAPPL/CMakeLists.txt +++ b/MakeAPPL/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2012 Wolfgang Thaller. +# Copyright 2014 Wolfgang Thaller. # # This file is part of Retro68. # @@ -18,8 +18,6 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_CXX_FLAGS "--std=c++0x") -add_library(ResourceFiles ResourceFork.h ResourceFork.cc BinaryIO.h BinaryIO.cc ResType.h ResType.cc) -target_include_directories(ResourceFiles PUBLIC .) add_executable(MakeAPPL main.cc) target_link_libraries(MakeAPPL ResourceFiles) diff --git a/MakeAPPL/BinaryIO.cc b/ResourceFiles/BinaryIO.cc similarity index 100% rename from MakeAPPL/BinaryIO.cc rename to ResourceFiles/BinaryIO.cc diff --git a/MakeAPPL/BinaryIO.h b/ResourceFiles/BinaryIO.h similarity index 100% rename from MakeAPPL/BinaryIO.h rename to ResourceFiles/BinaryIO.h diff --git a/ResourceFiles/CMakeLists.txt b/ResourceFiles/CMakeLists.txt new file mode 100644 index 0000000000..2205fdcff5 --- /dev/null +++ b/ResourceFiles/CMakeLists.txt @@ -0,0 +1,27 @@ +# Copyright 2014 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 . + +cmake_minimum_required(VERSION 2.8) +set(CMAKE_CXX_FLAGS "--std=c++0x") + +add_library(ResourceFiles + ResourceFork.h ResourceFork.cc + BinaryIO.h BinaryIO.cc + ResType.h ResType.cc + ) +target_include_directories(ResourceFiles PUBLIC .) + diff --git a/MakeAPPL/ResType.cc b/ResourceFiles/ResType.cc similarity index 100% rename from MakeAPPL/ResType.cc rename to ResourceFiles/ResType.cc diff --git a/MakeAPPL/ResType.h b/ResourceFiles/ResType.h similarity index 100% rename from MakeAPPL/ResType.h rename to ResourceFiles/ResType.h diff --git a/MakeAPPL/ResourceFork.cc b/ResourceFiles/ResourceFork.cc similarity index 100% rename from MakeAPPL/ResourceFork.cc rename to ResourceFiles/ResourceFork.cc diff --git a/MakeAPPL/ResourceFork.h b/ResourceFiles/ResourceFork.h similarity index 100% rename from MakeAPPL/ResourceFork.h rename to ResourceFiles/ResourceFork.h