Skip to content

Commit

Permalink
dig: cleanup dig loaders build
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmalak
jmalak committed Aug 24, 2024
1 parent 1c14db0 commit 17e339e
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 28 deletions.
4 changes: 2 additions & 2 deletions bld/dig/c/dsx/dipld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* ========================================================================
Expand Down Expand Up @@ -45,7 +45,7 @@
//#define MODINIT "DIPLOAD"
#define MODSIGN DIPSIGN

#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

void DIPSysUnload( dip_sys_handle *sys_hdl )
{
Expand Down
4 changes: 2 additions & 2 deletions bld/dig/c/dsx/madld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* ========================================================================
Expand Down Expand Up @@ -46,7 +46,7 @@
//#define MODINIT "MADLOAD"
#define MODSIGN MADSIGN

#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

void MADSysUnload( mad_sys_handle *sys_hdl )
{
Expand Down
4 changes: 2 additions & 2 deletions bld/dig/c/linux/dipld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@

#define DEFEXT ".dip"
#define MODSIGN DIPSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".so"
#define MODINIT "DIPLOAD"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
4 changes: 2 additions & 2 deletions bld/dig/c/linux/madld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@

#define DEFEXT ".mad"
#define MODSIGN MADSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".so"
#define MODINIT "MADLOAD"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
6 changes: 3 additions & 3 deletions bld/dig/c/linux/trpld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,21 @@ const static trap_callbacks TrapCallbacks = {

#define DEFEXT ".trp"
#define MODSIGN TRAPSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".trp"
#define MODINIT "TrapLoad_"
#include "../ldrpe.c" /* PE DLL format loader */
#include "ldrpe.c" /* PE DLL format loader */

#endif

#else

#define DEFEXT ".so"
#define MODINIT "TrapLoad"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
8 changes: 4 additions & 4 deletions bld/dig/c/nto/trpld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* ========================================================================
Expand Down Expand Up @@ -85,21 +85,21 @@ const static trap_callbacks TrapCallbacks = {

#define DEFEXT ".trp"
#define MODSIGN TRAPSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".trp"
#define MODINIT "TrapLoad_"
#include "../ldrpe.c" /* PE DLL format loader */
#include "ldrpe.c" /* PE DLL format loader */

#endif

#else

#define DEFEXT ".so"
#define MODINIT "TrapLoad"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
4 changes: 2 additions & 2 deletions bld/dig/c/osx/dipld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@

#define DEFEXT ".dip"
#define MODSIGN DIPSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".so"
#define MODINIT "DIPLOAD"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
6 changes: 3 additions & 3 deletions bld/dig/c/osx/madld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* ========================================================================
Expand Down Expand Up @@ -54,13 +54,13 @@

#define DEFEXT ".mad"
#define MODSIGN MADSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".so"
#define MODINIT "MADLOAD"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
6 changes: 3 additions & 3 deletions bld/dig/c/osx/trpld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,21 @@ const static trap_callbacks TrapCallbacks = {

#define DEFEXT ".trp"
#define MODSIGN TRAPSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".trp"
#define MODINIT "TrapLoad_"
#include "../ldrpe.c" /* PE DLL format loader */
#include "ldrpe.c" /* PE DLL format loader */

#endif

#else

#define DEFEXT ".so"
#define MODINIT "TrapLoad"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
2 changes: 1 addition & 1 deletion bld/dig/c/qnx/dipld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
//#define MODINIT "DIPLOAD"
#define MODSIGN DIPSIGN

#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

void DIPSysUnload( dip_sys_handle *sys_hdl )
{
Expand Down
6 changes: 3 additions & 3 deletions bld/dig/c/qnx/madld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* ========================================================================
Expand Down Expand Up @@ -54,13 +54,13 @@

#define DEFEXT ".mad"
#define MODSIGN MADSIGN
#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

#else

#define DEFEXT ".so"
#define MODINIT "MADLOAD"
#include "../ldrso.c" /* Shared library format loader */
#include "ldrso.c" /* Shared library format loader */

#endif

Expand Down
2 changes: 1 addition & 1 deletion bld/dig/c/qnx/trpld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
//#define MODINIT "TrapLoad"
#define MODSIGN TRAPSIGN

#include "../ldrrex.c" /* PharLap REX format loader */
#include "ldrrex.c" /* PharLap REX format loader */

extern void *_slib_func[2];

Expand Down
2 changes: 2 additions & 0 deletions bld/dip/dipdump/dipdump.mif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ inc_dirs = -I"../h" -I"$(dig_dir)/h"

extra_cpp_flags = -DBLDVER=$(bld_ver)

extra_c_flags_dipld = -I"$(dig_dir)/c"

# explicit rules
#################

Expand Down
2 changes: 2 additions & 0 deletions bld/trap/master.mif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ extra_c_flags_win_i86 = -bd
!endif
!endif

extra_c_flags_trpld = -I"$(dig_dir)/c"

# aflags stuff
###############
extra_a_flags += $(model_switch_$(host_cpu)) -D$(which)
Expand Down
2 changes: 2 additions & 0 deletions bld/wprof/master.mif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ extra_c_flags_qnx_i86 = -zt32
extra_c_flags_win_i86 = -zW

extra_c_flags_memutil = $(trmem_cover_cflags)
extra_c_flags_dipld = -I"$(dig_dir)/c"
extra_c_flags_madld = -I"$(dig_dir)/c"

#
# lflags
Expand Down
3 changes: 3 additions & 0 deletions bld/wv/master.mif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ extra_c_flags_os2_i86 = -zc
!endif

extra_c_flags_dynmem = $(trmem_cover_cflags)
extra_c_flags_dipld = -I"$(dig_dir)/c"
extra_c_flags_madld = -I"$(dig_dir)/c"
extra_c_flags_trpld = -I"$(dig_dir)/c"

#
# aflags
Expand Down

0 comments on commit 17e339e

Please sign in to comment.