From 149b49a81f38c89b146f0e7f93b2b129f87f5f4b Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Mon, 29 Sep 2025 05:18:52 +0000 Subject: [PATCH] better example git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@52 b9cfdab3-6d41-4d17-bbe4-086880011989 --- GNUmakefile | 16 +++++++--------- examples/example.c | 16 +++++----------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 68d6513..fb8cd77 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -12,8 +12,8 @@ L_LDFLAGS = $(LDFLAGS) L_LIBS = $(LIBS) E_CFLAGS = $(CFLAGS) -E_LDFLAGS = $(LDFLAGS) -E_LIBS = $(LIBS) +E_LDFLAGS = $(LDFLAGS) -Lsrc +E_LIBS = $(LIBS) -lMw L_OBJS = src/ds.o src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o L_OBJS += src/window.o src/button.o @@ -35,16 +35,14 @@ L_CFLAGS += -DUSE_X11 L_OBJS += src/x11.o L_LIBS += -lX11 -LIB = lib SO = .so EXEC = else ifeq ($(WINDOWS),1) L_CFLAGS += -DUSE_GDI -L_LDFLAGS += -Wl,--out-implib,src/Mw.lib +L_LDFLAGS += -Wl,--out-implib,src/libMw.lib L_OBJS += src/gdi.o L_LIBS += -lgdi32 -LIB = SO = .dll EXEC = .exe endif @@ -52,17 +50,17 @@ endif .PHONY: all format clean lib examples all: lib examples -lib: src/$(LIB)Mw$(SO) +lib: src/libMw$(SO) examples: examples/example$(EXEC) format: clang-format --verbose -i $(shell find src include -name "*.c" -or -name "*.h") -src/$(LIB)Mw$(SO): $(L_OBJS) +src/libMw$(SO): $(L_OBJS) $(CC) $(L_LDFLAGS) -shared -o $@ $(L_OBJS) $(L_LIBS) -examples/%$(EXEC): examples/%.o src/$(LIB)Mw$(SO) - $(CC) $(E_LDFLAGS) -o $@ $< src/$(LIB)Mw$(SO) $(E_LIBS) +examples/%$(EXEC): examples/%.o src/libMw$(SO) + $(CC) $(E_LDFLAGS) -o $@ $< $(E_LIBS) src/%.o: src/%.c $(CC) $(L_CFLAGS) -c -o $@ $< diff --git a/examples/example.c b/examples/example.c index 0b554b3..ec6731d 100644 --- a/examples/example.c +++ b/examples/example.c @@ -11,20 +11,14 @@ void handler(MwWidget handle, void* user_data, void* call_data){ } int main(){ - int y, x; - MwWidget window = MwVaCreateWidget(MwWindowClass, "main", NULL, 0, 0, 400, 260, + MwWidget window = MwVaCreateWidget(MwWindowClass, "main", NULL, 0, 0, 400, 400, MwNtitle, "hello world", NULL); + MwWidget button = MwVaCreateWidget(MwButtonClass, "button", window, 50, 50, 300, 300, + MwNtext, "lorem ipsum", + NULL); - for(y = 0; y < 5; y++){ - for(x = 0; x < 2; x++){ - MwWidget button = MwVaCreateWidget(MwButtonClass, "button", window, 5 + 195 * x, 5 + 50 * y, 195, 50, - MwNtext, "lorem ipsum", - NULL); - - MwAddUserHandler(button, MwNactivateHandler, handler, NULL); - } - } + MwAddUserHandler(button, MwNactivateHandler, handler, NULL); MwLoop(window); }