Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Joyrider Dingux port

  • Loading branch information...
commit 09767476372d2982a547ff512c90a3c77a8bec4d 1 parent 7c360f7
@uli authored
View
2,988 src/Makefile
2 additions, 2,986 deletions not shown
View
283 src/Makefile.linux
@@ -6,7 +6,7 @@ STRIP = strip
CFLAGS = -I"/usr/include" -I"$(CHAINPREFIX)/include" `sdl-config --cflags` -DDEBUG -DTARGET_PANDORA -Wall -Wno-deprecated -Wno-unknown-pragmas -Wno-format -pg -O3 -DTIXML_USE_STL
CXXFLAGS = $(CFLAGS)
-LDFLAGS = -L"/usr/lib" -L"$(CHAINPREFIX)/lib" `sdl-config --libs` -lfreetype -lSDL_image -lSDL_ttf -lSDL_gfx -ljpeg -lpng12 -lz #-lpnd #-lSDL_gfx
+LDFLAGS = -L"/usr/lib" -L"$(CHAINPREFIX)/lib" `sdl-config --libs` -lfreetype -lSDL_image -lSDL_gfx -ljpeg -lpng12 -lz #-lpnd #-lSDL_gfx
TARGET = ../build/gmenu
OBJDIR = ../objs/linux
@@ -43,6 +43,58 @@ depend:
makedepend -fMakefile.linux -p$(OBJDIR)/ -- $(CFLAGS) -- *.cpp
# DO NOT DELETE
+../objs/linux/asfont.o: asfont.h /usr/include/SDL/SDL.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_main.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_stdinc.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_config.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_platform.h
+../objs/linux/asfont.o: /usr/include/sys/types.h /usr/include/features.h
+../objs/linux/asfont.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+../objs/linux/asfont.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
+../objs/linux/asfont.o: /usr/include/bits/types.h
+../objs/linux/asfont.o: /usr/include/bits/typesizes.h /usr/include/time.h
+../objs/linux/asfont.o: /usr/include/endian.h /usr/include/bits/endian.h
+../objs/linux/asfont.o: /usr/include/sys/select.h /usr/include/bits/select.h
+../objs/linux/asfont.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+../objs/linux/asfont.o: /usr/include/sys/sysmacros.h
+../objs/linux/asfont.o: /usr/include/bits/pthreadtypes.h /usr/include/stdio.h
+../objs/linux/asfont.o: /usr/include/libio.h /usr/include/_G_config.h
+../objs/linux/asfont.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+../objs/linux/asfont.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
+../objs/linux/asfont.o: /usr/include/bits/waitflags.h
+../objs/linux/asfont.o: /usr/include/bits/waitstatus.h /usr/include/xlocale.h
+../objs/linux/asfont.o: /usr/include/alloca.h /usr/include/string.h
+../objs/linux/asfont.o: /usr/include/strings.h /usr/include/inttypes.h
+../objs/linux/asfont.o: /usr/include/stdint.h /usr/include/bits/wchar.h
+../objs/linux/asfont.o: /usr/include/ctype.h /usr/include/iconv.h
+../objs/linux/asfont.o: /usr/include/SDL/begin_code.h
+../objs/linux/asfont.o: /usr/include/SDL/close_code.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_audio.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_error.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_endian.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_mutex.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_thread.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_rwops.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_cdrom.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_cpuinfo.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_events.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_active.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_keyboard.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_keysym.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_mouse.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_video.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_joystick.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_quit.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_loadso.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_timer.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_version.h sfontplus.h surface.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/asfont.o: /usr/include/SDL/SDL_gfxPrimitives.h
+../objs/linux/asfont.o: /usr/include/math.h /usr/include/bits/huge_val.h
+../objs/linux/asfont.o: /usr/include/bits/huge_valf.h
+../objs/linux/asfont.o: /usr/include/bits/huge_vall.h /usr/include/bits/inf.h
+../objs/linux/asfont.o: /usr/include/bits/nan.h /usr/include/bits/mathdef.h
+../objs/linux/asfont.o: /usr/include/bits/mathcalls.h
../objs/linux/button.o: button.h /usr/include/SDL/SDL.h
../objs/linux/button.o: /usr/include/SDL/SDL_main.h
../objs/linux/button.o: /usr/include/SDL/SDL_stdinc.h
@@ -54,7 +106,6 @@ depend:
../objs/linux/button.o: /usr/include/bits/types.h
../objs/linux/button.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/button.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/button.o: /usr/include/bits/byteswap.h
../objs/linux/button.o: /usr/include/sys/select.h /usr/include/bits/select.h
../objs/linux/button.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
../objs/linux/button.o: /usr/include/sys/sysmacros.h
@@ -96,8 +147,8 @@ depend:
../objs/linux/button.o: /usr/include/assert.h
../objs/linux/button.o: /usr/include/google/type_traits.h surfacecollection.h
../objs/linux/button.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/button.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/button.o: /usr/include/SDL/SDL_gfxPrimitives.h
+../objs/linux/button.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/button.o: utilities.h /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/button.o: /usr/include/math.h /usr/include/bits/huge_val.h
../objs/linux/button.o: /usr/include/bits/huge_valf.h
../objs/linux/button.o: /usr/include/bits/huge_vall.h /usr/include/bits/inf.h
@@ -119,7 +170,6 @@ depend:
../objs/linux/dirdialog.o: /usr/include/bits/types.h
../objs/linux/dirdialog.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/dirdialog.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/dirdialog.o: /usr/include/bits/byteswap.h
../objs/linux/dirdialog.o: /usr/include/sys/select.h
../objs/linux/dirdialog.o: /usr/include/bits/select.h
../objs/linux/dirdialog.o: /usr/include/bits/sigset.h
@@ -177,8 +227,8 @@ depend:
../objs/linux/dirdialog.o: /usr/include/google/type_traits.h
../objs/linux/dirdialog.o: surfacecollection.h
../objs/linux/dirdialog.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/dirdialog.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/dirdialog.o: iconbutton.h button.h FastDelegate.h
+../objs/linux/dirdialog.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/dirdialog.o: utilities.h iconbutton.h button.h FastDelegate.h
../objs/linux/dirdialog.o: /usr/include/memory.h translator.h touchscreen.h
../objs/linux/dirdialog.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
../objs/linux/dirdialog.o: /usr/include/bits/uio.h inputmanager.h
@@ -196,7 +246,6 @@ depend:
../objs/linux/filedialog.o: /usr/include/bits/types.h
../objs/linux/filedialog.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/filedialog.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/filedialog.o: /usr/include/bits/byteswap.h
../objs/linux/filedialog.o: /usr/include/sys/select.h
../objs/linux/filedialog.o: /usr/include/bits/select.h
../objs/linux/filedialog.o: /usr/include/bits/sigset.h
@@ -256,8 +305,8 @@ depend:
../objs/linux/filedialog.o: /usr/include/google/type_traits.h
../objs/linux/filedialog.o: surfacecollection.h
../objs/linux/filedialog.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/filedialog.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/filedialog.o: iconbutton.h button.h FastDelegate.h
+../objs/linux/filedialog.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/filedialog.o: utilities.h iconbutton.h button.h FastDelegate.h
../objs/linux/filedialog.o: /usr/include/memory.h translator.h touchscreen.h
../objs/linux/filedialog.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
../objs/linux/filedialog.o: /usr/include/bits/uio.h inputmanager.h
@@ -270,7 +319,6 @@ depend:
../objs/linux/filelister.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/filelister.o: /usr/include/bits/stat.h /usr/include/sys/types.h
../objs/linux/filelister.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/filelister.o: /usr/include/bits/byteswap.h
../objs/linux/filelister.o: /usr/include/sys/select.h
../objs/linux/filelister.o: /usr/include/bits/select.h
../objs/linux/filelister.o: /usr/include/bits/sigset.h
@@ -337,8 +385,7 @@ depend:
../objs/linux/gmenu2x.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
../objs/linux/gmenu2x.o: /usr/include/bits/waitflags.h
../objs/linux/gmenu2x.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
-../objs/linux/gmenu2x.o: /usr/include/bits/endian.h
-../objs/linux/gmenu2x.o: /usr/include/bits/byteswap.h /usr/include/xlocale.h
+../objs/linux/gmenu2x.o: /usr/include/bits/endian.h /usr/include/xlocale.h
../objs/linux/gmenu2x.o: /usr/include/sys/types.h /usr/include/bits/types.h
../objs/linux/gmenu2x.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/gmenu2x.o: /usr/include/sys/select.h /usr/include/bits/select.h
@@ -424,7 +471,7 @@ depend:
../objs/linux/gmenu2x.o: /usr/include/linux/ioctl.h
../objs/linux/gmenu2x.o: /usr/include/linux/patchkey.h linkapp.h link.h
../objs/linux/gmenu2x.o: button.h FastDelegate.h /usr/include/memory.h
-../objs/linux/gmenu2x.o: linkaction.h menu.h sfontplus.h surface.h
+../objs/linux/gmenu2x.o: linkaction.h menu.h asfont.h sfontplus.h surface.h
../objs/linux/gmenu2x.o: /usr/include/SDL/SDL_image.h filedialog.h
../objs/linux/gmenu2x.o: filelister.h gmenu2x.h
../objs/linux/gmenu2x.o: /usr/include/google/dense_hash_map
@@ -455,7 +502,6 @@ depend:
../objs/linux/iconbutton.o: /usr/include/bits/types.h
../objs/linux/iconbutton.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/iconbutton.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/iconbutton.o: /usr/include/bits/byteswap.h
../objs/linux/iconbutton.o: /usr/include/sys/select.h
../objs/linux/iconbutton.o: /usr/include/bits/select.h
../objs/linux/iconbutton.o: /usr/include/bits/sigset.h
@@ -503,8 +549,8 @@ depend:
../objs/linux/iconbutton.o: /usr/include/google/type_traits.h
../objs/linux/iconbutton.o: surfacecollection.h
../objs/linux/iconbutton.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/iconbutton.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/iconbutton.o: /usr/include/SDL/SDL_gfxPrimitives.h
+../objs/linux/iconbutton.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/iconbutton.o: utilities.h /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/iconbutton.o: /usr/include/math.h /usr/include/bits/huge_val.h
../objs/linux/iconbutton.o: /usr/include/bits/huge_valf.h
../objs/linux/iconbutton.o: /usr/include/bits/huge_vall.h
@@ -529,7 +575,6 @@ depend:
../objs/linux/imagedialog.o: /usr/include/bits/typesizes.h
../objs/linux/imagedialog.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/imagedialog.o: /usr/include/bits/endian.h
-../objs/linux/imagedialog.o: /usr/include/bits/byteswap.h
../objs/linux/imagedialog.o: /usr/include/sys/select.h
../objs/linux/imagedialog.o: /usr/include/bits/select.h
../objs/linux/imagedialog.o: /usr/include/bits/sigset.h
@@ -589,10 +634,11 @@ depend:
../objs/linux/imagedialog.o: /usr/include/google/type_traits.h
../objs/linux/imagedialog.o: surfacecollection.h
../objs/linux/imagedialog.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/imagedialog.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/imagedialog.o: iconbutton.h button.h FastDelegate.h
-../objs/linux/imagedialog.o: /usr/include/memory.h translator.h touchscreen.h
-../objs/linux/imagedialog.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
+../objs/linux/imagedialog.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/imagedialog.o: sfontplus.h utilities.h iconbutton.h button.h
+../objs/linux/imagedialog.o: FastDelegate.h /usr/include/memory.h
+../objs/linux/imagedialog.o: translator.h touchscreen.h /usr/include/fcntl.h
+../objs/linux/imagedialog.o: /usr/include/bits/fcntl.h
../objs/linux/imagedialog.o: /usr/include/bits/uio.h inputmanager.h
../objs/linux/inputdialog.o: /usr/include/SDL/SDL.h
../objs/linux/inputdialog.o: /usr/include/SDL/SDL_main.h
@@ -608,7 +654,6 @@ depend:
../objs/linux/inputdialog.o: /usr/include/bits/typesizes.h
../objs/linux/inputdialog.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/inputdialog.o: /usr/include/bits/endian.h
-../objs/linux/inputdialog.o: /usr/include/bits/byteswap.h
../objs/linux/inputdialog.o: /usr/include/sys/select.h
../objs/linux/inputdialog.o: /usr/include/bits/select.h
../objs/linux/inputdialog.o: /usr/include/bits/sigset.h
@@ -662,10 +707,11 @@ depend:
../objs/linux/inputdialog.o: /usr/include/google/type_traits.h
../objs/linux/inputdialog.o: surfacecollection.h
../objs/linux/inputdialog.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/inputdialog.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/inputdialog.o: iconbutton.h button.h FastDelegate.h
-../objs/linux/inputdialog.o: /usr/include/memory.h translator.h touchscreen.h
-../objs/linux/inputdialog.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
+../objs/linux/inputdialog.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/inputdialog.o: sfontplus.h utilities.h iconbutton.h button.h
+../objs/linux/inputdialog.o: FastDelegate.h /usr/include/memory.h
+../objs/linux/inputdialog.o: translator.h touchscreen.h /usr/include/fcntl.h
+../objs/linux/inputdialog.o: /usr/include/bits/fcntl.h
../objs/linux/inputdialog.o: /usr/include/bits/uio.h /usr/include/sys/stat.h
../objs/linux/inputdialog.o: /usr/include/bits/stat.h inputmanager.h
../objs/linux/inputmanager.o: inputmanager.h /usr/include/SDL/SDL.h
@@ -683,7 +729,6 @@ depend:
../objs/linux/inputmanager.o: /usr/include/bits/typesizes.h
../objs/linux/inputmanager.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/inputmanager.o: /usr/include/bits/endian.h
-../objs/linux/inputmanager.o: /usr/include/bits/byteswap.h
../objs/linux/inputmanager.o: /usr/include/sys/select.h
../objs/linux/inputmanager.o: /usr/include/bits/select.h
../objs/linux/inputmanager.o: /usr/include/bits/sigset.h
@@ -742,10 +787,9 @@ depend:
../objs/linux/link.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h
../objs/linux/link.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
../objs/linux/link.o: /usr/include/time.h /usr/include/endian.h
-../objs/linux/link.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
-../objs/linux/link.o: /usr/include/sys/select.h /usr/include/bits/select.h
-../objs/linux/link.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
-../objs/linux/link.o: /usr/include/sys/sysmacros.h
+../objs/linux/link.o: /usr/include/bits/endian.h /usr/include/sys/select.h
+../objs/linux/link.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+../objs/linux/link.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
../objs/linux/link.o: /usr/include/bits/pthreadtypes.h /usr/include/stdio.h
../objs/linux/link.o: /usr/include/libio.h /usr/include/_G_config.h
../objs/linux/link.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
@@ -783,7 +827,8 @@ depend:
../objs/linux/link.o: /usr/include/google/sparsehash/densehashtable.h
../objs/linux/link.o: /usr/include/assert.h /usr/include/google/type_traits.h
../objs/linux/link.o: surfacecollection.h /usr/include/google/dense_hash_map
-../objs/linux/link.o: surface.h /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/link.o: surface.h /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/link.o: sfontplus.h utilities.h
../objs/linux/link.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/link.o: /usr/include/math.h /usr/include/bits/huge_val.h
../objs/linux/link.o: /usr/include/bits/huge_valf.h
@@ -808,7 +853,6 @@ depend:
../objs/linux/linkaction.o: /usr/include/bits/types.h
../objs/linux/linkaction.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/linkaction.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/linkaction.o: /usr/include/bits/byteswap.h
../objs/linux/linkaction.o: /usr/include/sys/select.h
../objs/linux/linkaction.o: /usr/include/bits/select.h
../objs/linux/linkaction.o: /usr/include/bits/sigset.h
@@ -855,7 +899,6 @@ depend:
../objs/linux/linkapp.o: /usr/include/bits/types.h
../objs/linux/linkapp.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/linkapp.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/linkapp.o: /usr/include/bits/byteswap.h
../objs/linux/linkapp.o: /usr/include/sys/select.h /usr/include/bits/select.h
../objs/linux/linkapp.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
../objs/linux/linkapp.o: /usr/include/sys/sysmacros.h
@@ -907,8 +950,8 @@ depend:
../objs/linux/linkapp.o: /usr/include/google/type_traits.h
../objs/linux/linkapp.o: surfacecollection.h
../objs/linux/linkapp.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/linkapp.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/linkapp.o: /usr/include/SDL/SDL_gfxPrimitives.h
+../objs/linux/linkapp.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/linkapp.o: utilities.h /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/linkapp.o: /usr/include/math.h /usr/include/bits/huge_val.h
../objs/linux/linkapp.o: /usr/include/bits/huge_valf.h
../objs/linux/linkapp.o: /usr/include/bits/huge_vall.h
@@ -936,9 +979,8 @@ depend:
../objs/linux/listview.o: /usr/include/bits/waitflags.h
../objs/linux/listview.o: /usr/include/bits/waitstatus.h
../objs/linux/listview.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/listview.o: /usr/include/bits/byteswap.h /usr/include/xlocale.h
-../objs/linux/listview.o: /usr/include/sys/types.h /usr/include/time.h
-../objs/linux/listview.o: /usr/include/sys/select.h
+../objs/linux/listview.o: /usr/include/xlocale.h /usr/include/sys/types.h
+../objs/linux/listview.o: /usr/include/time.h /usr/include/sys/select.h
../objs/linux/listview.o: /usr/include/bits/select.h
../objs/linux/listview.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
../objs/linux/listview.o: /usr/include/sys/sysmacros.h
@@ -975,8 +1017,8 @@ depend:
../objs/linux/listview.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/listview.o: /usr/include/SDL/SDL_timer.h
../objs/linux/listview.o: /usr/include/SDL/SDL_version.h
-../objs/linux/listview.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/listview.o: /usr/include/SDL/SDL_gfxPrimitives.h
+../objs/linux/listview.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/listview.o: utilities.h /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/listview.o: /usr/include/math.h /usr/include/bits/huge_val.h
../objs/linux/listview.o: /usr/include/bits/huge_valf.h
../objs/linux/listview.o: /usr/include/bits/huge_vall.h
@@ -1008,7 +1050,6 @@ depend:
../objs/linux/listviewitem.o: /usr/include/bits/waitstatus.h
../objs/linux/listviewitem.o: /usr/include/endian.h
../objs/linux/listviewitem.o: /usr/include/bits/endian.h
-../objs/linux/listviewitem.o: /usr/include/bits/byteswap.h
../objs/linux/listviewitem.o: /usr/include/xlocale.h /usr/include/sys/types.h
../objs/linux/listviewitem.o: /usr/include/time.h /usr/include/sys/select.h
../objs/linux/listviewitem.o: /usr/include/bits/select.h
@@ -1050,7 +1091,8 @@ depend:
../objs/linux/listviewitem.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/listviewitem.o: /usr/include/SDL/SDL_timer.h
../objs/linux/listviewitem.o: /usr/include/SDL/SDL_version.h
-../objs/linux/listviewitem.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/listviewitem.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/listviewitem.o: sfontplus.h utilities.h
../objs/linux/listviewitem.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/listviewitem.o: /usr/include/math.h
../objs/linux/listviewitem.o: /usr/include/bits/huge_val.h
@@ -1071,10 +1113,9 @@ depend:
../objs/linux/menu.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
../objs/linux/menu.o: /usr/include/time.h /usr/include/bits/stat.h
../objs/linux/menu.o: /usr/include/sys/types.h /usr/include/endian.h
-../objs/linux/menu.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
-../objs/linux/menu.o: /usr/include/sys/select.h /usr/include/bits/select.h
-../objs/linux/menu.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
-../objs/linux/menu.o: /usr/include/sys/sysmacros.h
+../objs/linux/menu.o: /usr/include/bits/endian.h /usr/include/sys/select.h
+../objs/linux/menu.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+../objs/linux/menu.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
../objs/linux/menu.o: /usr/include/bits/pthreadtypes.h /usr/include/dirent.h
../objs/linux/menu.o: /usr/include/bits/dirent.h
../objs/linux/menu.o: /usr/include/bits/posix1_lim.h
@@ -1084,27 +1125,26 @@ depend:
../objs/linux/menu.o: /usr/include/bits/huge_valf.h
../objs/linux/menu.o: /usr/include/bits/huge_vall.h /usr/include/bits/inf.h
../objs/linux/menu.o: /usr/include/bits/nan.h /usr/include/bits/mathdef.h
-../objs/linux/menu.o: /usr/include/bits/mathcalls.h gmenu2x.h
-../objs/linux/menu.o: /usr/include/google/dense_hash_map
-../objs/linux/menu.o: /usr/include/google/sparsehash/sparseconfig.h
+../objs/linux/menu.o: /usr/include/bits/mathcalls.h tinyxml/tinyxml.h
+../objs/linux/menu.o: /usr/include/ctype.h /usr/include/xlocale.h
../objs/linux/menu.o: /usr/include/stdio.h /usr/include/libio.h
../objs/linux/menu.o: /usr/include/_G_config.h /usr/include/wchar.h
../objs/linux/menu.o: /usr/include/bits/stdio_lim.h
-../objs/linux/menu.o: /usr/include/bits/sys_errlist.h
-../objs/linux/menu.o: /usr/include/google/sparsehash/densehashtable.h
-../objs/linux/menu.o: /usr/include/assert.h /usr/include/stdlib.h
+../objs/linux/menu.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
../objs/linux/menu.o: /usr/include/bits/waitflags.h
-../objs/linux/menu.o: /usr/include/bits/waitstatus.h /usr/include/xlocale.h
-../objs/linux/menu.o: /usr/include/alloca.h /usr/include/google/type_traits.h
-../objs/linux/menu.o: surfacecollection.h /usr/include/google/dense_hash_map
-../objs/linux/menu.o: surface.h /usr/include/SDL/SDL.h
-../objs/linux/menu.o: /usr/include/SDL/SDL_main.h
+../objs/linux/menu.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h
+../objs/linux/menu.o: /usr/include/string.h /usr/include/assert.h gmenu2x.h
+../objs/linux/menu.o: /usr/include/google/dense_hash_map
+../objs/linux/menu.o: /usr/include/google/sparsehash/sparseconfig.h
+../objs/linux/menu.o: /usr/include/google/sparsehash/densehashtable.h
+../objs/linux/menu.o: /usr/include/google/type_traits.h surfacecollection.h
+../objs/linux/menu.o: /usr/include/google/dense_hash_map surface.h
+../objs/linux/menu.o: /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h
../objs/linux/menu.o: /usr/include/SDL/SDL_stdinc.h
../objs/linux/menu.o: /usr/include/SDL/SDL_config.h
-../objs/linux/menu.o: /usr/include/SDL/SDL_platform.h /usr/include/string.h
-../objs/linux/menu.o: /usr/include/strings.h /usr/include/inttypes.h
-../objs/linux/menu.o: /usr/include/stdint.h /usr/include/bits/wchar.h
-../objs/linux/menu.o: /usr/include/ctype.h /usr/include/iconv.h
+../objs/linux/menu.o: /usr/include/SDL/SDL_platform.h /usr/include/strings.h
+../objs/linux/menu.o: /usr/include/inttypes.h /usr/include/stdint.h
+../objs/linux/menu.o: /usr/include/bits/wchar.h /usr/include/iconv.h
../objs/linux/menu.o: /usr/include/SDL/begin_code.h
../objs/linux/menu.o: /usr/include/SDL/close_code.h
../objs/linux/menu.o: /usr/include/SDL/SDL_audio.h
@@ -1126,13 +1166,13 @@ depend:
../objs/linux/menu.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menu.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menu.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menu.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/menu.o: /usr/include/SDL/SDL_gfxPrimitives.h iconbutton.h
-../objs/linux/menu.o: button.h FastDelegate.h /usr/include/memory.h
-../objs/linux/menu.o: translator.h touchscreen.h /usr/include/fcntl.h
-../objs/linux/menu.o: /usr/include/bits/fcntl.h /usr/include/bits/uio.h
-../objs/linux/menu.o: inputmanager.h linkapp.h link.h menu.h linkaction.h
-../objs/linux/menu.o: filelister.h pxml.h
+../objs/linux/menu.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/menu.o: utilities.h /usr/include/SDL/SDL_gfxPrimitives.h
+../objs/linux/menu.o: iconbutton.h button.h FastDelegate.h
+../objs/linux/menu.o: /usr/include/memory.h translator.h touchscreen.h
+../objs/linux/menu.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
+../objs/linux/menu.o: /usr/include/bits/uio.h inputmanager.h linkapp.h link.h
+../objs/linux/menu.o: menu.h linkaction.h filelister.h
../objs/linux/menusetting.o: menusetting.h gmenu2x.h
../objs/linux/menusetting.o: /usr/include/google/dense_hash_map
../objs/linux/menusetting.o: /usr/include/google/sparsehash/sparseconfig.h
@@ -1152,7 +1192,6 @@ depend:
../objs/linux/menusetting.o: /usr/include/bits/waitflags.h
../objs/linux/menusetting.o: /usr/include/bits/waitstatus.h
../objs/linux/menusetting.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/menusetting.o: /usr/include/bits/byteswap.h
../objs/linux/menusetting.o: /usr/include/xlocale.h /usr/include/sys/types.h
../objs/linux/menusetting.o: /usr/include/time.h /usr/include/sys/select.h
../objs/linux/menusetting.o: /usr/include/bits/select.h
@@ -1194,7 +1233,8 @@ depend:
../objs/linux/menusetting.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menusetting.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menusetting.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menusetting.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusetting.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusetting.o: sfontplus.h utilities.h
../objs/linux/menusetting.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusetting.o: /usr/include/math.h /usr/include/bits/huge_val.h
../objs/linux/menusetting.o: /usr/include/bits/huge_valf.h
@@ -1223,7 +1263,6 @@ depend:
../objs/linux/menusettingbool.o: /usr/include/bits/typesizes.h
../objs/linux/menusettingbool.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/menusettingbool.o: /usr/include/bits/endian.h
-../objs/linux/menusettingbool.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingbool.o: /usr/include/sys/select.h
../objs/linux/menusettingbool.o: /usr/include/bits/select.h
../objs/linux/menusettingbool.o: /usr/include/bits/sigset.h
@@ -1274,7 +1313,8 @@ depend:
../objs/linux/menusettingbool.o: /usr/include/google/type_traits.h
../objs/linux/menusettingbool.o: surfacecollection.h
../objs/linux/menusettingbool.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/menusettingbool.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusettingbool.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingbool.o: sfontplus.h utilities.h
../objs/linux/menusettingbool.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingbool.o: /usr/include/math.h
../objs/linux/menusettingbool.o: /usr/include/bits/huge_val.h
@@ -1309,7 +1349,6 @@ depend:
../objs/linux/menusettingdir.o: /usr/include/bits/waitstatus.h
../objs/linux/menusettingdir.o: /usr/include/endian.h
../objs/linux/menusettingdir.o: /usr/include/bits/endian.h
-../objs/linux/menusettingdir.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingdir.o: /usr/include/xlocale.h
../objs/linux/menusettingdir.o: /usr/include/sys/types.h /usr/include/time.h
../objs/linux/menusettingdir.o: /usr/include/sys/select.h
@@ -1352,7 +1391,8 @@ depend:
../objs/linux/menusettingdir.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menusettingdir.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menusettingdir.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menusettingdir.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusettingdir.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingdir.o: sfontplus.h utilities.h
../objs/linux/menusettingdir.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingdir.o: /usr/include/math.h
../objs/linux/menusettingdir.o: /usr/include/bits/huge_val.h
@@ -1391,7 +1431,6 @@ depend:
../objs/linux/menusettingfile.o: /usr/include/bits/waitstatus.h
../objs/linux/menusettingfile.o: /usr/include/endian.h
../objs/linux/menusettingfile.o: /usr/include/bits/endian.h
-../objs/linux/menusettingfile.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingfile.o: /usr/include/xlocale.h
../objs/linux/menusettingfile.o: /usr/include/sys/types.h /usr/include/time.h
../objs/linux/menusettingfile.o: /usr/include/sys/select.h
@@ -1435,7 +1474,8 @@ depend:
../objs/linux/menusettingfile.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menusettingfile.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menusettingfile.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menusettingfile.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusettingfile.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingfile.o: sfontplus.h utilities.h
../objs/linux/menusettingfile.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingfile.o: /usr/include/math.h
../objs/linux/menusettingfile.o: /usr/include/bits/huge_val.h
@@ -1475,7 +1515,6 @@ depend:
../objs/linux/menusettingimage.o: /usr/include/bits/waitstatus.h
../objs/linux/menusettingimage.o: /usr/include/endian.h
../objs/linux/menusettingimage.o: /usr/include/bits/endian.h
-../objs/linux/menusettingimage.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingimage.o: /usr/include/xlocale.h
../objs/linux/menusettingimage.o: /usr/include/sys/types.h
../objs/linux/menusettingimage.o: /usr/include/time.h
@@ -1521,7 +1560,8 @@ depend:
../objs/linux/menusettingimage.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menusettingimage.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menusettingimage.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menusettingimage.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusettingimage.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingimage.o: sfontplus.h utilities.h
../objs/linux/menusettingimage.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingimage.o: /usr/include/math.h
../objs/linux/menusettingimage.o: /usr/include/bits/huge_val.h
@@ -1556,7 +1596,6 @@ depend:
../objs/linux/menusettingint.o: /usr/include/bits/typesizes.h
../objs/linux/menusettingint.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/menusettingint.o: /usr/include/bits/endian.h
-../objs/linux/menusettingint.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingint.o: /usr/include/sys/select.h
../objs/linux/menusettingint.o: /usr/include/bits/select.h
../objs/linux/menusettingint.o: /usr/include/bits/sigset.h
@@ -1604,7 +1643,8 @@ depend:
../objs/linux/menusettingint.o: /usr/include/google/type_traits.h
../objs/linux/menusettingint.o: surfacecollection.h
../objs/linux/menusettingint.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/menusettingint.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusettingint.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingint.o: sfontplus.h utilities.h
../objs/linux/menusettingint.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingint.o: /usr/include/math.h
../objs/linux/menusettingint.o: /usr/include/bits/huge_val.h
@@ -1642,7 +1682,6 @@ depend:
../objs/linux/menusettingmultistring.o: /usr/include/bits/waitstatus.h
../objs/linux/menusettingmultistring.o: /usr/include/endian.h
../objs/linux/menusettingmultistring.o: /usr/include/bits/endian.h
-../objs/linux/menusettingmultistring.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingmultistring.o: /usr/include/xlocale.h
../objs/linux/menusettingmultistring.o: /usr/include/sys/types.h
../objs/linux/menusettingmultistring.o: /usr/include/time.h
@@ -1689,8 +1728,8 @@ depend:
../objs/linux/menusettingmultistring.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menusettingmultistring.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menusettingmultistring.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menusettingmultistring.o: /usr/include/SDL/SDL_image.h
-../objs/linux/menusettingmultistring.o: utilities.h
+../objs/linux/menusettingmultistring.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingmultistring.o: sfontplus.h utilities.h
../objs/linux/menusettingmultistring.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingmultistring.o: /usr/include/math.h
../objs/linux/menusettingmultistring.o: /usr/include/bits/huge_val.h
@@ -1729,7 +1768,6 @@ depend:
../objs/linux/menusettingrgba.o: /usr/include/bits/waitstatus.h
../objs/linux/menusettingrgba.o: /usr/include/endian.h
../objs/linux/menusettingrgba.o: /usr/include/bits/endian.h
-../objs/linux/menusettingrgba.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingrgba.o: /usr/include/xlocale.h
../objs/linux/menusettingrgba.o: /usr/include/sys/types.h /usr/include/time.h
../objs/linux/menusettingrgba.o: /usr/include/sys/select.h
@@ -1773,7 +1811,8 @@ depend:
../objs/linux/menusettingrgba.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menusettingrgba.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menusettingrgba.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menusettingrgba.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusettingrgba.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingrgba.o: sfontplus.h utilities.h
../objs/linux/menusettingrgba.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingrgba.o: /usr/include/math.h
../objs/linux/menusettingrgba.o: /usr/include/bits/huge_val.h
@@ -1814,7 +1853,6 @@ depend:
../objs/linux/menusettingstring.o: /usr/include/bits/waitstatus.h
../objs/linux/menusettingstring.o: /usr/include/endian.h
../objs/linux/menusettingstring.o: /usr/include/bits/endian.h
-../objs/linux/menusettingstring.o: /usr/include/bits/byteswap.h
../objs/linux/menusettingstring.o: /usr/include/xlocale.h
../objs/linux/menusettingstring.o: /usr/include/sys/types.h
../objs/linux/menusettingstring.o: /usr/include/time.h
@@ -1860,7 +1898,8 @@ depend:
../objs/linux/menusettingstring.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/menusettingstring.o: /usr/include/SDL/SDL_timer.h
../objs/linux/menusettingstring.o: /usr/include/SDL/SDL_version.h
-../objs/linux/menusettingstring.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/menusettingstring.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/menusettingstring.o: sfontplus.h utilities.h
../objs/linux/menusettingstring.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/menusettingstring.o: /usr/include/math.h
../objs/linux/menusettingstring.o: /usr/include/bits/huge_val.h
@@ -1891,7 +1930,6 @@ depend:
../objs/linux/messagebox.o: /usr/include/bits/types.h
../objs/linux/messagebox.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/messagebox.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/messagebox.o: /usr/include/bits/byteswap.h
../objs/linux/messagebox.o: /usr/include/sys/select.h
../objs/linux/messagebox.o: /usr/include/bits/select.h
../objs/linux/messagebox.o: /usr/include/bits/sigset.h
@@ -1945,29 +1983,12 @@ depend:
../objs/linux/messagebox.o: /usr/include/google/type_traits.h
../objs/linux/messagebox.o: surfacecollection.h
../objs/linux/messagebox.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/messagebox.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/messagebox.o: iconbutton.h button.h FastDelegate.h
+../objs/linux/messagebox.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/messagebox.o: utilities.h iconbutton.h button.h FastDelegate.h
../objs/linux/messagebox.o: /usr/include/memory.h translator.h touchscreen.h
../objs/linux/messagebox.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
../objs/linux/messagebox.o: /usr/include/bits/uio.h /usr/include/sys/stat.h
../objs/linux/messagebox.o: /usr/include/bits/stat.h inputmanager.h
-../objs/linux/pxml.o: pxml.h tinyxml/tinyxml.h /usr/include/ctype.h
-../objs/linux/pxml.o: /usr/include/features.h /usr/include/sys/cdefs.h
-../objs/linux/pxml.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
-../objs/linux/pxml.o: /usr/include/gnu/stubs-32.h /usr/include/bits/types.h
-../objs/linux/pxml.o: /usr/include/bits/typesizes.h /usr/include/endian.h
-../objs/linux/pxml.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
-../objs/linux/pxml.o: /usr/include/xlocale.h /usr/include/stdio.h
-../objs/linux/pxml.o: /usr/include/libio.h /usr/include/_G_config.h
-../objs/linux/pxml.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
-../objs/linux/pxml.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
-../objs/linux/pxml.o: /usr/include/bits/waitflags.h
-../objs/linux/pxml.o: /usr/include/bits/waitstatus.h /usr/include/sys/types.h
-../objs/linux/pxml.o: /usr/include/time.h /usr/include/sys/select.h
-../objs/linux/pxml.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-../objs/linux/pxml.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
-../objs/linux/pxml.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
-../objs/linux/pxml.o: /usr/include/string.h /usr/include/assert.h
../objs/linux/selector.o: /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h
../objs/linux/selector.o: /usr/include/SDL/SDL_stdinc.h
../objs/linux/selector.o: /usr/include/SDL/SDL_config.h
@@ -1980,7 +2001,6 @@ depend:
../objs/linux/selector.o: /usr/include/bits/types.h
../objs/linux/selector.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/selector.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/selector.o: /usr/include/bits/byteswap.h
../objs/linux/selector.o: /usr/include/sys/select.h
../objs/linux/selector.o: /usr/include/bits/select.h
../objs/linux/selector.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
@@ -2038,8 +2058,8 @@ depend:
../objs/linux/selector.o: /usr/include/google/type_traits.h
../objs/linux/selector.o: surfacecollection.h
../objs/linux/selector.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/selector.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/selector.o: iconbutton.h translator.h touchscreen.h
+../objs/linux/selector.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/selector.o: utilities.h iconbutton.h translator.h touchscreen.h
../objs/linux/selector.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
../objs/linux/selector.o: /usr/include/bits/uio.h inputmanager.h filelister.h
../objs/linux/selectordetector.o: selectordetector.h utilities.h
@@ -2058,7 +2078,6 @@ depend:
../objs/linux/selectordetector.o: /usr/include/bits/typesizes.h
../objs/linux/selectordetector.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/selectordetector.o: /usr/include/bits/endian.h
-../objs/linux/selectordetector.o: /usr/include/bits/byteswap.h
../objs/linux/selectordetector.o: /usr/include/sys/select.h
../objs/linux/selectordetector.o: /usr/include/bits/select.h
../objs/linux/selectordetector.o: /usr/include/bits/sigset.h
@@ -2125,7 +2144,6 @@ depend:
../objs/linux/settingsdialog.o: /usr/include/bits/typesizes.h
../objs/linux/settingsdialog.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/settingsdialog.o: /usr/include/bits/endian.h
-../objs/linux/settingsdialog.o: /usr/include/bits/byteswap.h
../objs/linux/settingsdialog.o: /usr/include/sys/select.h
../objs/linux/settingsdialog.o: /usr/include/bits/select.h
../objs/linux/settingsdialog.o: /usr/include/bits/sigset.h
@@ -2182,10 +2200,11 @@ depend:
../objs/linux/settingsdialog.o: /usr/include/google/type_traits.h
../objs/linux/settingsdialog.o: surfacecollection.h
../objs/linux/settingsdialog.o: /usr/include/google/dense_hash_map surface.h
-../objs/linux/settingsdialog.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/settingsdialog.o: iconbutton.h button.h FastDelegate.h
-../objs/linux/settingsdialog.o: /usr/include/memory.h translator.h
-../objs/linux/settingsdialog.o: touchscreen.h /usr/include/fcntl.h
+../objs/linux/settingsdialog.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/settingsdialog.o: sfontplus.h utilities.h iconbutton.h button.h
+../objs/linux/settingsdialog.o: FastDelegate.h /usr/include/memory.h
+../objs/linux/settingsdialog.o: translator.h touchscreen.h
+../objs/linux/settingsdialog.o: /usr/include/fcntl.h
../objs/linux/settingsdialog.o: /usr/include/bits/fcntl.h
../objs/linux/settingsdialog.o: /usr/include/bits/uio.h
../objs/linux/settingsdialog.o: /usr/include/sys/stat.h
@@ -2204,7 +2223,6 @@ depend:
../objs/linux/sfontplus.o: /usr/include/bits/types.h
../objs/linux/sfontplus.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/sfontplus.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/sfontplus.o: /usr/include/bits/byteswap.h
../objs/linux/sfontplus.o: /usr/include/sys/select.h
../objs/linux/sfontplus.o: /usr/include/bits/select.h
../objs/linux/sfontplus.o: /usr/include/bits/sigset.h
@@ -2242,9 +2260,8 @@ depend:
../objs/linux/sfontplus.o: /usr/include/SDL/SDL_quit.h
../objs/linux/sfontplus.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/sfontplus.o: /usr/include/SDL/SDL_timer.h
-../objs/linux/sfontplus.o: /usr/include/SDL/SDL_version.h surface.h
+../objs/linux/sfontplus.o: /usr/include/SDL/SDL_version.h
../objs/linux/sfontplus.o: /usr/include/SDL/SDL_image.h
-../objs/linux/sfontplus.o: /usr/include/SDL/SDL_ttf.h
../objs/linux/surface.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/surface.o: /usr/include/math.h /usr/include/features.h
../objs/linux/surface.o: /usr/include/sys/cdefs.h
@@ -2263,7 +2280,6 @@ depend:
../objs/linux/surface.o: /usr/include/sys/types.h /usr/include/bits/types.h
../objs/linux/surface.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/surface.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/surface.o: /usr/include/bits/byteswap.h
../objs/linux/surface.o: /usr/include/sys/select.h /usr/include/bits/select.h
../objs/linux/surface.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
../objs/linux/surface.o: /usr/include/sys/sysmacros.h
@@ -2299,7 +2315,8 @@ depend:
../objs/linux/surface.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/surface.o: /usr/include/SDL/SDL_timer.h
../objs/linux/surface.o: /usr/include/SDL/SDL_version.h surface.h
-../objs/linux/surface.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/surface.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/surface.o: utilities.h
../objs/linux/surfacecollection.o: surfacecollection.h
../objs/linux/surfacecollection.o: /usr/include/google/dense_hash_map
../objs/linux/surfacecollection.o: surface.h /usr/include/SDL/SDL.h
@@ -2317,7 +2334,6 @@ depend:
../objs/linux/surfacecollection.o: /usr/include/bits/typesizes.h
../objs/linux/surfacecollection.o: /usr/include/time.h /usr/include/endian.h
../objs/linux/surfacecollection.o: /usr/include/bits/endian.h
-../objs/linux/surfacecollection.o: /usr/include/bits/byteswap.h
../objs/linux/surfacecollection.o: /usr/include/sys/select.h
../objs/linux/surfacecollection.o: /usr/include/bits/select.h
../objs/linux/surfacecollection.o: /usr/include/bits/sigset.h
@@ -2361,7 +2377,8 @@ depend:
../objs/linux/surfacecollection.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/surfacecollection.o: /usr/include/SDL/SDL_timer.h
../objs/linux/surfacecollection.o: /usr/include/SDL/SDL_version.h
-../objs/linux/surfacecollection.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/surfacecollection.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/surfacecollection.o: sfontplus.h utilities.h
../objs/linux/surfacecollection.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/surfacecollection.o: /usr/include/math.h
../objs/linux/surfacecollection.o: /usr/include/bits/huge_val.h
@@ -2390,7 +2407,6 @@ depend:
../objs/linux/textdialog.o: /usr/include/bits/waitflags.h
../objs/linux/textdialog.o: /usr/include/bits/waitstatus.h
../objs/linux/textdialog.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/textdialog.o: /usr/include/bits/byteswap.h
../objs/linux/textdialog.o: /usr/include/xlocale.h /usr/include/sys/types.h
../objs/linux/textdialog.o: /usr/include/time.h /usr/include/sys/select.h
../objs/linux/textdialog.o: /usr/include/bits/select.h
@@ -2432,8 +2448,8 @@ depend:
../objs/linux/textdialog.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/textdialog.o: /usr/include/SDL/SDL_timer.h
../objs/linux/textdialog.o: /usr/include/SDL/SDL_version.h
-../objs/linux/textdialog.o: /usr/include/SDL/SDL_image.h utilities.h
-../objs/linux/textdialog.o: /usr/include/SDL/SDL_gfxPrimitives.h
+../objs/linux/textdialog.o: /usr/include/SDL/SDL_image.h asfont.h sfontplus.h
+../objs/linux/textdialog.o: utilities.h /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/textdialog.o: /usr/include/math.h /usr/include/bits/huge_val.h
../objs/linux/textdialog.o: /usr/include/bits/huge_valf.h
../objs/linux/textdialog.o: /usr/include/bits/huge_vall.h
@@ -2467,7 +2483,6 @@ depend:
../objs/linux/textmanualdialog.o: /usr/include/bits/waitstatus.h
../objs/linux/textmanualdialog.o: /usr/include/endian.h
../objs/linux/textmanualdialog.o: /usr/include/bits/endian.h
-../objs/linux/textmanualdialog.o: /usr/include/bits/byteswap.h
../objs/linux/textmanualdialog.o: /usr/include/xlocale.h
../objs/linux/textmanualdialog.o: /usr/include/sys/types.h
../objs/linux/textmanualdialog.o: /usr/include/time.h
@@ -2513,7 +2528,8 @@ depend:
../objs/linux/textmanualdialog.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/textmanualdialog.o: /usr/include/SDL/SDL_timer.h
../objs/linux/textmanualdialog.o: /usr/include/SDL/SDL_version.h
-../objs/linux/textmanualdialog.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/textmanualdialog.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/textmanualdialog.o: sfontplus.h utilities.h
../objs/linux/textmanualdialog.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/textmanualdialog.o: /usr/include/math.h
../objs/linux/textmanualdialog.o: /usr/include/bits/huge_val.h
@@ -2548,7 +2564,6 @@ depend:
../objs/linux/touchscreen.o: /usr/include/SDL/SDL_platform.h
../objs/linux/touchscreen.o: /usr/include/sys/types.h /usr/include/time.h
../objs/linux/touchscreen.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/touchscreen.o: /usr/include/bits/byteswap.h
../objs/linux/touchscreen.o: /usr/include/sys/select.h
../objs/linux/touchscreen.o: /usr/include/bits/select.h
../objs/linux/touchscreen.o: /usr/include/bits/sigset.h
@@ -2604,7 +2619,6 @@ depend:
../objs/linux/translator.o: /usr/include/bits/types.h
../objs/linux/translator.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/translator.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/translator.o: /usr/include/bits/byteswap.h
../objs/linux/translator.o: /usr/include/sys/select.h
../objs/linux/translator.o: /usr/include/bits/select.h
../objs/linux/translator.o: /usr/include/bits/sigset.h
@@ -2660,7 +2674,6 @@ depend:
../objs/linux/utilities.o: /usr/include/bits/typesizes.h /usr/include/time.h
../objs/linux/utilities.o: /usr/include/bits/stat.h /usr/include/sys/types.h
../objs/linux/utilities.o: /usr/include/endian.h /usr/include/bits/endian.h
-../objs/linux/utilities.o: /usr/include/bits/byteswap.h
../objs/linux/utilities.o: /usr/include/sys/select.h
../objs/linux/utilities.o: /usr/include/bits/select.h
../objs/linux/utilities.o: /usr/include/bits/sigset.h
@@ -2735,7 +2748,6 @@ depend:
../objs/linux/wallpaperdialog.o: /usr/include/bits/waitstatus.h
../objs/linux/wallpaperdialog.o: /usr/include/endian.h
../objs/linux/wallpaperdialog.o: /usr/include/bits/endian.h
-../objs/linux/wallpaperdialog.o: /usr/include/bits/byteswap.h
../objs/linux/wallpaperdialog.o: /usr/include/xlocale.h
../objs/linux/wallpaperdialog.o: /usr/include/sys/types.h /usr/include/time.h
../objs/linux/wallpaperdialog.o: /usr/include/sys/select.h
@@ -2779,7 +2791,8 @@ depend:
../objs/linux/wallpaperdialog.o: /usr/include/SDL/SDL_loadso.h
../objs/linux/wallpaperdialog.o: /usr/include/SDL/SDL_timer.h
../objs/linux/wallpaperdialog.o: /usr/include/SDL/SDL_version.h
-../objs/linux/wallpaperdialog.o: /usr/include/SDL/SDL_image.h utilities.h
+../objs/linux/wallpaperdialog.o: /usr/include/SDL/SDL_image.h asfont.h
+../objs/linux/wallpaperdialog.o: sfontplus.h utilities.h
../objs/linux/wallpaperdialog.o: /usr/include/SDL/SDL_gfxPrimitives.h
../objs/linux/wallpaperdialog.o: /usr/include/math.h
../objs/linux/wallpaperdialog.o: /usr/include/bits/huge_val.h
View
124 src/asfont.cpp
@@ -0,0 +1,124 @@
+#include "asfont.h"
+#include "surface.h"
+#include "utilities.h"
+
+#include <iostream>
+
+using namespace std;
+
+ASFont::ASFont(SDL_Surface* font) {
+ this->font.initFont(font);
+ halfHeight = getHeight()/2;
+ halfLineHeight = getLineHeight()/2;
+}
+
+ASFont::ASFont(Surface* font) {
+ this->font.initFont(font->raw);
+ halfHeight = getHeight()/2;
+ halfLineHeight = getLineHeight()/2;
+}
+
+ASFont::ASFont(string font) {
+ this->font.initFont(font);
+ halfHeight = getHeight()/2;
+ halfLineHeight = getLineHeight()/2;
+}
+
+ASFont::~ASFont() {
+ font.freeFont();
+}
+
+bool ASFont::utf8Code(unsigned char c) {
+ return font.utf8Code(c);
+}
+
+void ASFont::write(SDL_Surface* surface, const char* text, int x, int y) {
+ font.write(surface, text, x, y);
+}
+
+void ASFont::write(SDL_Surface* surface, const std::string& text, int x, int y, const unsigned short halign, const unsigned short valign) {
+ switch (halign) {
+ case SFontHAlignCenter:
+ x -= getTextWidth(text)/2;
+ break;
+ case SFontHAlignRight:
+ x -= getTextWidth(text);
+ break;
+ }
+
+ switch (valign) {
+ case SFontVAlignMiddle:
+ y -= getHalfHeight();
+ break;
+ case SFontVAlignBottom:
+ y -= getHeight();
+ break;
+ }
+
+ font.write(surface, text, x, y);
+}
+void ASFont::write(SDL_Surface* surface, vector<string> *text, int x, int y, const unsigned short halign, const unsigned short valign) {
+ switch (valign) {
+ case SFontVAlignMiddle:
+ y -= getHalfHeight()*text->size();
+ break;
+ case SFontVAlignBottom:
+ y -= getHeight()*text->size();
+ break;
+ }
+
+ for (uint i=0; i<text->size(); i++) {
+ int ix = x;
+ switch (halign) {
+ case SFontHAlignCenter:
+ ix -= getTextWidth(text->at(i))/2;
+ break;
+ case SFontHAlignRight:
+ ix -= getTextWidth(text->at(i));
+ break;
+ }
+
+ font.write(surface, text->at(i), x, y+getHeight()*i);
+ }
+}
+
+void ASFont::write(Surface* surface, const std::string& text, int x, int y, const unsigned short halign, const unsigned short valign) {
+ if (text.find("\n",0)!=string::npos) {
+ vector<string> textArr;
+ split(textArr,text,"\n");
+ write(surface->raw, &textArr, x, y, halign, valign);
+ } else
+ write(surface->raw, text, x, y, halign, valign);
+}
+
+int ASFont::getHeight() {
+ return font.getHeight();
+}
+int ASFont::getHalfHeight() {
+ return halfHeight;
+}
+
+int ASFont::getLineHeight() {
+ return font.getLineHeight();
+}
+int ASFont::getHalfLineHeight() {
+ return halfLineHeight;
+}
+
+int ASFont::getTextWidth(const char* text) {
+ return font.getTextWidth(text);
+}
+int ASFont::getTextWidth(const std::string& text) {
+ if (text.find("\n",0)!=string::npos) {
+ vector<string> textArr;
+ split(textArr,text,"\n");
+ return getTextWidth(&textArr);
+ } else
+ return getTextWidth(text.c_str());
+}
+int ASFont::getTextWidth(vector<string> *text) {
+ int w = 0;
+ for (uint i=0; i<text->size(); i++)
+ w = max( getTextWidth(text->at(i).c_str()), w );
+ return w;
+}
View
49 src/asfont.h
@@ -0,0 +1,49 @@
+//Advanced SFont by Massimiliano Torromeo (cpp wrapper around SFont)
+
+#ifndef ASFONT_H
+#define ASFONT_H
+
+#include <string>
+#include <vector>
+#include <SDL.h>
+#include "sfontplus.h"
+
+using std::string;
+using std::vector;
+
+const unsigned short SFontHAlignLeft = 0;
+const unsigned short SFontHAlignRight = 1;
+const unsigned short SFontHAlignCenter = 2;
+const unsigned short SFontVAlignTop = 0;
+const unsigned short SFontVAlignBottom = 1;
+const unsigned short SFontVAlignMiddle = 2;
+
+class Surface;
+
+class ASFont {
+public:
+ ASFont(SDL_Surface* font);
+ ASFont(Surface* font);
+ ASFont(string font);
+ ~ASFont();
+
+ bool utf8Code(unsigned char c);
+
+ int getHeight();
+ int getHalfHeight();
+ int getLineHeight();
+ int getHalfLineHeight();
+ int getTextWidth(const char* text);
+ int getTextWidth(const string& text);
+ int getTextWidth(vector<string> *text);
+ void write(SDL_Surface* surface, const char* text, int x, int y);
+ void write(SDL_Surface* surface, const std::string& text, int x, int y, const unsigned short halign = 0, const unsigned short valign = 0);
+ void write(SDL_Surface* surface, vector<string> *text, int x, int y, const unsigned short halign = 0, const unsigned short valign = 0);
+ void write(Surface* surface, const std::string& text, int x, int y, const unsigned short halign = 0, const unsigned short valign = 0);
+
+private:
+ SFontPlus font;
+ int halfHeight, halfLineHeight;
+};
+
+#endif /* ASFONT_H */
View
98 src/cpu.cpp
@@ -0,0 +1,98 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include "jz4740.h"
+#include "cpu.h"
+
+inline int sdram_convert(unsigned int pllin,unsigned int *sdram_freq)
+{
+ register unsigned int ns, tmp;
+
+ ns = 1000000000 / pllin;
+ /* Set refresh registers */
+ tmp = SDRAM_TREF/ns;
+ tmp = tmp/64 + 1;
+ if (tmp > 0xff) tmp = 0xff;
+ *sdram_freq = tmp;
+
+ return 0;
+
+}
+
+void pll_init(unsigned int clock)
+{
+ register unsigned int cfcr, plcr1;
+ unsigned int sdramclock = 0;
+ int n2FR[33] = {
+ 0, 0, 1, 2, 3, 0, 4, 0, 5, 0, 0, 0, 6, 0, 0, 0,
+ 7, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
+ 9
+ };
+ //int div[5] = {1, 4, 4, 4, 4}; /* divisors of I:S:P:L:M */
+ int div[5] = {1, 3, 3, 3, 3}; /* divisors of I:S:P:L:M */
+ int nf, pllout2;
+
+ cfcr = CPM_CPCCR_CLKOEN |
+ (n2FR[div[0]] << CPM_CPCCR_CDIV_BIT) |
+ (n2FR[div[1]] << CPM_CPCCR_HDIV_BIT) |
+ (n2FR[div[2]] << CPM_CPCCR_PDIV_BIT) |
+ (n2FR[div[3]] << CPM_CPCCR_MDIV_BIT) |
+ (n2FR[div[4]] << CPM_CPCCR_LDIV_BIT);
+
+ pllout2 = (cfcr & CPM_CPCCR_PCS) ? clock : (clock / 2);
+
+ /* Init UHC clock */
+// REG_CPM_UHCCDR = pllout2 / 48000000 - 1;
+ jz_cpmregl[0x6C>>2] = pllout2 / 48000000 - 1;
+
+ nf = clock * 2 / CFG_EXTAL;
+ plcr1 = ((nf - 2) << CPM_CPPCR_PLLM_BIT) | /* FD */
+ (0 << CPM_CPPCR_PLLN_BIT) | /* RD=0, NR=2 */
+ (0 << CPM_CPPCR_PLLOD_BIT) | /* OD=0, NO=1 */
+ (0x20 << CPM_CPPCR_PLLST_BIT) | /* PLL stable time */
+ CPM_CPPCR_PLLEN; /* enable PLL */
+
+ /* init PLL */
+// REG_CPM_CPCCR = cfcr;
+// REG_CPM_CPPCR = plcr1;
+ jz_cpmregl[0] = cfcr;
+ jz_cpmregl[0x10>>2] = plcr1;
+
+ sdram_convert(clock,&sdramclock);
+ if(sdramclock > 0)
+ {
+// REG_EMC_RTCOR = sdramclock;
+// REG_EMC_RTCNT = sdramclock;
+ jz_emcregs[0x8C>>1] = sdramclock;
+ jz_emcregs[0x88>>1] = sdramclock;
+
+ }else
+ {
+ printf("sdram init fail!\n");
+ while(1);
+ }
+
+}
+
+
+void jz_cpuspeed(unsigned clockspeed)
+{
+ if (clockspeed >= 200 && clockspeed <= 430)
+ {
+ jz_dev = open("/dev/mem", O_RDWR);
+ if(jz_dev)
+ {
+ jz_cpmregl=(unsigned long *)mmap(0, 0x80, PROT_READ|PROT_WRITE, MAP_SHARED, jz_dev, 0x10000000);
+ jz_emcregl=(unsigned long *)mmap(0, 0x90, PROT_READ|PROT_WRITE, MAP_SHARED, jz_dev, 0x13010000);
+ jz_emcregs=(unsigned short *)jz_emcregl;
+ pll_init(clockspeed*1000000);
+ munmap((void *)jz_cpmregl, 0x80);
+ munmap((void *)jz_emcregl, 0x90);
+ close(jz_dev);
+ }
+ else
+ printf("failed opening /dev/mem \n");
+ }
+}
View
24 src/cpu.h
@@ -0,0 +1,24 @@
+#ifndef CPU_H
+#define CPU_H
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ 336000000 /* CPU clock: 336 MHz */
+#define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */
+
+// SDRAM Timings, unit: ns
+#define SDRAM_TRAS 45 /* RAS# Active Time */
+#define SDRAM_RCD 20 /* RAS# to CAS# Delay */
+#define SDRAM_TPC 20 /* RAS# Precharge Time */
+#define SDRAM_TRWL 7 /* Write Latency Time */
+#define SDRAM_TREF 15625 /* Refresh period: 4096 refresh cycles/64ms */
+//#define SDRAM_TREF 7812 /* Refresh period: 8192 refresh cycles/64ms */
+
+static unsigned long jz_dev;
+static volatile unsigned long *jz_cpmregl, *jz_emcregl;
+volatile unsigned short *jz_emcregs;
+
+void jz_cpuspeed(unsigned clockspeed);
+void pll_init(unsigned int clock);
+inline int sdram_convert(unsigned int pllin,unsigned int *sdram_freq);
+
+#endif
View
16 src/dirdialog.cpp
@@ -38,7 +38,7 @@ DirDialog::DirDialog(GMenu2X *gmenu2x, string text, string dir) {
this->text = text;
selRow = 0;
if (dir.empty())
- path = "/mnt";
+ path = "/boot/local";
else
path = dir;
@@ -46,7 +46,7 @@ DirDialog::DirDialog(GMenu2X *gmenu2x, string text, string dir) {
ButtonAction actionUp = MakeDelegate(this, &DirDialog::up);
ButtonAction actionEnter = MakeDelegate(this, &DirDialog::enter);
ButtonAction actionConfirm = MakeDelegate(this, &DirDialog::confirm);
-
+
btnUp = new IconButton(gmenu2x, "skin:imgs/buttons/x.png", gmenu2x->tr["Up one folder"]);
btnUp->setAction(actionUp);
@@ -60,9 +60,9 @@ DirDialog::DirDialog(GMenu2X *gmenu2x, string text, string dir) {
bool DirDialog::exec() {
bool ts_pressed = false;
uint i, firstElement = 0, iY, action;
-
+
if (!fileExists(path))
- path = "/mnt";
+ path = "/boot/local";
fl = new FileLister(path,true,false);
fl->browse();
@@ -70,7 +70,7 @@ bool DirDialog::exec() {
selected = 0;
close = false;
result = true;
-
+
uint rowHeight = gmenu2x->font->getHeight()+1; // gp2x=15+1 / pandora=19+1
uint numRows = (gmenu2x->resY-gmenu2x->skinConfInt["topBarHeight"]-20)/rowHeight;
SDL_Rect clipRect = {0, gmenu2x->skinConfInt["topBarHeight"]+1, gmenu2x->resX-9, gmenu2x->resY-gmenu2x->skinConfInt["topBarHeight"]-25};
@@ -78,7 +78,7 @@ bool DirDialog::exec() {
while (!close) {
action = DirDialog::ACT_NONE;
if (gmenu2x->f200) gmenu2x->ts.poll();
-
+
gmenu2x->bg->blit(gmenu2x->s,0,0);
gmenu2x->drawTitleIcon("icons/explorer.png",true);
gmenu2x->writeTitle("Directory Browser");
@@ -173,7 +173,7 @@ bool DirDialog::exec() {
} break;
}
}
-
+
delete(fl);
return result;
@@ -181,7 +181,7 @@ bool DirDialog::exec() {
void DirDialog::up() {
string::size_type p = path.rfind("/");
- if (p==string::npos || path.substr(0,4)!="/mnt" || p<4) {
+ if (p==string::npos || path.substr(0,11)!="/boot/local" || p<4) {
close = true;
result = false;
} else {
View
8 src/filedialog.cpp
@@ -35,7 +35,7 @@ FileDialog::FileDialog(GMenu2X *gmenu2x, string text, string filter, string file
this->text = text;
this->filter = filter;
this->file = "";
- setPath("/mnt");
+ setPath("/boot/local");
title = "File Browser";
if (!file.empty()) {
string::size_type pos = file.rfind("/");
@@ -50,7 +50,7 @@ FileDialog::FileDialog(GMenu2X *gmenu2x, string text, string filter, string file
bool FileDialog::exec() {
bool close = false, result = true, ts_pressed = false;
if (!fileExists(path()))
- setPath("/mnt");
+ setPath("/boot/local");
fl.setFilter(filter);
fl.browse();
@@ -60,7 +60,7 @@ bool FileDialog::exec() {
uint numRows = (gmenu2x->resY-gmenu2x->skinConfInt["topBarHeight"]-20)/rowHeight;
SDL_Rect clipRect = {0, gmenu2x->skinConfInt["topBarHeight"]+1, gmenu2x->resX-9, gmenu2x->resY-gmenu2x->skinConfInt["topBarHeight"]-25};
SDL_Rect touchRect = {2, gmenu2x->skinConfInt["topBarHeight"]+4, gmenu2x->resX-12, clipRect.h};
-
+
selected = 0;
while (!close) {
action = FD_NO_ACTION;
@@ -155,7 +155,7 @@ bool FileDialog::exec() {
} break;
case FD_ACTION_GOUP: {
string::size_type p = path().rfind("/");
- if (p==string::npos || path().substr(0,4)!="/mnt" || p<4)
+ if (p==string::npos || path().substr(0,11)!="/boot/local" || p<4)
return false;
else
setPath( path().substr(0,p) );
View
4 src/filelister.cpp
@@ -86,8 +86,8 @@ void FileLister::browse() {
if (S_ISDIR(st.st_mode)) {
if (!showDirectories) continue;
-#if defined(TARGET_GP2X) || defined(TARGET_WIZ)
- if (!(path=="/mnt/" && (file!="sd" && file!="ext" && file!="nand")))
+#ifdef TARGET_GP2X
+// if (!(path=="/boot/local/" && (file!="sd" && file!="ext" && file!="nand")))
#endif
directories.push_back(file);
} else {
View
2  src/filelister.h
@@ -33,7 +33,7 @@ class FileLister {
bool showDirectories, showFiles;
public:
- FileLister(string startPath = "/mnt/sd", bool showDirectories = true, bool showFiles = true);
+ FileLister(string startPath = "/boot/local", bool showDirectories = true, bool showFiles = true);
void browse();
vector<string> directories, files, exclude;
View
367 src/gmenu2x.cpp
@@ -19,7 +19,6 @@
***************************************************************************/
#include <iostream>
-#include <iomanip>
#include <sstream>
#include <fstream>
#include <stdlib.h>
@@ -47,6 +46,7 @@
#include "linkapp.h"
#include "linkaction.h"
#include "menu.h"
+#include "asfont.h"
#include "sfontplus.h"
#include "surface.h"
#include "filedialog.h"
@@ -91,59 +91,37 @@ int main(int argc, char *argv[]) {
void GMenu2X::gp2x_init() {
#ifdef TARGET_GP2X
- gp2x_mem = open("/dev/mem", O_RDWR);
+/* gp2x_mem = open("/dev/mem", O_RDWR);
gp2x_memregs=(unsigned short *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_mem, 0xc0000000);
MEM_REG=&gp2x_memregs[0];
-
- batteryHandle = open(f200 ? "/dev/mmsp2adc" : "/dev/batt", O_RDONLY);
if (f200) {
//if wm97xx fails to open, set f200 to false to prevent any further access to the touchscreen
f200 = ts.init();
- }
-#endif
-#ifdef TARGET_WIZ
- /* open /dev/mem to access registers */
- wiz_mem = open("/dev/mem", O_RDWR);
- if (wiz_mem < 0) {
- printf("Could not open /dev/mem!\n");
- }
- /* get access to the registers */
- else {
- wiz_memregs = (volatile uint32_t*)mmap(0, 0x20000, PROT_READ|PROT_WRITE, MAP_SHARED, wiz_mem, 0xC0000000);
- if(wiz_memregs == (volatile uint32_t*)0xFFFFFFFF) {
- printf("Could not mmap hardware registers!\n");
- close(wiz_mem);
- }
- }
- /* get access to battery device */
- batteryHandle = open("/dev/pollux_batt", O_RDONLY);
- printf( "System Init Done!\n" );
+ }*/
+ batteryHandle = fopen("/proc/jz/battery", "r");
+ backlightHandle = fopen("/proc/jz/lcd_backlight","w+");
#endif
}
void GMenu2X::gp2x_deinit() {
#ifdef TARGET_GP2X
- if (gp2x_mem!=0) {
+/* if (gp2x_mem!=0) {
gp2x_memregs[0x28DA>>1]=0x4AB;
gp2x_memregs[0x290C>>1]=640;
close(gp2x_mem);
}
- if (f200) ts.deinit();
-#endif
-#ifdef TARGET_WIZ
- wiz_memregs = NULL;
- close(wiz_mem);
-#endif
-#if defined(TARGET_GP2X) || defined(TARGET_WIZ)
- if (batteryHandle!=0) close(batteryHandle);
+
+ if (f200) ts.deinit();*/
#endif
+ if (batteryHandle) fclose(batteryHandle);
+ if (backlightHandle) fclose(backlightHandle);
}
void GMenu2X::gp2x_tvout_on(bool pal) {
#ifdef TARGET_GP2X
- if (gp2x_mem!=0) {
- /*Ioctl_Dummy_t *msg;
- int TVHandle = ioctl(SDL_videofd, FBMMSP2CTRL, msg);*/
+/* if (gp2x_mem!=0) {
+// Ioctl_Dummy_t *msg;
+// int TVHandle = ioctl(SDL_videofd, FBMMSP2CTRL, msg);
if (cx25874!=0) gp2x_tvout_off();
//if tv-out is enabled without cx25874 open, stop
//if (gp2x_memregs[0x2800>>1]&0x100) return;
@@ -152,17 +130,17 @@ void GMenu2X::gp2x_tvout_on(bool pal) {
gp2x_memregs[0x2906>>1]=512;
gp2x_memregs[0x28E4>>1]=gp2x_memregs[0x290C>>1];
gp2x_memregs[0x28E8>>1]=239;
- }
+ }*/
#endif
}
void GMenu2X::gp2x_tvout_off() {
#ifdef TARGET_GP2X
- if (gp2x_mem!=0) {
+/* if (gp2x_mem!=0) {
close(cx25874);
cx25874 = 0;
gp2x_memregs[0x2906>>1]=1024;
- }
+ }*/
#endif
}
@@ -231,27 +209,23 @@ GMenu2X::GMenu2X(int argc, char *argv[]) {
path = "";
getExePath();
-#ifdef TARGET_WIZ
- wiz_mem = 0;
-#elif TARGET_GP2X
+#ifdef TARGET_GP2X
gp2x_mem = 0;
cx25874 = 0;
-#endif
-#if defined(TARGET_GP2X) || defined(TARGET_WIZ)
batteryHandle = 0;
+ backlightHandle = 0;
+
gp2x_init();
-#endif
-#ifdef TARGET_GP2X
//Fix tv-out
- if (gp2x_mem!=0) {
+/* if (gp2x_mem!=0) {
if (gp2x_memregs[0x2800>>1]&0x100) {
gp2x_memregs[0x2906>>1]=512;
//gp2x_memregs[0x290C>>1]=640;
gp2x_memregs[0x28E4>>1]=gp2x_memregs[0x290C>>1];
}
gp2x_memregs[0x28E8>>1]=239;
- }
+ }*/
#endif
//Screen
@@ -261,7 +235,7 @@ GMenu2X::GMenu2X(int argc, char *argv[]) {
}
s = new Surface();
-#if defined(TARGET_GP2X) || defined(TARGET_WIZ)
+#ifdef TARGET_GP2X
{
//I use a tmp variable to hide the cursor as soon as possible (and create the double buffer surface only after that)
//I'm forced to use SW surfaces since with HW there are issuse with changing the clock frequency
@@ -296,12 +270,10 @@ GMenu2X::GMenu2X(int argc, char *argv[]) {
input.init(path+"input.conf");
setInputSpeed();
initServices();
-
- setGamma(confInt["gamma"]);
+ setBacklight(confInt["backlight"]);
setVolume(confInt["globalVolume"]);
applyDefaultTimings();
setClock(confInt["menuClock"]);
-
//recover last session
readTmp();
if (lastSelectorElement>-1 && menu->selLinkApp()!=NULL && (!menu->selLinkApp()->getSelectorDir().empty() || !lastSelectorDir.empty()))
@@ -330,14 +302,14 @@ void GMenu2X::quit() {
s->free();
SDL_Quit();
#ifdef TARGET_GP2X
- if (gp2x_mem!=0) {
+/* if (gp2x_mem!=0) {
//Fix tv-out
if (gp2x_memregs[0x2800>>1]&0x100) {
gp2x_memregs[0x2906>>1]=512;
gp2x_memregs[0x28E4>>1]=gp2x_memregs[0x290C>>1];
}
gp2x_deinit();
- }
+ }*/
#endif
}
@@ -400,18 +372,13 @@ void GMenu2X::initFont() {
font = NULL;
}
- bool ttf = false;
- string fontFile = sc.getSkinFilePath("font.png");
- if (fontFile.empty()) {
- fontFile = sc.getSkinFilePath("font.ttf");
- ttf = true;
- }
+ string fontFile = sc.getSkinFilePath("imgs/font.png");
if (fontFile.empty()) {
- cout << "Font not found!" << endl;
+ cout << "Font png not found!" << endl;
quit();
exit(-1);
}
- font = new SFontPlus(fontFile, ttf, rgbatosdl(skinConfColors["fontColor"]), rgbatosdl(skinConfColors["fontOutlineColor"]));
+ font = new ASFont(fontFile);
}
void GMenu2X::initMenu() {
@@ -431,11 +398,11 @@ void GMenu2X::initMenu() {
menu->addActionLink(i,tr["Skin"],MakeDelegate(this,&GMenu2X::skinMenu),tr["Configure skin"],"skin:icons/skin.png");
menu->addActionLink(i,tr["Wallpaper"],MakeDelegate(this,&GMenu2X::changeWallpaper),tr["Change GMenu2X wallpaper"],"skin:icons/wallpaper.png");
#ifdef TARGET_GP2X
- menu->addActionLink(i,"TV",MakeDelegate(this,&GMenu2X::toggleTvOut),tr["Activate/deactivate tv-out"],"skin:icons/tv.png");
+/* menu->addActionLink(i,"TV",MakeDelegate(this,&GMenu2X::toggleTvOut),tr["Activate/deactivate tv-out"],"skin:icons/tv.png");
menu->addActionLink(i,"USB Sd",MakeDelegate(this,&GMenu2X::activateSdUsb),tr["Activate Usb on SD"],"skin:icons/usb.png");
if (fwType=="gph" && !f200)
menu->addActionLink(i,"USB Nand",MakeDelegate(this,&GMenu2X::activateNandUsb),tr["Activate Usb on Nand"],"skin:icons/usb.png");
- //menu->addActionLink(i,"USB Root",MakeDelegate(this,&GMenu2X::activateRootUsb),tr["Activate Usb on the root of the Gp2x Filesystem"],"skin:icons/usb.png");
+ //menu->addActionLink(i,"USB Root",MakeDelegate(this,&GMenu2X::activateRootUsb),tr["Activate Usb on the root of the Gp2x Filesystem"],"skin:icons/usb.png");*/
#endif
if (fileExists(path+"log.txt"))
menu->addActionLink(i,tr["Log Viewer"],MakeDelegate(this,&GMenu2X::viewLog),tr["Displays last launched program's output"],"skin:icons/ebook.png");
@@ -449,7 +416,7 @@ void GMenu2X::initMenu() {
menu->loadIcons();
//DEBUG
- //menu->addLink( "/mnt/sd/development/gmenu2x/", "sample.pxml", "applications" );
+ //menu->addLink( "/boot/local/", "sample.pxml", "applications" );
}
void GMenu2X::about() {
@@ -458,8 +425,6 @@ void GMenu2X::about() {
Website: http://gmenu2x.sourceforge.net\n\
E-Mail & PayPal account: massimiliano.torromeo@gmail.com\n\
\n\
-Wiz version by Pickle\n\
-\n\
Thanks goes to...\n\
\n\
Contributors\n\
@@ -552,21 +517,15 @@ void GMenu2X::readConfig() {
inf.close();
}
}
-
if (!confStr["lang"].empty()) tr.setLang(confStr["lang"]);
if (!confStr["wallpaper"].empty() && !fileExists(confStr["wallpaper"])) confStr["wallpaper"] = "";
if (confStr["skin"].empty() || !fileExists("skins/"+confStr["skin"])) confStr["skin"] = "Default";
evalIntConf( &confInt["outputLogs"], 0, 0,1 );
-#ifdef TARGET_GP2X
- evalIntConf( &confInt["maxClock"], 300, 200,300 );
-#endif
-#ifdef TARGET_WIZ
- evalIntConf( &confInt["maxClock"], 550, 200,900 );
-#endif
- evalIntConf( &confInt["menuClock"], f200 ? 136 : 100, 50,300 );
+ evalIntConf( &confInt["maxClock"], 430, 200,430 );
+ evalIntConf( &confInt["menuClock"], 200, 200,430 );
evalIntConf( &confInt["globalVolume"], 67, 0,100 );
- evalIntConf( &confInt["gamma"], 1, 1,100 );
+ evalIntConf( &confInt["backlight"], 100, 5,100 );
evalIntConf( &confInt["videoBpp"], 16, 8,32 );
if (confStr["tvoutEncoding"] != "PAL") confStr["tvoutEncoding"] = "NTSC";
@@ -658,12 +617,7 @@ void GMenu2X::writeSkinConfig() {
ConfRGBAHash::iterator endC = skinConfColors.end();
for(ConfRGBAHash::iterator curr = skinConfColors.begin(); curr != endC; curr++)
- inf << curr->first << "=#"
- << hex << setw(2) << setfill('0') << right << curr->second.r
- << hex << setw(2) << setfill('0') << right << curr->second.g
- << hex << setw(2) << setfill('0') << right << curr->second.b
- << hex << setw(2) << setfill('0') << right << curr->second.a << endl;
-
+ inf << curr->first << "=#" << hex << curr->second.r << hex << curr->second.g << hex << curr->second.b << hex << curr->second.a << endl;
inf.close();
sync();
@@ -746,32 +700,66 @@ void GMenu2X::writeTmp(int selelem, string selectordir) {
if (selectordir!="")
inf << "selectordir=" << selectordir << endl;
inf.close();
+ sync();
}
}
void GMenu2X::initServices() {
#ifdef TARGET_GP2X
- if (usbnet) {
+/* if (usbnet) {
string services = "scripts/services.sh "+ip+" "+(inet?"on":"off")+" "+(samba?"on":"off")+" "+(web?"on":"off")+" &";
system(services.c_str());
- }
+ }*/
#endif
}
void GMenu2X::ledOn() {
#ifdef TARGET_GP2X
- if (gp2x_mem!=0 && !f200) gp2x_memregs[0x106E >> 1] ^= 16;
+// if (gp2x_mem!=0 && !f200) gp2x_memregs[0x106E >> 1] ^= 16;
//SDL_SYS_JoystickGp2xSys(joy.joystick, BATT_LED_ON);
#endif
}
void GMenu2X::ledOff() {
#ifdef TARGET_GP2X
- if (gp2x_mem!=0 && !f200) gp2x_memregs[0x106E >> 1] ^= 16;
+// if (gp2x_mem!=0 && !f200) gp2x_memregs[0x106E >> 1] ^= 16;
//SDL_SYS_JoystickGp2xSys(joy.joystick, BATT_LED_OFF);
#endif
}
+void GMenu2X::setBacklight(int val)
+{
+ if ((val >= 0) && (val <=100))
+ {
+ if (backlightHandle)
+ {
+ stringstream valsstr;
+ string valstr = "";
+ if (val < 10)
+ valsstr << "00";
+ else if (val < 100)
+ valsstr << "0" ;
+ valsstr << val;
+ valsstr >> valstr;
+ fprintf(backlightHandle,"%s",valstr.c_str());
+ rewind(backlightHandle);
+ }
+ }
+}
+
+int GMenu2X::getBackLight()
+{
+ int val = 100;
+ if (backlightHandle)
+ {
+ char valcstring[4];
+ fscanf(backlightHandle,"%s",&valcstring);
+ rewind(backlightHandle);
+ val = atoi(valcstring);
+ }
+ return val;
+}
+
int GMenu2X::main() {
uint linksPerPage = linkColumns*linkRows;
int linkSpacingX = (resX-10 - linkColumns*skinConfInt["linkWidth"])/linkColumns;
@@ -786,14 +774,14 @@ int GMenu2X::main() {
stringstream ss;
uint sectionsCoordX = 24;
SDL_Rect re = {0,0,0,0};
-
+ bool helpDisplayed = false;
#ifdef DEBUG
//framerate
long tickFPS = SDL_GetTicks();
int drawn_frames = 0;
string fps = "";
#endif
-
+
IconButton btnContextMenu(this,"skin:imgs/menu.png");
btnContextMenu.setPosition(resX-38, bottomBarIconY);
btnContextMenu.setAction(MakeDelegate(this, &GMenu2X::contextMenu));
@@ -803,7 +791,7 @@ int GMenu2X::main() {
//Background
sc["bgmain"]->blit(s,0,0);
-
+
//Sections
sectionsCoordX = halfX - (constrain((uint)menu->sections.size(), 0 , linkColumns) * skinConfInt["linkWidth"]) / 2;
if (menu->firstDispSection()>0)
@@ -823,7 +811,7 @@ int GMenu2X::main() {
if (sc.exists(sectionIcon))
sc[sectionIcon]->blit(s,x-16,sectionLinkPadding,32,32);
else
- sc.skinRes("icons/section.png")->blit(s,x,sectionLinkPadding);
+ sc.skinRes("icons/section.png")->blit(s,x-16,sectionLinkPadding);
s->write( font, menu->sections[i], x, skinConfInt["topBarHeight"]-sectionLinkPadding, SFontHAlignCenter, SFontVAlignBottom );
}
@@ -878,9 +866,13 @@ int GMenu2X::main() {
}
}
sc.skinRes(batteryIcon)->blit( s, resX-19, bottomBarIconY );
-
+ //s->write( font, tr[batstr.c_str()], 20, 170 );
//On Screen Help
- if (input[ACTION_A]) {
+
+ if(input[ACTION_A] )
+ helpDisplayed = ! helpDisplayed;
+
+ if (helpDisplayed) {
s->box(10,50,300,143, skinConfColors["messageBoxBg"]);
s->rectangle( 12,52,296,helpBoxHeight, skinConfColors["messageBoxBorder"] );
s->write( font, tr["CONTROLS"], 20, 60 );
@@ -892,6 +884,7 @@ int GMenu2X::main() {
s->write( font, tr["SELECT: Show contextual menu"], 20, 155 );
s->write( font, tr["START: Show options menu"], 20, 170 );
if (fwType=="open2x") s->write( font, tr["X: Toggle speaker mode"], 20, 185 );
+
}
#ifdef DEBUG
@@ -907,23 +900,6 @@ int GMenu2X::main() {
s->write( font, fps+" FPS", resX-1,1 ,SFontHAlignRight );
#endif
-
-
-/*
- if (!TTF_WasInit()) TTF_Init();
- TTF_Font *font = TTF_OpenFont("/usr/share/fonts/webcore-vista/CALIBRII.TTF", 12);
- if (font != NULL) {
- cout << "TTF init" << endl;
- SDL_Surface *tmpSurface = TTF_RenderUTF8_Blended(font, "Hello world", (SDL_Color){0,0,0,255});
- SDL_BlitSurface(tmpSurface, NULL, s->raw, NULL);
- SDL_FreeSurface(tmpSurface);
- TTF_CloseFont(font);
- sleep(10);
- }
-*/
-
-
-
s->flip();
//touchscreen
@@ -988,16 +964,11 @@ int GMenu2X::main() {
if ( input.isActive(ACTION_VOLUP) && input.isActive(ACTION_VOLDOWN) ) menu->selLinkApp()->setVolume(-1);
} else {
// CLOCK
-#if defined(TARGET_WIZ)
- int inc = 10;
-#else
- int inc = 1;
-#endif
if ( input[ACTION_VOLDOWN] && !input.isActive(ACTION_VOLUP) )
- menu->selLinkApp()->setClock( constrain(menu->selLinkApp()->clock()-inc,50,confInt["maxClock"]) );
+ menu->selLinkApp()->setClock( constrain(menu->selLinkApp()->clock()-1,200,confInt["maxClock"]) );
if ( input[ACTION_VOLUP] && !input.isActive(ACTION_VOLDOWN) )
- menu->selLinkApp()->setClock( constrain(menu->selLinkApp()->clock()+inc,50,confInt["maxClock"]) );
- if ( input.isActive(ACTION_VOLUP) && input.isActive(ACTION_VOLDOWN) ) menu->selLinkApp()->setClock(200);
+ menu->selLinkApp()->setClock( constrain(menu->selLinkApp()->clock()+1,200,confInt["maxClock"]) );
+ if ( input.isActive(ACTION_VOLUP) && input.isActive(ACTION_VOLDOWN) ) menu->selLinkApp()->setClock(336);
}
}
if ( input.isActive(ACTION_A) ) {
@@ -1021,7 +992,7 @@ int GMenu2X::main() {
}
void GMenu2X::explorer() {
- FileDialog fd(this,tr["Select an application"],".gpu,.gpe,.sh");
+ FileDialog fd(this,tr["Select an application"],".gpu,.dge,.sh");
if (fd.exec()) {
if (confInt["saveSelection"] && (confInt["section"]!=menu->selSectionIndex() || confInt["link"]!=menu->selLinkIndex()))
writeConfig();
@@ -1047,8 +1018,8 @@ void GMenu2X::options() {
int curMenuClock = confInt["menuClock"];
int curGlobalVolume = confInt["globalVolume"];
//G
- int prevgamma = confInt["gamma"];
- bool showRootFolder = fileExists("/mnt/root");
+ int prevbacklight = confInt["backlight"];
+ bool showRootFolder = fileExists("/boot/local");
FileLister fl_tr("translations");
fl_tr.browse();
@@ -1062,32 +1033,26 @@ void GMenu2X::options() {
SettingsDialog sd(this,tr["Settings"]);
sd.addSetting(new MenuSettingMultiString(this,tr["Language"],tr["Set the language used by GMenu2X"],&lang,&fl_tr.files));
sd.addSetting(new MenuSettingBool(this,tr["Save last selection"],tr["Save the last selected link and section on exit"],&confInt["saveSelection"]));
-#ifdef TARGET_GP2X
- sd.addSetting(new MenuSettingInt(this,tr["Clock for GMenu2X"],tr["Set the cpu working frequency when running GMenu2X"],&confInt["menuClock"],50,325));
- sd.addSetting(new MenuSettingInt(this,tr["Maximum overclock"],tr["Set the maximum overclock for launching links"],&confInt["maxClock"],50,325));
-#endif
-#ifdef TARGET_WIZ
- sd.addSetting(new MenuSettingInt(this,tr["Clock for GMenu2X"],tr["Set the cpu working frequency when running GMenu2X"],&confInt["menuClock"],50,900,10));
- sd.addSetting(new MenuSettingInt(this,tr["Maximum overclock"],tr["Set the maximum overclock for launching links"],&confInt["maxClock"],50,900,10));
-#endif
+ sd.addSetting(new MenuSettingInt(this,tr["Clock for GMenu2X"],tr["Set the cpu working frequency when running GMenu2X"],&confInt["menuClock"],200,430));
+ sd.addSetting(new MenuSettingInt(this,tr["Maximum overclock"],tr["Set the maximum overclock for launching links"],&confInt["maxClock"],200,430));
sd.addSetting(new MenuSettingInt(this,tr["Global Volume"],tr["Set the default volume for the gp2x soundcard"],&confInt["globalVolume"],0,100));
sd.addSetting(new MenuSettingBool(this,tr["Output logs"],tr["Logs the output of the links. Use the Log Viewer to read them."],&confInt["outputLogs"]));
//G
- sd.addSetting(new MenuSettingInt(this,tr["Gamma"],tr["Set gp2x gamma value (default: 10)"],&confInt["gamma"],1,100));
- sd.addSetting(new MenuSettingMultiString(this,tr["Tv-Out encoding"],tr["Encoding of the tv-out signal"],&confStr["tvoutEncoding"],&encodings));
+ sd.addSetting(new MenuSettingInt(this,tr["Lcd Backlight"],tr["Set dingoo's Lcd Backlight value (default: 100)"],&confInt["backlight"],5,100));
+// sd.addSetting(new MenuSettingMultiString(this,tr["Tv-Out encoding"],tr["Encoding of the tv-out signal"],&confStr["tvoutEncoding"],&encodings));
sd.addSetting(new MenuSettingBool(this,tr["Show root"],tr["Show root folder in the file selection dialogs"],&showRootFolder));
if (sd.exec() && sd.edited()) {
//G
- if (prevgamma != confInt["gamma"]) setGamma(confInt["gamma"]);
+ if (prevbacklight != confInt["backlight"]) setBacklight(confInt["backlight"]);
if (curMenuClock!=confInt["menuClock"]) setClock(confInt["menuClock"]);
if (curGlobalVolume!=confInt["globalVolume"]) setVolume(confInt["globalVolume"]);
if (lang == "English") lang = "";
if (lang != tr.lang()) tr.setLang(lang);
- if (fileExists("/mnt/root") && !showRootFolder)
- unlink("/mnt/root");
- else if (!fileExists("/mnt/root") && showRootFolder)
- symlink("/","/mnt/root");
+ if (fileExists("/boot/local") && !showRootFolder)
+ unlink("/boot/local");
+ else if (!fileExists("/boot/local") && showRootFolder)
+ symlink("/","/boot/local");
writeConfig();
}
}
@@ -1102,7 +1067,7 @@ void GMenu2X::settingsOpen2x() {
sd.addSetting(new MenuSettingBool(this,tr["USB host on boot"],tr["Allow USB host to be started at boot time"],&o2x_usb_host_on_boot));
sd.addSetting(new MenuSettingBool(this,tr["USB HID on boot"],tr["Allow USB HID to be started at boot time"],&o2x_usb_hid_on_boot));
sd.addSetting(new MenuSettingBool(this,tr["USB storage on boot"],tr["Allow USB storage to be started at boot time"],&o2x_usb_storage_on_boot));
- //sd.addSetting(new MenuSettingInt(this,tr["Speaker Mode on boot"],tr["Set Speaker mode. 0 = Mute, 1 = Phones, 2 = Speaker"],&volumeMode,0,2,1));
+ //sd.addSetting(new MenuSettingInt(this,tr["Speaker Mode on boot"],tr["Set Speaker mode. 0 = Mute, 1 = Phones, 2 = Speaker"],&volumeMode,0,2));
sd.addSetting(new MenuSettingInt(this,tr["Speaker Scaler"],tr["Set the Speaker Mode scaling 0-150\% (default is 100\%)"],&volumeScalerNormal,0,150));
sd.addSetting(new MenuSettingInt(this,tr["Headphones Scaler"],tr["Set the Headphones Mode scaling 0-100\% (default is 65\%)"],&volumeScalerPhones,0,100));
@@ -1131,8 +1096,6 @@ void GMenu2X::skinMenu() {
sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Color"],tr["Background color of the message box"],&skinConfColors["messageBoxBg"]));
sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Border Color"],tr["Border color of the message box"],&skinConfColors["messageBoxBorder"]));
sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Selection Color"],tr["Color of the selection of the message box"],&skinConfColors["messageBoxSelection"]));
- sd.addSetting(new MenuSettingRGBA(this,tr["Font Color"],tr["Color of the font"],&skinConfColors["fontColor"]));
- sd.addSetting(new MenuSettingRGBA(this,tr["Font Outline Color"],tr["Color of the font's outline"],&skinConfColors["fontOutlineColor"]));
if (sd.exec() && sd.edited()) {
if (curSkin != confStr["skin"]) {
@@ -1146,10 +1109,10 @@ void GMenu2X::skinMenu() {
void GMenu2X::toggleTvOut() {
#ifdef TARGET_GP2X
- if (cx25874!=0)
+/* if (cx25874!=0)
gp2x_tvout_off();
else
- gp2x_tvout_on(confStr["tvoutEncoding"] == "PAL");
+ gp2x_tvout_on(confStr["tvoutEncoding"] == "PAL");*/
#endif
}
@@ -1172,8 +1135,6 @@ void GMenu2X::setSkin(string skin, bool setWallpaper) {
skinConfColors["messageBoxBg"] = (RGBAColor){255,255,255,255};
skinConfColors["messageBoxBorder"] = (RGBAColor){80,80,80,255};
skinConfColors["messageBoxSelection"] = (RGBAColor){160,160,160,255};
- skinConfColors["fontColor"] = (RGBAColor){255,255,255,255};
- skinConfColors["fontOutlineColor"] = (RGBAColor){0,0,0,130};
//load skin settings
string skinconfname = "skins/"+skin+"/skin.conf";
@@ -1429,6 +1390,7 @@ void GMenu2X::editLink() {
int linkVolume = menu->selLinkApp()->volume();
//G
int linkGamma = menu->selLinkApp()->gamma();
+ int linkBacklight = menu->selLinkApp()->backlight();
string diagTitle = tr.translate("Edit link: $1",linkTitle.c_str(),NULL);
string diagIcon = menu->selLinkApp()->getIconPath();
@@ -1439,14 +1401,10 @@ void GMenu2X::editLink() {
sd.addSetting(new MenuSettingMultiString(this,tr["Section"],tr["The section this link belongs to"],&newSection,&menu->sections));
sd.addSetting(new MenuSettingImage(this,tr["Icon"],tr.translate("Select an icon for the link: $1",linkTitle.c_str(),NULL),&linkIcon,".png,.bmp,.jpg,.jpeg"));
sd.addSetting(new MenuSettingFile(this,tr["Manual"],tr["Select a graphic/textual manual or a readme"],&linkManual,".man.png,.txt"));
-#ifdef TARGET_GP2X
- sd.addSetting(new MenuSettingInt(this,tr["Clock (default: 200)"],tr["Cpu clock frequency to set when launching this link"],&linkClock,50,confInt["maxClock"]));
-#endif
-#ifdef TARGET_WIZ
- sd.addSetting(new MenuSettingInt(this,tr["Clock (default: 550)"],tr["Cpu clock frequency to set when launching this link"],&linkClock,50,confInt["maxClock"],10));
-#endif
- sd.addSetting(new MenuSettingBool(this,tr["Tweak RAM Timings"],tr["This usually speeds up the application at the cost of stability"],&linkUseRamTimings));
+ sd.addSetting(new MenuSettingInt(this,tr["Clock (default: 336)"],tr["Cpu clock frequency to set when launching this link"],&linkClock,200,confInt["maxClock"]));
+// sd.addSetting(new MenuSettingBool(this,tr["Tweak RAM Timings"],tr["This usually speeds up the application at the cost of stability"],&linkUseRamTimings));
sd.addSetting(new MenuSettingInt(this,tr["Volume (default: -1)"],tr["Volume to set for this link"],&linkVolume,-1,100));
+ sd.addSetting(new MenuSettingInt(this,tr["Backlight (default: 100)"],tr["LCD backlight value to set when launching this link"],&linkBacklight,5,100));
sd.addSetting(new MenuSettingString(this,tr["Parameters"],tr["Parameters to pass to the application"],&linkParams, diagTitle,diagIcon));
sd.addSetting(new MenuSettingDir(this,tr["Selector Directory"],tr["Directory to scan for the selector"],&linkSelDir));
sd.addSetting(new MenuSettingBool(this,tr["Selector Browser"],tr["Allow the selector to change directory"],&linkSelBrowser));
@@ -1454,7 +1412,6 @@ void GMenu2X::editLink() {
sd.addSetting(new MenuSettingDir(this,tr["Selector Screenshots"],tr["Directory of the screenshots for the selector"],&linkSelScreens));
sd.addSetting(new MenuSettingFile(this,tr["Selector Aliases"],tr["File containing a list of aliases for the selector"],&linkSelAliases));
//G
- sd.addSetting(new MenuSettingInt(this,tr["Gamma (default: 0)"],tr["Gamma value to set when launching this link"],&linkGamma,0,100));
sd.addSetting(new MenuSettingBool(this,tr["Wrapper"],tr["Explicitly relaunch GMenu2X after this link's execution ends"],&menu->selLinkApp()->wrapper));
sd.addSetting(new MenuSettingBool(this,tr["Don't Leave"],tr["Don't quit GMenu2X when launching this link"],&menu->selLinkApp()->dontleave));
@@ -1475,7 +1432,7 @@ void GMenu2X::editLink() {
menu->selLinkApp()->setClock(linkClock);
menu->selLinkApp()->setVolume(linkVolume);
//G
- menu->selLinkApp()->setGamma(linkGamma);
+ menu->selLinkApp()->setBacklight(linkBacklight);
#ifdef DEBUG
cout << "New Section: " << newSection << endl;
@@ -1591,9 +1548,9 @@ void GMenu2X::scanner() {
#ifdef _TARGET_PANDORA
//char *configpath = pnd_conf_query_searchpath();
#else
- if (confInt["menuClock"]<200) {
- setClock(200);
- scanbg.write(font,tr["Raising cpu clock to 200Mhz"],5,lineY);
+ if (confInt["menuClock"]<430) {
+ setClock(336);
+ scanbg.write(font,tr["Raising cpu clock to 336Mhz"],5,lineY);
scanbg.blit(s,0,0);
s->flip();
lineY += 26;
@@ -1605,17 +1562,17 @@ void GMenu2X::scanner() {
lineY += 26;
vector<string> files;
- scanPath("/mnt/sd",&files);
+ scanPath("/boot/local/",&files);
//Onyl gph firmware has nand
- if (fwType=="gph" && !f200) {
+/* if (fwType=="gph" && !f200) {
scanbg.write(font,tr["Scanning NAND filesystem..."],5,lineY);
scanbg.blit(s,0,0);
s->flip();
lineY += 26;
- scanPath("/mnt/nand",&files);
+ scanPath("/boot/local/nand",&files);
}
-
+*/
stringstream ss;
ss << files.size();
string str = "";
@@ -1650,7 +1607,7 @@ void GMenu2X::scanner() {
s->flip();
lineY += 26;
- if (confInt["menuClock"]<200) {
+ if (confInt["menuClock"]<430) {
setClock(confInt["menuClock"]);
scanbg.write(font,tr["Decreasing cpu clock"],5,lineY);
scanbg.blit(s,0,0);
@@ -1688,8 +1645,8 @@ void GMenu2X::scanPath(string path, vector<string> *files) {
scanPath(filepath, files);
if (statRet != -1) {
ext = filepath.substr(filepath.length()-4,4);
-#if defined(TARGET_GP2X) || defined(TARGET_WIZ)
- if (ext==".gpu" || ext==".gpe")
+#ifdef TARGET_GP2X
+ if (ext==".gpu" || ext==".dge")
#else
if (ext==".pxml")
#endif
@@ -1701,8 +1658,8 @@ void GMenu2X::scanPath(string path, vector<string> *files) {
}
unsigned short GMenu2X::getBatteryLevel() {
-#if defined(TARGET_GP2X) || defined(TARGET_WIZ)
- if (batteryHandle<=0) return 0;
+#ifdef TARGET_GP2X
+/* if (batteryHandle<=0) return 0;
if (f200) {
MMSP2ADC val;
@@ -1733,7 +1690,18 @@ unsigned short GMenu2X::getBatteryLevel() {
if (battval>700) return 3;
if (battval>690) return 2;
if (battval>680) return 1;
- }
+ }*/
+ if (!batteryHandle) return 0;
+ int battval = 0;
+ char battvalcstr[5];
+ fscanf(batteryHandle,"%s",&battvalcstr);
+ rewind(batteryHandle);
+ battval = atoi(battvalcstr);
+ if (battval>4000) return 5;
+ if (battval>3800) return 4;
+ if (battval>3600) return 3;
+ if (battval>3400) return 2;
+ if (battval>3200) return 1;
return 0;
#else
return 6; //AC Power
@@ -1759,29 +1727,31 @@ void GMenu2X::setInputSpeed() {
void GMenu2X::applyRamTimings() {
#ifdef TARGET_GP2X
// 6 4 1 1 1 2 2
- if (gp2x_mem!=0) {
+/* if (gp2x_mem!=0) {
int tRC = 5, tRAS = 3, tWR = 0, tMRD = 0, tRFC = 0, tRP = 1, tRCD = 1;
gp2x_memregs[0x3802>>1] = ((tMRD & 0xF) << 12) | ((tRFC & 0xF) << 8) | ((tRP & 0xF) << 4) | (tRCD & 0xF);
gp2x_memregs[0x3804>>1] = ((tRC & 0xF) << 8) | ((tRAS & 0xF) << 4) | (tWR & 0xF);
- }
+ }*/
#endif
}
void GMenu2X::applyDefaultTimings() {
#ifdef TARGET_GP2X
// 8 16 3 8 8 8 8
- if (gp2x_mem!=0) {
+/* if (gp2x_mem!=0) {
int tRC = 7, tRAS = 15, tWR = 2, tMRD = 7, tRFC = 7, tRP = 7, tRCD = 7;
gp2x_memregs[0x3802>>1] = ((tMRD & 0xF) << 12) | ((tRFC & 0xF) << 8) | ((tRP & 0xF) << 4) | (tRCD & 0xF);
gp2x_memregs[0x3804>>1] = ((tRC & 0xF) << 8) | ((tRAS & 0xF) << 4) | (tWR & 0xF);
- }
+ }*/
#endif
}
+
+
void GMenu2X::setClock(unsigned mhz) {
- mhz = constrain(mhz,50,confInt["maxClock"]);
+ mhz = constrain(mhz,200,confInt["maxClock"]);
#ifdef TARGET_GP2X
- if (gp2x_mem!=0) {
+/* if (gp2x_mem!=0) {
unsigned v;
unsigned mdiv,pdiv=3,scale=0;
mhz*=1000000;
@@ -1791,26 +1761,14 @@ void GMenu2X::setClock(unsigned mhz) {
scale&=3;
v=mdiv | pdiv | scale;
MEM_REG[0x910>>1]=v;
- }
-#endif
-#ifdef TARGET_WIZ
- unsigned long v;
- unsigned mdiv, pdiv=9, sdiv=0;
- if (wiz_mem!=0) {
- printf( "Setting clockspeed to %d\n", mhz );
- mdiv= (mhz * pdiv) / SYS_CLK_FREQ;
- mdiv &= 0x3FF;
- v= pdiv<<18 | mdiv<<8 | sdiv;
-
- PLLSETREG0 = v;
- PWRMODE |= 0x8000;
- }
+ }*/
+ jz_cpuspeed(mhz);
#endif
}
void GMenu2X::setGamma(int gamma) {
#ifdef TARGET_GP2X
- float fgamma = (float)constrain(gamma,1,100)/10;
+/* float fgamma = (float)constrain(gamma,1,100)/10;
fgamma = 1 / fgamma;
MEM_REG[0x2880>>1]&=~(1<<12);
MEM_REG[0x295C>>1]=0;
@@ -1820,32 +1778,39 @@ void GMenu2X::setGamma(int gamma) {
unsigned short s = (g<<8) | g;
MEM_REG[0x295E>>1]= s;
MEM_REG[0x295E>>1]= g;
- }
+ }*/
#endif
}
int GMenu2X::getVolume() {
- int vol = -1;
- unsigned long soundDev = open("/dev/mixer", O_RDONLY);
- if (soundDev) {
- ioctl(soundDev, SOUND_MIXER_READ_PCM, &vol);
- close(soundDev);
- if (vol != -1) {
- //just return one channel , not both channels, they're hopefully the same anyways
- return vol & 0xFF;
+ unsigned long mixer;
+ int basevolume = -1;
+ mixer = open("/dev/mixer", O_RDONLY);
+ if(mixer)
+ {
+ if (ioctl(mixer, SOUND_MIXER_READ_VOLUME, &basevolume) == -1) {
+ fprintf(stderr, "Failed opening mixer for read - VOLUME\n");
}
+ close(mixer);
+ if(basevolume != -1)
+ return (basevolume>>8) & basevolume ;
}
- return vol;
+ return basevolume;
}
void GMenu2X::setVolume(int vol) {
- vol = constrain(vol,0,100);
- unsigned long soundDev = open("/dev/mixer", O_RDWR);
- if (soundDev) {
- vol = (vol << 8) | vol;
- ioctl(soundDev, SOUND_MIXER_WRITE_PCM, &vol);
- close(soundDev);
+ unsigned long mixer;
+ int newvolume = vol;
+ int oss_volume = newvolume | (newvolume << 8); // set volume for both channels
+ mixer = open("/dev/mixer", O_WRONLY);
+ if(mixer)
+ {
+ if (ioctl(mixer, SOUND_MIXER_WRITE_VOLUME, &oss_volume) == -1) {
+ fprintf(stderr, "Failed opening mixer for write - VOLUME\n");
+ }
+ close(mixer);
}
+
}
void GMenu2X::setVolumeScaler(int scale) {
@@ -1885,7 +1850,7 @@ string GMenu2X::getDiskFree() {
string df = "";
struct statvfs b;
- int ret = statvfs("/mnt/sd", &b);
+ int ret = statvfs("/boot/local/gmenu2x", &b);
if (ret==0) {
/*unsigned long free = b.f_bfree*b.f_frsize/1048576;
unsigned long total = b.f_blocks*b.f_frsize/1048576;
View
18 src/gmenu2x.h
@@ -45,6 +45,8 @@ const int BATTERY_READS = 10;
const int LOOP_DELAY=30000;
+extern void jz_cpuspeed(unsigned clockspeed);
+
using std::string;
using fastdelegate::FastDelegate0;
using google::dense_hash_map;
@@ -82,10 +84,10 @@ class GMenu2X {
@return A number representing battery charge. 0 means fully discharged. 5 means fully charged. 6 represents a gp2x using AC power.
*/
unsigned short getBatteryLevel();
- int batteryHandle;
+ FILE* batteryHandle, *backlightHandle;
void browsePath(string path, vector<string>* directories, vector<string>* files);
/*!
- Starts the scanning of the nand and sd filesystems, searching for gpe and gpu files and creating the links in 2 dedicated sections.