build: Don't use --(dis|en)able-core-inline

This commit is contained in:
Jookia
2022-09-11 15:41:17 +10:00
parent 69ff657c24
commit b9ff9943ef
22 changed files with 20 additions and 26 deletions

View File

@@ -423,11 +423,6 @@ The DOSBox-X configure script accepts the following switches, which you can use
Disables FFMPEG avcodec support Disables FFMPEG avcodec support
* --disable-core-inline
Disables some memory increasing inlines. This will reduces compiletime
for a possible speed decrease.
* --disable-fpu * --disable-fpu
Disables the emulated FPU. Although the FPU emulation code isn't Disables the emulated FPU. Although the FPU emulation code isn't

2
build
View File

@@ -19,6 +19,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug --prefix=/usr "$@" || exit 1 ./configure --enable-debug --prefix=/usr "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -37,6 +37,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1 ./configure --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -31,6 +31,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
# NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above # NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-dynamic-core "$@" || exit 1 ./configure --enable-debug=heavy --prefix=/usr --disable-dynamic-core "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -36,6 +36,6 @@ echo Compiling our internal SDLnet 1.x
(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 (cd vs/sdlnet && ./build-dosbox.sh) || exit 1
# NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above # NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-dynamic-core --enable-sdl2 "$@" || exit 1 ./configure --enable-debug=heavy --prefix=/usr --disable-dynamic-core --enable-sdl2 "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -30,6 +30,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1 ./configure --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -75,6 +75,6 @@ fi
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1 ./configure --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -72,6 +72,6 @@ fi
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1 ./configure --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -33,6 +33,6 @@ echo Compiling our internal SDLnet 1.x
(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 (cd vs/sdlnet && ./build-dosbox.sh) || exit 1
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" $opt || exit 1 ./configure --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -32,6 +32,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1 ./configure --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -75,6 +75,6 @@ fi
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1 ./configure --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -72,6 +72,6 @@ fi
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1 ./configure --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -65,6 +65,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually # FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1 ./configure --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -58,6 +58,6 @@ export INTERNAL_FREETYPE=1
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually # FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --disable-libfluidsynth --disable-opengl --enable-hx-dos --prefix=/usr "$@" || exit 1 ./configure --disable-libfluidsynth --disable-opengl --enable-hx-dos --prefix=/usr "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -58,6 +58,6 @@ export INTERNAL_FREETYPE=1
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually # FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1 ./configure --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -61,6 +61,6 @@ export INTERNAL_FREETYPE=1
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually # FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr --enable-sdl2 "$@" || exit 1 ./configure --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr --enable-sdl2 "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -63,6 +63,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually # FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr --enable-sdl2 "$@" || exit 1 ./configure --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr --enable-sdl2 "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -60,6 +60,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually # FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --enable-force-menu-sdldraw --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1 ./configure --enable-force-menu-sdldraw --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -13,7 +13,7 @@ export PATH=$GCCSDK_INSTALL_ENV/bin:$PATH
export CPPFLAGS=-I$GCCSDK_INSTALL_ENV/include export CPPFLAGS=-I$GCCSDK_INSTALL_ENV/include
export LDFLAGS="-L$GCCSDK_INSTALL_ENV/lib -static" export LDFLAGS="-L$GCCSDK_INSTALL_ENV/lib -static"
./configure --host=arm-unknown-riscos --enable-core-inline "$@" ./configure --host=arm-unknown-riscos "$@"
make -j3 || exit 1 make -j3 || exit 1
elf2aif src/dosbox-x !DosBox-X/dosbox-x,ff8 elf2aif src/dosbox-x !DosBox-X/dosbox-x,ff8
cp contrib/fonts/FREECG98.BMP !DosBox-X/resources/freecg98.bmp,69c cp contrib/fonts/FREECG98.BMP !DosBox-X/resources/freecg98.bmp,69c

View File

@@ -19,6 +19,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself # now compile ourself
echo Compiling DOSBox-X echo Compiling DOSBox-X
chmod +x configure chmod +x configure
./configure --enable-core-inline --enable-debug --prefix=/usr --enable-sdl2 "$@" || exit 1 ./configure --enable-debug --prefix=/usr --enable-sdl2 "$@" || exit 1
make -j3 || exit 1 make -j3 || exit 1

View File

@@ -75,7 +75,6 @@ modules:
- name: dosbox-x - name: dosbox-x
buildsystem: autotools buildsystem: autotools
config-opts: config-opts:
- --enable-core-inline
- --enable-debug=heavy - --enable-debug=heavy
- --enable-sdl2 - --enable-sdl2
sources: sources:

View File

@@ -57,7 +57,7 @@ options and features.
%build %build
./autogen.sh ./autogen.sh
%configure --enable-core-inline --enable-debug=heavy --enable-sdl2 %configure --enable-debug=heavy --enable-sdl2
%make_build %make_build
%install %install