Skip to content

Fix win32.mak to match posix hierarchy #6873

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
dlang-bot merged 1 commit into from
Jun 8, 2017
Merged

Fix win32.mak to match posix hierarchy #6873

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
5 changes: 3 additions & 2 deletions src/win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@

# fixed model for win32.mak, overridden by win64.mak
MODEL=32
BUILD=release

##### Directories

Expand All @@ -80,7 +81,7 @@ SCPDIR=..\backup

# Generated files directory
GEN = ..\generated
G = $(GEN)\$(OS)$(MODEL)
G = $(GEN)\$(OS)\$(BUILD)\$(MODEL)

##### Tools

Expand Down Expand Up @@ -333,7 +334,7 @@ $(TARGETEXE): $(DMD_SRCS) $(ROOT_SRCS) $G\newdelete.obj $(LIBS) $(STRING_IMPORT_
clean:
$(RD) /s /q $(GEN)
$(DEL) $D\msgs.h $D\msgs.c
$(DEL) optabgen.exe
$(DEL) optabgen.exe parser_test.exe example_avg.exe
$(DEL) $(TARGETEXE) $(DMDFRONTENDEXE) $(IDGENOUTPUT) *.map *.obj

install: detab install-copy
Expand Down