Changeset 433

Timestamp:

10/14/08 22:37:22 (1 year ago)

Author:

jdecq

Message:

changes for Gecko 1.9 on Windows
updating Readme

Files:

• trunk/uploadr/MacUploadr.app/Contents/Resources/components/flGM.vcproj (modified) (5 diffs)
• trunk/uploadr/MacUploadr.app/Contents/Resources/components/flKey.vcproj (modified) (5 diffs)
• trunk/uploadr/README.windows (modified) (10 diffs)

trunk/uploadr/MacUploadr.app/Contents/Resources/components/flGM.vcproj

@@ -43 +43 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-gecko-sdk.win
+xulrunner-sdk\sdk
-                                PreprocessorDefinitions="XP_WIN;XP_WIN32;NDEBUG;WIN32;_CONSOLE;_VISUALC_;NeedFunctionPrototypes;_MAGICKMOD_;_LIB;NEED_SOCKETS"
-                                MinimalRebuild="true"
@@ -70 +70 @@
-                                OutputFile="$(ProjectName).dll"
-                                LinkIncremental="2"
-gecko-sdk.win
+xulrunner-sdk\sdk
-                                GenerateDebugInformation="true"
-                                SubSystem="2"
@@ -127 +127 @@
-                        <Tool
-                                Name="VCCLCompilerTool"
-gecko-sdk.win\include&quot;;&quot;..\..\..\..\..\GraphicsMagick-1.1.10\Magick++\lib&quot;;&quot;..\..\..\..\..\GraphicsMagick-1.1.10&quot;;&quot;..\..\..\..\..\exiv2-0.16\src&quot;;c:\msys\1.0\local\include\ffmpeg;c:\msys\1.0\local\include
+xulrunner-sdk\sdk\include&quot;;&quot;..\..\..\..\GraphicsMagick-1.2.5\Magick++\lib&quot;;&quot;..\..\..\..\GraphicsMagick-1.2.5&quot;;&quot;..\..\..\..\exiv2-0.17.1\src&quot;;C:\msys\home\jdecq\ffmpeg;c:\msys\1.0\local\include;.\
-                                PreprocessorDefinitions="XP_WIN;XP_WIN32;NDEBUG;WIN32;_CONSOLE;_VISUALC_;NeedFunctionPrototypes;_MAGICKMOD_;_LIB;NEED_SOCKETS;XML_STATIC"
-                                RuntimeLibrary="2"
+                                TreatWChar_tAsBuiltInType="false"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="0"
@@ -148 +149 @@
-                                Name="VCLinkerTool"
-                                AdditionalOptions="/NODEFAULTLIB:libcmt.lib"
-
+swscale.a lib
-                                OutputFile="$(ProjectName).dll"
-                                LinkIncremental="1"
-
+
+
-                                GenerateDebugInformation="true"
-                                SubSystem="2"
@@ -182 +184 @@
-                        <Tool
-                                Name="VCPostBuildEventTool"
+                                Description="clear out cache"
+                                CommandLine="&quot;C:\Documents and Settings\jdecq\Application Data\Flickr\Flickr Uploadr\Profiles\nqdgl4yz.default\clearcache.bat&quot;"
-                        />
-                </Configuration>

trunk/uploadr/MacUploadr.app/Contents/Resources/components/flKey.vcproj

