Changeset 154416 in webkit


Ignore:
Timestamp:
Aug 21, 2013 2:24:22 PM (11 years ago)
Author:
achristensen@apple.com
Message:

<https://webkit.org/b/120137> Separating Win32 and Win64 builds.

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

Pass PlatformArchitecture as a command line parameter to bash scripts.

Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).

Source/WebCore:

  • WebCore.vcxproj/WebCoreGenerated.make:
  • WebCore.vcxproj/WebCoreGeneratedWinCairo.make:

Pass PlatformArchitecture as a command line parameter to bash scripts
and use PlatformArchitecture to determine which directory to delete
while cleaning (obj32 or obj64).

  • WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props:

Export PlatformArchitecture to be used by make and cmd scripts.

  • WebCore.vcxproj/build-generated-files.sh:

Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).

  • WebCore.vcxproj/copyForwardingHeaders.cmd:
  • WebCore.vcxproj/copyWebCoreResourceFiles.cmd:

Use PlatformArchitecture to determine which directory to copy to (obj32 or obj64).

Source/WebKit:

  • WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
  • WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
  • WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd:
  • WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:

Use PlatformArchitecture to determine correct object directory (obj32 or obj64).

Source/WTF:

  • WTF.vcxproj/WTFGenerated.make:

Pass PlatformArchitecture as a command line parameter to bash scripts.

  • WTF.vcxproj/build-generated-files.sh:

Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).

WebKitLibraries:

  • win/tools/vsprops/common.props:

Export PlatformArchitecture to be used by make and cmd scripts.
Use PlatformArchitecture to determine correct build directory
(lib32/bin32/obj32 or lib64/bin64/obj64).

