Skip to content

Commit 8460e29

Browse files
authored
Merge pull request dlang#3855 from WalterBright/useImportC32
compile .c files with ImportC
2 parents e150cca + a912ef8 commit 8460e29

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

win32.mak

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@ BUILD=release
99
OS=windows
1010
DMD=$(DMD_DIR)\generated\$(OS)\$(BUILD)\32\dmd
1111

12+
# Used for running MASM assembler on .asm files
1213
CC=dmc
14+
1315
MAKE=make
1416
HOST_DMD=dmd
1517

1618
DOCDIR=doc
1719
IMPDIR=import
1820

21+
# For compiling D and ImportC files
1922
DFLAGS=-m32omf -conf= -O -release -preview=dip1000 -preview=fieldwise -preview=dtorfields -inline -w -Isrc -Iimport
23+
# For unittest build
2024
UDFLAGS=-m32omf -conf= -O -release -preview=dip1000 -preview=fieldwise -w -Isrc -Iimport
21-
DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
22-
25+
# Also for unittest build
2326
UTFLAGS=-version=CoreUnittest -unittest -checkaction=context
2427

2528
CFLAGS=
@@ -97,7 +100,7 @@ lib\win32\winspool.lib: def\winspool.def
97100
################### C\ASM Targets ############################
98101

99102
errno_c_32omf.obj: src\core\stdc\errno.c
100-
$(CC) -c -o$@ $(CFLAGS) src\core\stdc\errno.c
103+
$(DMD) -c -of=$@ $(DFLAGS) -v -P=-I. src\core\stdc\errno.c
101104

102105
# only rebuild explicitly
103106
rebuild_minit_obj: src\rt\minit.asm

0 commit comments

Comments
 (0)