I'll check this in by EOD today if no response... > -----Original Message----- > From: [EMAIL PROTECTED] > [mailto:[EMAIL PROTECTED] On Behalf Of Eric Hyche > Sent: Thursday, August 11, 2005 4:36 PM > To: [EMAIL PROTECTED] > Subject: [Audio-dev] CR-Client: make inclusion of WaveOut in > .pcf matchsource > > > Description > ---------------------------------- > With the recent size reduction changes on Windows > to not include CAudioOutWindows if HELIX_CONFIG_MINIMIZE_SIZE > is defined in hxauddev.cpp, then the conditional logic > to build winaudio.cpp in auddevlib_win.pcf did not > match the source in hxauddev.cpp. This change fixes that. > > The old logic in auddevlib_win.pcf was: > > if project.IsDefined("HELIX_FEATURE_DIRECT_SOUND"): > if "HELIX_FEATURE_DIRECT_SOUND" in project.defines: > project.AddIncludes(GetSDKPath("dxsdk") + "/include") > project.AddSources("platform/win/hxaudevds.cpp") > else: > project.AddSources("platform/win/winaudio.cpp") > else: > project.AddSources("platform/win/winaudio.cpp") > if "HELIX_FEATURE_DIRECT_SOUND" in project.defines: > project.AddIncludes(GetSDKPath("dxsdk") + "/include") > project.AddSources("platform/win/hxaudevds.cpp"); > > which means that if HELIX_FEATURE_DIRECT_SOUND is defined, > then winaudio.cpp does not get included at all. This was > causing a build buster. The new logic is: > > if project.IsDefined("HELIX_FEATURE_DIRECT_SOUND"): > project.AddIncludes(GetSDKPath("dxsdk") + "/include") > project.AddSources("platform/win/hxaudevds.cpp") > > if not project.IsDefined("HELIX_FEATURE_DIRECT_SOUND") or \ > not project.IsDefined("HELIX_CONFIG_MINIMIZE_SIZE"): > project.AddSources("platform/win/winaudio.cpp") > > This matches the source in hxauddev.cpp and fixes > the build buster. This did not show up until Ryan's > changes from a couple of days ago. Apparently there is > some difference between: > > project.IsDefined(x) > and > x in project.defines > > Branches > --------------------------- > HEAD and 150Cay > > Files Modified > --------------------------- > audio/device/auddevlib_win.pcf > > > Index: auddevlib_win.pcf > =================================================================== > RCS file: /cvsroot/audio/device/auddevlib_win.pcf,v > retrieving revision 1.4 > diff -u -w -u -w -r1.4 auddevlib_win.pcf > --- auddevlib_win.pcf 9 Aug 2005 02:57:47 -0000 1.4 > +++ auddevlib_win.pcf 11 Aug 2005 20:28:40 -0000 > @@ -37,16 +37,11 @@ > > project.AddIncludes("pub/platform/win") > > - > if project.IsDefined("HELIX_FEATURE_DIRECT_SOUND"): > - if "HELIX_FEATURE_DIRECT_SOUND" in project.defines: > project.AddIncludes(GetSDKPath("dxsdk") + "/include") > project.AddSources("platform/win/hxaudevds.cpp") > - else: > - project.AddSources("platform/win/winaudio.cpp") > -else: > + > +if not project.IsDefined("HELIX_FEATURE_DIRECT_SOUND") or \ > + not project.IsDefined("HELIX_CONFIG_MINIMIZE_SIZE"): > project.AddSources("platform/win/winaudio.cpp") > - if "HELIX_FEATURE_DIRECT_SOUND" in project.defines: > - project.AddIncludes(GetSDKPath("dxsdk") + "/include") > - project.AddSources("platform/win/hxaudevds.cpp"); > > > > > =========================================== > Eric Hyche ([EMAIL PROTECTED]) > Embedded Player and Technologies > RealNetworks, Inc. > > _______________________________________________ > Audio-dev mailing list > [email protected] > http://lists.helixcommunity.org/mailman/listinfo/audio-dev >
_______________________________________________ Audio-dev mailing list [email protected] http://lists.helixcommunity.org/mailman/listinfo/audio-dev
