mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-10-14 02:17:36 +08:00
update scripts
This commit is contained in:
Wengier
23
.github/workflows/hxdos.yml
vendored
23
.github/workflows/hxdos.yml
vendored
@@ -29,12 +29,12 @@ jobs:
|
||||
pwd>pwd.txt
|
||||
mkdir package
|
||||
mkdir mingw-get
|
||||
vs/tool/unzip.exe build-scripts/mingw/bin/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip -d mingw-get
|
||||
vs/tool/unzip.exe build-scripts/mingw/lowend-bin/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip -d mingw-get
|
||||
mingw-get/bin/mingw-get.exe install msys-base gcc g++ autoconf automake libiconv libpdcurses libz
|
||||
mv pwd.txt mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/bin/msys.bat mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/bin/runbuild.sh mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/bin/gawk.exe mingw-get/msys/1.0/bin
|
||||
cp build-scripts/mingw/lowend-bin/msys.bat mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/lowend-bin/runbuild.sh mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/lowend-bin/gawk.exe mingw-get/msys/1.0/bin
|
||||
- name: Build HX-DOS
|
||||
shell: pwsh
|
||||
run: |
|
||||
@@ -45,22 +45,23 @@ jobs:
|
||||
run: |
|
||||
top=`pwd`
|
||||
strip -s $top/src/dosbox-x.exe
|
||||
$top/build-scripts/mingw/hxdos/PESTUB.EXE -n $top/src/dosbox-x.exe
|
||||
$top/build-scripts/mingw/hxdos-bin/PESTUB.EXE -n $top/src/dosbox-x.exe
|
||||
$top/vs/tool/upx.exe --lzma -9 $top/src/dosbox-x.exe
|
||||
cp $top/src/dosbox-x.exe $top/package/dosbox-x.exe
|
||||
cp $top/CHANGELOG $top/package/CHANGELOG.txt
|
||||
cp $top/COPYING $top/package/COPYING.txt
|
||||
cp $top/dosbox-x.reference.conf $top/package/dosbox-x.ref
|
||||
cp $top/dosbox-x.reference.full.conf $top/package/dosbox-x.ref.full
|
||||
cp $top/contrib/windows/installer/inpout32.dll $top/package/INPOUT32.DLL
|
||||
cp $top/contrib/fonts/FREECG98.BMP $top/package/
|
||||
cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/
|
||||
cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos/DPMILD32.EXE $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos/HDPMI32.EXE $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos/HXGUIHLP.INI $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos/README.TXT $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos/WINSPOOL.DRV $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos/*.DLL $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos-bin/DPMILD32.EXE $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos-bin/HDPMI32.EXE $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos-bin/HXGUIHLP.INI $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos-bin/README.TXT $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos-bin/WINSPOOL.DRV $top/package/
|
||||
cp $top/build-scripts/mingw/hxdos-bin/*.DLL $top/package/
|
||||
mkdir -p $top/package/drivez
|
||||
cp $top/contrib/windows/installer/drivez_readme.txt $top/package/drivez/readme.txt
|
||||
mkdir -p $top/package/language
|
||||
|
||||
8
.github/workflows/macos.yml
vendored
8
.github/workflows/macos.yml
vendored
@@ -29,20 +29,24 @@ jobs:
|
||||
- name: Build macOS SDL1
|
||||
run: |
|
||||
top=`pwd`
|
||||
./build-macosx
|
||||
./build-macos
|
||||
strip $top/src/dosbox-x
|
||||
make dosbox-x.app
|
||||
mv dosbox-x.app $top/src/bin/dosbox-x
|
||||
cp $top/CHANGELOG $top/src/bin/dosbox-x/CHANGELOG.txt
|
||||
cp $top/COPYING $top/src/bin/dosbox-x/COPYING.txt
|
||||
cp $top/contrib/macos/readme.txt $top/src/bin/dosbox-x/README.txt
|
||||
- name: Build macOS SDL2
|
||||
run: |
|
||||
top=`pwd`
|
||||
./build-macosx-sdl2
|
||||
./build-macos-sdl2
|
||||
strip $top/src/dosbox-x
|
||||
make dosbox-x.app
|
||||
rm dosbox-x.app/Contents/MacOS/libSDL2-2*.dylib
|
||||
mv dosbox-x.app $top/src/bin/dosbox-x-sdl2
|
||||
cp $top/CHANGELOG $top/src/bin/dosbox-x-sdl2/CHANGELOG.txt
|
||||
cp $top/COPYING $top/src/bin/dosbox-x-sdl2/COPYING.txt
|
||||
cp $top/contrib/macos/readme.txt $top/src/bin/dosbox-x-sdl2/README.txt
|
||||
- name: Unit testing
|
||||
run: |
|
||||
top=`pwd`
|
||||
|
||||
12
.github/workflows/mingw32.yml
vendored
12
.github/workflows/mingw32.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
||||
run: |
|
||||
echo "timestamp=`date +%F-%T | sed -e 's/:/-/g' | sed -e 's/-//g'`" >> $GITHUB_ENV
|
||||
top=`pwd`
|
||||
ln -s $top/build-scripts/mingw/bin/make.exe /usr/bin/make.exe
|
||||
ln -s $top/build-scripts/mingw/lowend-bin/make.exe /usr/bin/make.exe
|
||||
./build-mingw
|
||||
strip -s $top/src/dosbox-x.exe
|
||||
- name: Package MinGW32 SDL1
|
||||
@@ -115,13 +115,13 @@ jobs:
|
||||
top=`pwd`
|
||||
pwd>pwd.txt
|
||||
mkdir mingw-get
|
||||
vs/tool/unzip.exe $top/build-scripts/mingw/bin/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip -d mingw-get
|
||||
vs/tool/unzip.exe $top/build-scripts/mingw/lowend-bin/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip -d mingw-get
|
||||
mingw-get/bin/mingw-get.exe install msys-base gcc g++ autoconf automake libiconv libpdcurses libz
|
||||
mv pwd.txt mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/bin/msys.bat mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/bin/runbuild.sh mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/bin/gawk.exe mingw-get/msys/1.0/bin
|
||||
vs/tool/unzip.exe $top/build-scripts/mingw/bin/d3d9.zip -d d3d9
|
||||
cp build-scripts/mingw/lowend-bin/msys.bat mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/lowend-bin/runbuild.sh mingw-get/msys/1.0
|
||||
cp build-scripts/mingw/lowend-bin/gawk.exe mingw-get/msys/1.0/bin
|
||||
vs/tool/unzip.exe $top/build-scripts/mingw/lowend-bin/d3d9.zip -d d3d9
|
||||
cp d3d9/*.inl mingw-get/include
|
||||
cp d3d9/*.h mingw-get/include
|
||||
cp d3d9/*.a mingw-get/lib
|
||||
|
||||
2
.github/workflows/mingw64.yml
vendored
2
.github/workflows/mingw64.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
||||
run: |
|
||||
echo "timestamp=`date +%F-%T | sed -e 's/:/-/g' | sed -e 's/-//g'`" >> $GITHUB_ENV
|
||||
top=`pwd`
|
||||
ln -s $top/build-scripts/mingw/bin/make.exe /usr/bin/make.exe
|
||||
ln -s $top/build-scripts/mingw/lowend-bin/make.exe /usr/bin/make.exe
|
||||
./build-mingw
|
||||
strip -s $top/src/dosbox-x.exe
|
||||
- name: Package MinGW64 SDL1
|
||||
|
||||
4
.github/workflows/vsbuild64.yml
vendored
4
.github/workflows/vsbuild64.yml
vendored
@@ -50,7 +50,7 @@ jobs:
|
||||
cp $top/contrib/windows/installer/readme.txt $top/package/bin/x64/Release/README.txt
|
||||
cp $top/contrib/windows/installer/inpoutx64.dll $top/package/bin/x64/Release/inpoutx64.dll
|
||||
cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/x64/Release/FREECG98.BMP
|
||||
cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/x64/Release/wqy_12pt.bdf
|
||||
cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/x64/Release/
|
||||
cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/x64/Release/Nouveau_IBM.ttf
|
||||
cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/x64/Release/SarasaGothicFixed.ttf
|
||||
cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/x64/Release/drivez/readme.txt
|
||||
@@ -81,7 +81,7 @@ jobs:
|
||||
cp $top/contrib/windows/installer/readme.txt $top/package/bin/x64/"Release SDL2"/README.txt
|
||||
cp $top/contrib/windows/installer/inpoutx64.dll $top/package/bin/x64/"Release SDL2"/inpoutx64.dll
|
||||
cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/x64/"Release SDL2"/FREECG98.BMP
|
||||
cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/x64/"Release SDL2"/wqy_12pt.bdf
|
||||
cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/x64/"Release SDL2"/
|
||||
cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/x64/"Release SDL2"/Nouveau_IBM.ttf
|
||||
cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/x64/"Release SDL2"/SarasaGothicFixed.ttf
|
||||
cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/x64/"Release SDL2"/drivez/readme.txt
|
||||
|
||||
6
BUILD.md
6
BUILD.md
@@ -43,7 +43,7 @@ the original SDL 1.x source code and is thus somewhat incompatible with the
|
||||
stock library.
|
||||
|
||||
The modifications provide additional functions needed to improve DOSBox-X
|
||||
and fix many issues with keyboard input, window mangement, and display
|
||||
and fix many issues with keyboard input, window management, and display
|
||||
management that previously required terrible kludges within the DOSBox
|
||||
and DOSBox-X source code.
|
||||
|
||||
@@ -74,12 +74,12 @@ sudo make install
|
||||
|
||||
* macOS compile (SDL1)
|
||||
```
|
||||
./build-macosx
|
||||
./build-macos
|
||||
```
|
||||
|
||||
* macOS compile (SDL2)
|
||||
```
|
||||
./build-macosx-sdl2
|
||||
./build-macos-sdl2
|
||||
```
|
||||
|
||||
* MinGW compile (using MinGW-w64) for Windows Vista/7 or later (SDL1)
|
||||
|
||||
@@ -106,7 +106,7 @@ But please note that this package is not built or updated by the DOSBox-X Team.
|
||||
|
||||
If you use macOS as your operating system, we also release portable packages for the macOS (64-bit) platform. The official macOS packages for the latest DOSBox-X version are available from the [DOSBox-X homepage](https://dosbox-x.com/).
|
||||
|
||||
The macOS package requires 64-bit Intel or ARM-based macOS operating system. It should run natively on the recent versions of macOS such as macOS Catalina (10.15) and Big Sur (11.0). Both SDL1 and SDL2 binaries (in .app format) are provided in the macOS package, in the directories named ```dosbox-x``` and ```dosbox-x-sdl2``` respectively inside the zip file. While the SDL1 version is the default version, the SDL2 version may be preferred over the SDL1 version for certain features (particularly related to input handling) such as touchscreen input support. You can select either SDL1 or SDL2 version according to your preference, or just run the SDL1 version if you are not sure.
|
||||
The macOS package requires 64-bit Intel or ARM-based macOS operating system. It should run natively on the recent versions of macOS such as macOS Monterey (12), Big Sur (11.0), and Catalina (10.15). Both SDL1 and SDL2 binaries (in .app format) are provided in the macOS package, in the directories named ```dosbox-x``` and ```dosbox-x-sdl2``` respectively inside the zip file. While the SDL1 version is the default version, the SDL2 version may be preferred over the SDL1 version for certain features (particularly related to input handling) such as touchscreen input support. You can select either SDL1 or SDL2 version according to your preference, or just run the SDL1 version if you are not sure.
|
||||
|
||||
There are two ways to run DOSBox-X in macOS, either from the Finder or from the command-line (Terminal):
|
||||
|
||||
|
||||
@@ -56,7 +56,6 @@ dosbox-x.app: src/dosbox-x contrib/macos/dosbox.icns src/tool/mach-o-matic
|
||||
done; \
|
||||
src/tool/mach-o-matic dosbox-x.app/Contents/MacOS/dosbox-x || exit 1; \
|
||||
codesign --deep -s - dosbox-x.app/Contents/MacOS/dosbox-x || exit 1
|
||||
cp -v contrib/macos/readme.txt dosbox-x.app/README.txt
|
||||
|
||||
debug-dosbox-x-app:
|
||||
(cd dosbox-x.app/Contents/MacOS && (DYLD_PRINT_LIBRARIES=1 ./dosbox-x -defaultconf -defaultdir . -silent -c 'echo hello' -c 'exit')) 2>mac-os-x-dylib-report.txt
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# If an error occurs, quit the script and inform the user. This ensures scripts
|
||||
# like ./build-macosx etc. don't continue on if Autotools isn't installed.
|
||||
# like ./build-macos and ./build-macos-sdl2 etc. Don't continue on if Autotools isn't installed.
|
||||
function finish {
|
||||
if [ $success -eq 0 ]; then
|
||||
echo 'autogen.sh failed to complete: verify that GNU Autotools is installed on the system and try again'
|
||||
|
||||
@@ -24,9 +24,11 @@ git reset --hard
|
||||
git pull
|
||||
git clean -dfx
|
||||
git reset --hard
|
||||
./build-macosx || exit 1
|
||||
./build-macos || exit 1
|
||||
make dosbox-x.app || exit 1
|
||||
cp CHANGELOG CHANGELOG.txt || exit 1
|
||||
cp COPYING COPYING.txt || exit 1
|
||||
cp contrib/macos/readme.txt README.txt || exit 1
|
||||
|
||||
cd "$top/dosbox-x-sdl2" || exit 1
|
||||
git clean -dfx
|
||||
@@ -37,14 +39,16 @@ git reset --hard
|
||||
git pull
|
||||
git clean -dfx
|
||||
git reset --hard
|
||||
./build-macosx-sdl2 || exit 1
|
||||
./build-macos-sdl2 || exit 1
|
||||
make dosbox-x.app || exit 1
|
||||
cp CHANGELOG CHANGELOG.txt || exit 1
|
||||
cp COPYING COPYING.txt || exit 1
|
||||
cp contrib/macos/readme.txt README.txt || exit 1
|
||||
|
||||
cd "$top" || exit 1
|
||||
echo "Packing up now..."
|
||||
|
||||
zip -r -9 "$name" dosbox-x/dosbox-x.app dosbox-x/CHANGELOG.txt dosbox-x-sdl2/dosbox-x.app dosbox-x-sdl2/CHANGELOG.txt || exit 1
|
||||
zip -r -9 "$name" dosbox-x/dosbox-x.app dosbox-x/CHANGELOG.txt dosbox-x/COPYING.txt dosbox-x/README.txt dosbox-x-sdl2/dosbox-x.app dosbox-x-sdl2/CHANGELOG.txt dosbox-x-sdl2/COPYING.txt dosbox-x-sdl2/README.txt || exit 1
|
||||
|
||||
exit 0
|
||||
|
||||
|
||||
@@ -57,13 +57,14 @@ git reset --hard
|
||||
|
||||
# The paths of copied files and HX DOS Extender files
|
||||
copydir="build-scripts/mingw/dosbox-x-mingw-hx-dos"
|
||||
hxdir="build-scripts/mingw/hxdos"
|
||||
hxdir="build-scripts/mingw/hxdos-bin"
|
||||
|
||||
strip src/dosbox-x.exe || exit 1
|
||||
cp src/dosbox-x.exe dosbox-x.exe || exit 1
|
||||
$hxdir/pestub.exe -n dosbox-x.exe
|
||||
$tooldir/upx.exe --lzma -9 dosbox-x.exe
|
||||
cp CHANGELOG CHANGELOG.txt || exit 1
|
||||
cp COPYING COPYING.txt || exit 1
|
||||
cp dosbox-x.reference.conf dosbox-x.ref || exit 1
|
||||
cp dosbox-x.reference.full.conf dosbox-x.ref.full || exit 1
|
||||
cp contrib/windows/installer/inpout32.dll INPOUT32.DLL || exit 1
|
||||
@@ -84,7 +85,7 @@ for i in `ls contrib/translations/` ; do cp contrib/translations/$i/*.lng langua
|
||||
cd "$top/$hxdosdir" || exit 1
|
||||
echo "Packing up now..."
|
||||
|
||||
$tooldir/zip.exe -r -9 ../"$name" {CHANGELOG.txt,dosbox-x.exe,dosbox-x.ref,dosbox-x.ref.full,FREECG98.BMP,wqy_12pt.bdf,Nouveau_IBM.ttf,DPMILD32.EXE,HDPMI32.EXE,HXGUIHLP.INI,README.TXT,WINSPOOL.DRV,*.DLL,drivez/*,language/*} || exit 1
|
||||
$tooldir/zip.exe -r -9 ../"$name" {CHANGELOG.txt,COPYING.txt,dosbox-x.exe,dosbox-x.ref,dosbox-x.ref.full,FREECG98.BMP,wqy_1?pt.bdf,Nouveau_IBM.ttf,DPMILD32.EXE,HDPMI32.EXE,HXGUIHLP.INI,README.TXT,WINSPOOL.DRV,*.DLL,drivez/*,language/*} || exit 1
|
||||
cd ..
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -36,9 +36,14 @@ mkdir -p "$build" || exit 1
|
||||
ziptool="$top/dosbox-x-mingw/vs/tool/zip.exe"
|
||||
|
||||
# do it
|
||||
for what in mingw mingw-lowend mingw-sdl2 mingw-sdldraw; do
|
||||
for what in mingw mingw-sdl2 mingw-lowend mingw-lowend-sdl2; do
|
||||
buildtarget="$build/$what"
|
||||
mkdir -p "$buildtarget" || exit 1
|
||||
mkdir -p "$buildtarget/drivez" || exit 1
|
||||
mkdir -p "$buildtarget/scripts" || exit 1
|
||||
mkdir -p "$buildtarget/shaders" || exit 1
|
||||
mkdir -p "$buildtarget/glshaders" || exit 1
|
||||
mkdir -p "$buildtarget/languages" || exit 1
|
||||
cd "$top/dosbox-x-mingw" || exit 1
|
||||
git clean -dfx
|
||||
git reset --hard
|
||||
@@ -54,6 +59,21 @@ cp src/dosbox-x.exe "$buildtarget/dosbox-x.exe" || exit 1
|
||||
cp CHANGELOG "$buildtarget/CHANGELOG.txt" || exit 1
|
||||
cp dosbox-x.reference.conf "$buildtarget/dosbox-x.reference.conf" || exit 1
|
||||
cp dosbox-x.reference.full.conf "$buildtarget/dosbox-x.reference.full.conf" || exit 1
|
||||
if [[ "$MSYSTEM" == "MINGW32" ]]; then
|
||||
cp contrib/windows/installer/inpout32.dll "$buildtarget/inpout32.dll" || exit 1
|
||||
else
|
||||
cp contrib/windows/installer/inpoutx64.dll "$buildtarget/inpoutx64.dll" || exit 1
|
||||
fi
|
||||
cp contrib/fonts/FREECG98.BMP "$buildtarget/FREECG98.BMP" || exit 1
|
||||
cp contrib/fonts/wqy_1?pt.bdf "$buildtarget/" || exit 1
|
||||
cp contrib/fonts/Nouveau_IBM.ttf "$buildtarget/Nouveau_IBM.ttf" || exit 1
|
||||
cp contrib/fonts/SarasaGothicFixed.ttf "$buildtarget/SarasaGothicFixed.ttf" || exit 1
|
||||
cp contrib/windows/installer/drivez_readme.txt "$buildtarget/drivez/readme.txt" || exit 1
|
||||
cp contrib/windows/installer/windows_explorer_context_menu*.bat "$buildtarget/scripts/" || exit 1
|
||||
cp contrib/windows/shaders/* "$buildtarget/shaders/" || exit 1
|
||||
cp contrib/glshaders/* "$buildtarget/glshaders/" || exit 1
|
||||
cp contrib/translations/*/*.lng "$buildtarget/languages/" || exit 1
|
||||
|
||||
done
|
||||
|
||||
cd "$top" || exit 1
|
||||
|
||||
@@ -661,7 +661,7 @@ AM_CONDITIONAL(C_FREETYPE, test "x$enable_freetype" = "xyes")
|
||||
if test x$enable_freetype = xyes; then
|
||||
AC_MSG_CHECKING(for freetype)
|
||||
if test x$INTERNAL_FREETYPE = x1; then
|
||||
# CFLAGS and LDFLAGS were already updated by build-macosx
|
||||
# CFLAGS and LDFLAGS were already updated by build-macos
|
||||
AC_DEFINE(C_FREETYPE,1)
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
|
||||
@@ -3,7 +3,7 @@ README for DOSBox-X macOS version
|
||||
|
||||
Welcome to DOSBox-X, a cross-platform DOS emulator based on the DOSBox project.
|
||||
|
||||
This is an official DOSBox-X macOS package, which should run natively on the recent versions of macOS such as macOS Catalina (10.15) and Big Sur (11.0). Both SDL1 and SDL2 binaries (in .app format) are provided in the macOS package, in the directories named "dosbox-x" and "dosbox-x-sdl2" respectively inside the zip file. While the SDL1 version is the default version, the SDL2 version may be preferred over the SDL1 version for certain features (particularly related to input handling) such as touchscreen input support. You can select either SDL1 or SDL2 version according to your preference, or just run the SDL1 version if you are not sure.
|
||||
This is an official DOSBox-X macOS package, which should run natively on the recent versions of macOS such as macOS Monterey (12), Big Sur (11.0), and Catalina (10.15). Both SDL1 and SDL2 binaries (in .app format) are provided in the macOS package, in the directories named "dosbox-x" and "dosbox-x-sdl2" respectively inside the zip file. While the SDL1 version is the default version, the SDL2 version may be preferred over the SDL1 version for certain features (particularly related to input handling) such as touchscreen input support. You can select either SDL1 or SDL2 version according to your preference, or just run the SDL1 version if you are not sure.
|
||||
|
||||
There are two ways to run DOSBox-X in macOS, either from the Finder or from the command-line (Terminal):
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@
|
||||
#include <map>
|
||||
#include <list>
|
||||
#include <string>
|
||||
#if defined(__MINGW32__) && !defined(HX_DOS)
|
||||
#include <imm.h>
|
||||
#endif
|
||||
using namespace std;
|
||||
|
||||
extern bool dos_kernel_disabled, force_conversion, showdbcs, dbcs_sbcs, enableime, tonoime;
|
||||
|
||||
Reference in New Issue
Block a user