ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2002-06-22 Mike Kestner <mkestner@speakeasy.net>

Browse source 
* */makefile.win32 : add docs target
	* generator/ClassBase.cs : Make GenMethods public for interface gen
	* generator/Method.cs : Lose the CallingConvention
	* generator/Parameters.cs : fix uninitialized var
	* generator/SignalHandler.cs : Lose the CallingConvention
	* generator/StructBase.cs : Lose the CallingConvention

svn path=/trunk/gtk-sharp/; revision=5418
This commit is contained in:
Mike Kestner 2002-06-22 22:12:51 +00:00
parent d0bb4165b8
commit 948bb15432
14 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2002-06-22 Mike Kestner <mkestner@speakeasy.net>
* */makefile.win32 : add docs target
* generator/ClassBase.cs : Make GenMethods public for interface gen
* generator/Method.cs : Lose the CallingConvention
* generator/Parameters.cs : fix uninitialized var
* generator/SignalHandler.cs : Lose the CallingConvention
* generator/StructBase.cs : Lose the CallingConvention
2002-06-21 Michael Meeks <michael@ximian.com> 2002-06-21 Michael Meeks <michael@ximian.com>
* sample/Makefile.in: re-factor slightly. * sample/Makefile.in: re-factor slightly.

3
atk/makefile.win32
View file

@ -1,5 +1,8 @@
all: windows all: windows
windows: windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:atk-sharp.dll /recurse:*.cs
docs:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /doc:atk-sharp-docs.xml /out:atk-sharp.dll /recurse:*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /doc:atk-sharp-docs.xml /out:atk-sharp.dll /recurse:*.cs

3
gdk/makefile.win32
View file

@ -1,5 +1,8 @@
all: windows all: windows
windows: windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll /recurse:*.cs
docs:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /doc:gdk-sharp-docs.xml /out:gdk-sharp.dll /recurse:*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /doc:gdk-sharp-docs.xml /out:gdk-sharp.dll /recurse:*.cs

2
generator/ClassBase.cs
View file

