From e91c15b9e2adffbffc667e94ec13ac2b26ee4fa5 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Wed, 24 Mar 2010 10:12:08 +0000 Subject: [PATCH] Updates to the Win32 projects to link in zlib, libpng, and libjpeg --- mk/windoze/CopyWindowsRuntimeDlls.bat | 2 ++ mk/windoze/Glest.suo | Bin 58368 -> 89088 bytes mk/windoze/glest_game.vcproj | 2 +- mk/windoze/shared_lib.vcproj | 28 ++++++++++++++++++++++++-- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/mk/windoze/CopyWindowsRuntimeDlls.bat b/mk/windoze/CopyWindowsRuntimeDlls.bat index 4e6ccaf8d..c54532e69 100644 --- a/mk/windoze/CopyWindowsRuntimeDlls.bat +++ b/mk/windoze/CopyWindowsRuntimeDlls.bat @@ -2,5 +2,7 @@ if not exist ..\..\data\glest_game\dsound.dll copy dsound.dll ..\..\data\glest_game\ if not exist ..\..\data\glest_game\xerces-c_3_0.dll copy xerces-c_3_0.dll ..\..\data\glest_game\ +if not exist ..\..\data\glest_game\libpng14.dll copy libpng14.dll ..\..\data\glest_game\ +if not exist ..\..\data\glest_game\zlib1.dll copy zlib1.dll ..\..\data\glest_game\ pause diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo index 31fc90fb340e706ed59c101e686f0f125ae38e7a..4ca052709f6a3bc996e2fb2ff85b7056f0f11330 100755 GIT binary patch delta 14009 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 delta 3491 zcmb7G3s98T75>li@5)OaE3O0={6$10h`Bt(KaQS6jpr2)$^F0npvEf`{c?=s zzE`GBKaPhzGZ)(y74_fF)VG(7LixFJfZ>+A|7JXpKO_N)y&)n=yDv!M!BC;xb0eExBm6bX@1bY8 z#euL-FQ-^+EIxwXBOBZ}@R8D3st@4*d=c|cZpNM%KiY++u!Y?@%|yfdi?*Tto(VCF zLvX6h$3t9#rx`EI4Omv$8Q{i=;I8r@uihXxd(aw%jniSYr+B$MMnxSPmvT_1rP9x{fkXvAzz)&!0ebkr6SaH8^0~#mL8cTeRbNsZ6ks z9HJb2*f9luDRYr*_QYU&2tAE&r_^GwLq_r1Y}gmdXqy$Lk7NVZq3>c5I=hlFX!XXP zt{^0J`JuPlHX0W-Iq2**!jfPk8I7O*M70pDCf#?=$C>mZAH4{=REl2>nArcKyGO*C z=Afm~jKaGzEGM_q3ZC86Iuro={+4kTp0P`+bBvVDm!YI8$l&cdGs!R}f=q}=4HUe{ zeEbDTE2NE5Er@jJ#L+{~Qw*eiD6 z!F{pe+R8{oZZTPfTiY3dj0dKQBv-C`Sa;5pZPX2vZ`29zrJ!l@XcZD2{vLVRSEy&x zXwl>Eq+&K>`y#8uT7S+1FK<#{R1}A$*>@5l*EGKM2svynozUCDNFrl1Sx#(QP{h(1i8iD&TE#W=FOnP zoXql3l`b-YN&O~{{)XPB21*54_o{`dWa$2Ns*X~%g#S*4vvS;jC&M76uzg7y-?JN8 z>lSb_h(^T?Tj;l<`26UxV5%IT7Q|9Jln>`Pm#?_tgPYfjU7XvqcL605_Du-(FXCdo zMJnRU5$!DJp^lD^>nU(_&n4-H0U=fn%+*HE{oP~|oAKxX>B)#Dm)+^PFq_u9>W|}qqMarP3i`$L54|X(4gB-Xb zcEx-BmKMZA8Ydn&UufL0#))b-qRG?vWh{oDV1$cTGJikSIE7`a#^q>SFmtOkuEfbT zGQ;0`?uhWWX^LxD-k>RN(m1hD4a>3I)@q!>aKFCf`QVq-_B46|CkFUoSQ+97xpj;F1BXYf*#H0l diff --git a/mk/windoze/glest_game.vcproj b/mk/windoze/glest_game.vcproj index e3aec67fe..8242496e9 100755 --- a/mk/windoze/glest_game.vcproj +++ b/mk/windoze/glest_game.vcproj @@ -155,7 +155,7 @@ /> + + @@ -179,6 +183,10 @@ RelativePath="..\..\source\shared_lib\sources\graphics\context.cpp" > + + @@ -191,10 +199,18 @@ RelativePath="..\..\source\shared_lib\sources\graphics\graphics_interface.cpp" > + + + + @@ -211,6 +227,10 @@ RelativePath="..\..\source\shared_lib\sources\graphics\pixmap.cpp" > + + @@ -231,6 +251,10 @@ RelativePath="..\..\source\shared_lib\sources\graphics\texture_manager.cpp" > + +