Version 0.99.1 - "It's alive!"

finish merging generator patches. add more defines to fix inlines on qt.

README

@@ -5,9 +5,7 @@ src/
   Mono.VisualC.Interop
     The runtime library
   generator
-    The old binding generator
-  generator2
-    The new binding generator
+    The binding generator
   qt
     Auto generated Qt bindings + test program
 
@@ -29,4 +27,4 @@ g++ `pkg-config --cflags QtCore QtGui` --shared -fPIC -o libQtGui-inline.so -fke
 
 
 
-    
+    

configure.ac

@@ -1,7 +1,7 @@
 dnl Warning: This is an automatically generated file, do not edit!
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT([CPPInterop], [0.1])
+AC_INIT([CPPInterop], [0.99.1])
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE
 
@@ -63,8 +63,6 @@ src/generator/generator
 src/generator/Makefile
 src/QtTest/qttest
 src/QtTest/Makefile
-src/generator2/generator
-src/generator2/Makefile
 src/qt/Makefile
 src/Makefile
 tests2/Makefile

examples/Hello/Makefile.am

@@ -11,19 +11,19 @@ Hello.xml: Hello.h
 
 output gen:
 	$(RM) -r output
-	mono $(top_srcdir)/src/generator2/bin/Debug/generator.exe -ns=Hello -lib=hello Hello.xml
+	mono $(top_srcdir)/src/generator/bin/Debug/generator.exe -ns=Hello -lib=hello Hello.xml
 
 INTEROP_DLL = \
 	$(top_srcdir)/src/Mono.VisualC.Interop/bin/Debug/Mono.VisualC.Interop.dll
 
 HelloBinding.dll: output
-	mcs -out:$@ -target:library -r:$(INTEROP_DLL) output/*.cs
+	$(GMCS) -out:$@ -target:library -r:$(INTEROP_DLL) output/*.cs
 
 Hello.exe: HelloBinding.dll Hello.cs
-	mcs -out:$@ -target:exe -r:$(INTEROP_DLL) -r:HelloBinding.dll Hello.cs
+	$(GMCS) -out:$@ -target:exe -r:$(INTEROP_DLL) -r:HelloBinding.dll Hello.cs
 
 clean:
 	$(RM) -r output libhello.so Hello.xml Hello.exe HelloBinding.dll
 
 run: Hello.exe
-	MONO_PATH=$(top_srcdir)/src/Mono.VisualC.Interop/bin/Debug mono Hello.exe
+	MONO_PATH=$(top_srcdir)/src/Mono.VisualC.Interop/bin/Debug mono Hello.exe

src/qt/Makefile.am

@@ -10,16 +10,16 @@ qt-gui.xml: qt-gui.h
 
 generated: qt-gui.xml
 	$(RM) -r generated
-	mono --debug $(top_srcdir)/src/generator2/bin/Debug/generator.exe -o=generated -ns=Qt.Gui -lib=QtGui --filters=qt-gui-filters.txt qt-gui.xml
+	mono --debug $(top_srcdir)/src/generator/bin/Debug/generator.exe -o=generated -ns=Qt.Gui -lib=QtGui --filters=qt-gui-filters.txt qt-gui.xml
 
 libQtGui-inline.so: qt-gui.cpp
 	g++ `pkg-config --cflags QtCore QtGui` --shared -fPIC -o $@ -fkeep-inline-functions qt-gui.cpp `pkg-config --libs QtCore QtGui`
 
 Qt.Gui-binding.dll: generated
-	mcs -out:$@ -target:library -unsafe -r:$(INTEROP_DLL) generated/*.cs
+	$(GMCS) -out:$@ -target:library -unsafe -r:$(INTEROP_DLL) generated/*.cs
 
 hello.exe: Qt.Gui-binding.dll hello.cs libQtGui-inline.so
-	mcs -out:$@ -target:exe -r:$(INTEROP_DLL) -r:Qt.Gui-binding.dll hello.cs
+	$(GMCS) -out:$@ -target:exe -r:$(INTEROP_DLL) -r:Qt.Gui-binding.dll hello.cs
 
 clean:
 	$(RM) -rf generated hello.exe qt-gui.xml Qt.Gui-binding.dll libQtGui-inline.so

src/qt/qt-gui.cpp

@@ -10,6 +10,9 @@
 #define QT_NO_STYLE_WINDOWSMOBILE
 #define QT_NO_QWSEMBEDWIDGET
 
+// this one was annoying to track down!
+#define QT_NO_TRANSLATION
+
 #include <QtCore>
 #include <QtGui>