From 2811fb74f83764a6de8ca5c4041bd99794c10acc Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Fri, 25 Mar 2005 18:31:10 +0000 Subject: [PATCH] 2005-03-25 Mike Kestner * */makefile.win32 : add gapi-cdecl-insert to assembly target. svn path=/trunk/gtk-sharp/; revision=42258 --- ChangeLog | 4 ++++ atk/makefile.win32 | 1 + gdk/makefile.win32 | 1 + gnome/makefile.win32 | 1 + gtk/makefile.win32 | 1 + gtkdotnet/makefile.win32 | 1 + pango/makefile.win32 | 1 + 7 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 19f408002..ad9ed6bf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-03-25 Mike Kestner + + * */makefile.win32 : add gapi-cdecl-insert to assembly target. + 2005-03-25 Mike Kestner * generator/CallbackGen.cs : add CDeclCallback attrs to native dels. diff --git a/atk/makefile.win32 b/atk/makefile.win32 index 1b9ae6ba3..25bb8fb49 100644 --- a/atk/makefile.win32 +++ b/atk/makefile.win32 @@ -9,6 +9,7 @@ windows: generated-stamp generated-stamp: ../generator/codegen.exe atk-api.xml ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=atk-sharp --gluelib-name=atksharpglue --glue-filename=glue/generated.c && touch generated-stamp + ../gapi-cdecl-insert --keyfile=gtk-sharp.snk atk-sharp.dll atk-api.xml: atk-api.raw Atk.metadata cp atk-api.raw atk-api.xml diff --git a/gdk/makefile.win32 b/gdk/makefile.win32 index 4483d969f..c2d3ff288 100644 --- a/gdk/makefile.win32 +++ b/gdk/makefile.win32 @@ -6,6 +6,7 @@ all: windows windows: generated-stamp $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:System.Drawing.dll /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs + ../gapi-cdecl-insert --keyfile=gtk-sharp.snk gdk-sharp.dll cd glue && make -f makefile.win32 generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom diff --git a/gnome/makefile.win32 b/gnome/makefile.win32 index 40cae9658..9ca4575d3 100644 --- a/gnome/makefile.win32 +++ b/gnome/makefile.win32 @@ -2,5 +2,6 @@ all: windows windows: $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /out:gnome-sharp.dll /recurse:*.cs + ../gapi-cdecl-insert --keyfile=gtk-sharp.snk gnome-sharp.dll diff --git a/gtk/makefile.win32 b/gtk/makefile.win32 index d06fb4bd6..a9eca1a83 100644 --- a/gtk/makefile.win32 +++ b/gtk/makefile.win32 @@ -6,6 +6,7 @@ all: windows windows: generated-stamp $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs + ../gapi-cdecl-insert --keyfile=gtk-sharp.snk gtk-sharp.dll cd glue && make -f makefile.win32 generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom diff --git a/gtkdotnet/makefile.win32 b/gtkdotnet/makefile.win32 index 02f544a74..cdeda5199 100644 --- a/gtkdotnet/makefile.win32 +++ b/gtkdotnet/makefile.win32 @@ -4,6 +4,7 @@ all: windows windows: $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:System.Drawing.dll /out:$(ASSEMBLY) /recurse:*.cs + ../gapi-cdecl-insert --keyfile=gtk-sharp.snk gtk-dotnet.dll clean: rm -f $(ASSEMBLY) diff --git a/pango/makefile.win32 b/pango/makefile.win32 index dfc33d7c9..24f9c49ef 100644 --- a/pango/makefile.win32 +++ b/pango/makefile.win32 @@ -6,6 +6,7 @@ all: windows windows: generated-stamp $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:../glib/glib-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs + ../gapi-cdecl-insert --keyfile=gtk-sharp.snk pango-sharp.dll generated-stamp: ../generator/codegen.exe $(APIS) ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=pango-sharp && touch generated-stamp