Skip to content

Commit 6c315cd

Browse files
rderooyrderooy
committed
Move font to contrib/fonts
1 parent 662e2a6 commit 6c315cd

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

‎Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dosbox-x.app: src/dosbox-x src/dosbox.icns
1414
cp -v src/dosbox.plist dosbox-x.app/Contents/Info.plist
1515
cp -v src/dosbox.pkginfo dosbox-x.app/Contents/PkgInfo
1616
cp -v src/dosbox.icns dosbox-x.app/Contents/Resources/DosBox.icns
17-
cp -v font/FREECG98.BMP dosbox-x.app/Contents/Resources/freecg98.bmp
17+
cp -v contrib/fonts/FREECG98.BMP dosbox-x.app/Contents/Resources/freecg98.bmp
1818
cp -v src/dosbox-x dosbox-x.app/Contents/MacOS/DosBox
1919
# this is where it gets ugly
2020
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
7373
install -m 755 src/dosbox-x $(DESTDIR)$(bindir)
7474
mkdir -p $(DESTDIR)$(prefix)/share/dosbox-x
7575
install -m 644 CHANGELOG $(DESTDIR)$(prefix)/share/dosbox-x
76-
install -m 644 font/FREECG98.BMP $(DESTDIR)$(prefix)/share/dosbox-x
76+
install -m 644 contrib/fonts/FREECG98.BMP $(DESTDIR)$(prefix)/share/dosbox-x
7777
install -m 644 dosbox-x.reference.conf $(DESTDIR)$(prefix)/share/dosbox-x
7878
mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps
7979
install -m 644 contrib/icons/dosbox-x.svg $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/dosbox-x.svg

‎build-riscos

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

‎font/FREECG98.BMP ‎contrib/fonts/FREECG98.BMP

File renamed without changes.

‎font/TODO.txt ‎contrib/fonts/TODO.txt

File renamed without changes.

‎font/UnifontFullMediumMono.ttf ‎contrib/fonts/UnifontFullMediumMono.ttf

File renamed without changes.

‎src/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resdir = $(datarootdir)/dosbox-x
88

99
res_DATA = \
1010
../dosbox-x.reference.conf \
11-
../font/FREECG98.BMP \
11+
../contrib/fonts/FREECG98.BMP \
1212
../CHANGELOG
1313

1414
if HAVE_WINDRES

‎vs2015/dosbox-x.vcxproj

+16-16
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@
347347
</Message>
348348
</CustomBuildStep>
349349
<PostBuildEvent>
350-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
350+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
351351
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
352352
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
353353
mkdir "$(OutputPath)\shaders"
@@ -381,7 +381,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
381381
</Message>
382382
</CustomBuildStep>
383383
<PostBuildEvent>
384-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
384+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
385385
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
386386
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
387387
mkdir "$(OutputPath)\shaders"
@@ -411,7 +411,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
411411
<SubSystem>Windows</SubSystem>
412412
</Link>
413413
<PostBuildEvent>
414-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
414+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
415415
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
416416
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
417417
mkdir "$(OutputPath)\shaders"
@@ -442,7 +442,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
442442
<SubSystem>Windows</SubSystem>
443443
</Link>
444444
<PostBuildEvent>
445-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
445+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
446446
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
447447
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
448448
mkdir "$(OutputPath)\shaders"
@@ -473,7 +473,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
473473
<SubSystem>Windows</SubSystem>
474474
</Link>
475475
<PostBuildEvent>
476-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
476+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
477477
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
478478
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
479479
mkdir "$(OutputPath)\shaders"
@@ -506,7 +506,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
506506
<SubSystem>Windows</SubSystem>
507507
</Link>
508508
<PostBuildEvent>
509-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
509+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
510510
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
511511
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
512512
mkdir "$(OutputPath)\shaders"
@@ -537,7 +537,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
537537
<SubSystem>Windows</SubSystem>
538538
</Link>
539539
<PostBuildEvent>
540-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
540+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
541541
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
542542
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
543543
mkdir "$(OutputPath)\shaders"
@@ -568,7 +568,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
568568
<SubSystem>Windows</SubSystem>
569569
</Link>
570570
<PostBuildEvent>
571-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
571+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
572572
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
573573
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
574574
mkdir "$(OutputPath)\shaders"
@@ -605,7 +605,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
605605
</Message>
606606
</CustomBuildStep>
607607
<PostBuildEvent>
608-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
608+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
609609
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
610610
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
611611
mkdir "$(OutputPath)\shaders"
@@ -640,7 +640,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
640640
</Message>
641641
</CustomBuildStep>
642642
<PostBuildEvent>
643-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
643+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
644644
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
645645
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
646646
mkdir "$(OutputPath)\shaders"
@@ -671,7 +671,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
671671
<SubSystem>Windows</SubSystem>
672672
</Link>
673673
<PostBuildEvent>
674-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
674+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
675675
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
676676
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
677677
mkdir "$(OutputPath)\shaders"
@@ -703,7 +703,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
703703
<SubSystem>Windows</SubSystem>
704704
</Link>
705705
<PostBuildEvent>
706-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
706+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
707707
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
708708
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
709709
mkdir "$(OutputPath)\shaders"
@@ -735,7 +735,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
735735
<SubSystem>Windows</SubSystem>
736736
</Link>
737737
<PostBuildEvent>
738-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
738+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
739739
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
740740
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
741741
mkdir "$(OutputPath)\shaders"
@@ -769,7 +769,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
769769
<SubSystem>Windows</SubSystem>
770770
</Link>
771771
<PostBuildEvent>
772-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
772+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
773773
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
774774
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
775775
mkdir "$(OutputPath)\shaders"
@@ -801,7 +801,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
801801
<SubSystem>Windows</SubSystem>
802802
</Link>
803803
<PostBuildEvent>
804-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
804+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
805805
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
806806
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
807807
mkdir "$(OutputPath)\shaders"
@@ -833,7 +833,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
833833
<SubSystem>Windows</SubSystem>
834834
</Link>
835835
<PostBuildEvent>
836-
<Command>copy "$(SolutionDir)\..\font\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
836+
<Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
837837
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
838838
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
839839
mkdir "$(OutputPath)\shaders"

‎windows-installer/DOSBox-X-setup.iss

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

0 commit comments

Comments
 (0)