Skip to content

Commit 49ec8dd

Browse files
authored
Merge pull request #4 from acasta69/vs2017
Update script to build deps without /LTCG option
2 parents 6b6ec7f + 6398080 commit 49ec8dd

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

build-deps-x64.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ CALL:copyFile %LUX_WINDOWS_BUILD_ROOT%\support\jpeg.sln .
256256
CALL:copyFile %LUX_WINDOWS_BUILD_ROOT%\support\jpeg.vcxproj .
257257
CALL:copyFile jconfig.vc jconfig.h
258258

259-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"jpeg" jpeg.sln
259+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"jpeg" jpeg.sln
260260
if ERRORLEVEL 1 goto :EOF
261261

262262
CALL:copyFile *.h %INCLUDE_DIR%
@@ -279,7 +279,7 @@ cd build
279279
cmake %CMAKE_OPTS% ..
280280
if ERRORLEVEL 1 goto :EOF
281281

282-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"zlibstatic" zlib.sln
282+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"zlibstatic" zlib.sln
283283
if ERRORLEVEL 1 goto :EOF
284284

285285
CALL:copyFile ..\zconf.h.included ..\zconf.h
@@ -307,7 +307,7 @@ cd build
307307
cmake %CMAKE_OPTS% -D BUILD_SHARED_LIBS=0 ..
308308
if ERRORLEVEL 1 goto :EOF
309309

310-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"Half" /target:"IlmThread" /target:"Imath" ilmbase.sln
310+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"Half" /target:"IlmThread" /target:"Imath" ilmbase.sln
311311
if ERRORLEVEL 1 goto :EOF
312312

313313
mkdir %INCLUDE_DIR%\OpenEXR
@@ -339,7 +339,7 @@ cd build
339339
cmake %CMAKE_OPTS% ..
340340
if ERRORLEVEL 1 goto :EOF
341341

342-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"png16_static" libpng.sln
342+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"png16_static" libpng.sln
343343
if ERRORLEVEL 1 goto :EOF
344344

345345
CALL:copyFile ..\*.h %INCLUDE_DIR%
@@ -392,7 +392,7 @@ cd build
392392
cmake %CMAKE_OPTS% -D BUILD_SHARED_LIBS=0 -D ILMBASE_PACKAGE_PREFIX="%INSTALL_DIR%" ..
393393
if ERRORLEVEL 1 goto :EOF
394394

395-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"IlmImf" openexr.sln
395+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"IlmImf" openexr.sln
396396
if ERRORLEVEL 1 goto :EOF
397397

398398
mkdir %INCLUDE_DIR%\OpenEXR
@@ -417,7 +417,7 @@ cd build
417417
cmake %CMAKE_OPTS% ..
418418
if ERRORLEVEL 1 goto :EOF
419419

420-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"openjpeg" openjpeg.sln
420+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"openjpeg" openjpeg.sln
421421
if ERRORLEVEL 1 goto :EOF
422422

423423
CALL:copyFile ..\libopenjpeg\openjpeg.h %INCLUDE_DIR%
@@ -446,7 +446,7 @@ cd build
446446
cmake %CMAKE_OPTS% -D LINKSTATIC=1 -D USE_PYTHON=0 ..
447447
if ERRORLEVEL 1 goto :EOF
448448

449-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"OpenImageIO" OpenImageIO.sln
449+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"OpenImageIO" OpenImageIO.sln
450450
if ERRORLEVEL 1 goto :EOF
451451

452452
mkdir %INCLUDE_DIR%\OpenImageIO
@@ -472,7 +472,7 @@ CALL:xcopyFiles %LUX_WINDOWS_BUILD_ROOT%\support\FreeImage\*.* .
472472
rem Update source files
473473
%LUX_WINDOWS_BUILD_ROOT%\support\bin\patch --forward --backup --batch -p0 -i %LUX_WINDOWS_BUILD_ROOT%\support\FreeImage-3.16.0.patch
474474

475-
msbuild %MSBUILD_OPTS% /property:"Configuration=%BUILD_CONFIGURATION%" /target:"FreeImageLib" FreeImage.2013.sln
475+
msbuild %MSBUILD_OPTS% /property:"WholeProgramOptimization=False" /property:"Configuration=%BUILD_CONFIGURATION%" /target:"FreeImageLib" FreeImage.2013.sln
476476
if ERRORLEVEL 1 goto :EOF
477477

478478
CALL:copyFile Source\FreeImage.h %INCLUDE_DIR%

0 commit comments

Comments
 (0)