Browse Source

* Get the project to build in an alternate directory.

tags/v0.99.beta14
Sam Hocevar sam 16 years ago
parent
commit
da68305e2c
2 changed files with 14 additions and 9 deletions
  1. +5
    -5
      csharp/Makefile.am
  2. +9
    -4
      cucul/cucul_types.h.in

+ 5
- 5
csharp/Makefile.am View File

@@ -3,8 +3,8 @@
cuculdir = $(libdir)/cucul-sharp cuculdir = $(libdir)/cucul-sharp
cacadir = $(libdir)/caca-sharp 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 if USE_CSHARP
cucul_DATA = cucul-sharp.dll cucul-sharp.dll.config cucul_DATA = cucul-sharp.dll cucul-sharp.dll.config
@@ -14,7 +14,7 @@ endif


EXTRA_DIST = $(cucul_sources) cucul-sharp.dll.config.in \ EXTRA_DIST = $(cucul_sources) cucul-sharp.dll.config.in \
$(caca_sources) caca-sharp.dll.config.in \ $(caca_sources) caca-sharp.dll.config.in \
test.cs
$(srcdir)/test.cs


cucul-sharp.dll: $(cucul_sources) cucul-sharp.dll: $(cucul_sources)
gmcs -unsafe $(cucul_sources) -out:$@ -target:library \ gmcs -unsafe $(cucul_sources) -out:$@ -target:library \
@@ -24,8 +24,8 @@ caca-sharp.dll: $(caca_sources) cucul-sharp.dll
gmcs -unsafe $(caca_sources) -out:$@ -target:library -lib:./ \ gmcs -unsafe $(caca_sources) -out:$@ -target:library -lib:./ \
-r:System.Drawing.dll -r:./cucul-sharp.dll -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 -r:System.Drawing.dll -r:./cucul-sharp.dll -r:./caca-sharp.dll


clean-local: clean-local:


+ 9
- 4
cucul/cucul_types.h.in View File

@@ -23,13 +23,15 @@
# define CUCUL_TYPES @CUCUL_TYPES@ # define CUCUL_TYPES @CUCUL_TYPES@
#endif #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 #if CUCUL_TYPES == 1
# include <inttypes.h>
# include <stdint.h>
# include <unistd.h>


/* mode 2: standard <stdint.h> header is present, just include it */
/* mode 2: standard <inttypes.h> header is present, just include it */
#elif CUCUL_TYPES == 2 #elif CUCUL_TYPES == 2
# include <stdint.h>
# include <inttypes.h>
# include <unistd.h>


/* fallback: nothing is available, we assume the platform is 32-bit and /* fallback: nothing is available, we assume the platform is 32-bit and
* sizeof(long) == sizeof(void *) */ * sizeof(long) == sizeof(void *) */
@@ -47,6 +49,9 @@ typedef unsigned long long int uint64_t;
typedef long int intptr_t; typedef long int intptr_t;
typedef unsigned long int uintptr_t; typedef unsigned long int uintptr_t;


typedef int ssize_t;
typedef unsigned int size_t;

#endif #endif


#endif /* __CUCUL_TYPES_H__ */ #endif /* __CUCUL_TYPES_H__ */


Loading…
Cancel
Save