From 3f23b47930707050f10f57e3b8b217e3253a9c01 Mon Sep 17 00:00:00 2001
From: Jiri Malak <malak.jiri@gmail.com>
Date: Wed, 5 Jun 2024 00:42:00 +0200
Subject: [PATCH] as: fix build of assember internal development version

---
 bld/as/axp/c/alphafmt.c | 6 ++++--
 bld/as/axp/c/alphains.c | 5 ++++-
 bld/as/c/assymbol.c     | 6 +++++-
 bld/as/mps/c/mipsfmt.c  | 6 ++++--
 bld/as/mps/c/mipsins.c  | 3 +++
 bld/as/ppc/c/ppcfmt.c   | 5 ++++-
 bld/as/ppc/c/ppcins.c   | 3 +++
 bld/as/y/scan.re        | 1 +
 bld/as/y/yydriver.c     | 4 ++++
 9 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/bld/as/axp/c/alphafmt.c b/bld/as/axp/c/alphafmt.c
index 0d651384e5..3d28ba0256 100644
--- a/bld/as/axp/c/alphafmt.c
+++ b/bld/as/axp/c/alphafmt.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -31,7 +31,9 @@
 
 
 #include "as.h"
-#ifndef _STANDALONE_
+#ifdef _STANDALONE_
+#include "options.h"
+#else
 #include "asinline.h"
 #endif
 
diff --git a/bld/as/axp/c/alphains.c b/bld/as/axp/c/alphains.c
index 2534a36b8a..097682431d 100644
--- a/bld/as/axp/c/alphains.c
+++ b/bld/as/axp/c/alphains.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -32,6 +32,9 @@
 
 
 #include "as.h"
+#ifdef _STANDALONE_
+#include "options.h"
+#endif
 
 
 #define MAX_NAME_LEN    20          // maximum length of an Alpha instruction mnemonic
diff --git a/bld/as/c/assymbol.c b/bld/as/c/assymbol.c
index 206c2cf885..06f667c0e0 100644
--- a/bld/as/c/assymbol.c
+++ b/bld/as/c/assymbol.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2019 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -32,6 +32,10 @@
 
 
 #include "as.h"
+#ifdef _STANDALONE_
+#include "options.h"
+#endif
+
 
 #define HASH_TABLE_SIZE         211
 
diff --git a/bld/as/mps/c/mipsfmt.c b/bld/as/mps/c/mipsfmt.c
index 2e0c56653e..72c95cd1f1 100644
--- a/bld/as/mps/c/mipsfmt.c
+++ b/bld/as/mps/c/mipsfmt.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -31,7 +31,9 @@
 
 
 #include "as.h"
-#ifndef _STANDALONE_
+#ifdef _STANDALONE_
+#include "options.h"
+#else
 #include "asinline.h"
 #endif
 
diff --git a/bld/as/mps/c/mipsins.c b/bld/as/mps/c/mipsins.c
index d7f048ed46..ec1174694b 100644
--- a/bld/as/mps/c/mipsins.c
+++ b/bld/as/mps/c/mipsins.c
@@ -31,6 +31,9 @@
 
 
 #include "as.h"
+#ifdef _STANDALONE_
+#include "options.h"
+#endif
 
 
 #define MAX_NAME_LEN    20          // maximum length of a MIPS instruction mnemonic (TODO)
diff --git a/bld/as/ppc/c/ppcfmt.c b/bld/as/ppc/c/ppcfmt.c
index 083dedd514..1b55ccab06 100644
--- a/bld/as/ppc/c/ppcfmt.c
+++ b/bld/as/ppc/c/ppcfmt.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2023      The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2023-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -31,6 +31,9 @@
 
 
 #include "as.h"
+#ifdef _STANDALONE_
+#include "options.h"
+#endif
 
 
 // these correspond to letters on Appendix A table of Motorola refrence
diff --git a/bld/as/ppc/c/ppcins.c b/bld/as/ppc/c/ppcins.c
index 2830be7a79..e7e3369485 100644
--- a/bld/as/ppc/c/ppcins.c
+++ b/bld/as/ppc/c/ppcins.c
@@ -31,6 +31,9 @@
 ****************************************************************************/
 
 #include "as.h"
+#ifdef _STANDALONE_
+#include "options.h"
+#endif
 
 
 #define MAX_NAME_LEN    20      /* maximum length of a PPC instruction mnemonic */
diff --git a/bld/as/y/scan.re b/bld/as/y/scan.re
index b7143a2af1..62966e22f8 100644
--- a/bld/as/y/scan.re
+++ b/bld/as/y/scan.re
@@ -4,6 +4,7 @@
 #include "asparser.h"
 #ifdef _STANDALONE_
 #include "preproc.h"
+#include "options.h"
 #endif
 
 #define BSIZE           8192
diff --git a/bld/as/y/yydriver.c b/bld/as/y/yydriver.c
index 94c2f1ff62..76e849d53a 100644
--- a/bld/as/y/yydriver.c
+++ b/bld/as/y/yydriver.c
@@ -1,6 +1,10 @@
 #include "as.h"
 #include "lexyacc.h"
 #include "asparser.h"
+#ifdef _STANDALONE_
+#include "options.h"
+#endif
+
 
 typedef uint_16         YYACTIONBASETYPE;
 typedef uint_16         YYACTIONTYPE;