mirror of
https://github.com/deadw00d/AROS.git
synced 2025-11-20 09:25:36 +00:00
Let the classic variant use the same window border dimensions as AmigaOS and MorphOS. Introduce the AROS_VARIANT_CLASSIC define to signal if the classic variant is being built.
This commit is contained in:
@ -26,6 +26,7 @@
|
||||
|
||||
#define AROS_NESTING_SUPERVISOR @aros_nesting_supervisor@
|
||||
|
||||
@CLASSIC_VARIANT_DEFINE@
|
||||
@PLATFORM_EXECSMP@
|
||||
@ENABLE_EXECSMP@
|
||||
|
||||
|
||||
11
configure
vendored
11
configure
vendored
@ -683,6 +683,7 @@ gcc_default_float_abi
|
||||
gcc_default_fpu
|
||||
gcc_default_cpu_tune
|
||||
gcc_default_cpu
|
||||
CLASSIC_VARIANT_DEFINE
|
||||
aros_nesting_supervisor
|
||||
target_grub2_version
|
||||
aros_enable_mmu
|
||||
@ -9443,6 +9444,10 @@ target_bootloader="none"
|
||||
PLATFORM_EXECSMP=
|
||||
ENABLE_EXECSMP=
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# This only applies to amiga target.
|
||||
CLASSIC_VARIANT_DEFINE=
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Additional options for some specific targets
|
||||
|
||||
@ -10535,6 +10540,9 @@ fi
|
||||
aros_target_arch="amiga"
|
||||
aros_target_mkdep="$aros_target_mkdep -D__GNUC__ -D_AMIGA -DAMIGA"
|
||||
aros_shared_default="no"
|
||||
if test "$aros_target_variant" = "classic" ; then
|
||||
CLASSIC_VARIANT_DEFINE="#define AROS_VARIANT_CLASSIC"
|
||||
fi
|
||||
|
||||
case "$target_cpu" in
|
||||
*m68k*)
|
||||
@ -17979,6 +17987,9 @@ aros_kernel_ranlib=$aros_kernel_ranlib
|
||||
# Unix/Hosted version related
|
||||
|
||||
|
||||
# Define set if classic variant is chosen
|
||||
|
||||
|
||||
# ARM default GCC target related
|
||||
|
||||
|
||||
|
||||
10
configure.in
10
configure.in
@ -1115,6 +1115,10 @@ target_bootloader="none"
|
||||
PLATFORM_EXECSMP=
|
||||
ENABLE_EXECSMP=
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Classic variant is possible for Amiga target.
|
||||
CLASSIC_VARIANT_DEFINE=
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Additional options for some specific targets
|
||||
|
||||
@ -1941,6 +1945,9 @@ case "$target_os" in
|
||||
aros_target_arch="amiga"
|
||||
aros_target_mkdep="$aros_target_mkdep -D__GNUC__ -D_AMIGA -DAMIGA"
|
||||
aros_shared_default="no"
|
||||
if test "$aros_target_variant" = "classic" ; then
|
||||
CLASSIC_VARIANT_DEFINE="#define AROS_VARIANT_CLASSIC"
|
||||
fi
|
||||
|
||||
case "$target_cpu" in
|
||||
*m68k*)
|
||||
@ -3619,6 +3626,9 @@ AC_SUBST(target_grub2_version)
|
||||
# Unix/Hosted version related
|
||||
AC_SUBST(aros_nesting_supervisor)
|
||||
|
||||
# Define set if classic variant is chosen
|
||||
AC_SUBST(CLASSIC_VARIANT_DEFINE)
|
||||
|
||||
# ARM default GCC target related
|
||||
AC_SUBST(gcc_default_cpu)
|
||||
AC_SUBST(gcc_default_cpu_tune)
|
||||
|
||||
@ -1731,7 +1731,7 @@ static const char THIS_FILE[] = __FILE__;
|
||||
*/
|
||||
UpdateScreenBitMap(&screen->Screen, IntuitionBase);
|
||||
|
||||
#ifdef __MORPHOS__
|
||||
#if defined(__MORPHOS__) || defined(AROS_VARIANT_CLASSIC)
|
||||
screen->Screen.WBorTop = 2;
|
||||
screen->Screen.WBorLeft = 4;
|
||||
screen->Screen.WBorRight = 4;
|
||||
|
||||
Reference in New Issue
Block a user