diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-09-04 15:19:59 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-09-04 15:19:59 +0000 |
commit | 16c9b16ec249693f8dcc9de3ea5bcd93164370c9 (patch) | |
tree | 2767f679df7fa331d10cd3c14c955460cd0567b9 | |
parent | 561df3827e091c5646648a50b94278843a7554aa (diff) | |
download | rockbox-16c9b16ec249693f8dcc9de3ea5bcd93164370c9.tar.gz rockbox-16c9b16ec249693f8dcc9de3ea5bcd93164370c9.zip |
WPS editor:
* Fix some typo's in TODO & README
* Fix libwps Makefile in Windows
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18408 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/config-creativezvm.h | 2 | ||||
-rw-r--r-- | utils/wpseditor/README | 27 | ||||
-rw-r--r-- | utils/wpseditor/TODO | 4 | ||||
-rw-r--r-- | utils/wpseditor/libwps/Makefile | 8 |
4 files changed, 25 insertions, 16 deletions
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index c2abcda7f5..bc6715b4dc 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #define CREATIVE_ZVM 1 | 29 | #define CREATIVE_ZVM 1 |
30 | 30 | ||
31 | #define MODEL_NAME "Creative Zen Vision: M" | 31 | #define MODEL_NAME "Creative Zen Vision:M" |
32 | 32 | ||
33 | /* This makes it part of the Creative Zen Vision family :) */ | 33 | /* This makes it part of the Creative Zen Vision family :) */ |
34 | #define CREATIVE_ZVx 1 | 34 | #define CREATIVE_ZVx 1 |
diff --git a/utils/wpseditor/README b/utils/wpseditor/README index c2b6a62866..ebdfd7a5a3 100644 --- a/utils/wpseditor/README +++ b/utils/wpseditor/README | |||
@@ -5,20 +5,27 @@ | |||
5 | Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 5 | Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
6 | \/ \/ \/ \/ \/ | 6 | \/ \/ \/ \/ \/ |
7 | 7 | ||
8 | Installation | 8 | /----------------------------------------------------------------\ |
9 | | Installation | | ||
10 | \----------------------------------------------------------------/ | ||
9 | 11 | ||
10 | To make a release version, change value in CONFIG from "debug" to "release" in gui.pro and QPropertyEditor.pro. | 12 | To make a release version, change the value CONFIG in gui.pro and QPropertyEditor.pro from "debug" to "release". |
11 | 13 | ||
12 | Windows: | ||
13 | 14 | ||
14 | * be sure that you have properly installed mingw, QT > 4.3.* and bin directories are set properly | 15 | /----------------------------------------------------------------\ |
16 | | Windows | | ||
17 | \----------------------------------------------------------------/ | ||
18 | |||
19 | * make sure that you have properly installed MingW, Qt > 4.3.* and bin directories are set properly | ||
15 | * if you want to debug wpseditor, you'll have to build Qt debug libraries | 20 | * if you want to debug wpseditor, you'll have to build Qt debug libraries |
16 | * if you haven't qmake from PATH enviromet use Qts command line. | 21 | * if you don't have qmake in your PATH environment, use the Qt command prompt |
17 | * run 'buildall.bat' in utils\wpseditor\ | 22 | * run 'qmake && make' in utils\wpseditor\ |
18 | * the binary is then in utils\wpseditor\gui\bin\wpseditord.exe | 23 | * the binary is then in utils\wpseditor\gui\bin\wpseditor.exe |
19 | 24 | ||
20 | Linux: | 25 | /----------------------------------------------------------------\ |
26 | | Linux | | ||
27 | \----------------------------------------------------------------/ | ||
21 | 28 | ||
22 | * Make sure you have libqt4-dev installed and you have a working Rockbox environment | 29 | * make sure you have libqt4-dev installed and you have a working Rockbox environment |
23 | * cd to utils/wpseditor/ and run 'buildall.sh' | 30 | * cd to utils/wpseditor/ and run 'qmake-qt4 && make' |
24 | * cd to gui/bin/ and start WPS editor with './wpseditord' | 31 | * cd to gui/bin/ and start WPS editor with './wpseditord' |
diff --git a/utils/wpseditor/TODO b/utils/wpseditor/TODO index 0fb4afca86..a42230bff4 100644 --- a/utils/wpseditor/TODO +++ b/utils/wpseditor/TODO | |||
@@ -2,7 +2,7 @@ | |||
2 | * Replace checkwps functionality | 2 | * Replace checkwps functionality |
3 | * Include 'screenshot utility' functionality | 3 | * Include 'screenshot utility' functionality |
4 | * Options | 4 | * Options |
5 | * Enable animation(timers,sliding lines, etc) | 5 | * Enable animation (timers, sliding lines, etc) |
6 | * Test on Mac OS | 6 | * Test on Mac OS |
7 | * Redesign GUI for more usability | 7 | * Redesign GUI for more usability |
8 | * Make editing via gui | 8 | * Make editing via gui |
@@ -16,4 +16,4 @@ Partially solved | |||
16 | 16 | ||
17 | THE BUGZ ARE COMING! | 17 | THE BUGZ ARE COMING! |
18 | * While loading wps for the first time, gui doesn't show properties from editor properly | 18 | * While loading wps for the first time, gui doesn't show properties from editor properly |
19 | * Strange text horisontal position in cabbie(probably other themes) | 19 | * Strange text horizontal position in cabbiev2 (probably other themes too) |
diff --git a/utils/wpseditor/libwps/Makefile b/utils/wpseditor/libwps/Makefile index 879cc8e4db..827a4b4194 100644 --- a/utils/wpseditor/libwps/Makefile +++ b/utils/wpseditor/libwps/Makefile | |||
@@ -11,7 +11,8 @@ ROOT=../../.. | |||
11 | ifneq ($or($(findstring MINGW,$(shell uname)),$(findstring Windows_NT,$(OS))),) | 11 | ifneq ($or($(findstring MINGW,$(shell uname)),$(findstring Windows_NT,$(OS))),) |
12 | OS = w32 | 12 | OS = w32 |
13 | CC = mingw32-gcc | 13 | CC = mingw32-gcc |
14 | COPY = copy | 14 | COPY = copy /Y |
15 | COPY_TO = ..\\gui\\bin | ||
15 | RM = del | 16 | RM = del |
16 | EXT = .dll | 17 | EXT = .dll |
17 | LDFLAGS = -DBUILD_DLL | 18 | LDFLAGS = -DBUILD_DLL |
@@ -20,7 +21,8 @@ endif | |||
20 | ifeq ($(findstring Linux,$(shell uname)),Linux) | 21 | ifeq ($(findstring Linux,$(shell uname)),Linux) |
21 | OS = linux | 22 | OS = linux |
22 | CC = gcc | 23 | CC = gcc |
23 | COPY = cp | 24 | COPY = cp -f |
25 | COPY_TO = ../gui/bin | ||
24 | RM = rm -f | 26 | RM = rm -f |
25 | EXT = .so | 27 | EXT = .so |
26 | LDFLAGS = -fPIC | 28 | LDFLAGS = -fPIC |
@@ -78,11 +80,11 @@ CFLAGS = -g -Wall -D__PCTOOL__ -DWPSEDITOR -DDEBUG -DROCKBOX_DIR_LEN=1 -DBUTTON_ | |||
78 | RESULTS := $(patsubst %,libwps_%$(EXT),$(TARGETS)) | 80 | RESULTS := $(patsubst %,libwps_%$(EXT),$(TARGETS)) |
79 | 81 | ||
80 | all: $(RESULTS) | 82 | all: $(RESULTS) |
81 | @$(COPY) $(RESULTS) ../gui/bin/ | ||
82 | 83 | ||
83 | libwps_%$(EXT): $(SOURCES) | 84 | libwps_%$(EXT): $(SOURCES) |
84 | @echo CC [$(subst libwps_,,$(subst $(EXT),,$@))] | 85 | @echo CC [$(subst libwps_,,$(subst $(EXT),,$@))] |
85 | @$(CC) $(INCLUDE) $(CFLAGS) -D$(subst libwps_,,$(subst $(EXT),,$@)) $(LDFLAGS) -shared -o $@ $+ | 86 | @$(CC) $(INCLUDE) $(CFLAGS) -D$(subst libwps_,,$(subst $(EXT),,$@)) $(LDFLAGS) -shared -o $@ $+ |
87 | @$(COPY) $@ $(COPY_TO) | ||
86 | 88 | ||
87 | clean: | 89 | clean: |
88 | $(RM) $(RESULTS) | 90 | $(RM) $(RESULTS) |