Skip to content

Commit

Permalink
fix build make files for dlls in trap project
Browse files Browse the repository at this point in the history
  • Loading branch information
jmalak committed Sep 1, 2023
1 parent ea58c3a commit 1086049
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 17 deletions.
4 changes: 3 additions & 1 deletion bld/trap/lcl/os2v2/splice/makefile
Expand Up @@ -18,6 +18,7 @@ sys_dll = 1

!include cproj.mif
!include defrule.mif
!include dllrule.mif
!include deftarg.mif

dig_arch = $(host_cpu)
Expand All @@ -44,5 +45,6 @@ extra_l_flags_dll = op oneautodata
#
# DLL
#
dlltarg_objs = splice.obj
dlltarg_prebuild_objs = $(dll_subdir)
dlltarg_objs = $(dll_subdir)/splice.obj
!include dlltarg.mif
8 changes: 6 additions & 2 deletions bld/trap/lcl/os2v2/wvpmhelp/makefile
Expand Up @@ -14,14 +14,17 @@ proj_name = wdpmhelp
wdpmhelp_autodepends = .AUTODEPEND
!endif

wdpmhelp_nocheckstack_dll = 1

!include cproj.mif
!include defrule.mif
!include dllrule.mif
!include deftarg.mif

#
# cflags
#
.c: ../c
.c: ../c;$(trap_dir)/common

inc_dirs = -I. -I"../h" -I"$(trap_dir)/h"

Expand All @@ -48,7 +51,8 @@ w d : wdpmhook.dll wdpmhelp.exe .SYMBOLIC
#
# DLL
#
dlltarg_objs = pmhook.obj
dlltarg_prebuild_objs = $(dll_subdir)
dlltarg_objs = $(dll_subdir)/pmhook.obj
dlltarg_name = wdpmhook
!include dlltarg.mif

Expand Down
27 changes: 13 additions & 14 deletions bld/trap/par/os2v2.pio/makefile
Expand Up @@ -15,8 +15,6 @@ os2v2pio_autodepends = .AUTODEPEND
# I/O can be built into the parallel trap file/server modules, which is
# where it belongs in the first place.

sys_dll = 1

!include cproj.mif
!include defrule.mif
!include deftarg.mif
Expand All @@ -25,15 +23,16 @@ sys_dll = 1

inc_dirs = -I"../h"

extra_c_flags_wdio = -nt=port -nc=IOPL_CODE

extra_l_flags = op protmode

extra_linker = segment 'port' IOPL &
export INPORT 2 &
export OUTPORT 4

dlltarg_objs = wdio.obj
dlltarg_name = wdio
dlltarg_opts = $(extra_linker)
!include dlltarg.mif
extra_c_flags_wdio = -nt=port -nc=IOPL_CODE -zls

wdio.dll : wdio.obj
$(noecho)%create $^&.lnk
@%append $^&.lnk format os2 dll option osname='OS/2 16-bit DLL'
@%append $^&.lnk op map, elim, protmode, nodef
@%append $^&.lnk name $@
@%append $^&.lnk file wdio.obj
@%append $^&.lnk segment 'port' IOPL
@%append $^&.lnk export INPORT 2
@%append $^&.lnk export OUTPORT 4
@%make echo_link
$(linker) @$^&.lnk

0 comments on commit 1086049

Please sign in to comment.