Skip to content

Some features appeared #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
acalm wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Some features appeared #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dcecc26
add the tomlc99 library
Jan 10, 2023
d715fb4
add build requirement for SDL2_image
Jan 10, 2023
d14d982
add sdl features and add config file support
Jan 10, 2023
079190b
update ubuntu build script
Jan 10, 2023
0d0981c
remove unused HVLRenderer_LogFunc
Jan 10, 2023
0af6ee1
use general.startpath if defined and no path is given from commandline
Jan 10, 2023
7a26883
example configuration file
Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
AUTOMAKE_OPTIONS = foreign subdir-objects

if DEBUG
AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl -I3rdparty/libsidplayfp -g3 -O0 -fsanitize=address -Wall -Wextra -Wno-unused-function -Wno-overlength-strings
AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl -I3rdparty/libsidplayfp -g3 -O0 -fsanitize=address -Wall -Wextra -Wno-unused-function -Wno-overlength-strings
AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 -I3rdparty/hvl -I3rdparty/libsidplayfp -g3 -O0 -fsanitize=address -Wall -Wextra -Wno-unused-function -Wno-overlength-strings
AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 -I3rdparty/hvl -I3rdparty/libsidplayfp -g3 -O0 -fsanitize=address -Wall -Wextra -Wno-unused-function -Wno-overlength-strings
else
AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl -I3rdparty/libsidplayfp -fno-omit-frame-pointer -O2 -Wall -Wextra -Wno-unused-function -Wno-overlength-strings -std=c11 -D_USE_MATH_DEFINES -D_DEFAULT_SOURCE
AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl -I3rdparty/libsidplayfp -fno-omit-frame-pointer -O2 -pedantic -Wall -Wextra -Wno-unused-function -Wno-overlength-strings -D_USE_MATH_DEFINES -D_DEFAULT_SOURCE
AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 -I3rdparty/hvl -I3rdparty/libsidplayfp -fno-omit-frame-pointer -O2 -Wall -Wextra -Wno-unused-function -Wno-overlength-strings -std=c11 -D_USE_MATH_DEFINES -D_DEFAULT_SOURCE
AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 -I3rdparty/hvl -I3rdparty/libsidplayfp -fno-omit-frame-pointer -O2 -pedantic -Wall -Wextra -Wno-unused-function -Wno-overlength-strings -D_USE_MATH_DEFINES -D_DEFAULT_SOURCE
endif

if WINDOWS
Expand All @@ -14,5 +14,5 @@ AM_CXXFLAGS += -mwindows
endif

