joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-13 17:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move font to contrib/fonts

Browse Source
This commit is contained in:
rderooy
2020-09-08 17:58:18 +02:00
parent 662e2a64b9
commit 6c315cda62
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -14,7 +14,7 @@ dosbox-x.app: src/dosbox-x src/dosbox.icns
cp -v src/dosbox.plist dosbox-x.app/Contents/Info.plist
cp -v src/dosbox.pkginfo dosbox-x.app/Contents/PkgInfo
cp -v src/dosbox.icns dosbox-x.app/Contents/Resources/DosBox.icns
cp -v font/FREECG98.BMP dosbox-x.app/Contents/Resources/freecg98.bmp
cp -v contrib/fonts/FREECG98.BMP dosbox-x.app/Contents/Resources/freecg98.bmp
cp -v src/dosbox-x dosbox-x.app/Contents/MacOS/DosBox
# this is where it gets ugly
otool -L dosbox-x.app/Contents/MacOS/DosBox | grep -E '/usr/local/lib|/usr/local/opt/ffmpeg/lib' | while read X; do Y=`echo "$$X" | sed -E '/^ +/s///' | cut -d ' ' -f 1`; \
@@ -73,7 +73,7 @@ install: src/dosbox-x
install -m 755 src/dosbox-x $(DESTDIR)$(bindir)
mkdir -p $(DESTDIR)$(prefix)/share/dosbox-x
install -m 644 CHANGELOG $(DESTDIR)$(prefix)/share/dosbox-x
install -m 644 font/FREECG98.BMP $(DESTDIR)$(prefix)/share/dosbox-x
install -m 644 contrib/fonts/FREECG98.BMP $(DESTDIR)$(prefix)/share/dosbox-x
install -m 644 dosbox-x.reference.conf $(DESTDIR)$(prefix)/share/dosbox-x
mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps
install -m 644 contrib/icons/dosbox-x.svg $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/dosbox-x.svg

2
build-riscos
View File

@@ -16,5 +16,5 @@ export LDFLAGS="-L$GCCSDK_INSTALL_ENV/lib -static"
./configure --host=arm-unknown-riscos --enable-core-inline "$@"
make -j3 || exit 1
elf2aif src/dosbox-x !DosBox-X/dosbox-x,ff8
cp font/FREECG98.BMP !DosBox-X/resources/freecg98.bmp,69c
cp contrib/fonts/FREECG98.BMP !DosBox-X/resources/freecg98.bmp,69c
dos2unix -n CHANGELOG !DosBox-X/CHANGELOG,fff

0
font/FREECG98.BMP → contrib/fonts/FREECG98.BMP
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 512 KiB

After

Width:  |  Height:  |  Size: 512 KiB

0
font/TODO.txt → contrib/fonts/TODO.txt
View File

0
font/UnifontFullMediumMono.ttf → contrib/fonts/UnifontFullMediumMono.ttf
View File

2
src/Makefile.am
View File

@@ -8,7 +8,7 @@ resdir = $(datarootdir)/dosbox-x
res_DATA = \
../dosbox-x.reference.conf \
../font/FREECG98.BMP \
../contrib/fonts/FREECG98.BMP \
../CHANGELOG
if HAVE_WINDRES

32
vs2015/dosbox-x.vcxproj
View File

@@ -347,7 +347,7 @@
</Message>
</CustomBuildStep>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -381,7 +381,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
</Message>
</CustomBuildStep>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -411,7 +411,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -442,7 +442,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -473,7 +473,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -506,7 +506,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -537,7 +537,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -568,7 +568,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -605,7 +605,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
</Message>
</CustomBuildStep>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -640,7 +640,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
</Message>
</CustomBuildStep>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -671,7 +671,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -703,7 +703,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -735,7 +735,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -769,7 +769,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -801,7 +801,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
@@ -833,7 +833,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"

2
windows-installer/DOSBox-X-setup.iss
View File

@@ -66,7 +66,7 @@ Source: ".\readme.txt"; DestDir: "{app}"; DestName: "README.txt"; Flags: ignorev
Source: ".\dosbox-x.reference.conf"; DestDir: "{app}"; Flags: ignoreversion; Components: full compact
Source: "..\CHANGELOG"; DestDir: "{app}"; DestName: "changelog.txt"; Flags: ignoreversion; Components: full compact
Source: "..\COPYING"; DestDir: "{app}"; DestName: "COPYING.txt"; Flags: ignoreversion; Components: full compact
Source: "..\font\FREECG98.BMP"; DestDir: "{app}"; Flags: ignoreversion; Components: full compact
Source: "..\contrib\fonts\FREECG98.BMP"; DestDir: "{app}"; Flags: ignoreversion; Components: full compact
Source: "..\shaders\*"; DestDir: "{app}\shaders"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: full compact
Source: "Win32_builds\x86_Release\dosbox-x.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: CheckDirName('Win32_builds\x86_Release'); Components: full compact
Source: "Win32_builds\x86_Release_SDL2\dosbox-x.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: CheckDirName('Win32_builds\x86_Release SDL2'); Components: full compact