Changeset 154416 in webkit
- Timestamp:
- Aug 21, 2013 2:24:22 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r154408 r154416 1 2013-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 1 16 2013-08-21 Filip Pizlo <fpizlo@apple.com> 2 17 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make
r154354 r154416 1 1 all: 2 2 touch "%ConfigurationBuildDir%\buildfailed" 3 bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" 3 bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%" 4 4 copy-files.cmd 5 5 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make
r154354 r154416 1 1 all: 2 2 touch "%ConfigurationBuildDir%\buildfailed" 3 bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" 3 bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%" 4 4 -del "%ConfigurationBuildDir%\buildfailed" 5 5 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh
r149220 r154416 17 17 export XDSTROOT 18 18 19 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj 32"19 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}" 20 20 21 21 cd "${BUILT_PRODUCTS_DIR}/JavaScriptCore/DerivedSources" -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make
r154354 r154416 1 1 all: 2 2 touch "%ConfigurationBuildDir%\buildfailed" 3 bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" 3 bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%" 4 4 5 5 -del "%ConfigurationBuildDir%\buildfailed" -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh
r149220 r154416 17 17 export XDSTROOT 18 18 19 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj 32/JavaScriptCore/DerivedSources"19 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore/DerivedSources" 20 20 21 21 ############################################################################## -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh
r149220 r154416 27 27 export SDKROOT 28 28 29 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj 32/JavaScriptCore"29 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore" 30 30 31 31 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/docs" -
trunk/Source/WTF/ChangeLog
r154381 r154416 1 2013-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 1 12 2013-08-21 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 13 -
trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make
r152973 r154416 1 1 all: WTFHeaderDetection.h 2 2 touch "%ConfigurationBuildDir%\buildfailed" 3 bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" 3 bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%" 4 4 !IF "$(OFFICIAL_BUILD)"!="1" 5 5 bash -c "python work-around-vs-dependency-tracking-bugs.py" -
trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh
r149220 r154416 2 2 3 3 # Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4 4 UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib 32/libicuuc${3}.lib")4 UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib${4}/libicuuc${3}.lib") 5 5 ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/include/private/ICUVersion.h") 6 6 if 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 1 2013-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 1 20 2013-08-21 Tim Horton <timothy_horton@apple.com> 2 21 -
trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make
r150618 r154416 4 4 echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed" 5 5 6 bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows 7 bash migrate-scripts.sh "%ConfigurationBuildDir%\obj 32\WebCore\scripts"6 bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%" 7 bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts" 8 8 cmd /C copyForwardingHeaders.cmd cg cf 9 9 cmd /C copyWebCoreResourceFiles.cmd 10 10 11 11 clean: 12 if exist "%ConfigurationBuildDir%\obj 32\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources"13 if exist "%ConfigurationBuildDir%\obj 32\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" 14 14 if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed" -
trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make
r146231 r154416 4 4 echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed" 5 5 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" 8 8 cmd /C copyForwardingHeaders.cmd cairo curl 9 9 cmd /C copyWebCoreResourceFiles.cmd 10 10 11 11 clean: 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" 14 14 if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed" -
trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props
r146153 r154416 7 7 <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> 8 8 <OutDir>$(ConfigurationBuildDir)\bin\</OutDir> 9 <IntDir>$(ConfigurationBuildDir)\obj \$(ProjectName)\</IntDir>9 <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir> 10 10 <LinkIncremental>false</LinkIncremental> 11 11 <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash 12 12 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% 13 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 13 14 nmake /nologo -f $(ProjectName)WinCairo.make</NMakeBuildCommandLine> 14 15 <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash 15 16 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% 17 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 16 18 nmake /nologo -f $(ProjectName)WinCairo.make clean 17 19 nmake /nologo -f $(ProjectName)WinCairo.make</NMakeReBuildCommandLine> … … 22 24 23 25 REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here 26 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 24 27 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir) 25 28 nmake /nologo -f $(ProjectName)WinCairo.make clean</NMakeCleanCommandLine> -
trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
r151706 r154416 54 54 export SDKROOT 55 55 56 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj 32/WebCore"56 export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}/WebCore" 57 57 58 58 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources" -
trunk/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd
r154181 r154416 14 14 15 15 xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" 16 xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj 32\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"16 xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" 17 17 xcopy /y /d "%ProjectDir%..\Modules\filesystem\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" 18 18 xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" -
trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd
r149220 r154416 1 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin 32\WebKit.resources\inspector"2 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%CONFIGURATIONBUILDDIR%\bin 32\WebKit.resources\inspector"3 xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj 32\WebCore\DerivedSources\InspectorBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\inspector"4 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin 32\WebKit.resources\en.lproj"5 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin 32\WebKit.resources\en.lproj"6 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin 32\WebKit.resources\en.lproj"1 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector" 2 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector" 3 xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\InspectorBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector" 4 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj" 5 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj" 6 xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj" -
trunk/Source/WebKit/ChangeLog
r154395 r154416 1 2013-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 1 13 2013-08-20 Brent Fulgham <bfulgham@apple.com> 2 14 -
trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd
r149220 r154416 12 12 xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\nptypes.h" "%CONFIGURATIONBUILDDIR%\include\WebKit" 13 13 14 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin 32\WebKit.resources"15 xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin 32\WebKit.resources"14 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources" 15 xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources" 16 16 17 17 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed" -
trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd
r149220 r154416 3 3 cmd /c 4 4 5 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj 32/WebKitExportGenerator5 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator 6 6 7 7 echo Generating export definitions -
trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd
r149220 r154416 1 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj 32\WebKitExportGenerator1 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitExportGenerator 2 2 echo Exporting link definition output (%GeneratorDirectory%\WebKitExports.def) 3 3 if exist "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\WebKitExports.def" -
trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd
r149220 r154416 3 3 4 4 echo Preparing generator output directory... 5 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj 32/WebKitExportGenerator5 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator 6 6 mkdir "%GeneratorDirectory%" 2>NUL 7 7 mkdir "%GeneratorDirectory%\DerivedSources" 2>NUL -
trunk/WebKitLibraries/ChangeLog
r154390 r154416 1 2013-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 1 12 2013-08-21 Brent Fulgham <bfulgham@apple.com> 2 13 -
trunk/WebKitLibraries/win/tools/vsprops/common.props
r149220 r154416 8 8 <PropertyGroup> 9 9 <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> 10 <OutDir>$(ConfigurationBuildDir)\bin 32\</OutDir>11 <IntDir>$(ConfigurationBuildDir)\obj 32\$(ProjectName)\</IntDir>10 <OutDir>$(ConfigurationBuildDir)\bin$(PlatformArchitecture)\</OutDir> 11 <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir> 12 12 <LinkIncremental>false</LinkIncremental> 13 13 <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash 14 14 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% 15 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 15 16 nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine> 16 17 <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash 17 18 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% 19 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 18 20 nmake /nologo -f $(ProjectName).make clean 19 21 nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine> … … 25 27 REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here 26 28 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir) 29 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 27 30 nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine> 28 31 <TargetName>$(ProjectName)$(DebugSuffix)</TargetName> … … 73 76 set INTDIR=$(IntDir) 74 77 set OUTDIR=$(OutDir) 78 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 75 79 set PLATFORMNAME=$(PlatformName) 76 80 set PROJECTDIR=$(ProjectDir) … … 108 112 set INTDIR=$(IntDir) 109 113 set OUTDIR=$(OutDir) 114 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 110 115 set PLATFORMNAME=$(PlatformName) 111 116 set PROJECTDIR=$(ProjectDir) … … 143 148 set INTDIR=$(IntDir) 144 149 set OUTDIR=$(OutDir) 150 set PLATFORMARCHITECTURE=$(PlatformArchitecture) 145 151 set PLATFORMNAME=$(PlatformName) 146 152 set PROJECTDIR=$(ProjectDir) … … 173 179 <BuildLog /> 174 180 <Link> 175 <AdditionalLibraryDirectories>$(IntDir)lib 32;$(ConfigurationBuildDir)\lib32;$(WEBKIT_LIBRARIES)\lib32</AdditionalLibraryDirectories>181 <AdditionalLibraryDirectories>$(IntDir)lib$(PlatformArchitecture);$(ConfigurationBuildDir)\lib$(PlatformArchitecture);$(WEBKIT_LIBRARIES)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories> 176 182 <LinkErrorReporting>PromptImmediately</LinkErrorReporting> 177 183 <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck> … … 196 202 <RandomizedBaseAddress>false</RandomizedBaseAddress> 197 203 <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute> 198 <ImportLibrary>$(ConfigurationBuildDir)\lib 32\$(TargetName).lib</ImportLibrary>204 <ImportLibrary>$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\$(TargetName).lib</ImportLibrary> 199 205 </Link> 200 206 <Bscmake />
Note: See TracChangeset
for help on using the changeset viewer.