Location:
trunk
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r154408 r154416  
     12013-08-21  Alex Christensen  <achristensen@apple.com>
     2
     3        <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
     4
     5        Reviewed by Brent Fulgham.
     6
     7        * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
     8        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
     9        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
     10        Pass PlatformArchitecture as a command line parameter to bash scripts.
     11        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
     12        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
     13        * JavaScriptCore.vcxproj/build-generated-files.sh:
     14        Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
     15
    1162013-08-21  Filip Pizlo  <fpizlo@apple.com>
    217
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make

    r154354 r154416  
    11all:
    22    touch "%ConfigurationBuildDir%\buildfailed"
    3     bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)"
     3    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
    44    copy-files.cmd
    55
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make

    r154354 r154416  
    11all:
    22    touch "%ConfigurationBuildDir%\buildfailed"
    3     bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
     3    bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
    44    -del "%ConfigurationBuildDir%\buildfailed"
    55
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh

    r149220 r154416  
    1717export XDSTROOT
    1818
    19 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32"
     19export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}"
    2020
    2121cd "${BUILT_PRODUCTS_DIR}/JavaScriptCore/DerivedSources"
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make

    r154354 r154416  
    11all:
    22    touch "%ConfigurationBuildDir%\buildfailed"
    3     bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)"
     3    bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
    44
    55    -del "%ConfigurationBuildDir%\buildfailed"
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh

    r149220 r154416  
    1717export XDSTROOT
    1818
    19 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/JavaScriptCore/DerivedSources"
     19export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore/DerivedSources"
    2020
    2121##############################################################################
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh

    r149220 r154416  
    2727export SDKROOT
    2828
    29 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/JavaScriptCore"
     29export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore"
    3030
    3131mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/docs"
  • trunk/Source/WTF/ChangeLog

    r154381 r154416  
     12013-08-21  Alex Christensen  <achristensen@apple.com>
     2
     3        <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
     4
     5        Reviewed by Brent Fulgham.
     6
     7        * WTF.vcxproj/WTFGenerated.make:
     8        Pass PlatformArchitecture as a command line parameter to bash scripts.
     9        * WTF.vcxproj/build-generated-files.sh:
     10        Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
     11
    1122013-08-21  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    213
  • trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make

    r152973 r154416  
    11all: WTFHeaderDetection.h
    22    touch "%ConfigurationBuildDir%\buildfailed"
    3     bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
     3    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
    44!IF "$(OFFICIAL_BUILD)"!="1"
    55    bash -c "python work-around-vs-dependency-tracking-bugs.py"
  • trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh

    r149220 r154416  
    22
    33# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
    4 UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib32/libicuuc${3}.lib")
     4UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib${4}/libicuuc${3}.lib")
    55ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/include/private/ICUVersion.h")
    66if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
  • trunk/Source/WebCore/ChangeLog

    r154415 r154416  
     12013-08-21  Alex Christensen  <achristensen@apple.com>
     2
     3        <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
     4
     5        Reviewed by Brent Fulgham.
     6
     7        * WebCore.vcxproj/WebCoreGenerated.make:
     8        * WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
     9        Pass PlatformArchitecture as a command line parameter to bash scripts
     10        and use PlatformArchitecture to determine which directory to delete
     11        while cleaning (obj32 or obj64).
     12        * WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props:
     13        Export PlatformArchitecture to be used by make and cmd scripts.
     14        * WebCore.vcxproj/build-generated-files.sh:
     15        Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
     16        * WebCore.vcxproj/copyForwardingHeaders.cmd:
     17        * WebCore.vcxproj/copyWebCoreResourceFiles.cmd:
     18        Use PlatformArchitecture to determine which directory to copy to (obj32 or obj64).
     19
    1202013-08-21  Tim Horton  <timothy_horton@apple.com>
    221
  • trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make

    r150618 r154416  
    44        echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
    55
    6         bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows
    7         bash migrate-scripts.sh "%ConfigurationBuildDir%\obj32\WebCore\scripts"
     6        bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
     7        bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
    88        cmd /C copyForwardingHeaders.cmd cg cf
    99        cmd /C copyWebCoreResourceFiles.cmd
    1010       
    1111clean:
    12         if exist "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources"
    13         if exist "%ConfigurationBuildDir%\obj32\WebCore\scripts" del /s /q "%ConfigurationBuildDir%\obj32\WebCore\scripts"
     12        if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"
     13        if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
    1414        if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"
  • trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make

    r146231 r154416  
    44        echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
    55
    6         bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo
    7         bash migrate-scripts.sh "%ConfigurationBuildDir%\obj\WebCore\scripts"
     6        bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%"
     7        bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
    88        cmd /C copyForwardingHeaders.cmd cairo curl
    99        cmd /C copyWebCoreResourceFiles.cmd
    1010       
    1111clean:
    12         del /s /q "%ConfigurationBuildDir%\obj\WebCore\DerivedSources"
    13         del /s /q "%ConfigurationBuildDir%\obj\WebCore\scripts"
     12        del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"
     13        del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
    1414        if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"
  • trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props

    r146153 r154416  
    77    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    88    <OutDir>$(ConfigurationBuildDir)\bin\</OutDir>
    9     <IntDir>$(ConfigurationBuildDir)\obj\$(ProjectName)\</IntDir>
     9    <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>
    1010    <LinkIncremental>false</LinkIncremental>
    1111    <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
    1212if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
     13set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    1314nmake /nologo -f $(ProjectName)WinCairo.make</NMakeBuildCommandLine>
    1415    <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
    1516if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
     17set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    1618nmake /nologo -f $(ProjectName)WinCairo.make clean
    1719nmake /nologo -f $(ProjectName)WinCairo.make</NMakeReBuildCommandLine>
     
    2224
    2325REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
     26set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    2427set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
    2528nmake /nologo -f $(ProjectName)WinCairo.make clean</NMakeCleanCommandLine>
  • trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh

    r151706 r154416  
    5454export SDKROOT
    5555
    56 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/WebCore"
     56export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}/WebCore"
    5757
    5858mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
  • trunk/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd

    r154181 r154416  
    1414
    1515xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
    16 xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj32\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
     16xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
    1717xcopy /y /d "%ProjectDir%..\Modules\filesystem\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
    1818xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
  • trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd

    r149220 r154416  
    1 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\inspector"
    2 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\inspector"
    3 xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj32\WebCore\DerivedSources\InspectorBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\inspector"
    4 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\en.lproj"
    5 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\en.lproj"
    6 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\en.lproj"
     1mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector"
     2xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector"
     3xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\InspectorBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector"
     4mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
     5xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
     6xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
  • trunk/Source/WebKit/ChangeLog

    r154395 r154416  
     12013-08-21  Alex Christensen  <achristensen@apple.com>
     2
     3        <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
     4
     5        Reviewed by Brent Fulgham.
     6
     7        * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
     8        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
     9        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd:
     10        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
     11        Use PlatformArchitecture to determine correct object directory (obj32 or obj64).
     12
    1132013-08-20  Brent Fulgham  <bfulgham@apple.com>
    214
  • trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd

    r149220 r154416  
    1212xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\nptypes.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
    1313
    14 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
    15 xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
     14mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
     15xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
    1616
    1717if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
  • trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd

    r149220 r154416  
    33cmd /c
    44
    5 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/WebKitExportGenerator
     5set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator
    66
    77echo Generating export definitions
  • trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd

    r149220 r154416  
    1 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj32\WebKitExportGenerator
     1set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitExportGenerator
    22echo Exporting link definition output (%GeneratorDirectory%\WebKitExports.def)
    33if exist "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\WebKitExports.def"
  • trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd

    r149220 r154416  
    33
    44echo Preparing generator output directory...
    5 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/WebKitExportGenerator
     5set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator
    66mkdir "%GeneratorDirectory%" 2>NUL
    77mkdir "%GeneratorDirectory%\DerivedSources" 2>NUL
  • trunk/WebKitLibraries/ChangeLog

    r154390 r154416  
     12013-08-21  Alex Christensen  <achristensen@apple.com>
     2
     3        <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
     4
     5        Reviewed by Brent Fulgham.
     6
     7        * win/tools/vsprops/common.props:
     8        Export PlatformArchitecture to be used by make and cmd scripts.
     9        Use PlatformArchitecture to determine correct build directory
     10        (lib32/bin32/obj32 or lib64/bin64/obj64).
     11
    1122013-08-21  Brent Fulgham  <bfulgham@apple.com>
    213
  • trunk/WebKitLibraries/win/tools/vsprops/common.props

    r149220 r154416  
    88  <PropertyGroup>
    99    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    10     <OutDir>$(ConfigurationBuildDir)\bin32\</OutDir>
    11     <IntDir>$(ConfigurationBuildDir)\obj32\$(ProjectName)\</IntDir>
     10    <OutDir>$(ConfigurationBuildDir)\bin$(PlatformArchitecture)\</OutDir>
     11    <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>
    1212    <LinkIncremental>false</LinkIncremental>
    1313    <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
    1414if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
     15set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    1516nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
    1617    <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
    1718if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
     19set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    1820nmake /nologo -f $(ProjectName).make clean
    1921nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
     
    2527REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
    2628set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
     29set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    2730nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
    2831    <TargetName>$(ProjectName)$(DebugSuffix)</TargetName>
     
    7376set INTDIR=$(IntDir)
    7477set OUTDIR=$(OutDir)
     78set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    7579set PLATFORMNAME=$(PlatformName)
    7680set PROJECTDIR=$(ProjectDir)
     
    108112set INTDIR=$(IntDir)
    109113set OUTDIR=$(OutDir)
     114set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    110115set PLATFORMNAME=$(PlatformName)
    111116set PROJECTDIR=$(ProjectDir)
     
    143148set INTDIR=$(IntDir)
    144149set OUTDIR=$(OutDir)
     150set PLATFORMARCHITECTURE=$(PlatformArchitecture)
    145151set PLATFORMNAME=$(PlatformName)
    146152set PROJECTDIR=$(ProjectDir)
     
    173179    <BuildLog />
    174180    <Link>
    175       <AdditionalLibraryDirectories>$(IntDir)lib32;$(ConfigurationBuildDir)\lib32;$(WEBKIT_LIBRARIES)\lib32</AdditionalLibraryDirectories>
     181      <AdditionalLibraryDirectories>$(IntDir)lib$(PlatformArchitecture);$(ConfigurationBuildDir)\lib$(PlatformArchitecture);$(WEBKIT_LIBRARIES)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
    176182      <LinkErrorReporting>PromptImmediately</LinkErrorReporting>
    177183      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
     
    196202      <RandomizedBaseAddress>false</RandomizedBaseAddress>
    197203      <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>
    198       <ImportLibrary>$(ConfigurationBuildDir)\lib32\$(TargetName).lib</ImportLibrary>
     204      <ImportLibrary>$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\$(TargetName).lib</ImportLibrary>
    199205    </Link>
    200206    <Bscmake />
Note: See TracChangeset for help on using the changeset viewer.