Changeset 2308

Timestamp:

04/20/08 00:51:20 (5 years ago)

Author:

sam

Message:

• Get the project to build in an alternate directory.

Location:

libcaca/trunk

Files:

• csharp/Makefile.am (modified) (3 diffs)
• cucul/cucul_types.h.in (modified) (2 diffs)

libcaca/trunk/csharp/Makefile.am

@@ -4 +4 @@
 cacadir = $(libdir)/caca-sharp
 
-cucul_sources = AssemblyInfo.cs Cucul.cs
-caca_sources = AssemblyInfo.cs Caca.cs
+cucul_sources = $(srcdir)/AssemblyInfo.cs $(srcdir)/Cucul.cs
+caca_sources = $(srcdir)/AssemblyInfo.cs $(srcdir)/Caca.cs
 
 if USE_CSHARP
@@ -15 +15 @@
 EXTRA_DIST = $(cucul_sources) cucul-sharp.dll.config.in \
              $(caca_sources) caca-sharp.dll.config.in \
-             test.cs
+             $(srcdir)/test.cs
 
 cucul-sharp.dll: $(cucul_sources)
@@ -25 +25 @@
           -r:System.Drawing.dll -r:./cucul-sharp.dll
 
-test.exe: test.cs caca-sharp.dll cucul-sharp.dll
-        gmcs test.cs -out:$@ -lib:./ \
+test.exe: $(srcdir)/test.cs caca-sharp.dll cucul-sharp.dll
+        gmcs $(srcdir)/test.cs -out:$@ -lib:./ \
           -r:System.Drawing.dll -r:./cucul-sharp.dll -r:./caca-sharp.dll
 

libcaca/trunk/cucul/cucul_types.h.in

@@ -24 +24 @@
 #endif
 
-/* mode 1: standard <inttypes.h> header is present, just include it */
+/* mode 1: standard <stdint.h> header is present, just include it */
 #if CUCUL_TYPES == 1
+#   include <stdint.h>
+#   include <unistd.h>
+
+/* mode 2: standard <inttypes.h> header is present, just include it */
+#elif CUCUL_TYPES == 2
 #   include <inttypes.h>
-
-/* mode 2: standard <stdint.h> header is present, just include it */
-#elif CUCUL_TYPES == 2
-#   include <stdint.h>
+#   include <unistd.h>
 
 /* fallback: nothing is available, we assume the platform is 32-bit and
@@ -48 +50 @@
 typedef unsigned long int uintptr_t;
 
+typedef int ssize_t;
+typedef unsigned int size_t;
+
 #endif