fix MSVC build

dlang · Jun 21, 2012 · 2dcf68a · 2dcf68a
1 parent eb41499
commit 2dcf68a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/src/dmd_msc.vcproj b/src/dmd_msc.vcproj
@@ -1300,14 +1300,6 @@
 					RelativePath=".\root\async.h"
 					>
 				</File>
-				<File
-					RelativePath=".\root\dchar.c"
-					>
-				</File>
-				<File
-					RelativePath=".\root\dchar.h"
-					>
-				</File>
 				<File
 					RelativePath=".\root\dmgcmem.c"
 					>
@@ -1360,14 +1352,6 @@
 					RelativePath=".\root\longdouble.h"
 					>
 				</File>
-				<File
-					RelativePath=".\root\lstring.c"
-					>
-				</File>
-				<File
-					RelativePath=".\root\lstring.h"
-					>
-				</File>
 				<File
 					RelativePath=".\root\man.c"
 					>

diff --git a/src/vcbuild/dmc_cl.bat b/src/vcbuild/dmc_cl.bat
@@ -9,6 +9,12 @@ if "%1" == "" goto done
 rem echo %1
 
 set opt=%1
+rem add longdouble.c and strtold.c to the build, they are not in the makefile
+if "%opt%" == "toir"     set opt=%opt%.c backend\strtold.c root\longdouble.c
+if "%opt%" == "toir.obj" set opt=%opt% strtold.obj longdouble.obj
+rem remove includes after ";"
+if "%opt%" == "tk" set opt=/Itk
+
 if "%opt:~0,1%" == "-" goto opt
 if "%opt:~0,1%" == "/" goto opt
 
@@ -24,6 +30,9 @@ if "%opt:~0,2%" == "-o" (
 	if "%opt:~-4%" == ".exe" set opt=/Fe%opt:~2%
 	if "%opt:~-4%" == ".obj" set opt=/Fo%opt:~2%
 )
+rem echo %opt%
+rem if "%opt:~0,2%" == "-I" goto shift
+
 if "%opt%" == "-e" goto shift
 if "%opt%" == "-Ae" goto shift
 if "%opt%" == "-Ar" goto shift