From 783250a9a2589767191006e27a08963091c186be Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Sun, 9 Jun 2019 16:02:55 -0400 Subject: [PATCH] tycho: move the files around for the last time i swear --- source/tycho/CMakeLists.txt | 14 +++++++------- source/tycho/Cargo.toml | 2 +- source/tycho/{headers => cc_headers}/mapprops.h | 0 source/tycho/{headers => cc_headers}/menu.h | 0 source/tycho/{headers => cc_headers}/tycho.h | 0 source/tycho/{source => cc_source}/main.cc | 0 source/tycho/{source => cc_source}/mapprops.cc | 0 source/tycho/{source => cc_source}/menu.cc | 0 source/tycho/{ => source}/main.rs | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename source/tycho/{headers => cc_headers}/mapprops.h (100%) rename source/tycho/{headers => cc_headers}/menu.h (100%) rename source/tycho/{headers => cc_headers}/tycho.h (100%) rename source/tycho/{source => cc_source}/main.cc (100%) rename source/tycho/{source => cc_source}/mapprops.cc (100%) rename source/tycho/{source => cc_source}/menu.cc (100%) rename source/tycho/{ => source}/main.rs (100%) diff --git a/source/tycho/CMakeLists.txt b/source/tycho/CMakeLists.txt index 1c25ec3..088f05d 100644 --- a/source/tycho/CMakeLists.txt +++ b/source/tycho/CMakeLists.txt @@ -22,13 +22,13 @@ add_library( SHARED $ENV{OUT_DIR}/bindings.cc $ENV{OUT_DIR}/bindings.h - headers/mapprops.h - headers/menu.h - headers/tycho.h + cc_headers/mapprops.h + cc_headers/menu.h + cc_headers/tycho.h + cc_source/main.cc + cc_source/mapprops.cc + cc_source/menu.cc resources/resources.qrc - source/main.cc - source/mapprops.cc - source/menu.cc ui/about.ui ui/mapprops.ui ui/mapview.ui @@ -46,7 +46,7 @@ set_target_properties( target_include_directories( maraiah-tycho-hermes PUBLIC - headers + cc_headers $ENV{OUT_DIR} ) diff --git a/source/tycho/Cargo.toml b/source/tycho/Cargo.toml index 3779ded..16b1334 100644 --- a/source/tycho/Cargo.toml +++ b/source/tycho/Cargo.toml @@ -16,4 +16,4 @@ rust_qt_binding_generator = "0.3" [[bin]] name = "tycho" -path = "main.rs" +path = "source/main.rs" diff --git a/source/tycho/headers/mapprops.h b/source/tycho/cc_headers/mapprops.h similarity index 100% rename from source/tycho/headers/mapprops.h rename to source/tycho/cc_headers/mapprops.h diff --git a/source/tycho/headers/menu.h b/source/tycho/cc_headers/menu.h similarity index 100% rename from source/tycho/headers/menu.h rename to source/tycho/cc_headers/menu.h diff --git a/source/tycho/headers/tycho.h b/source/tycho/cc_headers/tycho.h similarity index 100% rename from source/tycho/headers/tycho.h rename to source/tycho/cc_headers/tycho.h diff --git a/source/tycho/source/main.cc b/source/tycho/cc_source/main.cc similarity index 100% rename from source/tycho/source/main.cc rename to source/tycho/cc_source/main.cc diff --git a/source/tycho/source/mapprops.cc b/source/tycho/cc_source/mapprops.cc similarity index 100% rename from source/tycho/source/mapprops.cc rename to source/tycho/cc_source/mapprops.cc diff --git a/source/tycho/source/menu.cc b/source/tycho/cc_source/menu.cc similarity index 100% rename from source/tycho/source/menu.cc rename to source/tycho/cc_source/menu.cc diff --git a/source/tycho/main.rs b/source/tycho/source/main.rs similarity index 100% rename from source/tycho/main.rs rename to source/tycho/source/main.rs