From b77f1971e1b32709a5559a47a3a6652809bbcff2 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 23 Jul 2009 08:08:14 +0000 Subject: [PATCH] Remove .res and .obj files, and let makepanda compile them --- makepanda/makepanda.py | 20 +++++++++++++++----- panda/src/configfiles/pandaIcon.obj | Bin 6084 -> 0 bytes panda/src/configfiles/pandaIcon.res | Bin 5556 -> 0 bytes pandatool/src/maxegg/maxEgg.res | Bin 3440 -> 0 bytes pandatool/src/maxprogs/maxImportRes.obj | Bin 1332 -> 0 bytes 5 files changed, 15 insertions(+), 5 deletions(-) delete mode 100755 panda/src/configfiles/pandaIcon.obj delete mode 100755 panda/src/configfiles/pandaIcon.res delete mode 100755 pandatool/src/maxegg/maxEgg.res delete mode 100755 pandatool/src/maxprogs/maxImportRes.obj diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 34bea03224..96306f4a91 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -787,7 +787,7 @@ def CompileLink(dll, obj, opts): pass else: cmd = cmd + ' ' + BracketNameWithQuotes(x) if (GetOrigExt(dll)==".exe" and platform.architecture()[0] == "32bit"): - cmd = cmd + ' panda/src/configfiles/pandaIcon.obj' + cmd = cmd + ' built/tmp/pandaIcon.res' for (opt, name) in LIBNAMES: if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' ' + BracketNameWithQuotes(name) oscmd(cmd) @@ -1570,6 +1570,16 @@ COMMON_EGG2X_LIBS_PYSTUB = COMMON_EGG2X_LIBS + ['libp3pystub.dll'] print "Generating dependencies..." sys.stdout.flush() +# +# Compile Panda icon resource file. +# We do it first because we need it at +# the time we compile an executable. +# + +if (sys.platform.startswith("win")): + OPTS=['DIR:panda/src/configfiles'] + TargetAdd('pandaIcon.res', input='pandaIcon.rc') + # # DIRECTORY: dtool/src/dtoolbase/ # @@ -3423,11 +3433,11 @@ for VER in MAXVERSIONS: VNUM=VER[3:] if (PkgSkip(VER)==0) and (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/maxegg', VER, "WINCOMCTL", "WINCOMDLG", "WINUSER", "MSFORSCOPE"] - CopyFile(GetOutputDir()+"/tmp/maxEgg.obj", "pandatool/src/maxegg/maxEgg.obj") + TargetAdd('maxEgg.res', input='maxEgg.rc') TargetAdd('maxegg'+VNUM+'_loader.obj', opts=OPTS, input='maxEggLoader.cxx') TargetAdd('maxegg'+VNUM+'_composite1.obj', opts=OPTS, input='maxegg_composite1.cxx') TargetAdd('maxegg'+VNUM+'.dlo', input='maxegg'+VNUM+'_composite1.obj') - TargetAdd('maxegg'+VNUM+'.dlo', input='maxEgg.obj') + TargetAdd('maxegg'+VNUM+'.dlo', input='maxEgg.res') TargetAdd('maxegg'+VNUM+'.dlo', input='maxEgg.def', ipath=OPTS) TargetAdd('maxegg'+VNUM+'.dlo', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('maxegg'+VNUM+'.dlo', opts=OPTS) @@ -3440,14 +3450,14 @@ for VER in MAXVERSIONS: VNUM=VER[3:] if (PkgSkip(VER)==0) and (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/maxprogs', VER, "WINCOMCTL", "WINCOMDLG", "WINUSER", "MSFORSCOPE"] - CopyFile(GetOutputDir()+"/tmp/maxImportRes.obj", "pandatool/src/maxprogs/maxImportRes.obj") + TargetAdd('maxImportRes.res', input='maxImportRes.rc') TargetAdd('maxprogs'+VNUM+'_maxeggimport.obj', opts=OPTS, input='maxEggImport.cxx') TargetAdd('maxeggimport'+VNUM+'.dle', input='maxegg'+VNUM+'_loader.obj') TargetAdd('maxeggimport'+VNUM+'.dle', input='maxprogs'+VNUM+'_maxeggimport.obj') - TargetAdd('maxeggimport'+VNUM+'.dle', input='maxImportRes.obj') TargetAdd('maxeggimport'+VNUM+'.dle', input='libpandaegg.dll') TargetAdd('maxeggimport'+VNUM+'.dle', input='libpanda.dll') TargetAdd('maxeggimport'+VNUM+'.dle', input='libpandaexpress.dll') + TargetAdd('maxeggimport'+VNUM+'.dle', input='maxImportRes.res') TargetAdd('maxeggimport'+VNUM+'.dle', input='maxEggImport.def', ipath=OPTS) TargetAdd('maxeggimport'+VNUM+'.dle', input=COMMON_DTOOL_LIBS) TargetAdd('maxeggimport'+VNUM+'.dle', opts=OPTS) diff --git a/panda/src/configfiles/pandaIcon.obj b/panda/src/configfiles/pandaIcon.obj deleted file mode 100755 index 0a1e4b8f4ca6378dcf01214ce74d25f5dc59d245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6084 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 diff --git a/pandatool/src/maxegg/maxEgg.res b/pandatool/src/maxegg/maxEgg.res deleted file mode 100755 index 64741b76099fd54fadb6f90ea009f98c781922ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3440 zcmb7{&u<%55XWZ|Cv{Q-p@s6RR11xIs30;WR036n#CAy3q+Qi%h`2zSIEjUwggBvr z1B!ygfm05MJE#{V4jeckAt8iNPaOD1xN$*r`OLiC?ho5kyp{L8-8bL)J+sduB0j$` zbU&7v@#{dmKLky~_R3=;g_y`QqkP& zDmQs@6b#F-ye}tZ2nk_$B!OYpxcl;|RJqsWZ7!V;WJk8)vnR?eKL+4+TCSqO--C`< zO*XhX2_d#Ua_B*K7MV2>WY*seepN3rj0HiF(<=k zIVh_Cr}(ERgXa4~xnXp>*srltFFUV0-!!pkgEuqmwb)Df)mVGMkle+ur=$SC-u_6( z(3k6Ib|+B_-mzX^m|nw?UIBW!xcKO({@t;A3L4q-rMycnjYqh7_^ZZw%qK(X9Cta{ zFURl6y~C%RAn#k7vo_T6gvQ%>M}1P1V=t+IP4-({KDpdNo9xh>9g@pnLK{b9%oe=b z8(FZ7P=8Y-@da{7D>MubWdY2Z$;=WfZ425<(2hp5-Lkqdcfp(o zb27qA!+%dUGla_f_ehUYL|2E(*|3_SJt1oIDfx@sb2e+-$~X8}xyNa#JA8G}<_gIxqWE>9Ttv#g7# z{SyAajGd?Z+WFtTYc|54>5EVIp5A^smMip&qCC^nzNx5gX0XG>IiDLNB?*q{N9)x5 zvk{M578hS`g3*4}T{Q#C$MpG&$USSABVwSrs^1muZn3nS%fws$5ua*qJeRV$cV12A zz$$aYWWEr|)GSzgsJw>Bd;X#FUdzbS-hNDc*3tEx$vdR`Y|}GupahKpJA=zr^282If$?twC8w!GkPk}uQ(25#wMhm zWrKeIG<)JsGsn|9{t>AfO<5+1%IC%4 z*PUjxm$lG8?r00F4zN#8FgmW1;~uuDW*erR(#QHGoiL4?AjTSR9ZtUhynY|{={kEU zX~KzT4Sjw4@*F@vY4&94^H$|;T9h*>A5@XtL5^yi^mo-IIpet#-UO6tr_Y=}<6SU6 zRnWR^y(eAf`O?v*(+Wx>$YNwtlwc_{L)i12i zH*-ps`9f#S=3|H-k6l;1S!P&lP)in)lXmn>z9Fr=HT>Nu-1CRTs_mRq~!1;^$Gl z>Vr6glL`~QS~P(ug4&Tf$DVup6@-CaF UqxKws9bB|JXj;dM8ui}eUrrPE2mk;8 diff --git a/pandatool/src/maxprogs/maxImportRes.obj b/pandatool/src/maxprogs/maxImportRes.obj deleted file mode 100755 index ff31dd0c37eb637bdde4f3bcd05a48161518aaa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1332 zcmb7EO=}ZT6g@9vO`3uYSg0$RMHUuxNUKPfX=25qwIL}k#e7WS6lW&POlSp>;L3u3 z#9!dXMRDcIwfGY>|Dm4y-b|g;BK3y6k8{s^@7#OeyeG=S@{ezgH&=i%v?*uc_9mlh z$4r689DK+oXqlW64io!Ud(Cb>+i!25=}wvK6c*Ut z0H%L185J;OyGeY+zV(-1VUc-xDbzVL_)&^IJQvI7++5a{_%A}(5?hgKPER?|c7m@{ z$rJDiP2F#yhY%Aau&Jnv00Xvn@qqJfjQF#$10Q3uBC=ez<_usL9eO)@Rjfzi^>mba zbKNMYRs(mifos$Ps+nR>S2@oqw2IXF5moxd-d$QvnWbq`LqzQ^^?Gb=YIE_5zmRB| zkp!vsgiMb!pMJq?>~qv-)&p{dKf-IG&D3w=6{Y9%cvZ{)f~UH_Oz!?aZ^zXBue?!J z>limRN9roMm0SdjNaD|%MeZ_IaKJr(@?Hy9vJ^35$=D(Dk}wYv`-EteWm5Ddslqag=aRsX&}x$g$C~Mt&K;QZ4ygCiM$>6EBY8zFs%G zaNQP9^H|;P+1c6A^?vA&9d9sOdQQEfp+0oGiBqd7QVf!Riv+clyhihue}^RJmXepq id{r4U{{~SeIr0k4TeV%&CaC5>BkT7zAMt2|i0?NB#JQsY