Emulation/nestopia
1
0
Fork 0
mirror of https://github.com/0ldsk00l/nestopia.git synced 2024-06-02 19:38:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove SDL-only build and redundant NstDatabase.zip file

Browse source
This commit is contained in:
rdanbrook 2020-12-12 09:47:54 -05:00
parent ff42ba3736
commit 896fe9b7ee
5 changed files with 8 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,6 +10,7 @@
*.js
*.bc
.npmignore
source/core/database/
# Autotools cruft
Makefile

21
Makefile.am
View file

@ -16,17 +16,14 @@ nestopia_CPPFLAGS = \
$(ZLIB_CFLAGS) \
$(LIBARCHIVE_CFLAGS) \
$(SDL2_CFLAGS) \
$(LIBEPOXY_CFLAGS)
$(LIBEPOXY_CFLAGS) \
$(GTK3_CFLAGS)
nestopia_LDADD = \
$(ZLIB_LIBS) \
$(LIBARCHIVE_LIBS) \
$(SDL2_LIBS) \
$(LIBEPOXY_LIBS)
if ENABLE_GUI
nestopia_CPPFLAGS += -D_GTK $(GTK3_CFLAGS)
nestopia_LDADD += $(GTK3_LIBS)
endif
$(LIBEPOXY_LIBS) \
$(GTK3_LIBS)
################
# Installation #
@ -726,10 +723,7 @@ nestopia_SOURCES += \
source/sdl/cursor.cpp \
source/sdl/cursor.h \
source/sdl/sdlvideo.cpp \
source/sdl/sdlvideo.h
if ENABLE_GUI
nestopia_SOURCES += \
source/sdl/sdlvideo.h \
source/gtkui/gtkui_config.h \
source/gtkui/gtkui_archive.h \
source/gtkui/gtkui_cheats.cpp \
@ -744,11 +738,6 @@ nestopia_SOURCES += \
source/gtkui/gtkui_input.cpp \
source/gtkui/gtkui_input.h \
source/gtkui/gtkui_config.cpp
else
nestopia_SOURCES += \
source/sdl/sdlmain.cpp \
source/sdl/sdlmain.h
endif
# install full HTML suite
if ENABLE_FULL_HTML

9
configure.ac
View file

@ -80,14 +80,7 @@ dnl LibEpoxy
PKG_CHECK_MODULES([LIBEPOXY], [epoxy])
dnl GTK3
AC_ARG_ENABLE([gui],
AS_HELP_STRING([--enable-gui], [Enable building GUI with GTK+3]))
AS_IF([test "x$enable_gui" = "xyes"], [
dnl GUI with GTK+3 requested
PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
])
AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" = "xyes"])
PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
dnl full HTML suite
AC_ARG_ENABLE([doc],

BIN
source/core/database/NstDatabase.zip
View file

Binary file not shown.

10
source/sdl/sdlinput.cpp
View file

@ -23,9 +23,7 @@
#include <stdio.h>
#include <SDL.h>
#ifdef _GTK
#include "gtkui/gtkui.h"
#endif
#include "nstcommon.h"
#include "video.h"
@ -201,11 +199,6 @@ void nstsdl_input_match_keyboard(Input::Controllers *controllers, SDL_Event even
if (keys[SDL_SCANCODE_LCTRL] && keys[SDL_SCANCODE_2]) { nstsdl_input_conf(0, 1); } // Keyboard Player 2
if (keys[SDL_SCANCODE_LSHIFT] && keys[SDL_SCANCODE_1]) { nstsdl_input_conf(1, 0); } // Joystick Player 1
if (keys[SDL_SCANCODE_LSHIFT] && keys[SDL_SCANCODE_2]) { nstsdl_input_conf(1, 1); } // Joystick Player 2
// Escape exits
#ifndef _GTK
if (keys[SDL_SCANCODE_ESCAPE]) { nst_schedule_quit(); }
#endif
}
void nstsdl_input_match_mouse(Input::Controllers *controllers, SDL_Event event) {
@ -893,9 +886,8 @@ void nstsdl_input_conf_button(int pnum, int bnum) {
int axis = 0, axisnoise = 0, confrunning = 1;
while (confrunning) {
#ifdef _GTK
while (gtk_events_pending()) { gtk_main_iteration(); }
#endif
while (SDL_PollEvent(&event)) {
if (event.type == SDL_JOYAXISMOTION) {
if (abs(event.jaxis.value) >= DEADZONE) {