Skip to content
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

Jump to bottom

Add targets for Win32/COFF to win64.mak #3150

Merged
merged 3 commits into from Jun 18, 2015
Merged

Add targets for Win32/COFF to win64.mak #3150

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31d3de8
add win32coff target
rainers Apr 3, 2015
1b56fbd
add unittest32mscoff target
rainers Apr 5, 2015
36be484
add comments
rainers Apr 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions win64.mak
View file
Open in desktop
Expand Up @@ -481,6 +481,17 @@ cov : $(SRC_TO_COMPILE) $(LIB)

html : $(DOCS)

################### Win32 COFF support #########################

# default to 32-bit compiler relative to 64-bit compiler, link and lib are architecture agnostic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what "32-bit compiler relative to 64-bit compiler" means.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The VC 32-bit compiler is in the parent folder of the folder that contains the 64-bit compiler, e.g. for the default CC="$(VCDIR)\bin\amd64\cl", the 32-bit compiler is CC32="$(VCDIR)\bin\cl". Maybe there is a better wording...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"relative to the location of the 64 bit compiler"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"relative to the location of the 64 bit compiler"

Ah, ok. That's where the confusion comes from. I've updated the comment.

CC32=$(CC)\..\..\cl

phobos32mscoff:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A comment saying what this target actually builds would be helpful.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a few comments, also in the "targets" section in the header.

$(MAKE) -f win64.mak "DMD=$(DMD)" "MAKE=$(MAKE)" MODEL=32mscoff "CC=\$(CC32)"\"" "AR=\$(AR)"\"" "VCDIR=$(VCDIR)" "SDKDIR=$(SDKDIR)"

unittest32mscoff:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

$(MAKE) -f win64.mak "DMD=$(DMD)" "MAKE=$(MAKE)" MODEL=32mscoff "CC=\$(CC32)"\"" "AR=\$(AR)"\"" "VCDIR=$(VCDIR)" "SDKDIR=$(SDKDIR)" unittest

######################################################

$(ZLIB): $(SRC_ZLIB)
Expand Down