Changeset 1033


Ignore:
Timestamp:
01/09/11 00:43:54 (2 years ago)
Author:
reyalP
Message:

scripting optional makefile support from ultima in ​http://chdk.setepontos.com/index.php?topic=5793.msg59376#msg59376
does not include code changes to actually make script optional.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/buildconf.inc

    r1015 r1033  
    11#!build time optional components - comment out the features you dont want to have in your build 
    2 OPT_LUA_IOLIB=1 
    3 OPT_LUA_OSLIB=1 
    42OPT_GAME_REVERSI=1 
    53OPT_GAME_SOKOBAN=1 
    … …  
    119OPT_DEBUGGING=1 
    1210OPT_EDGEOVERLAY=1 
     11 
     12# Scripting components 
     13OPT_UBASIC=1 
     14OPT_LUA=1 
    1315OPT_LUA_STRLIB=1 
     16OPT_LUA_IOLIB=1 
     17OPT_LUA_OSLIB=1 
     18#allow Lua to call arbitrary ROM functions and eventprocs 
     19# WARNING: This is DANGEROUS. e.g. call_event_proc("EraseSectorOfRom",...) 
     20# NOTE: the interface for this may change in the future, to support better support buffers etc 
     21#OPT_LUA_CALL_NATIVE=1 
     22 
    1423# experimental - allocate memory from alternate heap. Default 2MB from EXMEM_RAMDISK 
    1524# See exmem_malloc_init in generic/wrappers.c 
    … …  
    1726# experimental PTP/USB interface 
    1827#OPT_PTP=1 
    19 #allow Lua to call arbitrary ROM functions and eventprocs 
    20 # WARNING: This is DANGEROUS. e.g. call_event_proc("EraseSectorOfRom",...) 
    21 # NOTE: the interface for this may change in the future, to support better support buffers etc 
    22 #OPT_LUA_CALL_NATIVE=1 
    2328#OPT_MD_DEBUG=1 
    2429# needs proper fi2.inc in platform/ !!! see http://chdk.setepontos.com/index.php/topic,2995.0.html 
    … …  
    3439# for people who won't use lang files at all / not done yet 
    3540#!OPT_LANGUAGEINTERFACE=1 
    36  
    37 # Not yet working, but need to be defined for a build right now 
    38 OPT_UBASIC=1 
    39 OPT_LUA=1 

  • trunk/core/Makefile

    r1015 r1033  
    5353CFLAGS+=-DOPT_MD_DEBUG 
    5454endif  
     55ifdef OPT_SCRIPTING 
     56OPT_OBJS+=motion_detector.o script.o 
     57endif  
     58ifdef OPT_LUA 
     59OPT_OBJS+=luascript.o  
     60endif  
    5561ifdef OPT_LUA_CALL_NATIVE 
    5662CFLAGS+=-DOPT_LUA_CALL_NATIVE 
    … …  
    6874OBJS=entry.o nothumb.o main.o gui_draw.o gui_menu.o gui_palette.o gui_mbox.o \ 
    6975     gui_fselect.o gui.o kbd.o action_stack.o conf.o \ 
    70      histogram.o gui_batt.o gui_space.o gui_osd.o script.o raw.o \ 
    71      gui_lang.o gui_mpopup.o gui_grid.o motion_detector.o raw_merge.o \ 
    72      luascript.o levent.o shot_histogram.o dng.o bitvector.o console.o $(OPT_OBJS) 
     76     histogram.o gui_batt.o gui_space.o gui_osd.o raw.o \ 
     77     gui_lang.o gui_mpopup.o gui_grid.o raw_merge.o \ 
     78     levent.o shot_histogram.o dng.o bitvector.o console.o $(OPT_OBJS) 
    7379 
    7480gui.o: FORCE 

  • trunk/lib/Makefile

    r864 r1033  
    22include $(topdir)makefile.inc 
    33 
    4 SUBDIRS=font math ubasic lang lua armutil 
     4SUBDIRS=font math lang armutil 
     5 
     6ifdef OPT_LUA 
     7SUBDIRS+=lua 
     8endif 
     9 
     10ifdef OPT_UBASIC 
     11SUBDIRS+=ubasic 
     12endif 
    513 
    614include $(topdir)bottom.inc 

  • trunk/makefile.inc

    r1025 r1033  
    428428endif 
    429429 
     430ifdef OPT_LUA 
     431CFLAGS+=-DOPT_LUA 
     432OPT_SCRIPTING=1 
     433endif 
     434 
     435ifdef OPT_UBASIC 
     436CFLAGS+=-DOPT_UBASIC 
     437OPT_SCRIPTING=1 
     438endif 
     439 
     440ifdef OPT_SCRIPTING  
     441CFLAGS+=-DOPT_SCRIPTING 
     442endif 
     443 
    430444ifdef OPT_EXMEM_MALLOC 
    431445CFLAGS+=-DOPT_EXMEM_MALLOC 
Note: See TracChangeset for help on using the changeset viewer.