Ron Aaron 5 жил өмнө
parent
commit
d4a0f6eef5

+ 1 - 1
demo/glfw_opengl3/Makefile

@@ -2,7 +2,7 @@
 BIN = demo
 
 # Flags
-CFLAGS += -std=c99 -pedantic -O2
+CFLAGS += -std=c89 -pedantic -O2
 
 SRC = main.c
 OBJ = $(SRC:.c=.o)

+ 6 - 2
nuklear.h

@@ -1,3 +1,4 @@
+/*
 /// # Nuklear
 /// ![](https://cloud.githubusercontent.com/assets/8057201/11761525/ae06f0ca-a0c6-11e5-819d-5610b25f6ef4.gif)
 ///
@@ -211,6 +212,7 @@
 ///
 /// ## API
 ///
+*/
 #ifndef NK_SINGLE_FILE
   #define NK_SINGLE_FILE
 #endif
@@ -5683,8 +5685,10 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
 #define STB_TRUETYPE_IMPLEMENTATION
 #endif
 
-#define STBTT_malloc(x,u) nk_malloc((nk_handle){0},0,x)
-#define STBTT_free(x,u) nk_mfree((nk_handle){0},x)
+static nk_handle fictional_handle = {0};
+
+#define STBTT_malloc(x,u)  nk_malloc( fictional_handle, 0, x ) 
+#define STBTT_free(x,u)    nk_mfree( fictional_handle , x)
 
 #endif /* NK_NUKLEAR_H_ */
 

+ 2 - 2
src/build.py

@@ -116,10 +116,10 @@ if macro == "":
 
 # Print concatenated output
 # -------------------------
-#print("/*")
+print("/*")
 for f in intro_files:
     sys.stdout.write(open(f, 'r').read())
-#print("*/")
+print("*/")
 
 # print(os.linesep + "#ifndef " + macro + "_SINGLE_HEADER");
 # print("#define " + macro + "_SINGLE_HEADER");

+ 4 - 2
src/nuklear.h

@@ -5466,7 +5466,9 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
 #define STB_TRUETYPE_IMPLEMENTATION
 #endif
 
-#define STBTT_malloc(x,u) nk_malloc((nk_handle){0},0,x)
-#define STBTT_free(x,u) nk_mfree((nk_handle){0},x)
+static nk_handle fictional_handle = {0};
+
+#define STBTT_malloc(x,u)  nk_malloc( fictional_handle, 0, x ) 
+#define STBTT_free(x,u)    nk_mfree( fictional_handle , x)
 
 #endif /* NK_NUKLEAR_H_ */

+ 1 - 1
src/paq.bat

@@ -1 +1 @@
-build.py --macro NK --intro HEADER --pub nuklear.h --priv nuklear_internal.h,nuklear_math.c,nuklear_util.c,nuklear_color.c,nuklear_utf8.c,nuklear_buffer.c,nuklear_string.c,nuklear_draw.c,nuklear_vertex.c,stb_rect_pack.h,stb_truetype.h,nuklear_font.c,nuklear_input.c,nuklear_style.c,nuklear_context.c,nuklear_pool.c,nuklear_page_element.c,nuklear_table.c,nuklear_panel.c,nuklear_window.c,nuklear_popup.c,nuklear_contextual.c,nuklear_menu.c,nuklear_layout.c,nuklear_tree.c,nuklear_group.c,nuklear_list_view.c,nuklear_widget.c,nuklear_text.c,nuklear_image.c,nuklear_button.c,nuklear_toggle.c,nuklear_selectable.c,nuklear_slider.c,nuklear_progress.c,nuklear_scrollbar.c,nuklear_text_editor.c,nuklear_edit.c,nuklear_property.c,nuklear_chart.c,nuklear_color_picker.c,nuklear_combo.c,nuklear_tooltip.c --outro LICENSE,CHANGELOG,CREDITS > ..\nuklear.h
+build.py --macro NK --intro HEADER --pub nuklear.h --priv nuklear_internal.h,nuklear_math.c,nuklear_util.c,nuklear_color.c,nuklear_utf8.c,nuklear_buffer.c,nuklear_string.c,nuklear_draw.c,nuklear_vertex.c,stb_rect_pack.h,stb_truetype.h,nuklear_font.c,nuklear_input.c,nuklear_style.c,nuklear_context.c,nuklear_pool.c,nuklear_page_element.c,nuklear_table.c,nuklear_panel.c,nuklear_window.c,nuklear_popup.c,nuklear_contextual.c,nuklear_menu.c,nuklear_layout.c,nuklear_tree.c,nuklear_group.c,nuklear_list_view.c,nuklear_widget.c,nuklear_text.c,nuklear_image.c,nuklear_button.c,nuklear_toggle.c,nuklear_selectable.c,nuklear_slider.c,nuklear_progress.c,nuklear_scrollbar.c,nuklear_text_editor.c,nuklear_edit.c,nuklear_property.c,nuklear_chart.c,nuklear_color_picker.c,nuklear_combo.c,nuklear_tooltip.c --outro LICENSE,CHANGELOG,CREDITS > ..\nuklear.h