git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/vfs - Better handling of -1 in handle list
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
WM
/
Makefile
diff --git
a/Usermode/Applications/axwin3_src/WM/Makefile
b/Usermode/Applications/axwin3_src/WM/Makefile
index
a8d77cf
..
1d67450
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/Makefile
+++ b/
Usermode/Applications/axwin3_src/WM/Makefile
@@
-3,15
+3,17
@@
-include ../../Makefile.cfg
CPPFLAGS += -I include/ -I ../include/
-include ../../Makefile.cfg
CPPFLAGS += -I include/ -I ../include/
+CFLAGS += -std=gnu99
DIR := Apps/AxWin/3.0
BIN := AxWinWM
DIR := Apps/AxWin/3.0
BIN := AxWinWM
-OBJ := main.o input.o video.o ipc.o image.o
-OBJ += wm.o wm_input.o wm_render.o wm_render_text.o
+OBJ := main.o input.o video.o ipc.o image.o
utf-8.o
+OBJ += wm.o wm_input.o wm_render.o wm_render_text.o
wm_hotkeys.o
OBJ += decorator.o
OBJ += decorator.o
-OBJ += renderers/
passthru
.o
+OBJ += renderers/
framebuffer
.o
OBJ += renderers/background.o
OBJ += renderers/menu.o
OBJ += renderers/background.o
OBJ += renderers/menu.o
+OBJ += renderers/richtext.o
# TODO: Move to a lower makefile
OBJ += renderers/widget.o
OBJ += renderers/widget/button.o
# TODO: Move to a lower makefile
OBJ += renderers/widget.o
OBJ += renderers/widget/button.o
@@
-19,6
+21,7
@@
OBJ += renderers/widget/image.o
OBJ += renderers/widget/disptext.o
OBJ += renderers/widget/textinput.o
OBJ += renderers/widget/spacer.o
OBJ += renderers/widget/disptext.o
OBJ += renderers/widget/textinput.o
OBJ += renderers/widget/spacer.o
+OBJ += renderers/widget/subwin.o
LDFLAGS += -limage_sif -luri -lnet
LDFLAGS += -limage_sif -luri -lnet
UCC
git Repository :: git.ucc.asn.au