AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes for new lib dirs for wxMSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2003-08-23 02:50:33 +00:00
parent 116d6bea10
commit 1e52188741
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wxPython/setup.py
View File

@ -329,7 +329,7 @@ def makeLibName(name):
def adjustCFLAGS(cflags, defines, includes): def adjustCFLAGS(cflags, defines, includes):
'''Extrace the raw -I, -D, and -U flags and put them into '''Extract the raw -I, -D, and -U flags and put them into
defines and includes as needed.''' defines and includes as needed.'''
newCFLAGS = [] newCFLAGS = []
for flag in cflags: for flag in cflags:
@ -350,7 +350,7 @@ def adjustCFLAGS(cflags, defines, includes):
def adjustLFLAGS(lfags, libdirs, libs): def adjustLFLAGS(lfags, libdirs, libs):
'''Extrace the -L and -l flags and put them in libdirs and libs as needed''' '''Extract the -L and -l flags and put them in libdirs and libs as needed'''
newLFLAGS = [] newLFLAGS = []
for flag in lflags: for flag in lflags:
if flag[:2] == '-L': if flag[:2] == '-L':
@ -402,7 +402,7 @@ if os.name == 'nt':
GENDIR = 'msw' GENDIR = 'msw'
includes = ['src', includes = ['src',
opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll'), opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()),
opj(WXDIR, 'include'), opj(WXDIR, 'include'),
opj(WXDIR, 'contrib', 'include'), opj(WXDIR, 'contrib', 'include'),
] ]
@ -425,7 +425,7 @@ if os.name == 'nt':
if not FINAL or HYBRID: if not FINAL or HYBRID:
defines.append( ('__WXDEBUG__', None) ) defines.append( ('__WXDEBUG__', None) )
libdirs = [ opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll') ] libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ]
libs = [ 'wxbase' + WXDLLVER + libFlag(), # TODO: trim this down to what is really needed for the core libs = [ 'wxbase' + WXDLLVER + libFlag(), # TODO: trim this down to what is really needed for the core
'wxbase' + WXDLLVER + libFlag() + '_net', 'wxbase' + WXDLLVER + libFlag() + '_net',
'wxbase' + WXDLLVER + libFlag() + '_xml', 'wxbase' + WXDLLVER + libFlag() + '_xml',