From c2fd06582a447241e51ad52527f7d82624ff375b Mon Sep 17 00:00:00 2001 From: darco Date: Thu, 24 Mar 2005 21:48:14 +0000 Subject: [PATCH] minor update git-svn-id: http://svn.voria.com/code@11 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/Makefile.am | 4 ++-- synfig-studio/trunk/images/Makefile.am | 16 ++++++++-------- synfig-studio/trunk/src/gtkmm/app.cpp | 17 ++++++++++++----- synfig-studio/trunk/win32inst.nsi.in | 2 +- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am index 4fdd09f..c1eaf84 100644 --- a/synfig-studio/trunk/Makefile.am +++ b/synfig-studio/trunk/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/studio/Makefile.am,v 1.2 2005/01/17 06:25:42 darco Exp $ +# $Header: /opt/voria/cvs/studio/Makefile.am,v 1.3 2005/03/24 21:40:05 darco Exp $ AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2 @@ -70,7 +70,7 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC $(DOXYGEN) doxygen.cfg touch .doc_stamp -win32inst.nsi: win32inst.nsi.in +win32inst.nsi: $(srcdir)/win32inst.nsi.in ./config.status win32inst.nsi installer: all win32inst.nsi diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index 523a6e4..ccffef1 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -21,13 +21,13 @@ SUFFIXES=.sif .tif .png PNGTOICO=pngtoico CONVERT=convert -sif_icon.ico: - $(SINFG) sif_icon.sif -w 16 -h 16 -o sif_icon_16.gif sif_icon.sif -w 32 -h 32 -o sif_icon_32.gif sif_icon.sif -w 64 -h 64 -o sif_icon_64.gif +sif_icon.ico: $(srcdir)/sif_icon.sif + $(SINFG) $< -w 16 -h 16 -o sif_icon_16.gif sif_icon.sif -w 32 -h 32 -o sif_icon_32.gif sif_icon.sif -w 64 -h 64 -o sif_icon_64.gif $(CONVERT) sif_icon_16.gif sif_icon_16.png $(CONVERT) sif_icon_32.gif sif_icon_32.png $(CONVERT) sif_icon_64.gif sif_icon_64.png - $(PNGTOICO) sif_icon_64.png > sif_icon.ico -# $(PNGTOICO) sif_icon_16.png sif_icon_32.png sif_icon_64.png > sif_icon.ico + $(PNGTOICO) sif_icon_64.png > $@ +# $(PNGTOICO) sif_icon_16.png sif_icon_32.png sif_icon_64.png > $@ clean: $(RM) $(CLEANFILES) @@ -38,16 +38,16 @@ clean: .sif.$(EXT): $(SINFG) -q $< -o $@ --time 0 -keyframe_lock_all.$(EXT): keyframe_lock_icon.sif +keyframe_lock_all.$(EXT): $(srcdir)/keyframe_lock_icon.sif $(SINFG) -q $< -o $@ --time 0 -keyframe_lock_past.$(EXT): keyframe_lock_icon.sif +keyframe_lock_past.$(EXT): $(srcdir)/keyframe_lock_icon.sif $(SINFG) -q $< -o $@ --time 0 -c PastOnly -keyframe_lock_future.$(EXT): keyframe_lock_icon.sif +keyframe_lock_future.$(EXT): $(srcdir)/keyframe_lock_icon.sif $(SINFG) -q $< -o $@ --time 0 -c FutureOnly -keyframe_lock_none.$(EXT): keyframe_lock_icon.sif +keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif $(SINFG) -q $< -o $@ --time 0 -c Disabled #.sif.png: diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index b63b37d..49cce74 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -2,7 +2,7 @@ /*! \file app.cpp ** \brief writeme ** -** $Id: app.cpp,v 1.10 2005/01/17 06:31:12 darco Exp $ +** $Id: app.cpp,v 1.11 2005/03/24 21:47:28 darco Exp $ ** ** \legal ** Copyright (c) 2002 Robert B. Quattlebaum Jr. @@ -371,7 +371,14 @@ static inline U32 hash_U32(U32 i) return i; } -inline int v_unwind_key(V_KeyUnwound* unwound, const char* key) +#ifdef BIG_ENDIAN +static const int endian_fix_table[8] = { 3, 2, 1, 0, 7, 6, 5, 4 } ; +#define endian_fix(x) (endian_fix_table[x]) +#else +#define endian_fix(x) (x) +#endif + +int v_unwind_key(V_KeyUnwound* unwound, const char* key) { int i; unwound->element.serial=0; @@ -408,7 +415,7 @@ inline int v_unwind_key(V_KeyUnwound* unwound, const char* key) return 1; } -inline int v_key_check(const char* key, U32* serial, U32 appid) +int v_key_check(const char* key, U32* serial, U32 appid) { V_KeyUnwound unwound_key; U32 appid_mask_a=hash_U32(appid); @@ -423,12 +430,12 @@ inline int v_key_check(const char* key, U32* serial, U32 appid) // Undo obfuscation pass { - U32 next=hash_U32(unwound_key.raw[7]); + U32 next=hash_U32(unwound_key.raw[endian_fix(7)]); int i; for(i=0;i<7;i++) { next=hash_U32(next); - unwound_key.raw[i]^=(next>>24); + unwound_key.raw[endian_fix(i)]^=(next>>24); } } diff --git a/synfig-studio/trunk/win32inst.nsi.in b/synfig-studio/trunk/win32inst.nsi.in index 8594deb..633be38 100644 --- a/synfig-studio/trunk/win32inst.nsi.in +++ b/synfig-studio/trunk/win32inst.nsi.in @@ -38,7 +38,7 @@ InstallDirRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir" ; Pages !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "alphalicense.txt" +!insertmacro MUI_PAGE_LICENSE "@srcdir@\alphalicense.txt" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES -- 2.7.4