Posix: Remove X11 dependencies
There is no code specific to X11 anymore, we can stop linking to it.
This commit is contained in:
parent
d319d2c6fb
commit
48d0717f82
|
@ -18,7 +18,6 @@
|
|||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#include <X11/Xlib.h>
|
||||
#include <SDL.h>
|
||||
#include <SDL_thread.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -628,12 +627,6 @@ int main(int argc, char ** argv) {
|
|||
|
||||
execute = true;
|
||||
|
||||
/* X11 multi-threading support */
|
||||
if(!XInitThreads())
|
||||
{
|
||||
fprintf(stderr, "Warning: X11 not thread-safe\n");
|
||||
}
|
||||
|
||||
if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1)
|
||||
{
|
||||
fprintf(stderr, "Error trying to initialize SDL: %s\n",
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
dep_x11 = dependency('x11')
|
||||
|
||||
cli_dependencies = dependencies + [dep_x11]
|
||||
|
||||
cli_src = [
|
||||
'main.cpp',
|
||||
'../shared/sndsdl.cpp',
|
||||
|
@ -17,7 +13,7 @@ includes = include_directories(
|
|||
|
||||
executable('desmume-cli',
|
||||
cli_src,
|
||||
dependencies: cli_dependencies,
|
||||
dependencies: dependencies,
|
||||
include_directories: includes,
|
||||
link_with: libdesmume,
|
||||
install: true,
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
#include <gio/gapplication.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <SDL.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <vector>
|
||||
|
||||
#include "types.h"
|
||||
|
@ -4591,12 +4590,6 @@ int main (int argc, char *argv[])
|
|||
my_config.parse(argc, argv);
|
||||
init_configured_features( &my_config);
|
||||
|
||||
/* X11 multi-threading support */
|
||||
if(!XInitThreads())
|
||||
{
|
||||
fprintf(stderr, "Warning: X11 not thread-safe\n");
|
||||
}
|
||||
|
||||
// TODO: pass G_APPLICATION_HANDLES_COMMAND_LINE instead.
|
||||
GtkApplication *app = gtk_application_new("org.desmume.DeSmuME", G_APPLICATION_HANDLES_OPEN);
|
||||
g_signal_connect (app, "activate", G_CALLBACK(common_gtk_main), &my_config);
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
dep_gtk3 = dependency('gtk+-3.0', version: '>=3.24')
|
||||
dep_x11 = dependency('x11')
|
||||
|
||||
gtk_dependencies = dependencies + [dep_gtk3, dep_x11]
|
||||
gtk_dependencies = dependencies + [dep_gtk3]
|
||||
|
||||
desmume_src = [
|
||||
'avout_pipe_base.cpp',
|
||||
|
|
Loading…
Reference in New Issue