Skip to content

Commit 355d286

Browse files
livecodefraserlivecodefraser
committed
Get server building for all platforms
1 parent a77446b commit 355d286

16 files changed

+452
-153
lines changed

‎config/linux.gypi‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
{
44
'defines':
55
[
6-
'_LINUX',
7-
'LINUX',
8-
'X11',
9-
'GTKTHEME',
106
'HAVE___THREAD',
11-
'TARGET_PLATFORM_LINUX',
12-
'TARGET_PLATFORM_POSIX',
137
'_FILE_OFFSET_BITS=64',
148
],
159

@@ -32,6 +26,27 @@
3226
],
3327
},
3428
],
29+
[
30+
'server_mode == 0',
31+
{
32+
'defines':
33+
[
34+
'TARGET_PLATFORM_LINUX',
35+
'TARGET_PLATFORM_POSIX',
36+
'GTKTHEME',
37+
'LINUX',
38+
'_LINUX',
39+
'X11',
40+
],
41+
},
42+
{
43+
'defines':
44+
[
45+
'_SERVER',
46+
'_LINUX_SERVER',
47+
],
48+
},
49+
],
3550
],
3651
},
3752
}

‎config/mac.gypi‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,25 @@
2121

2222
'target_defaults':
2323
{
24-
'defines':
24+
'target_conditions':
2525
[
26-
'TARGET_PLATFORM_MACOS_X',
27-
'_MACOSX',
26+
[
27+
'server_mode == 0',
28+
{
29+
'defines':
30+
[
31+
'TARGET_PLATFORM_MACOS_X',
32+
'_MACOSX',
33+
],
34+
},
35+
{
36+
'defines':
37+
[
38+
'_SERVER',
39+
'_MAC_SERVER',
40+
],
41+
},
42+
],
2843
],
2944

3045
'configurations':

‎config/win32.gypi‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@
6363
'_CRT_NONSTDC_NO_DEPRECATE',
6464
'_CRT_SECURE_NO_DEPRECATE',
6565
'_CRT_DISABLE_PERFCRIT_LOCKS',
66-
'_WINDOWS',
67-
'WIN32',
68-
'TARGET_PLATFORM_WINDOWS',
6966
'__LITTLE_ENDIAN__',
7067
],
7168

@@ -86,6 +83,7 @@
8683
[
8784
'_SERVER',
8885
'_WINDOWS_SERVER',
86+
'WIN32',
8987
],
9088
},
9189
],

0 commit comments

Comments
 (0)