diff options
| -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 @@ #define CREATIVE_ZVM 1 -#define MODEL_NAME "Creative Zen Vision: M" +#define MODEL_NAME "Creative Zen Vision:M" /* This makes it part of the Creative Zen Vision family :) */ #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 @@ Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ \/ \/ \/ \/ \/ -Installation +/----------------------------------------------------------------\ +| Installation | +\----------------------------------------------------------------/ -To make a release version, change value in CONFIG from "debug" to "release" in gui.pro and QPropertyEditor.pro. +To make a release version, change the value CONFIG in gui.pro and QPropertyEditor.pro from "debug" to "release". -Windows: - * be sure that you have properly installed mingw, QT > 4.3.* and bin directories are set properly +/----------------------------------------------------------------\ +| Windows | +\----------------------------------------------------------------/ + + * make sure that you have properly installed MingW, Qt > 4.3.* and bin directories are set properly * if you want to debug wpseditor, you'll have to build Qt debug libraries - * if you haven't qmake from PATH enviromet use Qts command line. - * run 'buildall.bat' in utils\wpseditor\ - * the binary is then in utils\wpseditor\gui\bin\wpseditord.exe + * if you don't have qmake in your PATH environment, use the Qt command prompt + * run 'qmake && make' in utils\wpseditor\ + * the binary is then in utils\wpseditor\gui\bin\wpseditor.exe -Linux: +/----------------------------------------------------------------\ +| Linux | +\----------------------------------------------------------------/ - * Make sure you have libqt4-dev installed and you have a working Rockbox environment - * cd to utils/wpseditor/ and run 'buildall.sh' + * make sure you have libqt4-dev installed and you have a working Rockbox environment + * cd to utils/wpseditor/ and run 'qmake-qt4 && make' * 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 @@ * Replace checkwps functionality * Include 'screenshot utility' functionality * Options -* Enable animation(timers,sliding lines, etc) +* Enable animation (timers, sliding lines, etc) * Test on Mac OS * Redesign GUI for more usability * Make editing via gui @@ -16,4 +16,4 @@ Partially solved THE BUGZ ARE COMING! * While loading wps for the first time, gui doesn't show properties from editor properly -* Strange text horisontal position in cabbie(probably other themes) +* 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=../../.. ifneq ($or($(findstring MINGW,$(shell uname)),$(findstring Windows_NT,$(OS))),) OS = w32 CC = mingw32-gcc - COPY = copy + COPY = copy /Y + COPY_TO = ..\\gui\\bin RM = del EXT = .dll LDFLAGS = -DBUILD_DLL @@ -20,7 +21,8 @@ endif ifeq ($(findstring Linux,$(shell uname)),Linux) OS = linux CC = gcc - COPY = cp + COPY = cp -f + COPY_TO = ../gui/bin RM = rm -f EXT = .so LDFLAGS = -fPIC @@ -78,11 +80,11 @@ CFLAGS = -g -Wall -D__PCTOOL__ -DWPSEDITOR -DDEBUG -DROCKBOX_DIR_LEN=1 -DBUTTON_ RESULTS := $(patsubst %,libwps_%$(EXT),$(TARGETS)) all: $(RESULTS) - @$(COPY) $(RESULTS) ../gui/bin/ libwps_%$(EXT): $(SOURCES) @echo CC [$(subst libwps_,,$(subst $(EXT),,$@))] @$(CC) $(INCLUDE) $(CFLAGS) -D$(subst libwps_,,$(subst $(EXT),,$@)) $(LDFLAGS) -shared -o $@ $+ + @$(COPY) $@ $(COPY_TO) clean: $(RM) $(RESULTS) |