blob: 1b145d7da1fc71ca79354b28122d64dc6ffd096b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- fs2_open/code/CMakeLists.txt 2022-03-27 21:03:27.290788070 +0200
+++ fs2_open/code/CMakeLists.txt 2022-03-27 21:06:50.271782416 +0200
@@ -41,8 +41,6 @@
target_link_libraries(code PUBLIC md5)
-target_link_libraries(code PUBLIC discord-rpc)
-
target_link_libraries(code PUBLIC libRocket)
target_link_libraries(code PUBLIC pcp)
--- fs2_open/code/source_groups.cmake 2021-11-01 18:00:53.000000000 +0100
+++ fs2_open/code/source_groups.cmake 2022-03-27 21:35:47.595734025 +0200
@@ -705,11 +705,6 @@
libs/antlr/ErrorListener.h
)
-add_file_folder("Libs\\\\Discord"
- libs/discord/discord.cpp
- libs/discord/discord.h
-)
-
if (FSO_BUILD_WITH_FFMPEG)
add_file_folder("Libs\\\\FFmpeg"
libs/ffmpeg/FFmpeg.cpp
--- fs2_open/lib/CMakeLists.txt 2022-03-27 21:03:27.287788070 +0200
+++ fs2_open/lib/CMakeLists.txt 2022-03-27 21:07:12.849781787 +0200
@@ -33,8 +33,6 @@
include(FFmpeg.cmake)
endif()
-add_subdirectory(discord)
-
include(libRocket.cmake)
add_subdirectory(libpcp)
--- fs2_open/freespace2/freespace.cpp 2021-11-01 18:00:53.000000000 +0100
+++ fs2_open/freespace2/freespace.cpp 2022-03-27 21:07:50.111780749 +0200
@@ -83,7 +83,6 @@
#include "jumpnode/jumpnode.h"
#include "lab/labv2.h"
#include "lab/wmcgui.h" //So that GUI_System can be initialized
-#include "libs/discord/discord.h"
#include "libs/ffmpeg/FFmpeg.h"
#include "lighting/lighting.h"
#include "localization/localize.h"
@@ -1987,8 +1987,6 @@
#ifdef WITH_FFMPEG
libs::ffmpeg::initialize();
#endif
-
- libs::discord::init();
}
nprintf(("General", "Ships.tbl is : %s\n", Game_ships_tbl_valid ? "VALID" : "INVALID!!!!"));
|
GitWeb
