mirror of
https://gitea.nishi.boats/pyrite-dev/milsko
synced 2026-01-08 10:23:27 +00:00
hack
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@586 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
11
GNUmakefile
11
GNUmakefile
@@ -9,7 +9,8 @@ USE_FDLIBM = 0
|
|||||||
|
|
||||||
CC = $(GCC)gcc
|
CC = $(GCC)gcc
|
||||||
|
|
||||||
CFLAGS = -Wall -Wextra -Wno-implicit-fallthrough -Wno-sign-compare -Iinclude
|
WARN = -Wall -Wextra -Wno-implicit-fallthrough -Wno-sign-compare
|
||||||
|
CFLAGS = -Iinclude
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
LIBS =
|
LIBS =
|
||||||
|
|
||||||
@@ -35,7 +36,7 @@ E_CFLAGS = $(CFLAGS)
|
|||||||
E_LDFLAGS = $(LDFLAGS) -Lsrc -Wl,-rpath,./src
|
E_LDFLAGS = $(LDFLAGS) -Lsrc -Wl,-rpath,./src
|
||||||
E_LIBS = $(LIBS) -lMw
|
E_LIBS = $(LIBS) -lMw
|
||||||
|
|
||||||
EXAMPLES = examples/basic/example$(EXEC) examples/basic/rotate$(EXEC) examples/basic/image$(EXEC) examples/basic/scrollbar$(EXEC) examples/basic/checkbox$(EXEC) examples/basic/radiobox$(EXEC) examples/basic/messagebox$(EXEC) examples/basic/viewport$(EXEC) examples/basic/listbox$(EXEC) examples/basic/progressbar$(EXEC) examples/basic/color_picker$(EXEC)
|
EXAMPLES = examples/basic/example$(EXEC) examples/basic/rotate$(EXEC) examples/basic/image$(EXEC) examples/basic/scrollbar$(EXEC) examples/basic/checkbox$(EXEC) examples/basic/radiobox$(EXEC) examples/basic/messagebox$(EXEC) examples/basic/viewport$(EXEC) examples/basic/listbox$(EXEC) examples/basic/progressbar$(EXEC) examples/basic/colorpicker$(EXEC)
|
||||||
|
|
||||||
include mk/platform.mk
|
include mk/platform.mk
|
||||||
include mk/flags.mk
|
include mk/flags.mk
|
||||||
@@ -77,13 +78,13 @@ examples/%$(EXEC): examples/%.o src/$(LIB)Mw$(SO)
|
|||||||
$(CC) $(E_LDFLAGS) -o $@ $< $(E_LIBS)
|
$(CC) $(E_LDFLAGS) -o $@ $< $(E_LIBS)
|
||||||
|
|
||||||
src/%.o: src/%.c
|
src/%.o: src/%.c
|
||||||
$(CC) $(L_CFLAGS) -c -o $@ $<
|
$(CC) $(L_CFLAGS) $(WARN) -c -o $@ $<
|
||||||
|
|
||||||
external/%.o: external/%.c
|
external/%.o: external/%.c
|
||||||
$(CC) $(L_CFLAGS) -Wno-unknown-warning-option -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-but-set-variable -Wno-unused-const-variable -Wno-sometimes-uninitialized -Wno-strict-aliasing -Wno-unused-value -Wno-unused-parameter -Wno-unused-function -Wno-stringop-overflow -c -o $@ $<
|
$(CC) $(L_CFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
examples/%.o: examples/%.c
|
examples/%.o: examples/%.c
|
||||||
$(CC) $(E_CFLAGS) -c -o $@ $<
|
$(CC) $(E_CFLAGS) $(WARN) -c -o $@ $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f */*.dll */*.so */*.lib */*.a */*.o */*/*.o external/*/src/*.o examples/*.exe examples/*/*.exe $(EXAMPLES)
|
rm -f */*.dll */*.so */*.lib */*.a */*.o */*/*.o external/*/src/*.o examples/*.exe examples/*/*.exe $(EXAMPLES)
|
||||||
|
|||||||
@@ -410,8 +410,11 @@ void MwLLNextEvent(MwLL handle) {
|
|||||||
|
|
||||||
MwLLDispatch(handle, draw, NULL);
|
MwLLDispatch(handle, draw, NULL);
|
||||||
if(handle->copy_buffer) {
|
if(handle->copy_buffer) {
|
||||||
|
#if 0
|
||||||
XCopyArea(handle->display, handle->pixmap, handle->window, handle->gc, 0, 0, w, h, 0, 0);
|
XCopyArea(handle->display, handle->pixmap, handle->window, handle->gc, 0, 0, w, h, 0, 0);
|
||||||
|
#endif
|
||||||
XSetWindowBackgroundPixmap(handle->display, handle->window, handle->pixmap);
|
XSetWindowBackgroundPixmap(handle->display, handle->window, handle->pixmap);
|
||||||
|
XClearWindow(handle->display, handle->window);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -208,6 +208,7 @@ static void color_picker_tick(MwWidget handle, void* user,
|
|||||||
void* call) {
|
void* call) {
|
||||||
color_picker_t* picker = user;
|
color_picker_t* picker = user;
|
||||||
|
|
||||||
|
(void)handle;
|
||||||
(void)call;
|
(void)call;
|
||||||
|
|
||||||
if(picker->doUpdate == 1) {
|
if(picker->doUpdate == 1) {
|
||||||
|
|||||||
Reference in New Issue
Block a user