Skip to content

Make win32.mak compatible with MODEL=32omf #8367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RazvanN7 merged 1 commit into from
Jan 25, 2022
Merged

Make win32.mak compatible with MODEL=32omf #8367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
ARCH: x64
x86-OMF:
OS: Win_32
MODEL: 32
MODEL: 32omf
ARCH: x86
steps:
- checkout: self
Expand Down
17 changes: 6 additions & 11 deletions win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# or just use the supplied minit.obj

## Memory model (32 or 64)
MODEL=32
MODEL=32omf

## Copy command

Expand All @@ -41,13 +41,13 @@ DRUNTIMELIB=$(DRUNTIME)/lib/druntime.lib

## Flags for dmd D compiler

DFLAGS=-conf= -O -release -w -de -preview=dip1000 -preview=dtorfields -preview=fieldwise -I$(DRUNTIME)\import
DFLAGS=-m$(MODEL) -conf= -O -release -w -de -preview=dip1000 -preview=dtorfields -preview=fieldwise -I$(DRUNTIME)\import
#DFLAGS=-unittest -g
#DFLAGS=-unittest -cov -g

## Flags for compiling unittests

UDFLAGS=-unittest -version=StdUnittest -version=CoreUnittest -conf= -O -w -preview=dip1000 -preview=fieldwise -I$(DRUNTIME)\import
UDFLAGS=-m$(MODEL) -unittest -version=StdUnittest -version=CoreUnittest -conf= -O -w -preview=dip1000 -preview=fieldwise -I$(DRUNTIME)\import

## C compiler

Expand All @@ -60,7 +60,7 @@ MAKE=make
DMD_DIR=../dmd
BUILD=release
OS=windows
DMD=$(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
DMD=$(DMD_DIR)/generated/$(OS)/$(BUILD)/32/dmd

## Zlib library

Expand Down Expand Up @@ -532,7 +532,7 @@ cov : $(SRC_TO_COMPILE) $(LIB)

$(ZLIB): $(SRC_ZLIB)
cd etc\c\zlib
$(MAKE) -f win$(MODEL).mak zlib.lib CC=$(CC) LIB=$(AR)
$(MAKE) -f win32.mak zlib.lib CC=$(CC) LIB=$(AR)
cd ..\..\..

######################################################
Expand All @@ -545,7 +545,7 @@ phobos.zip : zip

clean:
cd etc\c\zlib
$(MAKE) -f win$(MODEL).mak clean
$(MAKE) -f win32.mak clean
cd ..\..\..
del $(DOCS)
del $(UNITTEST_OBJS) unittest.obj unittest.exe
Expand All @@ -560,10 +560,5 @@ install: phobos.zip
auto-tester-build:
echo "Windows builds have been disabled on auto-tester"

JOBS=$(NUMBER_OF_PROCESSORS)
GMAKE=gmake

auto-tester-test:
echo "Windows builds have been disabled on auto-tester"
#$(GMAKE) -j$(JOBS) -f posix.mak unittest BUILD=release DMD="$(DMD)" OS=win$(MODEL) \
#CUSTOM_DRUNTIME=1 PIC=0 MODEL=$(MODEL) DRUNTIME=$(DRUNTIMELIB) CC=$(CC)