@@ -4 +4 @@
-        Version="8.00"
-        Name="key"
-575D254B-9B3B-4CBD-891E-22D3A870E4D9
+F53783EC-1288-478F-A730-8EA3F375A026
-        RootNamespace="flKey"
-        Keyword="Win32Proj"
@@ -43 +43 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-gecko-sdk.win
+xulrunner-sdk\sdk
-                                PreprocessorDefinitions="XP_WIN;XP_WIN32;NDEBUG;WIN32;_CONSOLE;_VISUALC_;NeedFunctionPrototypes;_MAGICKMOD_;_LIB;NEED_SOCKETS"
-                                MinimalRebuild="true"
@@ -70 +70 @@
-                                OutputFile="$(ProjectName).dll"
-                                LinkIncremental="2"
-gecko-sdk.win
+xulrunner-sdk\sdk
-                                GenerateDebugInformation="true"
-                                SubSystem="2"
@@ -127 +127 @@
-                        <Tool
-                                Name="VCCLCompilerTool"
-gecko-sdk.win
+xulrunner-sdk\sdk
-                                PreprocessorDefinitions="XP_WIN;XP_WIN32;NDEBUG;WIN32;_CONSOLE;_VISUALC_;NeedFunctionPrototypes;_MAGICKMOD_;_LIB;NEED_SOCKETS"
-                                RuntimeLibrary="2"
+                                TreatWChar_tAsBuiltInType="false"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
@@ -151 +152 @@
-                                OutputFile="$(ProjectName).dll"
-                                LinkIncremental="1"
-gecko-sdk.win
+xulrunner-sdk\sdk
-                                GenerateDebugInformation="true"
-                                SubSystem="2"

trunk/uploadr/README.windows

@@ -65 +65 @@
-Follow these steps to get MSYS working with Visual Studio:
-
-arrozcru.no-ip.org
+ffmpeg.arrozcru.com
-
-From the same download page, download the following packages:
-
-  From the MinGW Runtime section:
--runtime-3.14
+rt-3.15-mingw32-dev
-
-  From the GNU Binutils section:
@@ -76 +76 @@
-
-  From the MinGW API for MS-Windows section:
-
+ (because of http://archives.free.net.ph/message/20080910.160811.a4295713.en.html, not using 3.12 yet)
-
-  From the GCC Version 4 / Technology Preview: gcc-4.2.1-sjlj-2 section:
@@ -90 +90 @@
-  gcc-sjlj.exe to gcc.exe
-
+Make sure you have C:\msys\mingw\lib\crt2.o (comes from MinGW Runtime section)
+
-Follow these instructions to make mingw work with msys:
-
-arrozcru.no-ip.org
+ffmpeg.arrozcru.com
-
-You probably already have an SVN client, but if not, you can grab the
@@ -137 +139 @@
-
-Place the SDK here:
-gecko-sdk.win
-
-8
+xulrunner-sdk
+
+9
-if the XPCOM components use only frozen interfaces.  Fortunately,
-Uploadr currently falls into this category.
@@ -148 +150 @@
-
-Extract that and copy glib-1.2.dll and libIDL-0.6.dll from
-gecko-sdk.win
+xulrunner-sdk/sdk
-
-
@@ -214 +216 @@
-and adding "&" to make all of the catches happen by reference.  The
-official builds are build with 1.1.10 and will soon move to 1.1.11.
+build 1.2.5 builds all the CORE_* projects fine
-
-You can verify that enough of it built correctly by checking in the 
@@ -220 +223 @@
-
-Add the path to your GraphicsMagick build's VisualMagick\lib directory
-
-
+
+
+
-
-The magic.mgk, modules.mgk and delegates.mgk files must be in the root of
@@ -286 +290 @@
---- I'm dubious that we need to install anything extra here [CAL]
---- But i need to wait until i actually get gm.dll linking
-
+ (got it from zlib-1.2.3-MSYS-1.0.11-1.tar.bz2 from the MSYS supplementary tool download URL)
----   http://wiki.videolan.org/Win32CompileMSYS
-
@@ -300 +304 @@
-The lastest version of FFmpeg is kinda broken on windows and needs
-to be built one library at a time,. This should do the trick:
+ --- JDE : Note = with trunk from 09/17/08, make just works
+BUT
+had to patch MinGW as described at http://ffmpeg.arrozcru.org/wiki/index.php?title=MSys_MinGW
+and commented out the #include <sys/select.h>
-
-  $ cd libswscale && make && cd ..
@@ -325 +333 @@
-  UPLOADR/MacUploadr.app/Contents/Resources/components/*.vcproj
-
+Modify project properties to use your paths to GraphicsMagick and exiv2-0.17.1
+
-The two projects will generate gm.dll and key.dll.
-