diff options
author | Benoit Germain <bnt.germain@gmail.com> | 2018-10-25 18:38:22 +0200 |
---|---|---|
committer | Benoit Germain <bnt.germain@gmail.com> | 2018-10-25 18:38:22 +0200 |
commit | 611599ad979eee1364519fc9c3fb6103fd9fa9c6 (patch) | |
tree | d78aeff47518fc566e757f91c9f64cdca5e4e3f3 /src | |
parent | 0ba99f2ffa8b8d6a865a7fae8fb8d0a3a5d85e06 (diff) | |
download | lanes-611599ad979eee1364519fc9c3fb6103fd9fa9c6.tar.gz lanes-611599ad979eee1364519fc9c3fb6103fd9fa9c6.tar.bz2 lanes-611599ad979eee1364519fc9c3fb6103fd9fa9c6.zip |
Fix DLL exports
Diffstat (limited to 'src')
-rw-r--r-- | src/deep.h | 1 | ||||
-rw-r--r-- | src/lanes.h | 1 | ||||
-rw-r--r-- | src/platform.h | 24 | ||||
-rw-r--r-- | src/threading.h | 22 |
4 files changed, 28 insertions, 20 deletions
@@ -7,6 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "lua.h" | 9 | #include "lua.h" |
10 | #include "platform.h" | ||
10 | 11 | ||
11 | // forwards | 12 | // forwards |
12 | struct s_Universe; | 13 | struct s_Universe; |
diff --git a/src/lanes.h b/src/lanes.h index d07750a..23fa711 100644 --- a/src/lanes.h +++ b/src/lanes.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define __lanes_h__ 1 | 2 | #define __lanes_h__ 1 |
3 | 3 | ||
4 | #include "lua.h" | 4 | #include "lua.h" |
5 | #include "platform.h" | ||
5 | 6 | ||
6 | #if (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC) | 7 | #if (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC) |
7 | #define LANES_API __declspec(dllexport) | 8 | #define LANES_API __declspec(dllexport) |
diff --git a/src/platform.h b/src/platform.h new file mode 100644 index 0000000..da5264e --- /dev/null +++ b/src/platform.h | |||
@@ -0,0 +1,24 @@ | |||
1 | #ifndef __LANES_PLATFORM_H__ | ||
2 | #define __LANES_PLATFORM_H__ 1 | ||
3 | |||
4 | #ifdef _WIN32_WCE | ||
5 | #define PLATFORM_POCKETPC | ||
6 | #elif defined(_XBOX) | ||
7 | #define PLATFORM_XBOX | ||
8 | #elif (defined _WIN32) | ||
9 | #define PLATFORM_WIN32 | ||
10 | #elif (defined __linux__) | ||
11 | #define PLATFORM_LINUX | ||
12 | #elif (defined __APPLE__) && (defined __MACH__) | ||
13 | #define PLATFORM_OSX | ||
14 | #elif (defined __NetBSD__) || (defined __FreeBSD__) || (defined BSD) | ||
15 | #define PLATFORM_BSD | ||
16 | #elif (defined __QNX__) | ||
17 | #define PLATFORM_QNX | ||
18 | #elif (defined __CYGWIN__) | ||
19 | #define PLATFORM_CYGWIN | ||
20 | #else | ||
21 | #error "Unknown platform!" | ||
22 | #endif | ||
23 | |||
24 | #endif // __LANES_PLATFORM_H__ | ||
diff --git a/src/threading.h b/src/threading.h index bfa9ab8..4114dba 100644 --- a/src/threading.h +++ b/src/threading.h | |||
@@ -4,30 +4,12 @@ | |||
4 | #ifndef __threading_h__ | 4 | #ifndef __threading_h__ |
5 | #define __threading_h__ 1 | 5 | #define __threading_h__ 1 |
6 | 6 | ||
7 | /* Platform detection | 7 | /* |
8 | * win32-pthread: | 8 | * win32-pthread: |
9 | * define HAVE_WIN32_PTHREAD and PTW32_INCLUDE_WINDOWS_H in your project configuration when building for win32-pthread. | 9 | * define HAVE_WIN32_PTHREAD and PTW32_INCLUDE_WINDOWS_H in your project configuration when building for win32-pthread. |
10 | * link against pthreadVC2.lib, and of course have pthreadVC2.dll somewhere in your path. | 10 | * link against pthreadVC2.lib, and of course have pthreadVC2.dll somewhere in your path. |
11 | */ | 11 | */ |
12 | #ifdef _WIN32_WCE | 12 | #include "platform.h" |
13 | #define PLATFORM_POCKETPC | ||
14 | #elif defined(_XBOX) | ||
15 | #define PLATFORM_XBOX | ||
16 | #elif (defined _WIN32) | ||
17 | #define PLATFORM_WIN32 | ||
18 | #elif (defined __linux__) | ||
19 | #define PLATFORM_LINUX | ||
20 | #elif (defined __APPLE__) && (defined __MACH__) | ||
21 | #define PLATFORM_OSX | ||
22 | #elif (defined __NetBSD__) || (defined __FreeBSD__) || (defined BSD) | ||
23 | #define PLATFORM_BSD | ||
24 | #elif (defined __QNX__) | ||
25 | #define PLATFORM_QNX | ||
26 | #elif (defined __CYGWIN__) | ||
27 | #define PLATFORM_CYGWIN | ||
28 | #else | ||
29 | #error "Unknown platform!" | ||
30 | #endif | ||
31 | 13 | ||
32 | typedef int bool_t; | 14 | typedef int bool_t; |
33 | #ifndef FALSE | 15 | #ifndef FALSE |