bin_PROGRAMS = modp
modp_SOURCES = 3rdparty/hvl/hvl_replay.c 3rdparty/libsidplayfp/libsidplayfp_wrap.cpp src/AudioManager.c src/Player.c src/OpenMPTRenderer.c src/HVLRenderer.c src/HCS64File.c src/LocalDir.c src/GMERenderer.c src/XMPRenderer.c src/SIDRenderer.c glui/GL.c glui/Font.c glui/Main.c glui/GLWindow.c
modp_SOURCES = 3rdparty/hvl/hvl_replay.c 3rdparty/libsidplayfp/libsidplayfp_wrap.cpp deps/tomlc99/toml.c src/AudioManager.c src/Player.c src/OpenMPTRenderer.c src/HVLRenderer.c src/HCS64File.c src/LocalDir.c src/GMERenderer.c src/XMPRenderer.c src/SIDRenderer.c glui/GL.c glui/Font.c glui/Main.c glui/GLWindow.c glui/Config.c
modp_LDADD = -L/usr/local/lib/
71 changes: 47 additions & 24 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
am_modp_OBJECTS = 3rdparty/hvl/hvl_replay.$(OBJEXT) \
3rdparty/libsidplayfp/libsidplayfp_wrap.$(OBJEXT) \
src/AudioManager.$(OBJEXT) src/Player.$(OBJEXT) \
src/OpenMPTRenderer.$(OBJEXT) src/HVLRenderer.$(OBJEXT) \
src/HCS64File.$(OBJEXT) src/LocalDir.$(OBJEXT) \
src/GMERenderer.$(OBJEXT) src/XMPRenderer.$(OBJEXT) \
src/SIDRenderer.$(OBJEXT) glui/GL.$(OBJEXT) \
glui/Font.$(OBJEXT) glui/Main.$(OBJEXT) \
glui/GLWindow.$(OBJEXT)
deps/tomlc99/toml.$(OBJEXT) src/AudioManager.$(OBJEXT) \
src/Player.$(OBJEXT) src/OpenMPTRenderer.$(OBJEXT) \
src/HVLRenderer.$(OBJEXT) src/HCS64File.$(OBJEXT) \
src/LocalDir.$(OBJEXT) src/GMERenderer.$(OBJEXT) \
src/XMPRenderer.$(OBJEXT) src/SIDRenderer.$(OBJEXT) \
glui/GL.$(OBJEXT) glui/Font.$(OBJEXT) glui/Main.$(OBJEXT) \
glui/GLWindow.$(OBJEXT) glui/Config.$(OBJEXT)
modp_OBJECTS = $(am_modp_OBJECTS)
modp_DEPENDENCIES =
AM_V_P = $(am__v_P_@AM_V@)
Expand All @@ -134,6 +134,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = 3rdparty/hvl/$(DEPDIR)/hvl_replay.Po \
3rdparty/libsidplayfp/$(DEPDIR)/libsidplayfp_wrap.Po \
deps/tomlc99/$(DEPDIR)/toml.Po glui/$(DEPDIR)/Config.Po \
glui/$(DEPDIR)/Font.Po glui/$(DEPDIR)/GL.Po \
glui/$(DEPDIR)/GLWindow.Po glui/$(DEPDIR)/Main.Po \
src/$(DEPDIR)/AudioManager.Po src/$(DEPDIR)/GMERenderer.Po \
Expand Down Expand Up @@ -314,26 +315,29 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign subdir-objects
@DEBUG_FALSE@AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl \
@DEBUG_FALSE@ -I3rdparty/libsidplayfp -fno-omit-frame-pointer \
@DEBUG_FALSE@ -O2 -Wall -Wextra -Wno-unused-function \
@DEBUG_FALSE@ -Wno-overlength-strings -std=c11 \
@DEBUG_FALSE@ -D_USE_MATH_DEFINES -D_DEFAULT_SOURCE \
@DEBUG_FALSE@AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 \
@DEBUG_FALSE@ -I3rdparty/hvl -I3rdparty/libsidplayfp \
@DEBUG_FALSE@ -fno-omit-frame-pointer -O2 -Wall -Wextra \
@DEBUG_FALSE@ -Wno-unused-function -Wno-overlength-strings \
@DEBUG_FALSE@ -std=c11 -D_USE_MATH_DEFINES -D_DEFAULT_SOURCE \
@DEBUG_FALSE@ $(am__append_1)
@DEBUG_TRUE@AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl \
@DEBUG_TRUE@ -I3rdparty/libsidplayfp -g3 -O0 -fsanitize=address \
@DEBUG_TRUE@ -Wall -Wextra -Wno-unused-function \
@DEBUG_TRUE@ -Wno-overlength-strings $(am__append_1)
@DEBUG_FALSE@AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl \
@DEBUG_FALSE@ -I3rdparty/libsidplayfp -fno-omit-frame-pointer \
@DEBUG_FALSE@ -O2 -pedantic -Wall -Wextra -Wno-unused-function \
@DEBUG_TRUE@AM_CFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 \
@DEBUG_TRUE@ -I3rdparty/hvl -I3rdparty/libsidplayfp -g3 -O0 \
@DEBUG_TRUE@ -fsanitize=address -Wall -Wextra \
@DEBUG_TRUE@ -Wno-unused-function -Wno-overlength-strings \
@DEBUG_TRUE@ $(am__append_1)
@DEBUG_FALSE@AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 \
@DEBUG_FALSE@ -I3rdparty/hvl -I3rdparty/libsidplayfp \
@DEBUG_FALSE@ -fno-omit-frame-pointer -O2 -pedantic -Wall \
@DEBUG_FALSE@ -Wextra -Wno-unused-function \
@DEBUG_FALSE@ -Wno-overlength-strings -D_USE_MATH_DEFINES \
@DEBUG_FALSE@ -D_DEFAULT_SOURCE $(am__append_2)
@DEBUG_TRUE@AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -I3rdparty/hvl \
@DEBUG_TRUE@ -I3rdparty/libsidplayfp -g3 -O0 -fsanitize=address \
@DEBUG_TRUE@ -Wall -Wextra -Wno-unused-function \
@DEBUG_TRUE@ -Wno-overlength-strings $(am__append_2)
modp_SOURCES = 3rdparty/hvl/hvl_replay.c 3rdparty/libsidplayfp/libsidplayfp_wrap.cpp src/AudioManager.c src/Player.c src/OpenMPTRenderer.c src/HVLRenderer.c src/HCS64File.c src/LocalDir.c src/GMERenderer.c src/XMPRenderer.c src/SIDRenderer.c glui/GL.c glui/Font.c glui/Main.c glui/GLWindow.c
@DEBUG_TRUE@AM_CXXFLAGS = -Isrc -Iglui -Ideps/tinydir -Ideps/tomlc99 \
@DEBUG_TRUE@ -I3rdparty/hvl -I3rdparty/libsidplayfp -g3 -O0 \
@DEBUG_TRUE@ -fsanitize=address -Wall -Wextra \
@DEBUG_TRUE@ -Wno-unused-function -Wno-overlength-strings \
@DEBUG_TRUE@ $(am__append_2)
modp_SOURCES = 3rdparty/hvl/hvl_replay.c 3rdparty/libsidplayfp/libsidplayfp_wrap.cpp deps/tomlc99/toml.c src/AudioManager.c src/Player.c src/OpenMPTRenderer.c src/HVLRenderer.c src/HCS64File.c src/LocalDir.c src/GMERenderer.c src/XMPRenderer.c src/SIDRenderer.c glui/GL.c glui/Font.c glui/Main.c glui/GLWindow.c glui/Config.c
modp_LDADD = -L/usr/local/lib/
all: all-am

