Put vc.pdb and all_objs in obj directory

hughsando · hughsando · commit 7038919df571 · 2014-02-21T13:35:37.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,9 +11,9 @@ before_install:
 script:
   - cd build-tool/haxe
   - haxe run.hxml
-  - cd ../../runtime
-  - haxelib run hxcpp BuildLibs.xml
-  - haxelib run hxcpp BuildLibs.xml -DHXCPP_M64
+  - cd ../../project
+  - haxelib run hxcpp Build.xml
+  - haxelib run hxcpp Build.xml -DHXCPP_M64
   - cd ../test/ndlls
   - haxe compile.hxml && ./cpp/Test
   - haxe compile64.hxml && ./cpp64/Test
diff --git a/build-tool/haxe/BuildLibs.hx b/build-tool/haxe/BuildLibs.hx
@@ -5,7 +5,7 @@ class BuildLibs
 {
    static function showUsage()
    {
-      Sys.println("Usage : neko buildlibs.n [target ...] [arch] [-debug] [-verbose] [-D...]");
+      Sys.println("Usage : neko build.n [target ...] [arch] [-debug] [-verbose] [-D...]");
       Sys.println("  target  : clean, ios, android, windows, linux, mac, ios-legacy");
       Sys.println("          : static-android, static-windows, static-linux, static-mac,");
       Sys.println("            default (=current system)");
@@ -30,7 +30,7 @@ class BuildLibs
 
    static function run(inFlags:Array<String>)
    {
-       var args = ["run.n", "BuildLibs.xml"].concat(inFlags);
+       var args = ["run.n", "Build.xml"].concat(inFlags);
        var here = Sys.getCwd().split("\\").join("/");
 
        var parts = here.split("/");
diff --git a/build-tool/haxe/BuildTool.hx b/build-tool/haxe/BuildTool.hx
@@ -518,7 +518,7 @@ class Linker
          // Place list of obj files in a file called "all_objs"
          if (mFromFile=="@")
          {
-            var fname = "all_objs";
+            var fname = inCompiler.mObjDir + "/all_objs";
             var fout = sys.io.File.write(fname,false);
             for(obj in objs)
                fout.writeString(obj + "\n");
diff --git a/build-tool/haxe/buildlibs.hxml b/build-tool/haxe/buildlibs.hxml
@@ -1,4 +1,4 @@
--neko ../../runtime/buildlibs.n
+-neko ../../project/build.n
 -main BuildLibs
 -D neko_v1
 -debug
diff --git a/build-tool/msvc-toolchain.xml b/build-tool/msvc-toolchain.xml
@@ -29,6 +29,9 @@
 <set name="CONSOLE_VER" value=",5.01" if="HXCPP_WINXP_COMPAT" />
 <set name="CONSOLE_VER" value="" unless="MSVC17+" />
 
+<set name="MSVC_OBJ_DIR" value="obj/mscv${MSVC_VER}${OBJEXT}${OBJCACHE}${XPOBJ}" unless="winrt" />
+<set name="MSVC_OBJ_DIR" value="obj/mscv${MSVC_VER}-rt${OBJEXT}${OBJCACHE}${XPOBJ}" if="winrt" />
+
 <compiler id="MSVC" exe="cl.exe" if="windows">
   <flag value="-nologo"/>
   <flag value="-Od" if="debug"/>
@@ -52,6 +55,7 @@
      <flag value="-Zi" unless="HXCPP_COMPILE_CACHE" />
      <flag value="-Z7" if="HXCPP_COMPILE_CACHE" />
      <flag value="-FS" if="HXCPP_FORCE_PDB_SERVER" />
+     <flag value="-Fd${MSVC_OBJ_DIR}/vc.pdb" unless="HXCPP_COMPILE_CACHE" />
   </section>
   <flag value="-Oy-"/>
   <flag value="-c"/>
@@ -67,8 +71,7 @@
   <flag value="-wd4996"/>
   <outflag value="-Fo"/>
   <ext value=".obj"/>
-  <objdir value="obj/mscv${MSVC_VER}${OBJEXT}${OBJCACHE}${XPOBJ}" unless="winrt" />
-  <objdir value="obj/mscv${MSVC_VER}-rt${OBJEXT}${OBJCACHE}${XPOBJ}" if="winrt" />
+  <objdir value="${MSVC_OBJ_DIR}" />
 
   <getversion value="cl.exe"/>
 </compiler>
diff --git a/project/buildlibs.n b/project/buildlibs.n
diff --git a/run.n b/run.n

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ class BuildLibs`
`5`	`5`	`{`
`6`	`6`	`static function showUsage()`
`7`	`7`	`{`
`8`		`- Sys.println("Usage : neko buildlibs.n [target ...] [arch] [-debug] [-verbose] [-D...]");`
	`8`	`+ Sys.println("Usage : neko build.n [target ...] [arch] [-debug] [-verbose] [-D...]");`
`9`	`9`	`Sys.println(" target : clean, ios, android, windows, linux, mac, ios-legacy");`
`10`	`10`	`Sys.println(" : static-android, static-windows, static-linux, static-mac,");`
`11`	`11`	`Sys.println(" default (=current system)");`
`@@ -30,7 +30,7 @@ class BuildLibs`
`30`	`30`
`31`	`31`	`static function run(inFlags:Array<String>)`
`32`	`32`	`{`
`33`		`- var args = ["run.n", "BuildLibs.xml"].concat(inFlags);`
	`33`	`+ var args = ["run.n", "Build.xml"].concat(inFlags);`
`34`	`34`	`var here = Sys.getCwd().split("\\").join("/");`
`35`	`35`
`36`	`36`	`var parts = here.split("/");`
Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ class Linker`
`518`	`518`	`// Place list of obj files in a file called "all_objs"`
`519`	`519`	`if (mFromFile=="@")`
`520`	`520`	`{`
`521`		`- var fname = "all_objs";`
	`521`	`+ var fname = inCompiler.mObjDir + "/all_objs";`
`522`	`522`	`var fout = sys.io.File.write(fname,false);`
`523`	`523`	`for(obj in objs)`
`524`	`524`	`fout.writeString(obj + "\n");`