|
Lines 131-138
Link Here
|
| 131 |
_copyEnvGroup(conf.env, '_WX', '_WXGL') |
131 |
_copyEnvGroup(conf.env, '_WX', '_WXGL') |
| 132 |
conf.env.LIB_WXGL += cfg.makeLibName('gl') |
132 |
conf.env.LIB_WXGL += cfg.makeLibName('gl') |
| 133 |
|
133 |
|
| 134 |
_copyEnvGroup(conf.env, '_WX', '_WXWEBVIEW') |
134 |
#_copyEnvGroup(conf.env, '_WX', '_WXWEBVIEW') |
| 135 |
conf.env.LIB_WXWEBVIEW += cfg.makeLibName('webview') |
135 |
#conf.env.LIB_WXWEBVIEW += cfg.makeLibName('webview') |
| 136 |
|
136 |
|
| 137 |
_copyEnvGroup(conf.env, '_WX', '_WXXML') |
137 |
_copyEnvGroup(conf.env, '_WX', '_WXXML') |
| 138 |
conf.env.LIB_WXXML += cfg.makeLibName('xml', isMSWBase=True) |
138 |
conf.env.LIB_WXXML += cfg.makeLibName('xml', isMSWBase=True) |
|
Lines 220-235
Link Here
|
| 220 |
uselib_store='WXGL', mandatory=True, |
220 |
uselib_store='WXGL', mandatory=True, |
| 221 |
msg='Finding libs for WXGL') |
221 |
msg='Finding libs for WXGL') |
| 222 |
|
222 |
|
| 223 |
conf.check_cfg(path=conf.options.wx_config, package='', |
223 |
#conf.check_cfg(path=conf.options.wx_config, package='', |
| 224 |
args='--cxxflags --libs webview,core,net' + rpath, |
224 |
# args='--cxxflags --libs webview,core,net' + rpath, |
| 225 |
uselib_store='WXWEBVIEW', mandatory=True, |
225 |
# uselib_store='WXWEBVIEW', mandatory=True, |
| 226 |
msg='Finding libs for WXWEBVIEW') |
226 |
# msg='Finding libs for WXWEBVIEW') |
| 227 |
|
227 |
|
| 228 |
if isDarwin: |
228 |
#if isDarwin: |
| 229 |
conf.check_cfg(path=conf.options.wx_config, package='', |
229 |
# conf.check_cfg(path=conf.options.wx_config, package='', |
| 230 |
args='--cxxflags --libs core,net' + rpath, |
230 |
# args='--cxxflags --libs core,net' + rpath, |
| 231 |
uselib_store='WXWEBKIT', mandatory=True, |
231 |
# uselib_store='WXWEBKIT', mandatory=True, |
| 232 |
msg='Finding libs for WXWEBKIT') |
232 |
# msg='Finding libs for WXWEBKIT') |
| 233 |
|
233 |
|
| 234 |
conf.check_cfg(path=conf.options.wx_config, package='', |
234 |
conf.check_cfg(path=conf.options.wx_config, package='', |
| 235 |
args='--cxxflags --libs xml,core,net' + rpath, |
235 |
args='--cxxflags --libs xml,core,net' + rpath, |
|
Lines 567-573
Link Here
|
| 567 |
makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC') |
567 |
makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC') |
| 568 |
makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML') |
568 |
makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML') |
| 569 |
makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL') |
569 |
makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL') |
| 570 |
makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW') |
570 |
#makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW') |
| 571 |
makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML') |
571 |
makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML') |
| 572 |
makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC') |
572 |
makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC') |
| 573 |
makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT') |
573 |
makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT') |
|
Lines 577-584
Link Here
|
| 577 |
makeETGRule(bld, 'etg/_aui.py', '_aui', 'WXAUI') |
577 |
makeETGRule(bld, 'etg/_aui.py', '_aui', 'WXAUI') |
| 578 |
|
578 |
|
| 579 |
# Modules that are platform-specific |
579 |
# Modules that are platform-specific |
| 580 |
if isDarwin: |
580 |
#if isDarwin: |
| 581 |
makeETGRule(bld, 'etg/_webkit.py', '_webkit', 'WXWEBKIT') |
581 |
#makeETGRule(bld, 'etg/_webkit.py', '_webkit', 'WXWEBKIT') |
| 582 |
if isWindows: |
582 |
if isWindows: |
| 583 |
makeETGRule(bld, 'etg/_msw.py', '_msw', 'WX') |
583 |
makeETGRule(bld, 'etg/_msw.py', '_msw', 'WX') |
| 584 |
|
584 |
|
