From ed3dc4b58b64718810b966628294d75765238f3b Mon Sep 17 00:00:00 2001 From: MageKing17 Date: Wed, 19 Aug 2015 02:43:52 -0700 Subject: [PATCH] Move the temporary grammar files into the build directory. These are only used for voice recognition on Windows. In addition, the gc.exe shouldn't be needed locally since it should be included with SAPI, which Visual Studio 2010 and later should already include. I also tried to backport some of the changes from the 2013/2015 project files to the 2010/2012 project files, but lack of certain compiler flags made me tend to err on the conservative side in that regard. --- .gitignore | 5 -- code/freespace2/freespace.rc | 2 +- code/sound/gc.exe | Bin 49152 -> 0 bytes projects/MSVC_2010/Freespace2.vcxproj | 55 ++++++++------- projects/MSVC_2010/code.vcxproj | 61 ++++++++-------- projects/MSVC_2010/code.vcxproj.filters | 2 +- projects/MSVC_2012/Freespace2.vcxproj | 50 ++++++++------ projects/MSVC_2012/code.vcxproj | 88 ++++++++++-------------- projects/MSVC_2012/code.vcxproj.filters | 2 +- projects/MSVC_2013/Freespace2.vcxproj | 8 +++ projects/MSVC_2013/code.vcxproj | 66 +++++++----------- projects/MSVC_2013/code.vcxproj.filters | 2 +- projects/MSVC_2015/Freespace2.vcxproj | 8 +++ projects/MSVC_2015/code.vcxproj | 66 +++++++----------- projects/MSVC_2015/code.vcxproj.filters | 2 +- 15 files changed, 196 insertions(+), 221 deletions(-) delete mode 100644 code/sound/gc.exe diff --git a/.gitignore b/.gitignore index 9844b63b544..250d46485bd 100644 --- a/.gitignore +++ b/.gitignore @@ -272,8 +272,3 @@ xcuserdata # documentation/doxygen/* !documentation/doxygen/.gitkeep - -#### -# Ignore voice recognition files -code/sound/grammar.h -code/sound/phrases.cfg diff --git a/code/freespace2/freespace.rc b/code/freespace2/freespace.rc index f2512dcc215..eaf386552ae 100644 --- a/code/freespace2/freespace.rc +++ b/code/freespace2/freespace.rc @@ -448,5 +448,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // #ifdef FS2_VOICER -IDR_CMD_CFG SRGRAMMAR DISCARDABLE "..\..\code\sound\phrases.cfg" +IDR_CMD_CFG SRGRAMMAR DISCARDABLE "phrases.cfg" #endif diff --git a/code/sound/gc.exe b/code/sound/gc.exe deleted file mode 100644 index 611eb504daded4a1a3b4c17f61dc92aa9565f8c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49152 zcmeFadt6l28b7>;8DPZ084MH+bxgd47Ya3LGzVb-O>lH{5EaY>L{cEw+e?8CZs;&< zr>yLDPRBI6o$ja1LuCqLfaNi78KtK%%{C1wCc&WOe!tJ&!$mvi{Lb(5dH;AnpEqpH zx;<;HXFcm#Ydz~(&)Ov|-pZ&MhS9)D62nx&r$4j&``>>Wk=<|DNBx-Hef~MTQZ?tF z!xv<)Dm3O7d2VhVYrH?xSit2PSLGVx=Gu&F@-i|f1O^6#d#iqL&xMI? zUzHd2cCCo(S|2aEET=n*cF6JiA`kp=t=o#;hQGY^pGEC*{HdZVa{dQ$eEzBx*;H2- z=2i>C%u%Ts%hfnjS6U;ZSM^o-Gt5?`n3dE^Q{fxncF1v+97f!iQOS~DDVdb{-D4g6!?Pze^B5L3j9HV|4&fhwXF=Z5AF!u zH*hU*op1qq1$P0?1E+mT8H%a!M|s1G;ID=&f_oHh2VB?R zt&c$|;QhPR#Hemd?};BoyeqHE@6tW^AR!hm@^-}?3}RGOaC_k@;ogMX0rxCiT;}Rb zHj`nJ^X6x+$ydK=_hG8$K6;^QWZ{@Q z#v1Q7jw}pd5FVM)6#?vl35;qF++Min#xbgdTOMrHUN|1K;}I&`@c}^OzbeIxA6aNz zGBMA%B5UQctW~QsbC<8lOhZbxF*|d4MrJ{;#8tWZ9NQfaK=}#G3MPwLDc3ZCSl}h{}yh*os23I?l{~}QH<&mTq|7eBt~@x&IMSVToZUg z@#8H81$hN`8)eU!m!FxtDtDz!0OZH!t;t`tdO5o)FV|Setyqy+SeV7F9!@CAe-i%I z+|8&;;3$FOsPVXf;=k5Fl!1|Zoq%GhQlC-jOkadVSmW+nHe%%2i@=hVP}@kTCp`TeUijcgvYWvkd#%U7>@ zD3gesFIU45++74mYPHPVJZ@#Su`qx6icDh`+FqTvZdI>>a#wrGP5F=I3fYYRQf@Mp z%jXI*jcZpGu-x+1#w;#(g-pg3%U7?K8z8(U{m1&3<>h9AdJ~sJBejY(vedGCfqpoSzbThfE(1EqY zY<2-S6%<QyTgHp*UJXe`KlkjpG2WZ3LX<9shO zU;x?7f;Fph(Ptz24BhAQT=bGFBm%BmzF|Uub#>_D99_!%VLf8RdVlQBOW)y!Bb!i>q~RcP&aiZ=sHly?dUKx$$2%sHyzBG5z1i5;30t?O!SL`+qmWm#BLF zss6{m-ZgAi_5AZu{cr!e${Rr=m5*BE>*ufS6VO)|*iUZ=>VHdc$bf;Ng9hIkHe~29 z-S*2?TvIS;H}lbe_SU_l|vtzEZ%!$S`j6>r?s zJ+9B)$H@B@bJKVb-MdC)%)iO|{kZ(UFeXe%_dgZT`d|Ka(Uknnz5e+y|J%Q=@-!xY z{1F9yKeGS-nw!7x|NmXe|7ji&#|7hG7w1u|Cv0H;$HmACb~F6{wi5L~8JM215>ly% z3%d59?^iQ7#36j&5I@)}o?FPM3gD>hvIiN}3OEW+C}31~!gbX0RVeBexeZhYm8Y@{$}qO&ELV_$463hSl^j}-%@q`S(^4`sax=Y=1rYrxIVmq! z&b4t~e>qEK8I)rH&j5~K802@4$J-lw=tyl1a`eQLct$l34)7?3(x?P=p-Nx}Sl|hC zfi;jvAJ7%_2pvQJ&`tD~I*q?ev!(Pul^zdzI!rzjjyY5M^vIgK5LYYl;H;f*PESL; zpAs+0^bKBp_IS|8Tjh9FMD8n3MApxW;lIl}@X^qRmRP1vAOB9YHSyyP^X_LHsv*vs z;JeqrH~`Aw+*ai#vy*H4+^-Uf1$&u$D+P8ff@X;&y9J(pKFY?QMexs7+?yOqy=|5k#=l$*Qx&EQt zr*SX;_|f7GpFgpE+>;e6AN(mk?k_Rxe|u$2z}UyuF0B%;9!P%FKZ+k-9X>xd&k>S8 zB=O#7FPH{1T%R|NnA!}3jVFTM%vbO^@M_FAyzRZD#~)ZdaL~EaizcRImTjv#9P>f0 z;gjcQw8WKsYAJnFH+A+K*Z(r^`^^~(+3(_3e^~Iutewr5p3BwTc5;Dw>EPje7T^1) z$4~hEeAjl{vwM#`HY<6h`T5liIsN)fn7+^Uu5t4B|BU_f?XH0@3F~J*w)w7-!KpK6 z?^`tMr;Q)InLYOOy5W{hM-$2x_-%Z=-q&a1E9Ul)qV0*BCv6Le`g-*E2S1#txDhLy{to=vX6Aw?Qy7z;77WLb6_32I4H#dH!8gGet z)^qzC( z&CmG_d-jtb>%MFm`cO$oOhWm2NnjpZ*yloUu;*M z2-@)|jZeo1Yu;Hq?Wkn$o*eZ_%JHD>7m*MC@_+ce(AFz{?9GB* zmrS4B``ES5?}>=X@#w;qjpshm-n(tRDd_r(i&mHX*s;IamYn!;MZa4Y&O5jCuP+5G z8oIGhV&(TK-#C_QDqmJ^xVj3t^py<4jlc#&;ewS9IR_c-W@F$HwK2Il1!U+m;Wk#kc>^yLo>L{hH^Ov( zRd&_xG4GG^TR*8de#iSq%S=!HYnS1rtz%xbeK2=hv){?*9-ZzpF>CMCl-ovHp4x6) zbv$*oZ{l?Ok)coDnegJ-yDDbxj@*~^i^WvsJDB58eOj^tbCq-1{f(iY?YD<3`^9>>yWq%$Eso z&b|7Ic6a!NX-_Um-goHd#PXR#f4KGUC#5luZ!Xwu*CgyXc~8WiUw%4~Hg4oovD;_Q zefGJ;i-nUXzAz;;#B}#}0m-GSkH2*&DmKb?<$TSI*i*62ojLcv>N{t8f$i<@&AryQ zO`(RrJ*0cn^2FiPpWpe%!?yVYV=hg(YxkVzw>;W<_=88U7e2{8{dg4k>72q(cW=8T zzxn$fz1WVep>GW9wSHMAO#k8+8|Ir%UO&dT9ks9BIUVJHRLXab{QmlH4>ehyI=c7{ z$A+(iQlC$IaAq9feHHk1H?^m^-{P)I7xz53c)(p-x6Yi{lONk&_IPa2 zm^qJpu>bO0;}7*s;ma&f7Y>;HOh}Rb^tnst0@P3FfBU?0_Rb6`wQRwrHrIg}2bO(m zOc3sTynR~4m&fw6JGS3<_KAeefr(%E%{t#aC*{v|`&N7y=NL9-#-BXT?wgtYR$=3t zqUEK3{pqRl!Q*b9ae1FBanNhCx3p*;b^rWS!~6Z$Z##Q?T>M9mY~T9rSIv(XU;4+g z*6%9f_xxkx=f}!BwzX`%;Q2f{HnH-n`uL~M2L1JgoA!^J^^`a3Jd0jDGks~+BMC1& zvt?^dqOe>)<*WXOcAf~@OZ!>DcQ4#NX;=BreJ3S85mA2fj=}*G3zPP}qK;b>``&nU z{P(7T86}tAj@UKsj@W0fjA~xI@0$8AvmDPh9X=lP0qvJqUmh(=diB#e6X(9-b|hU4 zwf1YcnwPU@{q%&&xMxEq%>DZVqdHDp=?pp%^zk$DcvUsejxp&9_{0w{4cu~K+qJtN zADb}o-m=WNJ-1wY=l!=HZP>Q?$n~=kkC`9M9)E6KpNaj3ZYX+mW!#CNXK1_&PHX2} zRzG*7|8sMmdt}17uf8mQ?Y@g`Umsc|Sjx{%-1^v8o}y)6g+_lK@Jq};qMmp?WN&lZ zCl5Tl?iY-A`E_c);{(G@{ZG9~N33po@|)Ot@OP;K|J2Y^AIE*VGUknpe>|F&oAKU> z{&&_N`f`i;ecK(OPyea>nY>>|>>l3#YW!PG|GfNyU#4qTj4^r4)UmUjTX#M6?D0?5 zM3uK|+BP2#+Ol22|ICPA-#sAo#JQ0VZCB;{CT|`;dfTZDh9@6UU)xXoy=9jI->2Z$ z4`0aqIrf?BrBOL6_FoHoe84cqh0u_v|+ z{8#_+$*XfMf3qDooU4sl`^2@|Z%ywTIs1ddlc(?QIBN~Ri9dAP^5$Hh*0Ww*F}!u^ zjr_AQPrpBB%DJ?tX&E{9pD8^xI-dVLZf3wIpA7E%XwsC=S0-4VOWeNc)`77Z+vYUVUf#13Af$N8Vki3%mVD&|5z+ zuQPG$rjv|Fa{U5MwJ1VJoAo7Do1x3bP$NWduj55 zrJ1=Iq;Ohl%g@YQk-fBVdH$-UY+l~#!lf%$EX}(=XX&b_sZ*9F#7@Z1xSvY*{MiLI zTpLwowMuMwXt|#~M?%0zu}CQd=P8v?n|{E+EEJmgW}VF*bvimtD_nMRo$SLY5~mf< z=@~}wn69Ndi#_a0!Ov8~_OXipL~5$g;L?~}ag2{u3NZ#Tsynz-e7`X7~uls+)XV(-r~ZGybgl%1c60r&A?d zUMBdZFFABTqo8H5r$n_yb6TOpS=`F@Bdn6BeW#_xb9b$(FoX$0;kB|DB-}kk+)#<-P@L!gG=zx|H z;=(m$RT~3F(zQq+bf}IRDMW+uDXZfADt*n2qsA(J1x87&u?v@_5FH2!x*Om*{V;}< z8g(doPPmpGGH+hC2E5~n*I4D@4s-g=o2QJn+sE0DMqDPX%`QyVq6r#wUCPGw(P_b) zuQM&!Jxbz&rBkjV#z&~*tJHjBr??w56As$I6Tw#T)!!t^X$clAT4BA$bPaT^at}*E z2^J-4y(Km)CG06yaUI~PN=|3ZJ`aqu6L&BwaXY%n9}IRE{U-baS|x z?Js;Gc!X+jF4(qS9`0p=I(-RfYD*D1y7^=&Y8uUei6ZPa3>4^0ad11|tfHbg%z|gaU`OHqn>PqSq?dS@DDKn_^P)$_Tp&G!IG;1-|d^E!j zkvOBog-KkfOlt$kjkzL)grZ{iSOi@z&vi)>kISQB6quWU!A`*dJ#-+9$?;hPETXE+ z3NChVaY~LRb$@Vwa7)#dSBd#`l%VNK2ox*^-pEw?fK%N8#2HBjCt#PQrybBSU{1j= zMJNi_nfzG;8j^eQg&2%Zfqng!c{!4A4z@*|#(bBYX`RkAk29^snbw?8XKAIoT~o1E z?`oylY|*(URSJF;T1Urtc7mg0B0H8Z_Ao41%p*qjWtg(6RMx-F(wTyZBu#N8dBpqB z^`^g}usPcSq^;uNg)&&GzI2ORWvj`8>KzpJGiMjcFt2%GxbYar{x zm-lE=3m&wIoqe!g#Kn5*G~ugd#Mwm(b+`pK@w=YP`{c~?pm1s`)=vyFpXp(+W+w#; zHSjFWLQ-hd>EUV3P8B*UOs0XBPT8bWz*jmYSUNH34%K8+J%mtcheERVK}jhxI~>W% z;!uJ%`GY$5M_}=8_S=hWnf)eu*{^x*P5ju+pf~U%A__lBX6%IuOVWais9@GAJf6e2 zEZ|Je09cwi`5JI3rUND+l7iv+5=*1J+gDtERg%(_ZS&uiGybP?V|&WY!-TP8qGA_w zSvt|MjvA&`!%hq$iadC?TX&t^kE(PDSnZPHpaJVr*F^A|VMsCX2( z&aSd`G;)~B7?7J54%(4%BZ%<|rS%j5l~~Le(LrN~^(#k11PzH)sG{?-cT+8j&=xcf z=_x{SXqm+J$x3XGVJJHdc(#v_)T-*s+ccQ-MWJXl!s6l6f*Gg9Ak_Cw3f7mc!^8wxz}B=LV;jeh zS8554IusL~6vhVf#bG{dU?rZjINVDp!l`rAsVUfjiksh{Kd?RoCsgmWcwCldumaiw z4+iHj^JIpYBol5KOWW)qg(Y~;aL&JSIMwNI75BG8E;yu+9!n@1QF+_-SK6KTzcnYf zHueA1+PoWDn}h|s-D1GPBC-A-(|YT^UzxD|Q=_Vc>sQ`zSq@v#p}P2SY7AaoyoT0t zxv6OiM??yi7H7N`i-$8Fv!Kx#j~RE~84m&Ds52hKIO&WJ6D$qRc%xuBikNvO0fReWX!1EF51AFz{I=5Kn_Yoa*j`q3NtsUa~`{7OGRCPTTf7P!!UWVPD1@&^%)T>VzYhIGCm46c3hn4$RrXtXYckaT#1Q1_NE=Gj3T7A~z-+;IgHEc zT$WaAHf=^ZYPx)Iph@v{uo*-~g0bU3vJdIzq7d5MQgR?#fdu6}5YFPxqWRIq1{MIF zUI2r*vIn4OG}to5wNRW7@^(5cSl2vYMG&^mBDNAPV2yb?p#k&TRLAcUt9L7`+0XQEfE37(vd16O5?BloCAXndy4b7@{0DOAPa2 z;7Z9lBnM@S-Gt7-3`$J}T-W|e@TX7$J1myzLp64i6vt2xTFTmr2I91*BPZs9ZLo2J z)ZxekAGhiMT9uwy!%xo#SNgEN;#P1zKsDk%jC3}cXyM=hX+1Ty7tjM;K+kmni3}d_ z0VXFjTYC#+`{h`V_isaKp-$WYws2;OLaXy0NWTlfQbMx98CZlCF=cm^lW*5LL$*+0 zt*+#PvXmN69qKnUSes=LokXQT#Kkf(;zqCRhXHtW8o+x2#Fd_md&o%JH z=NSV2kbqC(hfnI1gj!eTVet|=RzuQImY_A8v&s%}Z4rna^CZ^f1ZRiRXg&!L2p3N7 zyj@g-s;RWA+r?TW18qfa(%Ho}5Y1^hgL&8}-ia{e0cu8s7=S(dj95l3N!)oci0Y`> zc^~LhR%Oo#PRCvbI|Rnqg$ zGk8&YP1NxZwcu2@?@oet>U{WWBY!|s(oy~*qbm9->d;4_$i_*enr|Fdece}>^nv+3 ztZ$ksK?60G#A-0UYCb^X4;W)guC51g(J^csHR8BISbwJP#sGkmnnn!t5=?H+R9!G| zdNx{EXNah-_W1Hu2CF!6Fm;fxf}$m45m-W|FYgI1?ki^-dvwLckK@Q_j7LW@2wKu2_@>QBLW}CoRYv#G2Cn#wmp=mt*l&KW3=7@UXV3|rd z3obHitTn=%aE-7aT$?5MWI0taF*9dofkc;yS!$X#pvfE+)(Wk-nEI1ilRXK{qD)GN zYy+~x5d{GF|kal>d72|{)AL*z)<-=)Mk@hFb%aZ8};d0?XG&M=+ z2PKM+bd0annA!_|M$+(ok+iPW?w<fh&1jsNsjM%RyiUd(o)(Ay8pula>PEF`D3l@76a@0qHJArTh(SWh)lOO@OYcM2 z0YO_)GnKWXK`ZSztL2gAZpraY-M3``rq(Bvb>-!(mtTT7j-czW@~>4@p*5Et;yNM@ z0F`NL$9i*nrRS(!&-;FeBH87r$RNjYBgp)absry!=8sREbHZ@r<3oYLEg{u*@b1UYm5`c_HsPC=Q5w6ayNI*sv z$pqSc*(i=~D2@Hs^4SKXijfsV*=7`)f8`}{Jw_PFV}ULwT!rc$Y$1d$?3^D_Yn_+V zDurZ&fS55xc&?X4^j;R5cFLpTflLqnzuh|`-0*A~3~>OUc2;57NL~fA%6qoRAT^aZ z0LQ`Rk`2DuQBU7CizM z#T)?FeecqI0?~=FiZLM|Rzun8ROb-d{N)PVS;Azh&picu_4;lOuS1oHvO`nEz9@x} zcdFSL!V%$Ug({}pXC|1ojjz$D+bjB^iGz|{hgg3LhHE5M$3Vqd=W7Pi7*Y&nYWk98 zHPU2iR(w&0q98-PJumZ+kfw_|9=%YT;v67!)R72)r3)t~-lEkwqa9OkV^p6Qsn zl?bJo1F7{||D_3%-)!y* zjS!ni<+uQ9e>xCkr$R3=0bqmldychjR(j=!ewrodBjLOC`aOr*N|X#WQYAlgQ#O`p zxnrXlRE=IY4Mz$V7Hk@7-pEMmWy)b;9!=O@EcGqcJ;%tyZ(=y))plP!M#c`&m)6>y zBx#!JoRi-~BI^&52o0Q%@U48_ffgj{kWeF* zWj{m=;xPy~sm`V01_2HSkRsIRUSRr^)#5ITR4TKjko8EDt8AH?#;^hAsiE98`e}>! z)GV~v#g~JWqx1mGF}kx7eib}DmsSl6r4W{CsDWy637wRh6Kx+mFs*Ik11O34$!Rf} zn*If%>>`=7&UXxcjUbV$oZ#F;9rtM%UMunUX_;EHZ-5X;V0=}0Nj2p|$ov*0cg2MV zV|& zu}SE|ele9-5OMl>@fdJ39{qrW`g62@0rHhnOVNI}pCH#4b-GO2n1kjG0yN1IyPzV8 zX{%PTbK0u4Twh>X4otz}({PPe1ECwDc6EoZpmWJ`_oNb~q|>j$!j#8rT=BZ>9XK{v z#evu_fnF**L5kP%s9qCmF@0C`bku2uE-uY!*Q65u9*N5v|w!z zY7*NUZmr_0egy)wp@P?;o0@?+<3(rENIKW@9v|mDoS!3EV|Mr9J!(#aptc8zC%i`t z_HRJK9U#LIh$EK2rq*vM!2Fda6IG>L{-(; zyPEw|PqUFXH#_V#nV_VQH&FygQ>EE0*|;>{ z2`Vtw4ChGliKCpW!woLDh(;`>SoWZMuwp%f1{w83%jSXJt0lvULBhg7tJ*wVo}`aOt}Q;$zz(pBb1^E8tiX$WRw%=dV)!gAlbT-B7Naw>e*6aPec{q9&HBDV zP`Qt!((kEq>-77o=2=B{7#+$m+?=|PUybBP(x6>vao>V#j0%fZO45n{AcEf`p`KzL zv+2k5w3@aAof$g$7U64lIKN5DaJPb@I+dS$aD`f$6Rs1!5I3VxES2(?Pg9#NfX7gE zN%I_>;GxU5RfI+zDm@K-x-+R+U#f%bX-{#hg`}gBMF$?RH0!tg3e}|Jnz5+ARl5Q5KVhpW7BO2LtU-k_qj{saK*(O1w>OI z0c5r?O&V_Ms055nq=th+xi-`fO!<0c|7Wg4KHrJ=$U z*Ox}1F314doefy*kb;Gv&T@v9%qAaX)maWx*imByQ&T_ea6rl>c@oajF>gvUz z?06wj11-j=Hp_2X{eH%osxerHv??h_pY;Fqry}pj4fuVKiXemRVW+R0b*#Gqf95A}pR`o~9MZms!P2 z547s`p9N`}^(ClZ0o61^uA>D46{yYopOlg{46=uht?)mRp+YEayR7 zrfE3Ry?|6qUrLu`=$=oLKVgP(L#|O_S+-A>kkp*z)VguY-0akPd8cVVb(kP)2$1dH zR%2%UiRGSi8}$D$ce>k=f)U{^MIEQSkh0^Of{LKXEbQCfz#nJYzae^-LHutJu5vz6 zFe7MTiu-uS)~$gew_T{|TgM@E9v7#$hi{RRTFR<6`B5?(E?8Qhn{Q3Ai6@}reVCRtJ3)2shq62-|CE1KS6Y2(0RELtBjx+ZQn-2nsSl1Kk+GosZyJ z+iG;U8izfLrP-ci6vJ^_jnfPi%g}Kk&6OmIlaSU{qfKRl+iEnNKE<9Bi5#(mZrbRE z>I}oi@WrjnMiV+Hz|h1}FD2DSRb>fkT+{5fitpgu6`LB1jeO&1REtE^yIVX%6%^Mq zsoYVh>^QRWqIy3?aw#*XsET zxDwC_#pg}a55EItv?)g;{tb(!tg25Dm*G?ogSkdoA3u+Xxv&w(-9bXqd0f(76}~3b z*Bip;WX|+D&f|C6p#t$rTzg59Jc`7T(IHFUhNL#cE-nUna6h6iqZ=i6KiM2Zd;@Hc z3x@;Z^SA)5K^G#a3wA`v8iB4=1`;!>vGH)=9l1pLGCJKC#+!S#Q+&2 zm8g|bgoFbDOTcAwz2hwO1&$6M?(VF=X;thb+$5(6_e6Mbuo<0VC6RCsF+Q%~>Nq`0 zlvZuf^NqjZq8hrPWSx=!Tv~=Qe3piB`q8ztB1_uEXF(V`Vv!yQ;#z#5nblKu{ci=D zbU;xgK3uVwiAs^Ux`owK@p;e%gt`cZrz@tYHeB?WEik8;YG)>5su3kuOZ-V}NUt+$?_&mVY3UUXzj&D!zpA5Wp0voLdP^B%WAQOxZNW_+H7d6gg?7Lw*bGL<3z$+C%f7N~^=gh* z8gUslhcyp1E|&43Ls8?p+n~(Rh@6)s18|ho;z&zrM}lQ)bKl}vC{3mn3dvgWQ$k19 zf%DA<7^y@LiA0t?gnu-_>s$06tn5j%)Hg0sNl3mjf-AO;B1Cfs6cL-OLX0anntJtwh zKIfLV1a2OGPR#}?0LYzqFL#BG*h|uv)wI`9MQnd6sxPfTSV`e7Dn(Z#<6iFSl5`Z% zE~{}46<6i=f>}|NuV+ZnL zAgfDc)!>p!4GtqUmHp*k4JK<%We|l^a?F^G`|;gf)s;71kE+_G`8%W9bsqcat~2=A zZ$K0VTg#O5ZZHl+cI^JRp(i*g%)k4Y%#BWqpd8uzRxY%r}EoiN<{8Cy~ zTSjpsJH_T&cqK)@CjduwQ}wzb5%n=L-CTR+0+mMmb??YCD`chqv1LnWZW1o8vS!#4 zDlJ>>h@ny|*4y~Lno87T{uy3aXwP$om2-|LRU$=wrEFo^do zUKiX|Nxh@m=&fQH?^#}O3-5VoUB9k+>K#o+cVn+w_QAFVx(2>E6k9l_jXG@t2}>6c zrLk#5zpKT*z-IDQku#^afJ+K~c3DI#6mH&;(U%PeC=D`SEULN(+9^}ZIfRI#f20`& z9mN+RuYZJ)E9p{2Q0Z}f>05~C_rys0J;$4HrnZFq;kxF8Wa;EdwGhA+P?v*gR}WeTx0X48SStvK~>kidJhz#6bW6sna> zt$8|4nu5zht=NQ-k&8M5sdl%Ya|roSRbAZe4vZcWhed?#C(*yfub4Gb}C6PozCf06dm9_*SY?6z7(SlNFnu@9PS9-^V^Nd2Prw2 z_jGdl9_XFxQ4F`zCSPJ>eJNe@2$LIurju(lwX>S&dsqm_;8d|M*b)X!O8O=&f#Mn9 zOM4Flwmj!OJE;a}-gZ(ap^Do{gAC~n3x?$k@9`}*WC=P8P3$b^oOpxTEy_953G3p( zigH>D%I8FencYoF22Ji_Lxs%t(uD5wNk1U7{vRfmH54C>gK z2r^+?y-V4TRBU*581lL;Fha6hF;LiLXlL8y1rDe*nfA)R-nSJfK&=;cwF>U zZjlf_39&E)LruPwAUf>+MGJZ?t(_(wg>44x(BdO|K=yh;Zu5d9%OKL)aiYPSq9t;n zklEzBn}9=6I2iS#-k%}fOKaoAAK(*+)#ST{5DEiGXmsUn(2~G%pwgGtTE%@bm|fgM zK4dSum?c7vY7ycyOuh?VA(nduMX<&fUY!&RC&V?RfVJmKTooPCbt-h+6&0n3dR-H3rv2d@(bg!11 z$zL_n>ftCHBz$(l?V97GX+JT1X=U8?KHLZ(Fno|Z%r(2QJLmbzgMdb+A7!R$a8oPT zw89b%41v|qXfM_X3v~j1=WCrdXy`g|9oW0oG{_%7rd3}C8v`Z+_o-=~>T8;u891EZ zn{N7cEpBJk(1^&TOs7x*Qcjt^VbjU@{6UTBK`m$EuNld*)loQ5`257h_EW=I;5$dH z;f51Zcen?;?roIQcPrRZmW=O%KohlSg;^SBvJ%z^v$ReaNOL-<;M1_dv@)F5^o_pM zffk@eb?J@?sesnvI>L$a$@tac*OaW~?yCT~%9Hfht3kzbgbPPHiuGVX;WL@0C)~iN z&mcK0Q#YoPN%@NL)_0NU#@aNB&M? zHoDC`LkI>oASO)S4W`Uy%nVa~RMoWie%hI18OV@dfs>6Dx#QB+2FtTUoGQA z?JBhg(ww42wVIpcigQ}g3Pen5GNtQW)&Nwnzd`n0R>LcEP@b{g3JBJoeJ}>|+N;H( z3yMi4QV7j%7!1T4L2y$4Z3U^S}!Wt+T?5Vzhd}Y&oKG8%)SZ@$GTYIvxqOMn{=)O zLkyqjk@)gvTpLTSt)1|k2KadSQD^RKp{P|;=MWK~h%epI&Eh_XAO;<;uLlUZ=IUVD z?~Kv9W+R|=!g48NdmIxbB{=tPC&sCWkFBV`UR_#+@hVS_g_2~wM&>ol&7azj54URR z+Fvo=z}pLup%;(v)dTsnEjBD-)g3t9YaA)F_zt6M+GdDK#eMlB(us?Fl1Fj}^3{!y zucF#ch@j6-T4IF;n1`Fba|dH36HFtLJR`36{etVu*94pBX`Hs;NBCU0@C_aX^@a!_ zhz0@>O$~}-+&M(9FxDU#_^T2q$Oa2rwo>PWqOEaVRZkJ*q!9}}Bp0|6}*2WA#fWW@hs@j2muk;HZE6R*Cg}TXW$lOBesNeQ@g&D#42I7#xz^YE#)O; zYbYKid_hZDr>kfxb_YB-9I>=K&Ixy2&qYBUk9Bi+U-vlITq{nUNzKFW)p*xg58BZR4{4kmG-yzGNbB4H8#)&eJ*m~DyDV(bIA?2}0GLMr&Usod zUg;Hc{IKfw#j1N9tFE7>c!Z<4F9^3EWgWti6PNm!gd=j~#3i89r>H!R)?9!Dx{@2c z8GRn6Ez7l6K{dHi-cU|l>~oj$F1fEWz&R%f@23$JxEA#>SF(zd?(D>HlhLhfg9_FW zgH1zdiQ@XBE|a|0a{gX%04YwbYo^AlYp}=O8M!DnGE&~!$=np2fxXkBZ8y_JD9$9C z@hjiM8E|2Xrx4EAPN7gIJgkKcJiFYbTgw+chRbh@eWB|CgS6l=O*63p0GHCRm5qD!-*UA<)nAi12 zbbvJAONhF79ICU!UhIgx`^*7cbbc@wl!dFUESyl+jVq^9jyuY=P&eN$<&S~T1T~o} z$uJKw9D}fY!`hnlm0$der5e)1-VP#C18Ftl&NEmr%w7>5Z&`kXd`qf8a#pbz5#U;* z=*7Bz?HJhLzE#{947~wi*g3Xe#`P9-R`6Sdn)VE&*9*1etB<*1$4Pc%5N&k?bFAsu z>0>_~Yv_B3Yi++Gv;Zm?5Kxh|Ur-+_=w|}lI&Fd81lYBGk|U6D>w@s$sM82(5z@7P zgL}Gf7~wPF1oU%ghrY(JbCG|$$ zf?CaZI!F+>H93h49F7cMcux~{nTXwrUFg3U_g5%o7iSO%jc`eG7>0!`7>f;f)8#B~ z=KQfn=hC`s(b`A^#l*Sh3srZOE9|di2qvg;{nHi~369g}_@v-1me$(~gP>N|f)yS5 zQrfLhrSeu1yQltKs!C%X4U;xKVBchR2LpL~TrU zACIs!!=U#Njc*H$@5yg4FRnCEAox@DDt3`g{1x{* z^6{}N4G-7py|7Ijj1#9k;m^AV%1?p3-J^Y#H^Q*tJU9so0_aqUgWSW>u1&-vBHRjz zCy?lcKZYQ|*Gpm^up?BNp+I$PZ&dZXyj}ixbl2F#_?ywa!zNya-DN6NA7`*+K#uGl zuJd%~eO|uzUo8n}yN8$gsQZH;J@ z13FBZ0SM7%;!MO-Ka=j)cVXke4#n-(_=3xP$1Mfnd`I}YVdAB)NKn-VqEeX9okdL0 z{kj{l5Jl5#N;>u;qhLTu$7k@@^%JWUa3U_i-&11HX&{y}HQPW06wxr54?D1ea8pxo z{}yl0)*%O`a*qkD=(I+PofMy^m{8ZW26S>3AIANCaXsA` zYj-=!8_?6#()Uo54kKQAMIKVDJag`1jvS=;|n6d>D@x(42TX zfzpf2H^sCsX+;dno=OvXAR_qu(d1Ilotx~koVSwrB~NJ_lbgF{^K{C;X*N?5aokP{ z$dmOK#7wpN(w~U1G+F&=e7Qz?P0EFK&(u&mc!?H#%v8>J!%PkJ&QzQ*K}>yVE!9Nl z#c8*8e=DfGP8lcI0-Y4TppO9DI8HLJhjfkAt>A{JHhJQr$~JDGEyqXfgyaE5E^MIL zm0lL7`A9g?T=ilB4u`!>Fm8B=b%+*Z;zGtfkc+==B!XHR-MK<>nCUt+WYdXvg|txc zgr6{k7Nr#N1>EDyMzRpF+;NyuL+ME!iJWK(67JuTFOM!T`4{9-WxY_C1N0Y(U4b<< zm@PM03E%1LqJ zC$gU?ejxjE#J6PMD!wfH3&g+5{vz=y*+Ts1<%OA*C==lLH^)4`a+gG9_#|aPYBe#j-!N%)th|J;QE=A z>3;(pl<698UW|q^8@-uZ#|nrw@dHez&CkLax@ zPH6uu~ul0s`};a z_OI2SW0l}^S6-=z$Ia#43DPua?pkACxd%u}xoLoiGu`0v$xhqhqsm6xUPry3r@M6dgZOdj|q zO@WSYRIBS@lHRfb7jEG$5!qYeuO^?t&p0?M+=ycpe&zlZ@v8C!RYklHsx43O;cL}= zom~0h?#e;OZde&g#n<}qbv}f`E8S3A6_|KHBv8(l?i`f=0`2XE+YR?7+)HrJ!)=4x z0w=^hdfplL*m?LOd=Y*#{ATzq@LS-w!f%D|f$xFe3BS{&Avv5;x2Qc`l#r;yEpVN1 zhKEtNMN7l9m3rGdtn}QQLcG$O8X!d%tc$$^`nTv#Fa5)N=pXpom6towZhjG3k=nlo zm5m6ZuCDRuP{t#I#$!Ej0R#bWEl2n@xTA0t@#+!B$`jPdsCX_>Zcndj2`_Jc&lp|w z;V;S5-_i?mYcDupkKTF5>Y|#zL?f!-yckPUuM(&`9LS7=n*=uvE)H%E+yc0jaG-M- z=o|(=6n-fDVEDoC4e+6scvJ@;3WrCv@U`$Y@bS#6_qZtZaiBi@-?>%K!o5j#ca2ND z8olo|4ssm5?KKAI8(@^Q8^%qUH>A{~%`v+X^^(Xp4SQpk>WnT5+hb%^pR7{D*B_zb zfSSbM^r@s-gNIKkq!+Q~T+bF!L54J$n5yU9j!{^o74mhY4V+-YD?WCNYtmXl_r6m( zM)5`OYj8=PEo*S&-q(s|l$I8}uXWdCJVu%bQba+I2PFwEUnyR)K|>AU!#Vhd%Y0q* zJT2!d<5pvv_puRcoIAi9fYRQ1uhto>aXz3+rSI>_TZLVGlhj)t82uTm#mkqmhN6gjh;W3z&`V_qQBPClg3i!k z{H;qHlRpds-zXe%{;y8!3BdB-pVlXX6}wOC3xSFE^ld|sH~y#7dJffBBaZBWAK`_^ ziMJYOmKx<1lzeL=R^Y%11r?1yZc(5+nx)g$#e~vLi#rGrjVmS?8Au{g6jwz2a+u1h z@MKhciA3Hd~9b{c7@jn?#-Yz zB=Z1;>VgM!m+azNtm8s0lpKOaR&s#usV-fcBcmK&@{(9xinxRx$&*8luYsh}uEBr0Dce$)*oRwBq_ zXh3Q^uu-T(s$`xW@|u<%MDnAABSBV4mahF8tkrOViU(%#nsm~>;Tq1OBg-g7(Vk+5 zeoDMRbK?sMwBrKBx!q0CCn52fsZI#G9xo5$X3*l{1}fBqa2;qB?*Kdwg2GqsVKC>-@+PX@FR9v5T%^If4qkFpgMX zyh{4Qp}*JAL%S_Es}`6VF`=glOLrA=1yJ7CLp2U`Q(R&4OI0DtHLa@pM;~=NzY#ZB z(JDznwf*q3Z9;gBEOmtcUYs6B=YJ_%Zmo0|g4|MQd3mo0)2wVj?Zm>=Ma2cK0fUXX0 z$VYoT5>JP*oNL;Y?jz$uECr<5k&pItWW4EUf8&u+1Rl!q9u46%H`I=W;?NOL7#}4@ zob(T5dr)Ul^gKAKpTXg=7apYLaZ)YNQ-`v$W{S@BcET55cOcyedY*&NEz(TBKf1U9 zsuTS62Ec3gb~XVE4$Lm+$c+OQ8jVT#G*t>LDtpz1yLx<~_`GO24jiFHavN|;mGF7t zq+q9tE)4hb#f><%+QbnA0nMo^^IdTvOqgl(={dO_-(OuMPN>8JbtWgwWjO==Lx?6w zM)N_T7$0G(1ivsy5G;FL`BM9-5mzGcT&r^@J;xR5XSIKQ>!Fgfj6sr0su_cdQGa2& zTyPhZ0PJkxyZy9W-(2lrb(&aK+|2&iX1R=G^BLJ3-aXZHrI60bkvSUBsuNg{)qvcJ z8^$g2+v}0^g$Vi*r5Q{_Ae{h#W&`}*BguEm^K>4drz_fbB|*ZWVFJvJD@G?wJ;?qt zE@s-`!G|1YjXu?ym`56Kh)!)}j}NX2lknPAJ|WQZXA}Q=02Er3VH!eqSomz_IZ`M$ z@DB$wctR}em_#Qn(5ddpv`*r?lREt#KOFS;fEz$A{T_d-Ena@dz#pWGA4_KfI04@S zV!v7zQB582o+C;B4naVSpcdC>n5KJMe2`l7@SDcqF|OanemPoeiZ~qfz($M@Uhqly+K*`aj_z=`~1dW1{SeoF~M&PhiZwxwn_iUqcW!_lw4zgN8zyO zjbm^lXtRqI1O~MF2=Rp0q7ilI>Vtwkk#;_Owxhl+Znnz7>K%AQkmFMh1BkRfi`;!2 znSGdYTzA){{6FoTYjjlA701s^karzsI&Ke;*=RI> z;K&Eqsk><81J#GecCC-}4BN^|{f|no9=!UaIi2N!RsPHb3VpsXUbY_+qx8y_59z3! zHgd~=(tY&}9Xq#vNPV@!>AU+YmiyWk%ok@gi*R;$?W~^JEYgo0Hfu4-bWP@6|8@cU zI(Al%5OY168-3TCVheLv%KyZ+kz0Zz&J5=F*GIe8iYai|IS>{n}Fct2qw@^c&;sp?lX4vPPlfXH1z| z(vuiivU|DT|9Z(meBJmSE!mzLQki;T>=P*e5Sql^-h}_ai`hScJIi|KZtJ{bG&N^B z!=srZ%63-R)wD7GvXU0CN9n(5`+&TWb6K1#@KpFY77k zwk~E(z*{A|t#j7wwf?p>oln#$MC~SOAW_fnyJ`LchvTv%q}$e6cGz)xC-WG@Otv4Y%SoRr%9TISIq?QXve8hlqoTU|8th- zt=<;Ubaj7pVkt8YqZ8*C;<^IP)@3hQ<*np&uAv#zz`QJ*kA5dk zI6#9tJ{Yi=70z0|b-@5Tx;Vq^`SvKf{k>fm>?Tirx*I5i{((E{f60AL*PzenQ|OHx z?>XpnZ){tTgoDB7rMtS4s8{uef3eT;U{;+{)4vA3mwi5E`uDRre0 zWqk>X$}ZHl{h1Mko{?LsN!xYiR$E^SrLT)9V=QKiDdQ(@mcCvnyM<$iWHm;g(c&WA z?5C`XlCs_=&xA+$HDcQgoo~03)>#H_E8%0QIx5&UG#2$~U=e+~j4cCIPCxj*q!BFa z(?Gj3=hzb@V%HibqsD}nGdj4khnX?%`3Lv9S|}^v^BqsoMb$d=$O~7jwag4M|aeAc(JwfG3zF5FO7|8B)TcvMur#ZW|vei#rYJc`&}-^cwDe6 z#?dAI=>wJMSPY#KSFhY@Ql}_!P5QORDU&p4S{z#s8$_Fov^rMi=P`$2XXm&<(e@Gg zX*vA}i-{brm=as$m^m=lMcY?#$104rPhza&M7Z5a?W8xc8bJDqWqk*hb<8ieMR7J} zpv&!kt!+}QRInqsqchT#{_bzl!3VVy@*87*+}q11V8!=%SobQFwUiF&nhjozF;&EI z=7rgi6}OoFdZm1)HUgI4N=2G$GhjpHGdGpexaU7~mPL+<|Ah&1y1Q5AI_0K7X*itVRBB^x zQB0i`_MRk?;Yv?CofE&|s|;x@v7a>@T(OuVK;eelwwzz(OwC9nm^snB&Ps4Dd9u`8 zro4{5VfG#;MWZSG_!MZ(hpJ77N%t7+8qtc!`qq|+`H?~#*qyLaEvlkYvy8J$V-f2Z zk$gR`K9&^A=7{pl($Wi+hg(ba_R;i}VR}EJhp-_OyoM$?3&remKd|rFUh|gicd{6R28O72`*3!ozE9dvT3*9j zC(dRBtL1;k){z=Lr1ATYduF(q<(293cgQYjX2c1;WTwPY$t99sSt=Su!Hfy`tIDfG zEl&MW{;2FQb#SXAW7V!?4#mc!W1yL*7+$21^QJ&^pMRzmn-yQqk?Ll69)ir$wz(dU z=%mG2=bGnA`nuL6hs@efIM1V~O>y?3G2aZ%oF1(5&OX1#SDADUS)UbeTHG9tm=Q`( zC0u1Sx46fzn^|?inO=%~Q{L>{NWfvia68g?( zM=OZQ$ljRdSi~#BX&7_=a}vl&ASZ#G1acC{NgyYIoCIv4N< zYjCwHU@|Tl0eu9_0vQ`_da(oHvn3I+UNuj zuX+yg(+0$IyX#(ytNW{g?ymtVhql$62X1l0x8aJPJAlgj84%qTApV{Py8i;u{X&Ey z`S^hJImSG-B_IqIf^UJ@pdM6#3UDbX2BSd{$Ops0U@!m}(8F4(gW!GeHh2@H!CvqR z=mtB$cJL4o{r%u>a0j>PPjpz(!Q&W3evr|nR2Vhn!5VFd;gB7rs6+KKbd*bZ9v~Xul)Z0FL7f6m;>}Z z{UP`@cpkh5blhJtm=3g{Q0bNC5+FTY4sHVXgXh4zfEjA$d{7NyAa~^?kdr`80{`0* z@M&6u`VnnMKZnn5^NT+wUf-N)5HH+m%ysIF^t-Oh8%In7-~R>t57Hl~GnHnBnNGNp z|5Nbm`rUxH=*OxY^I=oqIay^ikSalXj|26?#+VDhI5U>#Q>d7~0Dp^2%9e_rU=dGw32uyX7IFV#Y9VgU zC8rj6SVVl-?maOd!{kw(AllRules.ruleset - fs2_open_3_7_3-DEBUG - fs2_open_3_7_3_SSE-DEBUG - fs2_open_3_7_3_SSE2-DEBUG - fs2_open_3_7_3 - fs2_open_3_7_3_SSE - fs2_open_3_7_3_SSE2 + fs2_open_3_7_3-DEBUG + fs2_open_3_7_3_SSE-DEBUG + fs2_open_3_7_3_SSE2-DEBUG + fs2_open_3_7_3 + fs2_open_3_7_3_SSE + fs2_open_3_7_3_SSE2 @@ -150,8 +150,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -168,10 +167,12 @@ EditAndContinue NDEBUG;%(UndefinePreprocessorDefinitions) false + true - _DEBUG;_VC08;%(PreprocessorDefinitions) + _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -227,8 +228,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -246,10 +246,12 @@ true EditAndContinue NDEBUG;%(UndefinePreprocessorDefinitions) + true - _DEBUG;_VC08;%(PreprocessorDefinitions) + _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -305,8 +307,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -324,10 +325,12 @@ true EditAndContinue NDEBUG;%(UndefinePreprocessorDefinitions) + true - _DEBUG;_VC08;_SSE2;%(PreprocessorDefinitions) + _DEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -381,19 +384,19 @@ - MaxSpeed + Full AnySuitable true Speed true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true MultiThreaded false false - Fast + Precise $(OutDir)$(ProjectName).pch $(IntDir) $(IntDir) @@ -405,10 +408,12 @@ true ProgramDatabase _DEBUG;%(UndefinePreprocessorDefinitions) + true - NDEBUG;_VC08;%(PreprocessorDefinitions) + NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -464,7 +469,7 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true MultiThreaded false @@ -483,10 +488,12 @@ _DEBUG;%(UndefinePreprocessorDefinitions) + true - NDEBUG;_VC08;%(PreprocessorDefinitions) + NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -541,7 +548,7 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true MultiThreaded false @@ -560,10 +567,12 @@ _DEBUG;%(UndefinePreprocessorDefinitions) + true - NDEBUG;_VC08;_SSE2;%(PreprocessorDefinitions) + NDEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) diff --git a/projects/MSVC_2010/code.vcxproj b/projects/MSVC_2010/code.vcxproj index 69dbdf2785b..50a91cb9a2d 100644 --- a/projects/MSVC_2010/code.vcxproj +++ b/projects/MSVC_2010/code.vcxproj @@ -117,8 +117,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -134,6 +133,7 @@ true EditAndContinue NDEBUG;%(UndefinePreprocessorDefinitions) + true _DEBUG;%(PreprocessorDefinitions) @@ -158,8 +158,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -177,6 +176,7 @@ true EditAndContinue NDEBUG;%(UndefinePreprocessorDefinitions) + true _DEBUG;%(PreprocessorDefinitions) @@ -201,8 +201,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -220,6 +219,7 @@ true EditAndContinue NDEBUG;%(UndefinePreprocessorDefinitions) + true _DEBUG;%(PreprocessorDefinitions) @@ -250,7 +250,7 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -269,6 +269,7 @@ _DEBUG;%(UndefinePreprocessorDefinitions) + true NDEBUG;%(PreprocessorDefinitions) @@ -293,7 +294,7 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -313,6 +314,7 @@ _DEBUG;%(UndefinePreprocessorDefinitions) + true NDEBUG;%(PreprocessorDefinitions) @@ -337,7 +339,7 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -357,6 +359,7 @@ _DEBUG;%(UndefinePreprocessorDefinitions) + true NDEBUG;%(PreprocessorDefinitions) @@ -934,30 +937,22 @@ - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) diff --git a/projects/MSVC_2010/code.vcxproj.filters b/projects/MSVC_2010/code.vcxproj.filters index 102da876a26..dc16d94e734 100644 --- a/projects/MSVC_2010/code.vcxproj.filters +++ b/projects/MSVC_2010/code.vcxproj.filters @@ -1607,7 +1607,7 @@ Sound - + Sound diff --git a/projects/MSVC_2012/Freespace2.vcxproj b/projects/MSVC_2012/Freespace2.vcxproj index 64cf8f1b35e..4e57a465c41 100644 --- a/projects/MSVC_2012/Freespace2.vcxproj +++ b/projects/MSVC_2012/Freespace2.vcxproj @@ -198,7 +198,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -218,8 +218,9 @@ true - _DEBUG;_VC08;%(PreprocessorDefinitions) + _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -276,7 +277,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -297,8 +298,9 @@ true - _DEBUG;_VC08;%(PreprocessorDefinitions) + _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -355,7 +357,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -376,8 +378,9 @@ true - _DEBUG;_VC08;_SSE2;%(PreprocessorDefinitions) + _DEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -418,7 +421,7 @@ Copying build... - copy /y "$(TargetPath)" "$(FS2PATH)\$(TargetFileName)" + copy /y "$(TargetPath)" "$(FS2PATH)\$(TargetFileName)" $(FS2PATH)\$(TargetFileName);%(Outputs) @@ -434,7 +437,7 @@ Disabled ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -455,8 +458,9 @@ true - _DEBUG;_VC08;_SSE2;%(PreprocessorDefinitions) + _DEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -511,19 +515,19 @@ - MaxSpeed + Full AnySuitable true Speed true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true MultiThreaded false false - Fast + Precise $(OutDir)$(ProjectName).pch $(IntDir) $(IntDir) @@ -538,8 +542,9 @@ true - NDEBUG;_VC08;%(PreprocessorDefinitions) + NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -596,7 +601,7 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true MultiThreaded false @@ -618,8 +623,9 @@ true - NDEBUG;_VC08;%(PreprocessorDefinitions) + NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -675,7 +681,7 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true MultiThreaded false @@ -697,8 +703,9 @@ true - NDEBUG;_VC08;_SSE2;%(PreprocessorDefinitions) + NDEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -734,7 +741,7 @@ Copying build... - copy /y "$(TargetPath)" "$(FS2PATH)\$(TargetFileName)" + copy /y "$(TargetPath)" "$(FS2PATH)\$(TargetFileName)" $(FS2PATH)\$(TargetFileName);%(Outputs) @@ -755,12 +762,12 @@ true true ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;USE_OPENAL;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true MultiThreaded false false - StreamingSIMDExtensions2 + AdvancedVectorExtensions Precise $(OutDir)$(ProjectName).pch $(IntDir) @@ -777,8 +784,9 @@ true - NDEBUG;_VC08;_SSE2;%(PreprocessorDefinitions) + NDEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) diff --git a/projects/MSVC_2012/code.vcxproj b/projects/MSVC_2012/code.vcxproj index 7e2833114bc..d40fa9b4e4b 100644 --- a/projects/MSVC_2012/code.vcxproj +++ b/projects/MSVC_2012/code.vcxproj @@ -158,8 +158,8 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -190,7 +190,7 @@ %(IgnoreSpecificDefaultLibraries) - + %(AdditionalOptions) true $(IntDir)$(ProjectName).bsc @@ -199,8 +199,8 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -233,7 +233,7 @@ %(IgnoreSpecificDefaultLibraries) - + %(AdditionalOptions) true $(IntDir)$(ProjectName).bsc @@ -242,8 +242,8 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -276,7 +276,7 @@ %(IgnoreSpecificDefaultLibraries) - + %(AdditionalOptions) true $(IntDir)$(ProjectName).bsc @@ -285,8 +285,8 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - _WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -319,7 +319,7 @@ %(IgnoreSpecificDefaultLibraries) - + %(AdditionalOptions) true $(IntDir)$(ProjectName).bsc @@ -334,8 +334,8 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -378,8 +378,8 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -423,8 +423,8 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -468,8 +468,8 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer;%(AdditionalIncludeDirectories) + FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -1067,38 +1067,22 @@ - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) diff --git a/projects/MSVC_2012/code.vcxproj.filters b/projects/MSVC_2012/code.vcxproj.filters index 3fb4e12ada9..ee4abd53281 100644 --- a/projects/MSVC_2012/code.vcxproj.filters +++ b/projects/MSVC_2012/code.vcxproj.filters @@ -1601,7 +1601,7 @@ Sound - + Sound diff --git a/projects/MSVC_2013/Freespace2.vcxproj b/projects/MSVC_2013/Freespace2.vcxproj index dc0398c7e02..5e5199feeee 100644 --- a/projects/MSVC_2013/Freespace2.vcxproj +++ b/projects/MSVC_2013/Freespace2.vcxproj @@ -212,6 +212,7 @@ _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -285,6 +286,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -358,6 +360,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" _DEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -431,6 +434,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" _DEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -510,6 +514,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -586,6 +591,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -662,6 +668,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -741,6 +748,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) diff --git a/projects/MSVC_2013/code.vcxproj b/projects/MSVC_2013/code.vcxproj index d14e63cfdc2..9708f9a824c 100644 --- a/projects/MSVC_2013/code.vcxproj +++ b/projects/MSVC_2013/code.vcxproj @@ -157,7 +157,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -199,7 +199,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -243,7 +243,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -287,7 +287,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -337,7 +337,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -381,7 +381,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -426,7 +426,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -471,7 +471,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -985,7 +985,7 @@ - + @@ -1070,38 +1070,22 @@ - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) diff --git a/projects/MSVC_2013/code.vcxproj.filters b/projects/MSVC_2013/code.vcxproj.filters index 9af641d9d22..d07e87edc10 100644 --- a/projects/MSVC_2013/code.vcxproj.filters +++ b/projects/MSVC_2013/code.vcxproj.filters @@ -1607,7 +1607,7 @@ Sound - + Sound diff --git a/projects/MSVC_2015/Freespace2.vcxproj b/projects/MSVC_2015/Freespace2.vcxproj index 98f9ba6cb8f..bac5c25e003 100644 --- a/projects/MSVC_2015/Freespace2.vcxproj +++ b/projects/MSVC_2015/Freespace2.vcxproj @@ -212,6 +212,7 @@ _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -285,6 +286,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" _DEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -358,6 +360,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" _DEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -431,6 +434,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" _DEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) true @@ -510,6 +514,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -586,6 +591,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -662,6 +668,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) @@ -741,6 +748,7 @@ copy /y "$(OutputPath)$(TargetName).pdb" "$(FS2PATH)\$(TargetName).pdb" NDEBUG;_VC08;_SSE2;FS2_VOICER;%(PreprocessorDefinitions) 0x0409 + $(Configuration)\code\voicer\;%(AdditionalIncludeDirectories) odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;vfw32.lib;msacm32.lib;comctl32.lib;openal32.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;theora_static.lib;%(AdditionalDependencies) diff --git a/projects/MSVC_2015/code.vcxproj b/projects/MSVC_2015/code.vcxproj index ba45afd453a..7d607b5049a 100644 --- a/projects/MSVC_2015/code.vcxproj +++ b/projects/MSVC_2015/code.vcxproj @@ -157,7 +157,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -199,7 +199,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -243,7 +243,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -287,7 +287,7 @@ Disabled - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;_WINDOWS;WIN32;_DEBUG;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -337,7 +337,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -381,7 +381,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -426,7 +426,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -471,7 +471,7 @@ Speed true true - ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;%(AdditionalIncludeDirectories) + ../../code;../../libjpeg;../../libpng;../../lua;../../oggvorbis/include;../../openal/include;../../zlib;$(IntDir)voicer\;%(AdditionalIncludeDirectories) FS2_SPEECH;FS2_VOICER;NDEBUG;WIN32;_WINDOWS;PDB_DEBUGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) true Sync @@ -985,7 +985,7 @@ - + @@ -1070,38 +1070,22 @@ - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) - "%(RootDir)%(Directory)gc" "%(RootDir)%(Directory)%(Filename)" -"%(RootDir)%(Directory)gc" /h "%(RootDir)%(Directory)grammar.h" "%(RootDir)%(Directory)%(Filename)" - - %(RootDir)%(Directory)phrases.cfg;%(RootDir)%(Directory)grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) + gc /O "$(IntDir)voicer\%(Filename).cfg" /H "$(IntDir)voicer\grammar.h" "%(RootDir)%(Directory)%(Filename)" + $(IntDir)voicer\%(Filename).cfg;$(IntDir)voicer\grammar.h;%(Outputs) diff --git a/projects/MSVC_2015/code.vcxproj.filters b/projects/MSVC_2015/code.vcxproj.filters index a3e68bbe63d..1a6c0eb0531 100644 --- a/projects/MSVC_2015/code.vcxproj.filters +++ b/projects/MSVC_2015/code.vcxproj.filters @@ -1607,7 +1607,7 @@ Sound - + Sound