On 12/11/2018 11:52 AM, Brüns, Stefan wrote: > On Dienstag, 11. Dezember 2018 17:27:20 CET Wayne Stambaugh wrote: >> Hi Stefan, >> >> On 12/11/2018 11:17 AM, Brüns, Stefan wrote: >>> On Sonntag, 9. Dezember 2018 18:07:21 CET Wayne Stambaugh wrote: >>>> Stefan, >>>> >>>> I tested you patch and it seems to work fine on linux. However, it also >>>> affects macos which I'm not sure that it wont break something. Would >>>> one of our macos devs please take a look at this patch when you get a >>>> chance. >>> >>> Hi Wayne, >>> >>> I am quite sure it does not affect MacOS, as the changed code block is >>> guarded by #ifndef __WXMAC__ [1], and PLUGINDIR is not used outside the >>> block as far as I can see. >>> >>> Kind regards, >>> >>> Stefan >>> >>> [1] https://git.launchpad.net/kicad/tree/3d-viewer/3d_cache/ >>> 3d_plugin_manager.cpp#n123 >> >> The patch I'm looking at applies at line 149 which is inside #ifndef >> _WIN32 block which would effect both linux and macos. Is it possible >> this code changed you submitted the patch (it does apply cleanly) or I >> have the wrong patch. I've attached the patch I tested just in case. > > And line 123 has #ifndef __WXMAC__. The WIN32 block is nested inside it, so > literally it is #if !(defined(__WXMAC__) || defined(_WIN32)). > > Regards, > > Stefan >
I missed that. The indented pragmas threw me off. I merge this as soon as I get a chance. Cheers, Wayne _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
