TARGET = mag
PRIVATE_INCDIR = $(SRC_DIR)/../../include/server
SRC_CC := big_mouse.cc main.cc screen.cc view_stack.cc \
- user_state.cc plugin.cc input_driver.cc object_gc.cc
-#OBJS += binary_default.tff.o
+ user_state.cc plugin.cc input_driver.cc object_gc.cc \
+ input_source.cc session.cc core_api.cc
+OBJS += mag.lua.bin.o
+OBJS += default.tff.bin.o
#MODE := shared
-STATIC_PLUGINS := mag-input-lxdd mag-input-libinput mag-client_fb
+STATIC_PLUGINS += mag-input-libinput
+STATIC_PLUGINS += mag-input-event
+STATIC_PLUGINS += mag-client_fb
STATIC_PLUGINS += mag-mag_client
-REQUIRES_LIBS:= libsupc++ libdl mag-gfx
+REQUIRES_LIBS:= libsupc++ libdl mag-gfx lua++
REQUIRES_LIBS += $(STATIC_PLUGINS)
#LDFLAGS += --export-dynamic
L4_MULTITHREADED = y
-vpath %.ttf $(SRC_DIR)
-
include $(L4DIR)/mk/prog.mk
-symbol_name = _binary_$(subst .,_,$(subst binary_,,$(subst .o,,$@)))
+#symbol_name = _binary_$(subst .,_,$(subst binary_,,$(subst .o,,$@)))
+
+%.bin.o: $(SRC_DIR)/% $(SRC_DIR)/Makefile $(ELF_PATCHER)
+ @$(GEN_MESSAGE)
+ $(VERBOSE)(TARGETDIR=$$PWD && cd $(SRC_DIR) && $(OBJCOPY) -I binary -B $(BFD_ARCH) -O $(OFORMAT) $(notdir $<) $$TARGETDIR/$@ )
+ $(VERBOSE)$(ELF_PATCHER) $@ --min-section-align=4
-binary_%.o: $(SRC_DIR)/%
-# $(MSG_CONVERT)$@
- $(VERBOSE)hexdump -ve '/1 "0x%02x,"' $< |\
- sed '1s/^/char $(symbol_name)_start[] __attribute__((aligned (4))) = {/;$$s/,$$/};/;$$a\' |\
- $(CC) -x c -o $@ -c -
+#binary_%.o: $(SRC_DIR)/%
+## $(MSG_CONVERT)$@
+# $(VERBOSE)hexdump -ve '/1 "0x%02x,"' $< |\
+# sed '1s/^/char $(symbol_name)_start[] __attribute__((aligned (4))) = {/;$$s/,$$/};/;$$a\' |\
+# $(CC) -x c -o $@ -c -