Skip to content

Commit f1eb46a

Browse files
FrodeSolheimFrodeSolheim
committed
Various accumulated updates
1 parent 4f429dd commit f1eb46a

File tree

217 files changed

+8233
-1609
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+8233
-1609
lines changed

‎.gitattributes

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*.sh lf
2+
Makefile lf
3+
Makefile.in lf
4+
*.svg lf
5+
debian/rules lf
6+
configure.ac lf

‎.gitignore

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ autom4te.cache
88
*.autosave
99
/base-dir
1010
build68k
11-
/build/linux-dist/*-linux-*
12-
/build/linux-dist/Makefile
13-
/build/linux-dist/*-steamos-*
14-
/build/steamos-dist/Makefile
15-
/build-dir/
11+
/build/
1612
/cef/
1713
/*.cfg
1814
/*.changes
@@ -32,6 +28,7 @@ build68k
3228
*.core
3329
core
3430
*.creator.user
31+
/data/
3532
*.dbg
3633
/*.deb
3734
/depcomp
@@ -156,6 +153,7 @@ src/od-win32/lib
156153
/state
157154
*-swp
158155
*.swp
156+
/t
159157
*.tar.gz
160158
*.tar.xz
161159
temp

‎.vscode/c_cpp_properties.json

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"${workspaceFolder}/src/od-win32/caps",
1616
"${workspaceFolder}/libfsemu/include",
1717
"${workspaceFolder}/libnfd/src/include",
18-
"${workspaceFolder}/manymouse",
1918
"${workspaceFolder}/libudis86/include",
2019
"${workspaceFolder}/prowizard/include",
2120
"/usr/include/glib-2.0",

‎ChangeLog

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Version 3.1.0dev:
22

3+
* fs-uae-device-helper now goes into libexec, not bin.
34
* Add Midi Support to FS-UAE using the PortMidi library [cnvogelg].
45
* Support for F13-F19 keys on Apple Extended keyboard [immutable].
56
* Better clipboard sharing integration.
@@ -1430,10 +1431,10 @@ Version 2.1.4:
14301431
* Updated translations: fr [Foul], sr [Milanchez].
14311432
* Using directory prefix $BASE/ caused one character to be cut off.
14321433
* Fixed Launcher-created joystick config when using 2+ of the same type.
1433-
* Support environment variable FS_UAE_BASE_DIR.
1434+
* Support environment variable fsuae_path_base_dir.
14341435
* (Launcher) Fixed problem starting joystick configurator on Mac.
14351436
* (Launcher) GUI setting for swap left/right ctrl keys.
1436-
* (Launcher) Support environment variable FS_UAE_BASE_DIR.
1437+
* (Launcher) Support environment variable fsuae_path_base_dir.
14371438
* (Launcher) Fix for non-ASCII characters in joystick device names.
14381439
* (Launcher) Can set option __netplay_state_dir_name with /set to force a
14391440
specific state dir for net play, for persistent states.

‎Makefile.am

+99-36
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ ZIP = @ZIP@
116116
s = $(srcdir)
117117
b = $(builddir)
118118

119-
bin_PROGRAMS = \
120-
fs-uae \
121-
fs-uae-device-helper
119+
bin_PROGRAMS = fs-uae
120+
121+
libexec_PROGRAMS = fs-uae-device-helper
122122

123123
dist_doc_DATA = README COPYING
124124

@@ -143,34 +143,46 @@ fs_uae_SOURCES = \
143143
src/fsuae/fsuae-accelerator.h \
144144
src/fsuae/fsuae-action.c \
145145
src/fsuae/fsuae-action.h \
146+
src/fsuae/fsuae-actions.h \
146147
src/fsuae/fsuae-config.c \
147148
src/fsuae/fsuae-config.h \
148-
src/fsuae/fsuae-drives.c \
149-
src/fsuae/fsuae-drives.h \
150149
src/fsuae/fsuae-graphics.c \
151150
src/fsuae/fsuae-graphics.h \
152151
src/fsuae/fsuae-hardware.c \
153152
src/fsuae/fsuae-hardware.h \
154153
src/fsuae/fsuae-input.c \
154+
src/fsuae/fsuae-input.h \
155155
src/fsuae/fsuae-inputport.c \
156+
src/fsuae/fsuae-inputport.h \
156157
src/fsuae/fsuae-joystick.c \
158+
src/fsuae/fsuae-joystick.h \
157159
src/fsuae/fsuae-keyboard.c \
160+
src/fsuae/fsuae-keyboard.h \
158161
src/fsuae/fsuae-main.c \
162+
src/fsuae/fsuae-main.h \
163+
src/fsuae/fsuae-media.c \
164+
src/fsuae/fsuae-media.h \
159165
src/fsuae/fsuae-menu.c \
166+
src/fsuae/fsuae-menu.h \
160167
src/fsuae/fsuae-model.c \
161168
src/fsuae/fsuae-model.h \
162169
src/fsuae/fsuae-mouse.c \
170+
src/fsuae/fsuae-mouse.h \
163171
src/fsuae/fsuae-options.h \
164172
src/fsuae/fsuae-oskeyboard.c \
165-
src/fsuae/fsuae-paths.c \
166-
src/fsuae/fsuae-paths.h \
173+
src/fsuae/fsuae-oskeyboard.h \
174+
src/fsuae/fsuae-path.c \
175+
src/fsuae/fsuae-path.h \
167176
src/fsuae/fsuae-plugins.c \
168177
src/fsuae/fsuae-plugins.h \
169178
src/fsuae/fsuae-recording.c \
170179
src/fsuae/fsuae-recording.h \
180+
src/fsuae/fsuae-savestate.c \
181+
src/fsuae/fsuae-savestate.h \
171182
src/fsuae/fsuae-sound.c \
172183
src/fsuae/fsuae-sound.h \
173184
src/fsuae/fsuae-video.c\
185+
src/fsuae/fsuae-video.h\
174186
src/fsuae/uae_config.c
175187

176188

@@ -183,7 +195,7 @@ endif
183195
fs_uae_LDADD =
184196

185197
fs_uae_device_helper_SOURCES = \
186-
src/fsuae/fsuae-device-helper.c
198+
src/fsuae/device-helper.c
187199

188200
fs_uae_device_helper_LDADD =
189201

@@ -816,23 +828,25 @@ libfsemu_a_SOURCES = \
816828
libfsemu/src/video/video-buffer.c
817829

818830
if FSEMU
831+
819832
noinst_LIBRARIES += libfsemu2.a
820833
AM_CPPFLAGS += -I$(s)/fsemu/src
821834
fs_uae_LDADD += libfsemu2.a
822835
fs_uae_device_helper_LDADD += libfsemu2.a
823836
libfsemu2_a_SOURCES = \
824-
fsemu/gamemode/lib/gamemode_client.h \
825-
fsemu/manymouse/linux_evdev.c \
826-
fsemu/manymouse/macosx_hidmanager.c \
827-
fsemu/manymouse/macosx_hidutilities.c \
828-
fsemu/manymouse/manymouse.c \
829-
fsemu/manymouse/manymouse.h \
830-
fsemu/manymouse/windows_wminput.c \
831-
fsemu/manymouse/x11_xinput2.c \
837+
fsemu/gamemode/lib/gamemode_client.h \
838+
fsemu/manymouse/linux_evdev.c \
839+
fsemu/manymouse/macosx_hidmanager.c \
840+
fsemu/manymouse/macosx_hidutilities.c \
841+
fsemu/manymouse/manymouse.c \
842+
fsemu/manymouse/manymouse.h \
843+
fsemu/manymouse/windows_wminput.c \
844+
fsemu/manymouse/x11_xinput2.c \
832845
fsemu/src/fsemu-all.h \
833846
fsemu/src/fsemu-button.h \
834847
fsemu/src/fsemu-action.c \
835848
fsemu/src/fsemu-action.h \
849+
fsemu/src/fsemu-actions.h \
836850
fsemu/src/fsemu-audio-alsa.c \
837851
fsemu/src/fsemu-audio-alsa.h \
838852
fsemu/src/fsemu-audio-buffer.c \
@@ -892,6 +906,7 @@ libfsemu2_a_SOURCES = \
892906
fsemu/src/fsemu-inputmode.h \
893907
fsemu/src/fsemu-inputport.c \
894908
fsemu/src/fsemu-inputport.h \
909+
fsemu/src/fsemu-internal.h \
895910
fsemu/src/fsemu-key.h \
896911
fsemu/src/fsemu-keyboard.h \
897912
fsemu/src/fsemu-layer.h \
@@ -903,6 +918,8 @@ libfsemu2_a_SOURCES = \
903918
fsemu/src/fsemu-mainmenu.h \
904919
fsemu/src/fsemu-manymouse.c \
905920
fsemu/src/fsemu-manymouse.h \
921+
fsemu/src/fsemu-media.c \
922+
fsemu/src/fsemu-media.h \
906923
fsemu/src/fsemu-menu.c \
907924
fsemu/src/fsemu-menu.h \
908925
fsemu/src/fsemu-module.c \
@@ -922,6 +939,8 @@ libfsemu2_a_SOURCES = \
922939
fsemu/src/fsemu-oskeyboard.h \
923940
fsemu/src/fsemu-osmenu.c \
924941
fsemu/src/fsemu-osmenu.h \
942+
fsemu/src/fsemu-path.c \
943+
fsemu/src/fsemu-path.h \
925944
fsemu/src/fsemu-perfgui.c \
926945
fsemu/src/fsemu-perfgui.h \
927946
fsemu/src/fsemu-quit.c \
@@ -972,6 +991,42 @@ libfsemu2_a_SOURCES = \
972991
fsemu/src/fsemu-window.h \
973992
fsemu/src/fsemu-xmlshader.c \
974993
fsemu/src/fsemu-xmlshader.h
994+
995+
fsemu_data_files = \
996+
fsemu/fonts/saira/SairaCondensed-Bold.ttf \
997+
fsemu/fonts/saira/SairaCondensed-Medium.ttf \
998+
fsemu/fonts/saira/SairaCondensed-Regular.ttf \
999+
fsemu/fonts/saira/SairaCondensed-SemiBold.ttf \
1000+
fsemu/icons/fontawesome/NotificationCursor.png \
1001+
fsemu/icons/fontawesome/NotificationInfo.png \
1002+
fsemu/icons/fontawesome/NotificationKeyboard.png \
1003+
fsemu/icons/fontawesome/NotificationPause.png \
1004+
fsemu/icons/fontawesome/NotificationWarning.png \
1005+
fsemu/icons/fontawesome/NotificationWarp.png \
1006+
fsemu/images/TitleBarCloseIcon.png \
1007+
fsemu/images/TitleBarMaximizeIcon.png \
1008+
fsemu/images/TitleBarMenuIcon.png \
1009+
fsemu/images/TitleBarMinimizeIcon.png \
1010+
fsemu/images/TitleBarWithShadow.png
1011+
1012+
# FIXME: EXTRA_DIST ?
1013+
libfsemu2_a_SOURCES += $(fsemu_data_files)
1014+
1015+
data/.fsemu: $(fsemu_data_files)
1016+
mkdir -p $(b)/data/Fonts
1017+
cp $(s)/fsemu/fonts/saira/* $(b)/data/Fonts/
1018+
mkdir -p $(b)/data/Icons
1019+
cp $(s)/fsemu/icons/fontawesome/* $(b)/data/Icons/
1020+
mkdir -p $(b)/data/Images
1021+
cp $(s)/fsemu/images/* $(b)/data/Images/
1022+
touch data/.fsemu
1023+
1024+
fsemu-data: data/.fsemu
1025+
1026+
else
1027+
1028+
fsemu-data:
1029+
9751030
endif
9761031

9771032
if BUILTIN_CEF
@@ -1460,17 +1515,17 @@ fs_uae_LDADD += libnfd.a
14601515
endif
14611516

14621517

1463-
noinst_LIBRARIES += libdummy.a
1464-
nodist_libdummy_a_SOURCES = \
1465-
gen/cdummy.c \
1466-
gen/cppdummy.cpp
1467-
BUILT_SOURCES += $(nodist_libdummy_a_SOURCES)
1468-
1469-
gen/cdummy.c:
1470-
echo "int cdummy;" > $(b)/gen/cdummy.c
1471-
1472-
gen/cppdummy.cpp:
1473-
echo "int cppdummy;" > $(b)/gen/cppdummy.cpp
1518+
#noinst_LIBRARIES += libdummy.a
1519+
#nodist_libdummy_a_SOURCES = \
1520+
# gen/cdummy.c \
1521+
# gen/cppdummy.cpp
1522+
#BUILT_SOURCES += $(nodist_libdummy_a_SOURCES)
1523+
#
1524+
#gen/cdummy.c:
1525+
# echo "int cdummy;" > $(b)/gen/cdummy.c
1526+
#
1527+
#gen/cppdummy.cpp:
1528+
# echo "int cppdummy;" > $(b)/gen/cppdummy.cpp
14741529

14751530
gen_build68k_SOURCES = \
14761531
src/build68k.cpp \
@@ -1558,7 +1613,7 @@ EXTRA_DIST = $(TESTS) $(EXTRA_TESTS) \
15581613
docs/old-files.md \
15591614
docs/portable.md \
15601615
docs/serial-port.md \
1561-
docs/to-do.md \
1616+
docs/todo.md \
15621617
docs/variable-refresh-rate.md \
15631618
docs/vpar.md \
15641619
docs/vsync.md \
@@ -1671,7 +1726,7 @@ EXTRA_DIST = $(TESTS) $(EXTRA_TESTS) \
16711726
src/mame/tm34010/34010ops.c \
16721727
src/mame/tm34010/34010ops.h \
16731728
src/mame/tm34010/34010gfx.c \
1674-
src/od-win32/mman.cpp \
1729+
src/od-win32/mman.cpp \
16751730
src/p96_blit.cpp \
16761731
src/sinctable.cpp \
16771732
src/table68k \
@@ -1842,21 +1897,23 @@ fs-uae.dat: $(catalogs)
18421897
( cd $$d && $(ZIP) -X $(abs_builddir)/fs-uae.dat $$(find share | LC_ALL=C sort ) ) ; \
18431898
done
18441899

1845-
all-local: mo fs-uae.dat
1900+
all-local: mo fs-uae.dat fsemu-data
18461901

18471902
install-data-hook: mo fs-uae.dat
1848-
chmod -R u+w $(s)/share/
1903+
chmod -R u+w $(s)/share # FIXME: Why?
1904+
18491905
mkdir -p $(DESTDIR)$(datadir)/applications
1850-
cp -R $(s)/share/applications/* $(DESTDIR)$(datadir)/applications
1906+
cp -R $(s)/share/applications/* $(DESTDIR)$(datadir)/applications/
18511907
mkdir -p $(DESTDIR)$(datadir)/fs-uae
18521908
touch $(DESTDIR)$(datadir)/fs-uae/share-dir
1853-
cp fs-uae.dat $(DESTDIR)$(datadir)/fs-uae
1909+
cp fs-uae.dat $(DESTDIR)$(datadir)/fs-uae/
1910+
cp -R data/* $(DESTDIR)$(datadir)/fs-uae/
18541911
mkdir -p $(DESTDIR)$(datadir)/icons
1855-
cp -R $(s)/share/icons/* $(DESTDIR)$(datadir)/icons
1912+
cp -R $(s)/share/icons/* $(DESTDIR)$(datadir)/icons/
18561913
mkdir -p $(DESTDIR)$(datadir)/locale
1857-
cp -R $(b)/share/locale/* $(DESTDIR)$(datadir)/locale
1914+
cp -R $(b)/share/locale/* $(DESTDIR)$(datadir)/locale/
18581915
mkdir -p $(DESTDIR)$(datadir)/mime
1859-
cp -R $(s)/share/mime/* $(DESTDIR)$(datadir)/mime
1916+
cp -R $(s)/share/mime/* $(DESTDIR)$(datadir)/mime/
18601917

18611918
uninstall-local:
18621919
rm -f $(DESTDIR)$(datadir)/applications/net.fs_uae.FS-UAE.desktop
@@ -1867,6 +1924,10 @@ uninstall-local:
18671924

18681925
clean-local:
18691926
rm -f fs-uae.dat
1927+
rm -Rf data/Fonts
1928+
rm -Rf data/Icons
1929+
rm -Rf data/Images
1930+
rm -f data/.fsemu
18701931
find share -name fs-uae.mo -delete
18711932

18721933
fs-uae-dist:
@@ -1923,3 +1984,5 @@ if WINDOWS
19231984
mv fs-uae-@PACKAGE_VERSION@/fs-uae_@PACKAGE_VERSION@_windows_x86.tar.xz .
19241985
endif
19251986
rm -Rf fs-uae-@PACKAGE_VERSION@
1987+
1988+
.PHONY: fsemu-data

0 commit comments

Comments
 (0)