From c3ef63934fbf6bcd82bb38c04df48de763addfea Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Tue, 27 Nov 2018 10:07:07 -0800 Subject: [PATCH] API files renamed --- 4coder_API/{custom.h => 4coder_custom.h} | 8 ++++---- 4coder_API/{types.h => 4coder_types.h} | 0 4coder_API/{version.h => 4coder_version.h} | 0 4coder_default_include.cpp | 2 +- 4ed_app_target.cpp | 2 +- meta/4ed_build.cpp | 2 +- meta/4ed_metagen.cpp | 11 +++++------ platform_linux/linux_4ed.cpp | 4 ++-- platform_mac/mac_4ed.cpp | 4 ++-- platform_mac/mac_4ed.m | 2 +- platform_win32/win32_4ed.cpp | 4 ++-- site/4ed_sitegen.cpp | 2 +- site/source_material/site_header.txt | 2 +- 13 files changed, 21 insertions(+), 22 deletions(-) rename 4coder_API/{custom.h => 4coder_custom.h} (74%) rename 4coder_API/{types.h => 4coder_types.h} (100%) rename 4coder_API/{version.h => 4coder_version.h} (100%) diff --git a/4coder_API/custom.h b/4coder_API/4coder_custom.h similarity index 74% rename from 4coder_API/custom.h rename to 4coder_API/4coder_custom.h index 4ce7823a..36419201 100644 --- a/4coder_API/custom.h +++ b/4coder_API/4coder_custom.h @@ -1,5 +1,5 @@ /* -custom.h +4coder_custom.h */ // TOP @@ -9,12 +9,12 @@ custom.h #include -#include "version.h" #include "4coder_lib/4coder_string.h" #include "4coder_lib/4cpp_lexer_types.h" -#include "4coder_keycodes.h" +#include "4coder_API/4coder_version.h" +#include "4coder_API/4coder_keycodes.h" #include "4coder_API/4coder_style.h" -#include "types.h" +#include "4coder_API/4coder_types.h" #include "4coder_generated/app_functions.h" extern "C" _GET_VERSION_SIG(get_alpha_4coder_version){ diff --git a/4coder_API/types.h b/4coder_API/4coder_types.h similarity index 100% rename from 4coder_API/types.h rename to 4coder_API/4coder_types.h diff --git a/4coder_API/version.h b/4coder_API/4coder_version.h similarity index 100% rename from 4coder_API/version.h rename to 4coder_API/4coder_version.h diff --git a/4coder_default_include.cpp b/4coder_default_include.cpp index 423e6b14..00175e89 100644 --- a/4coder_default_include.cpp +++ b/4coder_default_include.cpp @@ -10,7 +10,7 @@ // NOTE(allen): Define USE_OLD_STYLE_JUMPS before 4coder_default_include.cpp to get // the direct jumps (instead of sticky jumps). -#include "4coder_API/custom.h" +#include "4coder_API/4coder_custom.h" #include "4coder_os_comp_cracking.h" #include "4coder_generated/command_metadata.h" diff --git a/4ed_app_target.cpp b/4ed_app_target.cpp index 2605e8d3..339dd934 100644 --- a/4ed_app_target.cpp +++ b/4ed_app_target.cpp @@ -14,7 +14,7 @@ #include "4ed_defines.h" -#include "4coder_API/custom.h" +#include "4coder_API/4coder_custom.h" #include "4ed_math.h" #include "4ed_font.h" diff --git a/meta/4ed_build.cpp b/meta/4ed_build.cpp index 28fa373d..206cd880 100644 --- a/meta/4ed_build.cpp +++ b/meta/4ed_build.cpp @@ -16,7 +16,7 @@ #define FTECH_FILE_MOVING_IMPLEMENTATION #include "4ed_file_moving.h" -#include "../4coder_API/version.h" +#include "../4coder_API/4coder_version.h" // // OS and compiler index diff --git a/meta/4ed_metagen.cpp b/meta/4ed_metagen.cpp index f14b4b1a..81085310 100644 --- a/meta/4ed_metagen.cpp +++ b/meta/4ed_metagen.cpp @@ -12,16 +12,15 @@ #define API_H "4coder_generated/app_functions.h" #define REMAPPING_FILE "4coder_generated/remapping.h" -#include "../4ed_defines.h" +#include "4ed_defines.h" #include "4ed_meta_defines.h" -#include "../4coder_API/version.h" +#include "4coder_API/4coder_version.h" #include "4coder_API/4coder_keycodes.h" #define FSTRING_IMPLEMENTATION -#include "../4coder_lib/4coder_string.h" - -#include "../4coder_lib/4cpp_lexer.h" -#include "../4ed_linked_node_macros.h" +#include "4coder_lib/4coder_string.h" +#include "4coder_lib/4cpp_lexer.h" +#include "4ed_linked_node_macros.h" #include #include diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index c009f9f5..1fac8885 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -15,7 +15,7 @@ #include #include "4ed_defines.h" -#include "4coder_API/version.h" +#include "4coder_API/4coder_version.h" #include "4coder_lib/4coder_utf8.h" @@ -28,7 +28,7 @@ # include "4coder_lib/4coder_arena.h" # include "4coder_lib/4coder_arena.cpp" -# include "4coder_API/types.h" +# include "4coder_API/4coder_types.h" #else # include "4coder_default_bindings.cpp" diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index 607976b5..3b0a2029 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -12,7 +12,7 @@ #define IS_PLAT_LAYER #include "4ed_defines.h" -#include "4coder_API/version.h" +#include "4coder_API/4coder_version.h" #include "4coder_lib/4coder_utf8.h" @@ -25,7 +25,7 @@ # include "4coder_lib/4coder_arena.h" # include "4coder_lib/4coder_arena.cpp" -# include "4coder_API/types.h" +# include "4coder_API/4coder_types.h" #else # include "4coder_default_bindings.cpp" diff --git a/platform_mac/mac_4ed.m b/platform_mac/mac_4ed.m index 7a5d9e73..67bd7860 100644 --- a/platform_mac/mac_4ed.m +++ b/platform_mac/mac_4ed.m @@ -14,7 +14,7 @@ #define inline internal #include "4ed_defines.h" #undef inline -#include "4coder_API/version.h" +#include "4coder_API/4coder_version.h" #include "4coder_generated/keycodes.h" #include "4ed_log.h" diff --git a/platform_win32/win32_4ed.cpp b/platform_win32/win32_4ed.cpp index 3863f721..ef1c5643 100644 --- a/platform_win32/win32_4ed.cpp +++ b/platform_win32/win32_4ed.cpp @@ -22,7 +22,7 @@ #define frame_useconds (1000000 / FPS) #include "4ed_defines.h" -#include "4coder_API/version.h" +#include "4coder_API/4coder_version.h" #include #include "4coder_lib/4coder_utf8.h" @@ -36,7 +36,7 @@ # include "4coder_lib/4coder_arena.h" # include "4coder_lib/4coder_arena.cpp" -# include "4coder_API/types.h" +# include "4coder_API/4coder_types.h" #else # include "4coder_default_bindings.cpp" diff --git a/site/4ed_sitegen.cpp b/site/4ed_sitegen.cpp index 9d49dff7..238e8d3e 100644 --- a/site/4ed_sitegen.cpp +++ b/site/4ed_sitegen.cpp @@ -23,7 +23,7 @@ #include "../4ed_defines.h" #include "../meta/4ed_meta_defines.h" -#include "../4coder_API/version.h" +#include "../4coder_API/4coder_version.h" #define FSTRING_IMPLEMENTATION #include "../4coder_lib/4coder_string.h" #include "../4coder_lib/4cpp_lexer.h" diff --git a/site/source_material/site_header.txt b/site/source_material/site_header.txt index 6944b778..a9901853 100644 --- a/site/source_material/site_header.txt +++ b/site/source_material/site_header.txt @@ -1,5 +1,5 @@ \META_PARSE{custom_funcs}{4ed_api_implementation.cpp} -\META_PARSE{custom_types}{4coder_API/types.h} +\META_PARSE{custom_types}{4coder_API/4coder_types.h} \META_PARSE{string} {string/internal_4coder_string.cpp} \META_PARSE{lexer_funcs} {4coder_lib/4cpp_lexer.h} \META_PARSE{lexer_types} {4coder_lib/4cpp_lexer_types.h}