Changeset 1569 for trunk/core/Makefile

Timestamp:

01/16/12 08:22:51 (17 months ago)

Author:

philmoz

Message:

Update trunk with latest changes from reyalp-flt branch.

Location:

trunk

Files:

• . (modified) (1 prop)
• core/Makefile (modified) (4 diffs)

trunk/core/Makefile

@@ -18 +18 @@
 
 OPT_OBJS=
+ifdef OPT_GAMES
+CFLAGS+=-DOPT_GAMES
+endif
 ifdef OPT_CURVES
 CFLAGS+=-DOPT_CURVES
-#OPT_OBJS+=curves.o
 endif
 ifdef OPT_TEXTREADER
 CFLAGS+=-DOPT_TEXTREADER
-#OPT_OBJS+=gui_read.o 
+endif
+ifdef OPT_CALENDAR
+CFLAGS+=-DOPT_CALENDAR
 endif
 ifdef OPT_DEBUGGING
@@ -39 +43 @@
 endif 
 ifdef OPT_SCRIPTING
-OPT_OBJS+=motion_detector.o script.o
+OPT_OBJS+=script.o
 endif 
 ifdef OPT_LUA
@@ -60 +64 @@
      gui.o kbd.o action_stack.o conf.o module_wrappers.o module_exportlist.o \
      histogram.o gui_batt.o gui_space.o gui_osd.o raw.o \
-     gui_usb.o gui_lang.o gui_grid.o modules.o module_load.o\
-     levent.o shot_histogram.o bitvector.o console.o\
+     gui_usb.o gui_lang.o modules.o module_load.o \
+     levent.o shot_histogram.o console.o \
      usb_input.o usb_module.o usb_remote.o $(OPT_OBJS)
 
@@ -103 +107 @@
 module_exportlist.h: $(topdir)tools/makeexport$(EXE) module_exportlist.c
         @echo $< \-\> $@
-        $(topdir)tools/makeexport$(EXE) module_exportlist.c module_exportlist.h modules/exportlist.txt
+        $(topdir)tools/makeexport$(EXE) module_exportlist.c module_exportlist.h modules/exportlist.txt module_hashlist.h
 
 flt.h: $(topdir)tools/elf2flt/flt.h