diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mo_edit.c | 6 | ||||
| -rw-r--r-- | src/project_base.h | 232 | ||||
| -rw-r--r-- | src/settings.c | 2 |
3 files changed, 121 insertions, 119 deletions
diff --git a/src/mo_edit.c b/src/mo_edit.c index 67d3516..9b954b4 100644 --- a/src/mo_edit.c +++ b/src/mo_edit.c @@ -467,7 +467,7 @@ int main(int argc, char **argv) platform_window window = platform_open_window("mo-edit", window_w, window_h, 0, 0, 800, 600);
main_window = &window;
- validate_license();
+ //validate_license();
settings_page_create();
@@ -507,7 +507,7 @@ int main(int argc, char **argv) tb_translation_list = array_create(sizeof(textbox_state));
load_config(&config);
- while(window.is_open) {
+ while(window.is_open) {
u64 last_stamp = platform_get_time(TIME_FULL, TIME_US);
platform_handle_events(&window, &mouse, &keyboard);
platform_set_cursor(&window, CURSOR_DEFAULT);
@@ -516,7 +516,7 @@ int main(int argc, char **argv) platform_window_make_current(&window);
- if (!license_check_status()) break;
+ //if (!license_check_status()) break;
static bool icon_loaded = false;
if (!icon_loaded && logo_small_img->loaded)
diff --git a/src/project_base.h b/src/project_base.h index 023a072..16e4e29 100644 --- a/src/project_base.h +++ b/src/project_base.h @@ -1,117 +1,117 @@ -/* -* BSD 2-Clause “Simplified” License -* Copyright (c) 2019, Aldrik Ramaekers, aldrik.ramaekers@protonmail.com -* All rights reserved. -*/ - -#ifndef INCLUDE_PROJECT_BASE -#define INCLUDE_PROJECT_BASE - -#ifdef _WIN32 -#define OS_WIN -#include <windows.h> -#include <time.h> -#endif -#ifdef __linux__ -#define OS_LINUX -#include <sys/times.h> -#include <sys/vtimes.h> -#endif -#ifdef __APPLE__ -#define OS_OSX -#error platform not supported -#endif - -#include "stdint.h" -#include "string.h" -#include "assert.h" - -#include <GL/gl.h> -#ifdef OS_LINUX -#include <GL/glx.h> -#endif -#include <GL/glu.h> -#include <GL/glext.h> - -#define s8 int8_t -#define s16 int16_t -#define s32 int32_t -#define s64 int64_t - -#define u8 uint8_t -#define u16 uint16_t -#define u32 uint32_t -#define u64 uint64_t - -#define float32 float -#define float64 double - -#ifdef OS_LINUX -#define bool uint8_t -#endif -#ifdef OS_WIN -#define bool _Bool -#endif - -#define true 1 -#define false 0 - -#include "asset_definitions.h" - -#include "../../project-base/src/thread.h" -#include "../../project-base/src/array.h" -#include "../../project-base/src/memory.h" -#include "../../project-base/src/licensing.h" -#include "../../project-base/src/external/cJSON.h" - -#define STB_IMAGE_IMPLEMENTATION -#include "../../project-base/src/external/stb_image.h" - -#define STB_TRUETYPE_IMPLEMENTATION -#include "../../project-base/src/external/stb_truetype.h" - -#include "../../project-base/src/external/utf8.h" -#include "../../project-base/src/input.h" -#include "../../project-base/src/assets.h" -#include "../../project-base/src/memory_bucket.h" -#include "../../project-base/src/platform.h" -#include "../../project-base/src/render.h" -#include "../../project-base/src/camera.h" -#include "../../project-base/src/ui.h" -#include "../../project-base/src/string_utils.h" -#include "../../project-base/src/settings_config.h" -#include "../../project-base/src/localization.h" - -#include "../../project-base/src/platform_shared.c" - -#ifdef OS_LINUX -#define DEFAULT_DIRECTORY "/home/" -#define CONFIG_DIRECTORY "/.config/moedit" - -#include "../../project-base/src/linux/thread.c" -#include "../../project-base/src/linux/platform.c" -#endif - -#ifdef OS_WIN -#define DEFAULT_DIRECTORY "C:/" -#define CONFIG_DIRECTORY "\\moedit" - -#include "../../project-base/src/windows/thread.c" -#include "../../project-base/src/windows/platform.c" -#endif - -#include "../../project-base/src/input.c" -#include "../../project-base/src/array.c" -#include "../../project-base/src/assets.c" -#include "../../project-base/src/render.c" -#include "../../project-base/src/camera.c" -#include "../../project-base/src/ui.c" -#include "../../project-base/src/string_utils.c" -#include "../../project-base/src/settings_config.c" -#include "../../project-base/src/localization.c" -#include "../../project-base/src/memory_bucket.c" -#include "../../project-base/src/licensing.c" - -#include "../../project-base/src/external/cJSON.c" - +/*
+* BSD 2-Clause “Simplified” License
+* Copyright (c) 2019, Aldrik Ramaekers, aldrik.ramaekers@protonmail.com
+* All rights reserved.
+*/
+
+#ifndef INCLUDE_PROJECT_BASE
+#define INCLUDE_PROJECT_BASE
+
+#ifdef _WIN32
+#define OS_WIN
+#include <windows.h>
+#include <time.h>
+#endif
+#ifdef __linux__
+#define OS_LINUX
+#include <sys/times.h>
+#include <sys/vtimes.h>
+#endif
+#ifdef __APPLE__
+#define OS_OSX
+#error platform not supported
+#endif
+
+#include "stdint.h"
+#include "string.h"
+#include "assert.h"
+
+#include <GL/gl.h>
+#ifdef OS_LINUX
+#include <GL/glx.h>
+#endif
+#include <GL/glu.h>
+#include <GL/glext.h>
+
+#define s8 int8_t
+#define s16 int16_t
+#define s32 int32_t
+#define s64 int64_t
+
+#define u8 uint8_t
+#define u16 uint16_t
+#define u32 uint32_t
+#define u64 uint64_t
+
+#define float32 float
+#define float64 double
+
+#ifdef OS_LINUX
+#define bool uint8_t
+#endif
+#ifdef OS_WIN
+#define bool _Bool
+#endif
+
+#define true 1
+#define false 0
+
+#include "asset_definitions.h"
+
+#include "../../project-base/src/thread.h"
+#include "../../project-base/src/array.h"
+#include "../../project-base/src/memory.h"
+//#include "../../project-base/src/licensing.h"
+#include "../../project-base/src/external/cJSON.h"
+
+#define STB_IMAGE_IMPLEMENTATION
+#include "../../project-base/src/external/stb_image.h"
+
+#define STB_TRUETYPE_IMPLEMENTATION
+#include "../../project-base/src/external/stb_truetype.h"
+
+#include "../../project-base/src/external/utf8.h"
+#include "../../project-base/src/input.h"
+#include "../../project-base/src/assets.h"
+#include "../../project-base/src/memory_bucket.h"
+#include "../../project-base/src/platform.h"
+#include "../../project-base/src/render.h"
+#include "../../project-base/src/camera.h"
+#include "../../project-base/src/ui.h"
+#include "../../project-base/src/string_utils.h"
+#include "../../project-base/src/settings_config.h"
+#include "../../project-base/src/localization.h"
+
+#include "../../project-base/src/platform_shared.c"
+
+#ifdef OS_LINUX
+#define DEFAULT_DIRECTORY "/home/"
+#define CONFIG_DIRECTORY "/.config/moedit"
+
+#include "../../project-base/src/linux/thread.c"
+#include "../../project-base/src/linux/platform.c"
+#endif
+
+#ifdef OS_WIN
+#define DEFAULT_DIRECTORY "C:/"
+#define CONFIG_DIRECTORY "\\moedit"
+
+#include "../../project-base/src/windows/thread.c"
+#include "../../project-base/src/windows/platform.c"
+#endif
+
+#include "../../project-base/src/input.c"
+#include "../../project-base/src/array.c"
+#include "../../project-base/src/assets.c"
+#include "../../project-base/src/render.c"
+#include "../../project-base/src/camera.c"
+#include "../../project-base/src/ui.c"
+#include "../../project-base/src/string_utils.c"
+#include "../../project-base/src/settings_config.c"
+#include "../../project-base/src/localization.c"
+#include "../../project-base/src/memory_bucket.c"
+//#include "../../project-base/src/licensing.c"
+
+#include "../../project-base/src/external/cJSON.c"
+
#endif
\ No newline at end of file diff --git a/src/settings.c b/src/settings.c index 31e3052..425007f 100644 --- a/src/settings.c +++ b/src/settings.c @@ -103,6 +103,7 @@ void settings_page_update_render() } ui_block_end(); +#if 0 ui_block_begin(LAYOUT_HORIZONTAL); { char license_text[30]; @@ -110,6 +111,7 @@ void settings_page_update_render() ui_push_text(license_text); } ui_block_end(); +#endif } global_ui_context.layout.offset_y = global_settings_page.window.height - 33; |