Expand Down Expand Up @@ -431,6 +435,14 @@ clean-binPROGRAMS:
3rdparty/libsidplayfp/libsidplayfp_wrap.$(OBJEXT): \
3rdparty/libsidplayfp/$(am__dirstamp) \
3rdparty/libsidplayfp/$(DEPDIR)/$(am__dirstamp)
deps/tomlc99/$(am__dirstamp):
@$(MKDIR_P) deps/tomlc99
@: > deps/tomlc99/$(am__dirstamp)
deps/tomlc99/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) deps/tomlc99/$(DEPDIR)
@: > deps/tomlc99/$(DEPDIR)/$(am__dirstamp)
deps/tomlc99/toml.$(OBJEXT): deps/tomlc99/$(am__dirstamp) \
deps/tomlc99/$(DEPDIR)/$(am__dirstamp)
src/$(am__dirstamp):
@$(MKDIR_P) src
@: > src/$(am__dirstamp)
Expand Down Expand Up @@ -468,6 +480,8 @@ glui/Main.$(OBJEXT): glui/$(am__dirstamp) \
glui/$(DEPDIR)/$(am__dirstamp)
glui/GLWindow.$(OBJEXT): glui/$(am__dirstamp) \
glui/$(DEPDIR)/$(am__dirstamp)
glui/Config.$(OBJEXT): glui/$(am__dirstamp) \
glui/$(DEPDIR)/$(am__dirstamp)

