compile fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,7 +10,7 @@ class MyPanel(wx.Panel):
|
|||||||
|
|
||||||
intro = 'Welcome To PyCrust %s - The Flakiest Python Shell' % version.VERSION
|
intro = 'Welcome To PyCrust %s - The Flakiest Python Shell' % version.VERSION
|
||||||
pycrust = shell.Shell(self, -1, introText=intro)
|
pycrust = shell.Shell(self, -1, introText=intro)
|
||||||
#pycrust = wxTextCtrl(self, -1, intro)
|
#pycrust = wx.TextCtrl(self, -1, intro)
|
||||||
|
|
||||||
sizer = wx.BoxSizer(wx.VERTICAL)
|
sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
sizer.Add(text, 0, wx.EXPAND|wx.ALL, 10)
|
sizer.Add(text, 0, wx.EXPAND|wx.ALL, 10)
|
||||||
|
@@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
|
|
||||||
WXDIR = $(WXWIN)
|
WXDIR = $(WXWIN)
|
||||||
PYTHONDIR = c:\tools\Python23
|
PYTHONDIR = c:\tools\Python24
|
||||||
VER = 25d
|
VER = 26d
|
||||||
|
|
||||||
INCLUDES = -I$(WXDIR)\lib\vc_dll\mswd -I$(WXDIR)\include -I$(WXDIR)\wxPython\include -I$(PYTHONDIR)\include -I$(PYTHONDIR)\PC
|
INCLUDES = -I$(WXDIR)\lib\vc_dll\mswd -I$(WXDIR)\include -I$(WXDIR)\wxPython\include -I$(PYTHONDIR)\include -I$(PYTHONDIR)\PC
|
||||||
CXXFLAGS = /c /nologo /Od /MDd /W3 /GX /Z7 /D_DEBUG -DWIN32 -D_WINDOWS -D__WXMSW__ -DWXUSINGDLL=1 -DWXP_USE_THREAD=1 -UNDEBUG -D__WXDEBUG__ /Gy
|
CXXFLAGS = /c /nologo /Od /MDd /W3 /GX /Z7 /D_DEBUG -DWIN32 -D_WINDOWS -D__WXMSW__ -DWXUSINGDLL=1 -DWXP_USE_THREAD=1 -UNDEBUG -D__WXDEBUG__ /Gy
|
||||||
LIBFLAGS = /nologo /pdb:None /DEBUG /LIBPATH:$(WXDIR)\lib\vc_dll /LIBPATH:$(PYTHONDIR)\libs
|
LIBFLAGS = /nologo /DEBUG /LIBPATH:$(WXDIR)\lib\vc_dll /LIBPATH:$(PYTHONDIR)\libs
|
||||||
LIBS = wxbase$(VER).lib wxmsw$(VER)_core.lib \
|
LIBS = wxmsw$(VER).lib \
|
||||||
kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib \
|
kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib \
|
||||||
shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib \
|
shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib \
|
||||||
uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
|
uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
|
||||||
|
Reference in New Issue
Block a user