@ -125,7 +125,7 @@ namespace GtkSharp.Generation {
(props != null) && props.ContainsKey(mname.Substring(3))); (props != null) && props.ContainsKey(mname.Substring(3)));
} }
protected void GenMethods (StreamWriter sw) public void GenMethods (StreamWriter sw)
{ {
if (methods == null) if (methods == null)
return; return;

3
generator/Method.cs
View file

@ -211,8 +211,7 @@ namespace GtkSharp.Generation {
protected void GenerateImport (StreamWriter sw) protected void GenerateImport (StreamWriter sw)
{ {
sw.WriteLine("\t\t[DllImport(\"" + libname + sw.WriteLine("\t\t[DllImport(\"" + libname + "\")]");
"\", CallingConvention=CallingConvention.Cdecl)]");
sw.Write("\t\tstatic extern " + safety + m_ret + " " + cname + isig); sw.Write("\t\tstatic extern " + safety + m_ret + " " + cname + isig);
sw.WriteLine(); sw.WriteLine();
} }

2
generator/Parameters.cs
View file

@ -77,7 +77,7 @@ namespace GtkSharp.Generation {
bool need_sep = false; bool need_sep = false;
int len = 0; int len = 0;
XmlElement last_param; XmlElement last_param = null;
foreach (XmlNode parm in elem.ChildNodes) { foreach (XmlNode parm in elem.ChildNodes) {
if (parm.Name != "parameter") { if (parm.Name != "parameter") {
continue; continue;

3
generator/SignalHandler.cs
View file

@ -149,8 +149,7 @@ namespace GtkSharp.Generation {
} }
sw.WriteLine("\t\t}"); sw.WriteLine("\t\t}");
sw.WriteLine(); sw.WriteLine();
sw.Write("\t\t[DllImport(\"gobject-2.0\", "); sw.Write("\t\t[DllImport(\"gobject-2.0\")]");
sw.WriteLine("CallingConvention=CallingConvention.Cdecl)]");
sw.Write("\t\tstatic extern void g_signal_connect_data("); sw.Write("\t\tstatic extern void g_signal_connect_data(");
sw.Write("IntPtr obj, String name, " + dname + " cb, int key, IntPtr p,"); sw.Write("IntPtr obj, String name, " + dname + " cb, int key, IntPtr p,");
sw.WriteLine(" int flags);"); sw.WriteLine(" int flags);");

6
generator/StructBase.cs
View file

@ -46,8 +46,7 @@ namespace GtkSharp.Generation {
String cname = ctor.GetAttribute("cname"); String cname = ctor.GetAttribute("cname");
sw.WriteLine("\t\t[DllImport(\"" + LibraryName + sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
"\", CallingConvention=CallingConvention.Cdecl)]");
sw.WriteLine("\t\tstatic extern IntPtr " + cname + isig); sw.WriteLine("\t\tstatic extern IntPtr " + cname + isig);
sw.WriteLine(); sw.WriteLine();
@ -149,8 +148,7 @@ namespace GtkSharp.Generation {
return true; return true;
} }
sw.WriteLine("\t\t[DllImport(\"" + LibraryName + sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
"\", CallingConvention=CallingConvention.Cdecl)]");
sw.Write("\t\tstatic extern " + m_ret + " " + cname + isig); sw.Write("\t\tstatic extern " + m_ret + " " + cname + isig);
sw.WriteLine(); sw.WriteLine();

3
generator/makefile.win32
View file

@ -4,3 +4,6 @@ windows: *.cs
$(CSC) /unsafe /out:codegen.exe *.cs $(CSC) /unsafe /out:codegen.exe *.cs
./codegen gtkapi.xml ./codegen gtkapi.xml
docs: windows

3
glib/makefile.win32
View file

@ -1,5 +1,8 @@
all: windows all: windows
windows: windows:
$(CSC) /unsafe /target:library /out:glib-sharp.dll /recurse:*.cs
docs:
$(CSC) /unsafe /target:library /doc:glib-sharp-docs.xml /out:glib-sharp.dll /recurse:*.cs $(CSC) /unsafe /target:library /doc:glib-sharp-docs.xml /out:glib-sharp.dll /recurse:*.cs

3
gtk/makefile.win32
View file

@ -1,5 +1,8 @@
all: windows all: windows
windows: windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /out:gtk-sharp.dll /recurse:*.cs
docs:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /doc:gtk-sharp-docs.xml /out:gtk-sharp.dll /recurse:*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /doc:gtk-sharp-docs.xml /out:gtk-sharp.dll /recurse:*.cs

5
makefile.win32
View file

@ -9,3 +9,8 @@ windows:
(cd $$i; CSC=$(CSC) make -f makefile.win32) || exit 1;\ (cd $$i; CSC=$(CSC) make -f makefile.win32) || exit 1;\
done; done;
docs:
for i in $(DIRS); do \
(cd $$i; CSC=$(CSC) make -f makefile.win32 docs) || exit 1;\
done;

3
pango/makefile.win32
View file

@ -1,5 +1,8 @@
all: windows all: windows
windows: windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:pango-sharp.dll /recurse:*.cs
docs:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /doc:pango-sharp-docs.xml /out:pango-sharp.dll /recurse:*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /doc:pango-sharp-docs.xml /out:pango-sharp.dll /recurse:*.cs

3
sample/makefile.win32
View file

@ -5,3 +5,6 @@ windows:
$(CSC) /unsafe /out:button.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll ButtonApp.cs $(CSC) /unsafe /out:button.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll ButtonApp.cs
$(CSC) /unsafe /out:menu.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll Menu.cs $(CSC) /unsafe /out:menu.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll Menu.cs
docs:
@echo "No docs to make."