diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..1efe2125 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,34 @@ +4coder-alpha License + +The Software ("4coder", "4ed.exe") is Copyright 2015 by Four Tech LLC, all +rights are reserved. Anyone who has purchased a copy of the Software, +("The User"), is granted a personal, non-assignable, non-transferable, +license to use the Software for personal or commercial uses. + +The User may not redistribute, sub-license, or resell the Software. The User is +permitted to make an unlimited number of copies of the Software which are subject +to the aforementioned restrictions. + +The Software is provided "as is" without warranty of any kind, either express or +implied, including without limitation any implied warranties of condition, +uninterrupted use, merchantability, fitness for a particular purpose, or +non-infringement. + + + +The following parts of the Software are separately licensed as follows: + +- The Liberation font family is licensed under the SIL Open Font License (version 2 onwards). + The full text of this license is available in the accompanying 3rdparty/sil.txt file + +- The Hack font family is licensed under the a modified SIL license + The full text of this license is available in the accompanying 3rdparty/hacksil.txt file + +- The Inconsolata font family is licensed under the SIL Open Font License + Copyright (c) 2011, Raph Levien (firstname.lastname@gmail.com), Copyright (c) 2012, Cyreal (cyreal.org) + The full text of this license is available in the accompanying 3rdpart/sil.txt + +- The Cutive font family is licensed under the SIL Open Font License + Copyright (c) 2012 by vernon adams (vern@newtypography.co.uk) + The full text of this license is available in the accompanying 3rdpart/sil.txt + diff --git a/README.txt b/README.txt new file mode 100644 index 00000000..7069ae78 --- /dev/null +++ b/README.txt @@ -0,0 +1,12 @@ + +Thank you for contributing to the 4coder project! + +To submit bug reports or to request particular features email: +editor@4coder.net + +Watch the 4coder.handmade.network blog and @AllenWebster4th twitter for news about 4coder progress. + +For documentation, feature lists, and usage tutorial videos go to: +4coder.com + + diff --git a/meta/build.cpp b/meta/build.cpp index 2b31797d..6016f3d3 100644 --- a/meta/build.cpp +++ b/meta/build.cpp @@ -506,9 +506,9 @@ static void standard_build(char *cdir, u32 flags){ fsm_generator(cdir); metagen(cdir); - do_buildsuper(cdir, Custom_Default, flags); + //do_buildsuper(cdir, Custom_Default, flags); //do_buildsuper(cdir, Custom_Experiments, flags); - //do_buildsuper(cdir, Custom_Casey, flags); + do_buildsuper(cdir, Custom_Casey, flags); //do_buildsuper(cdir, Custom_ChronalVim, flags); build_main(cdir, flags); } @@ -678,6 +678,9 @@ package(char *cdir){ copy_folder(dir, "themes"); + copy_file(cdir, "LICENSE.txt", dir, 0, 0); + copy_file(cdir, "README.txt", dir, 0, 0); + get_4coder_dist_name(&str, true, zip_dir, tier, arch, "zip"); zip(par_dir, "4coder", str.str); } @@ -758,7 +761,12 @@ package(char *cdir){ copy_all(0, "4coder_*", dir); - copy_file(0, "buildsuper" BAT, dir, 0, 0); + if (!(flags[i] & X86)){ + copy_file(0, "buildsuper" BAT, dir, 0, 0); + } + else{ + copy_file(0, "buildsuper_x86" BAT, dir, 0, "buildsuper" BAT); + } #if defined(IS_WINDOWS) copy_folder(dir, "windows_scripts"); @@ -771,6 +779,9 @@ package(char *cdir){ copy_folder(dir, "languages"); copy_folder(dir, "themes"); + copy_file(cdir, "LICENSE.txt", dir, 0, 0); + copy_file(cdir, "README.txt", dir, 0, 0); + get_4coder_dist_name(&str, true, zip_dir, tier, arch, "zip"); zip(par_dir, "4coder", str.str); } diff --git a/power/4coder_casey.cpp b/power/4coder_casey.cpp index 73515e5c..8e170afd 100644 --- a/power/4coder_casey.cpp +++ b/power/4coder_casey.cpp @@ -1709,7 +1709,7 @@ SCROLL_RULE_SIG(casey_smooth_scroll_rule){ return(result); } -HOOK_SIG(casey_start) +START_HOOK_SIG(casey_start) { // NOTE(allen): This initializes a couple of global memory // management structs on the custom side that are used in @@ -1736,7 +1736,7 @@ extern "C" GET_BINDING_DATA(get_bindings) Bind_Helper context_actual = begin_bind_helper(data, size); Bind_Helper *context = &context_actual; - set_hook(context, hook_start, casey_start); + set_start_hook(context, casey_start); set_command_caller(context, default_command_caller); set_open_file_hook(context, casey_file_settings); set_scroll_rule(context, casey_smooth_scroll_rule);