modp$(EXEEXT): $(modp_OBJECTS) $(modp_DEPENDENCIES) $(EXTRA_modp_DEPENDENCIES)
@rm -f modp$(EXEEXT)
Expand All @@ -477,6 +491,7 @@ mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f 3rdparty/hvl/*.$(OBJEXT)
-rm -f 3rdparty/libsidplayfp/*.$(OBJEXT)
-rm -f deps/tomlc99/*.$(OBJEXT)
-rm -f glui/*.$(OBJEXT)
-rm -f src/*.$(OBJEXT)

Expand All @@ -485,6 +500,8 @@ distclean-compile:

@AMDEP_TRUE@@am__include@ @am__quote@3rdparty/hvl/$(DEPDIR)/hvl_replay.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@3rdparty/libsidplayfp/$(DEPDIR)/libsidplayfp_wrap.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@deps/tomlc99/$(DEPDIR)/toml.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@glui/$(DEPDIR)/Config.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@glui/$(DEPDIR)/Font.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@glui/$(DEPDIR)/GL.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@glui/$(DEPDIR)/GLWindow.Po@am__quote@ # am--include-marker
Expand Down Expand Up @@ -804,6 +821,8 @@ distclean-generic:
-rm -f 3rdparty/hvl/$(am__dirstamp)
-rm -f 3rdparty/libsidplayfp/$(DEPDIR)/$(am__dirstamp)
-rm -f 3rdparty/libsidplayfp/$(am__dirstamp)
-rm -f deps/tomlc99/$(DEPDIR)/$(am__dirstamp)
-rm -f deps/tomlc99/$(am__dirstamp)
-rm -f glui/$(DEPDIR)/$(am__dirstamp)
-rm -f glui/$(am__dirstamp)
-rm -f src/$(DEPDIR)/$(am__dirstamp)
Expand All @@ -820,6 +839,8 @@ distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f 3rdparty/hvl/$(DEPDIR)/hvl_replay.Po
-rm -f 3rdparty/libsidplayfp/$(DEPDIR)/libsidplayfp_wrap.Po
-rm -f deps/tomlc99/$(DEPDIR)/toml.Po
-rm -f glui/$(DEPDIR)/Config.Po
-rm -f glui/$(DEPDIR)/Font.Po
-rm -f glui/$(DEPDIR)/GL.Po
-rm -f glui/$(DEPDIR)/GLWindow.Po
Expand Down Expand Up @@ -882,6 +903,8 @@ maintainer-clean: maintainer-clean-am
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f 3rdparty/hvl/$(DEPDIR)/hvl_replay.Po
-rm -f 3rdparty/libsidplayfp/$(DEPDIR)/libsidplayfp_wrap.Po
-rm -f deps/tomlc99/$(DEPDIR)/toml.Po
-rm -f glui/$(DEPDIR)/Config.Po
-rm -f glui/$(DEPDIR)/Font.Po
-rm -f glui/$(DEPDIR)/GL.Po
-rm -f glui/$(DEPDIR)/GLWindow.Po
Expand Down
2 changes: 1 addition & 1 deletion build-ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apt update
apt install -y build-essential git cmake libsdl2-dev libarchive-dev portaudio19-dev libxmp-dev libopenmpt-dev libfftw3-dev libsidplayfp-dev
apt install -y build-essential git cmake libsdl2-dev libsdl2-image-dev libarchive-dev portaudio19-dev libxmp-dev libopenmpt-dev libfftw3-dev libsidplayfp-dev
git clone https://bitbucket.org/mpyne/game-music-emu.git
cd game-music-emu/
patch -p1 < ../contrib/gme-b3d158a-playlist.patch
Expand Down
42 changes: 42 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6630,6 +6630,48 @@ else $as_nop
as_fn_error $? "SDL2 is required" "$LINENO" 5
fi

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lSDL2_image" >&5
printf %s "checking for main in -lSDL2_image... " >&6; }
if test ${ac_cv_lib_SDL2_image_main+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
LIBS="-lSDL2_image $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */


int
main (void)
{
return main ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_SDL2_image_main=yes
else $as_nop
ac_cv_lib_SDL2_image_main=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL2_image_main" >&5
printf "%s\n" "$ac_cv_lib_SDL2_image_main" >&6; }
if test "x$ac_cv_lib_SDL2_image_main" = xyes
then :
printf "%s\n" "#define HAVE_LIBSDL2_IMAGE 1" >>confdefs.h

LIBS="-lSDL2_image $LIBS"

else $as_nop
as_fn_error $? "SDL2_image is required" "$LINENO" 5
fi

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -larchive" >&5
printf %s "checking for main in -larchive... " >&6; }
if test ${ac_cv_lib_archive_main+y}
Expand Down
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ AM_CONDITIONAL([DEBUG], [test x$enable_debug = xyes])
AM_CONDITIONAL([WINDOWS], [test x$windows = xtrue])
# Checks for libraries.
AC_CHECK_LIB([SDL2], [SDL_Init], [], [AC_MSG_ERROR([SDL2 is required])])
AC_CHECK_LIB([SDL2_image], [main], [], [AC_MSG_ERROR([SDL2_image is required])])
AC_CHECK_LIB([archive], [main], [], [AC_MSG_ERROR([archive lib is required])])
AC_CHECK_LIB([fftw3f], [main], [], [AC_MSG_ERROR([fftw3f is required])])
AC_CHECK_LIB([gme], [main], [], [AC_MSG_ERROR([gme lib is required])])
Expand Down
Loading