diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-17 06:52:02 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-17 06:52:02 +0000 |
commit | 36b934d241d2560be6693f90c9aba501a1ec0ae7 (patch) | |
tree | 39b57aa3bc373a967e4d1f7d29671226307294c8 | |
parent | ca564287ee3f48945d45c7d92be7a83452f53745 (diff) | |
download | rockbox-36b934d241d2560be6693f90c9aba501a1ec0ae7.tar.gz rockbox-36b934d241d2560be6693f90c9aba501a1ec0ae7.zip |
Move the skin parser to a seperate library
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26877 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | lib/skin_parser/Makefile | 28 | ||||
-rw-r--r-- | lib/skin_parser/skin_debug.c (renamed from utils/themeeditor/parser/skin_debug.c) | 0 | ||||
-rw-r--r-- | lib/skin_parser/skin_debug.h (renamed from utils/themeeditor/parser/skin_debug.h) | 0 | ||||
-rw-r--r-- | lib/skin_parser/skin_parser.c (renamed from utils/themeeditor/parser/skin_parser.c) | 0 | ||||
-rw-r--r-- | lib/skin_parser/skin_parser.h (renamed from utils/themeeditor/parser/skin_parser.h) | 0 | ||||
-rw-r--r-- | lib/skin_parser/skin_scan.c (renamed from utils/themeeditor/parser/skin_scan.c) | 0 | ||||
-rw-r--r-- | lib/skin_parser/skin_scan.h (renamed from utils/themeeditor/parser/skin_scan.h) | 0 | ||||
-rw-r--r-- | lib/skin_parser/symbols.h (renamed from utils/themeeditor/parser/symbols.h) | 0 | ||||
-rw-r--r-- | lib/skin_parser/tag_table.c (renamed from utils/themeeditor/parser/tag_table.c) | 0 | ||||
-rw-r--r-- | lib/skin_parser/tag_table.h (renamed from utils/themeeditor/parser/tag_table.h) | 0 | ||||
-rw-r--r-- | utils/themeeditor/themeeditor.pro | 29 |
11 files changed, 45 insertions, 12 deletions
diff --git a/lib/skin_parser/Makefile b/lib/skin_parser/Makefile new file mode 100644 index 0000000000..5c1be67578 --- /dev/null +++ b/lib/skin_parser/Makefile | |||
@@ -0,0 +1,28 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | |||
10 | BUILDDIR ?= . | ||
11 | |||
12 | SRC = skin_parser.c skin_debug.c skin_scan.c tag_table.c | ||
13 | OBJ := $(patsubst %.c,$(BUILDDIR)/%.o,$(SRC)) | ||
14 | OUT = $(BUILDDIR)/libskin_parser.a | ||
15 | CC = gcc | ||
16 | AR = ar | ||
17 | INCLUDES = -I. | ||
18 | |||
19 | default: $(OUT) | ||
20 | |||
21 | $(BUILDDIR)/%.o: %.c | ||
22 | $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ | ||
23 | |||
24 | $(OUT): $(OBJ) | ||
25 | $(AR) rcs $(OUT) $(OBJ) | ||
26 | |||
27 | clean: | ||
28 | rm -f $(OBJ) $(OUT) | ||
diff --git a/utils/themeeditor/parser/skin_debug.c b/lib/skin_parser/skin_debug.c index 549f7b9e6c..549f7b9e6c 100644 --- a/utils/themeeditor/parser/skin_debug.c +++ b/lib/skin_parser/skin_debug.c | |||
diff --git a/utils/themeeditor/parser/skin_debug.h b/lib/skin_parser/skin_debug.h index a550dc4c7b..a550dc4c7b 100644 --- a/utils/themeeditor/parser/skin_debug.h +++ b/lib/skin_parser/skin_debug.h | |||
diff --git a/utils/themeeditor/parser/skin_parser.c b/lib/skin_parser/skin_parser.c index 93a71919bf..93a71919bf 100644 --- a/utils/themeeditor/parser/skin_parser.c +++ b/lib/skin_parser/skin_parser.c | |||
diff --git a/utils/themeeditor/parser/skin_parser.h b/lib/skin_parser/skin_parser.h index 1fc4a7ae6b..1fc4a7ae6b 100644 --- a/utils/themeeditor/parser/skin_parser.h +++ b/lib/skin_parser/skin_parser.h | |||
diff --git a/utils/themeeditor/parser/skin_scan.c b/lib/skin_parser/skin_scan.c index 79f7162aab..79f7162aab 100644 --- a/utils/themeeditor/parser/skin_scan.c +++ b/lib/skin_parser/skin_scan.c | |||
diff --git a/utils/themeeditor/parser/skin_scan.h b/lib/skin_parser/skin_scan.h index b1d04a6e34..b1d04a6e34 100644 --- a/utils/themeeditor/parser/skin_scan.h +++ b/lib/skin_parser/skin_scan.h | |||
diff --git a/utils/themeeditor/parser/symbols.h b/lib/skin_parser/symbols.h index b4f31289ef..b4f31289ef 100644 --- a/utils/themeeditor/parser/symbols.h +++ b/lib/skin_parser/symbols.h | |||
diff --git a/utils/themeeditor/parser/tag_table.c b/lib/skin_parser/tag_table.c index 6d82b47cc3..6d82b47cc3 100644 --- a/utils/themeeditor/parser/tag_table.c +++ b/lib/skin_parser/tag_table.c | |||
diff --git a/utils/themeeditor/parser/tag_table.h b/lib/skin_parser/tag_table.h index ec9a1021ab..ec9a1021ab 100644 --- a/utils/themeeditor/parser/tag_table.h +++ b/lib/skin_parser/tag_table.h | |||
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro index 213bcd82d3..bf48bda7f2 100644 --- a/utils/themeeditor/themeeditor.pro +++ b/utils/themeeditor/themeeditor.pro | |||
@@ -5,17 +5,26 @@ UI_DIR = $$MYBUILDDIR/ui | |||
5 | MOC_DIR = $$MYBUILDDIR/moc | 5 | MOC_DIR = $$MYBUILDDIR/moc |
6 | RCC_DIR = $$MYBUILDDIR/rcc | 6 | RCC_DIR = $$MYBUILDDIR/rcc |
7 | 7 | ||
8 | RBBASE_DIR = $$_PRO_FILE_PWD_ | ||
9 | RBBASE_DIR = $$replace(RBBASE_DIR,/utils/themeeditor,) | ||
10 | |||
8 | #Include directories | 11 | #Include directories |
9 | INCLUDEPATH += gui | 12 | INCLUDEPATH += gui |
10 | INCLUDEPATH += parser | ||
11 | INCLUDEPATH += models | 13 | INCLUDEPATH += models |
12 | 14 | ||
13 | HEADERS += parser/tag_table.h \ | 15 | |
14 | parser/symbols.h \ | 16 | # Stuff for the parse lib |
15 | parser/skin_parser.h \ | 17 | libskin_parser.commands = @$(MAKE) \ |
16 | parser/skin_scan.h \ | 18 | BUILDDIR=$$OBJECTS_DIR -C $$RBBASE_DIR/lib/skin_parser CC=\"$$QMAKE_CC\" |
17 | parser/skin_debug.h \ | 19 | QMAKE_EXTRA_TARGETS += libskin_parser |
18 | models/parsetreemodel.h \ | 20 | PRE_TARGETDEPS += libskin_parser |
21 | INCLUDEPATH += $$RBBASE_DIR/lib/skin_parser | ||
22 | LIBS += -L$$OBJECTS_DIR -lskin_parser | ||
23 | |||
24 | |||
25 | DEPENDPATH = $$INCLUDEPATH | ||
26 | |||
27 | HEADERS += models/parsetreemodel.h \ | ||
19 | models/parsetreenode.h \ | 28 | models/parsetreenode.h \ |
20 | gui/editorwindow.h \ | 29 | gui/editorwindow.h \ |
21 | gui/skinhighlighter.h \ | 30 | gui/skinhighlighter.h \ |
@@ -26,11 +35,7 @@ HEADERS += parser/tag_table.h \ | |||
26 | gui/tabcontent.h \ | 35 | gui/tabcontent.h \ |
27 | gui/configdocument.h \ | 36 | gui/configdocument.h \ |
28 | gui/skinviewer.h | 37 | gui/skinviewer.h |
29 | SOURCES += parser/tag_table.c \ | 38 | SOURCES += main.cpp \ |
30 | parser/skin_parser.c \ | ||
31 | parser/skin_scan.c \ | ||
32 | parser/skin_debug.c \ | ||
33 | main.cpp \ | ||
34 | models/parsetreemodel.cpp \ | 39 | models/parsetreemodel.cpp \ |
35 | models/parsetreenode.cpp \ | 40 | models/parsetreenode.cpp \ |
36 | gui/editorwindow.cpp \ | 41 | gui/editorwindow.cpp \ |