From ca64b8178518a418f006304034bd600f4fcb5c16 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 16 Nov 2017 17:48:22 -0600 Subject: [PATCH] Attempt at fixing windows build issue. Linux breakage TBD. --- indra/cmake/BuildBranding.cmake | 13 +++++++------ indra/newview/CMakeLists.txt | 4 +--- indra/tools/vstool/VSTool.exe | Bin 24576 -> 24576 bytes indra/tools/vstool/main.cs | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/indra/cmake/BuildBranding.cmake b/indra/cmake/BuildBranding.cmake index b68cc7483..4cb59e246 100644 --- a/indra/cmake/BuildBranding.cmake +++ b/indra/cmake/BuildBranding.cmake @@ -1,37 +1,38 @@ # -*- cmake -*- if (WINDOWS) + message(WARNING, ${CMAKE_CURRENT_BINARY_DIR}/newview/viewerRes.rc.in) configure_file( ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in - ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc + ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc ) endif (WINDOWS) if (DARWIN) configure_file( ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in - ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings + ${CMAKE_CURRENT_BINARY_DIR}/English.lproj/InfoPlist.strings ) endif (DARWIN) if (LINUX) configure_file( ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in - ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh + ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/wrapper.sh @ONLY ) configure_file( ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in - ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh + ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/handle_secondlifeprotocol.sh @ONLY ) configure_file( ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in - ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh + ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/install.sh @ONLY ) configure_file( ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in - ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh + ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/refresh_desktop_app_entry.sh @ONLY ) endif (LINUX) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 573d0962c..2cb71071d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -6,6 +6,7 @@ include(00-Common) include(Boost) include(BuildPackagesInfo) include(BuildVersion) +include(BuildBranding) include(CMakeCopyIfDifferent) include(DBusGlib) include(FMODSTUDIO) @@ -1300,9 +1301,6 @@ if (WINDOWS) set_source_files_properties(${viewer_RESOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/res/viewerRes.rc - ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc - ) set(viewer_RESOURCE_FILES ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc ${viewer_RESOURCE_FILES} diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe index 2ed31a0d9aeae9906ce5b91e9a53edf6f4736f06..07910a9a610af1287691cd96cec6482e5a85da7a 100755 GIT binary patch delta 4043 zcmZu!4U81k9sj>Kvu{3jZ@8IVcMf;%Ztr`!-8=8(L(UTrfx< zv>F>SS-2>tz z``-J1f6V{?f3s6FY-)zxw_Cr$b*`J<8}N5WrhmTP**!vZHR0Jr^p-x|mei++66H_W zg7QYz!%xmTd^?+Tvd6$CpEdY#iqUI%qM2qQ26zsUfWSb>PWLW~`TcsVX};FFx%Yxz zyQw!hz^M^TV05<|;7r*bl{GC@m|MrFg0s z2V__L5PEOYa?oOTm5L46at@ZAqL)dlczmCHh%%{c7_bIM{JY@*>q_f~?3&(1S*cej zy>aMWGOPD2wMH-1^tQLp>W!Q%&3d^AZl$x|cqJd5-Z?>zeCHhJ_y10dBsMdk(OpO_1l{m`c!KmU{s@Hd zA&qY0#(`WKW(yrE&4qaQG_c!|2zw_t{0&|415+~pi(ilur_Yv%`%|bXeeuI3NfP>5 z%37+TiR#{#R!fykcyAU8x#?ncV zZ;^#^AZdiROLjxOe_JuQ!rzb-u5e@bY`ys1@XnfGxL2NJcZ!Hl-|6?#a#W&x5F&Ya zJx%!Ch%>4bEvwU~5zY1OaHb|7bwUQ3;*&D=|RYafv8#xkJL_v ztRj&J{|$txy2+F;UgY41ox?=4m6EW>pqmUuSNg*10p~DugeuG005J|VM5TQr$R(>< z+ugIZ9o|~k6BTqysTWDT(werFY+vfjEQnrLuML~|bla2E9St#!u0>>s)Ae&`PNBNo z&M(2K)FLxt6#9%=Zxd#CwC1^LdOj(~ORg2HeY(+5nN!iaD-c$Vel*o<)r`)ep*5u8 zwcs^qGzp{VM|XP`f_4s_7FmwxCyZhna8O<%26MlMxnesog*8S|demSQmh!@UYu2gr zT$=0vSFTfvm;%kwg;OQoU8w^`6SUp~>~kD0EXKHwR}c|di`f;E(B%Xf8SJ51R{Tyl2dC23aX z;14ikBL}HC-(J8mZWQ~lA?8nHisks|J6)cb+f)iats_=g;s5HuQY$pf8taf1x^-ZI z6*kv_i>z>79q7#ugbM-Ll@;MKwGW3QYM&ooqxO6_uJ(>_tJ*WA@D>~_*^{-tF9@SJ z2vCm9D2W_n^W|4%Kt%GA{vmeMx0|xLvKPg(f-9pDu#_vy5irD+`3P9Rl@Aec5#!~1 zFC1-_mShVrLB-*M#)THXY1MA)eVGjVpxm5UF>vW4;0uTC8YP^-QOyZAc3!0@Z26Il zU&196W+b0%$)xEgt^8%RrgW{ns6TcnX@jW;Os=gOGkmEg5T3wE-KC=2wJ@$M*K*Cr zrPSb&d?PRoRs=3hU{Kp0JHXf;%QxE>892SHbwA4)_iHKUAP z0+#BH9-fgd%keJL6^?)s#d)4P(1TA2d1c+0SbIZYiHF}ur;wj|r0LaH9a zuVd^Q8pV{C>>aDeMpk0q1b9>Vk1ea2Q*LhESpHt?Rr*uxxK@6xb#Lhs=28!v!QIg= zE@6YTO!wvkkHik@LlLO{B;O&K^v%eAAx>&6V$&!BXI-qd!{G=0I}qW!c>2zrzf z>^)#siN6wKqcH~jW8xq5j52SrE7>q)5A!du<~5C-qQ7XvWU;YV;cq`i^3zC4lAgz! zp|`Pi(4X06%2R=Frunpx6o}nzQq_5&$+(SR1XX$17j7*kb0qZG0 z-nlN;k0|Nz=bdk)N_OJFedfHYu70w8;-eE^>Hjb3S;kB)ODu+i>q^j3$2Q$yUP3ci zpl8V&k7r|n<4$;6g61GboH+r6933G#F@rY;L4#qMoO?s=636kDOPL{XNG=X8Ge{Vw zW0pW$)$EuKRB#7|I18jY$8k&}hOIe}+@KKi#^oA#mkORLM zcerpG4bvMmy%BG1v$xJ0a{_@N8ojkvR%70nx31AKvfRWTn4?+EG{MybosPHBaiGJL zi(?{EXO0o)L0}>pM{TxYRN+7v8b|2n^EKYI$9rv(s&9er)9M7fTxXv;0c^uygr; R=J4Y~huzVS=S&Y6{|A5WUUvWh delta 4870 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 & // <100.