this repo has no description
[carbon] Get rid of X11 dependency for now
We weren't actually using it anyways, so let's just comment out the last
remaining uses (for the modular build update).
authored by
Ariel Abreu
and committed by
Thomas A
98c8acf3
b926434f
+8
-4
+7
-3
src/frameworks/Carbon/HIToolbox/src/MacWindows.cpp
+7
-3
src/frameworks/Carbon/HIToolbox/src/MacWindows.cpp
···
1
1
#include "MacWindows.h"
2
-
#include <X11/Xlib.h>
3
2
#include <stdlib.h>
4
3
#include <stdio.h>
5
4
6
5
#define NO_X11
7
6
7
+
#ifndef NO_X11
8
+
#include <X11/Xlib.h>
9
+
#endif
8
10
9
11
static int verbose = 0;
10
12
···
14
16
}
15
17
16
18
19
+
#ifndef NO_X11
17
20
static Display* g_display = nullptr;
21
+
#endif
18
22
static void closeDisplay() __attribute__((destructor));
19
23
20
24
namespace Darling
···
23
27
namespace Carbon
24
28
{
25
29
30
+
#ifndef NO_X11
26
31
Display* getDisplay()
27
32
{
28
-
#ifndef NO_X11
29
33
if (g_display)
30
34
return g_display;
31
35
···
39
43
abort();
40
44
}
41
45
42
-
#endif
43
46
return g_display;
44
47
}
48
+
#endif
45
49
46
50
void closeDisplay()
47
51
{