Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added gtk-config to build.cfg

Browse Source 
some minor tweaks


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-06-21 03:48:31 +00:00
parent ec66f52340
commit 86d60447c3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/src/build.cfg
View File

@@ -41,7 +41,7 @@ else:
OTHERINSTALLTARGETS = 'installLib installDemo installHelpers ' OTHERINSTALLTARGETS = 'installLib installDemo installHelpers '
OTHERUNINSTALLTARGETS = 'uninstallLib uninstallDemo uninstallHelpers ' OTHERUNINSTALLTARGETS = 'uninstallLib uninstallDemo uninstallHelpers '
#OTHERLFLAGS = '-L. ' OTHERCFLAGS = '`gtk-config --cflags`'
OTHERRULES = """ OTHERRULES = """
HELPERLIBNAME = lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER).0.0 HELPERLIBNAME = lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER).0.0
helperlib: $(HELPERLIBNAME) helperlib: $(HELPERLIBNAME)
@@ -101,12 +101,12 @@ installDemo:
cp ../demo/data/*.txt $(TARGETDIR)/demo/data; \\ cp ../demo/data/*.txt $(TARGETDIR)/demo/data; \\
cp ../demo/data/*.i $(TARGETDIR)/demo/data; \\ cp ../demo/data/*.i $(TARGETDIR)/demo/data; \\
cp ../demo/data/*.h $(TARGETDIR)/demo/data; \\ cp ../demo/data/*.h $(TARGETDIR)/demo/data; \\
echo "(1,0)" > $(TARGETDIR)/demo/data/showTips; \\
chmod 666 $(TARGETDIR)/demo/data/showTips; \\
$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR)/demo;\\ $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR)/demo;\\
$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR)/demo; $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR)/demo;
uninstallLib: uninstallLib:
rm -rf $(TARGETDIR)/lib; rm -rf $(TARGETDIR)/lib;

2
wxPython/src/gtk/misc.cpp
View File

@@ -134,7 +134,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
return retval; return retval;
} }
#if 0 // we want to use the definition from the header, no the #if 0 // we want to use the definition from the header, not the
// one SWIG will generate. // one SWIG will generate.
extern wxAcceleratorTable wxNullAcceleratorTable; extern wxAcceleratorTable wxNullAcceleratorTable;

2
wxPython/src/helpers.cpp
View File

@@ -33,7 +33,7 @@
//#include <gdk/gdkx.h> //#include <gdk/gdkx.h>
//#include <gtk/gtkwindow.h> //#include <gtk/gtkwindow.h>
extern GtkWidget *wxRootWindow; //extern GtkWidget *wxRootWindow;
#endif #endif