don't build stdio_msvc12.d into lib, create object files stdio_msvc12…

….obj and stdio_msvc14.obj instead
dlang · Aug 11, 2015 · 0bcf0fa · 0bcf0fa
1 parent c8f8ad0
commit 0bcf0fa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/mak/MANIFEST b/mak/MANIFEST
@@ -187,6 +187,8 @@ MANIFEST=\
 	src\core\sys\windows\threadaux.d \
 	src\core\sys\windows\windows.d \
 	src\core\sys\windows\winsock2.d \
+	src\core\sys\windows\stdio_msvc12.d \
+	src\core\sys\windows\stdio_msvc14.d \
 	\
 	src\gc\bits.d \
 	src\gc\config.d \

diff --git a/mak/SRCS b/mak/SRCS
@@ -75,7 +75,6 @@ SRCS=\
 	src\core\sys\windows\threadaux.d \
 	src\core\sys\windows\windows.d \
 	src\core\sys\windows\winsock2.d \
-	src\core\sys\windows\stdio_msvc12.d \
 	\
 	src\gc\bits.d \
 	src\gc\config.d \

diff --git a/src/core/sys/windows/stdio_msvc12.d b/src/core/sys/windows/stdio_msvc12.d
@@ -84,11 +84,6 @@ int _fgetc_nolock(FILE *fp)
         return _filbuf(fp);
 }
 
-shared(FILE)* __acrt_iob_func(uint id)
-{
-    return __iob_func() + id;
-}
-
 @trusted
 {
     ///

diff --git a/win64.mak b/win64.mak
@@ -27,10 +27,12 @@ CFLAGS=/Z7 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
 DRUNTIME_BASE=druntime$(MODEL)
 DRUNTIME=lib\$(DRUNTIME_BASE).lib
 GCSTUB=lib\gcstub$(MODEL).obj
+STDIO_VS12=lib\stdio_msvc12_$(MODEL).obj
+STDIO_VS14=lib\stdio_msvc14_$(MODEL).obj
 
 DOCFMT=
 
-target : import copydir copy $(DRUNTIME) $(GCSTUB)
+target : import copydir copy $(DRUNTIME) $(GCSTUB) stdio_vs
 
 $(mak\COPY)
 $(mak\DOCS)
@@ -660,6 +662,16 @@ src\rt\minit.obj : src\rt\minit.asm
 $(GCSTUB) : src\gcstub\gc.d win64.mak
 	$(DMD) -c -of$(GCSTUB) src\gcstub\gc.d $(DFLAGS)
 
+################### VS 2015 init code #########################
+
+stdio_vs: $(STDIO_VS14) $(STDIO_VS12)
+
+$(STDIO_VS12) : src\core\sys\windows\stdio_msvc12.d win64.mak
+	$(DMD) -c -of$(STDIO_VS12) src\core\sys\windows\stdio_msvc12.d $(DFLAGS)
+
+$(STDIO_VS14) : src\core\sys\windows\stdio_msvc14.d win64.mak
+	$(DMD) -c -of$(STDIO_VS14) src\core\sys\windows\stdio_msvc14.d $(DFLAGS)
+
 ################### Library generation #########################
 
 $(DRUNTIME): $(OBJS) $(SRCS) win64.mak