Path fixed.

Signed-off-by: Ciprian Khlud <[email protected]>
ciplogic · Nov 6, 2013 · ce178fe · ce178fe
1 parent 15243ae
commit ce178fe
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 618 deletions.
diff --git a/CodeRefractor.sln b/CodeRefractor.sln
@@ -36,11 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodeRefactorCppDebugging",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsilReader", "Compiler\Frontend\MsilReader\MsilReader.csproj", "{1B6CF014-6CBD-4A06-A4DE-50656C61B5C7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F862559F-65E9-49A6-AB2A-8A7E85A30192}"
-	ProjectSection(SolutionItems) = preProject
-		Performance1.psess = Performance1.psess
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/Common/CodeRefractor.RuntimeBase/CommonExtensions.cs b/Common/CodeRefractor.RuntimeBase/CommonExtensions.cs
@@ -203,11 +203,13 @@ public static string ToEscapedString(this string input)
 
         public static string ExecuteCommand(this string pathToGpp, string arguments = "")
         {
+            var currentPath = Directory.GetCurrentDirectory();
+            var finalGccPath = Path.Combine(currentPath, pathToGpp);
             var p = new Process
                         {
                             StartInfo =
                                 {
-                                    FileName = pathToGpp,
+                                    FileName = finalGccPath,
                                     Arguments = arguments,
                                     RedirectStandardOutput = true,
                                     RedirectStandardError = true,

diff --git a/Common/CodeRefractor.RuntimeBase/Util/NativeCompilationUtils.cs b/Common/CodeRefractor.RuntimeBase/Util/NativeCompilationUtils.cs
@@ -23,7 +23,7 @@ private class GccOptions : Options
         {
             public GccOptions()
             {
-                PathOfCompilerTools = @"c:\Oss\Dev-Cpp\MinGW64\bin\";
+                PathOfCompilerTools = @"..\Lib\Gcc\bin\";
                 CompilerExe = "g++.exe";
                 OptimizationFlags = "-Ofast -fomit-frame-pointer -ffast-math -std=c++11 -static-libgcc ";
                 LinkerOptions = "";

diff --git a/VmTests/Projects/SimpleAdditions/NBody.cs b/VmTests/Projects/SimpleAdditions/NBody.cs
@@ -4,26 +4,15 @@
    contributed by Isaac Gouy, optimization and use of more C# idioms by Robert F. Tobler
 */
 
+using System;
+
 namespace SimpleAdditions
 {
     class NBody
     {
-        unsafe static void FillWithColor(uint* data, int w, int h, uint color)
-        {
-            var pixelCount = w*h;
-            for (var i = 0; i < pixelCount; i++)
-            {
-                *data = color;
-                data++;
-            }
-        }
-        public static unsafe void Main()
+        public static void Main()
         {
-            var surface = new uint[800*600];
-            fixed (uint* srf = surface)
-            {
-                FillWithColor(srf, 800, 600, 255);
-            }
+            Console.WriteLine(2+2);
         }
     }
 }
diff --git a/VmTests/Projects/SimpleAdditions/SimpleAdditions.csproj b/VmTests/Projects/SimpleAdditions/SimpleAdditions.csproj
@@ -35,11 +35,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NBody.cs" />

diff --git a/bin/Makefile.win b/bin/Makefile.win
@@ -1,29 +1,28 @@
 # Project: Output
-# Makefile created by Dev-C++ 5.4.1
+# Makefile created by Dev-C++ 5.5.2
 
 CPP      = g++.exe
 CC       = gcc.exe
 WINDRES  = windres.exe
 OBJ      = output.o
 LINKOBJ  = output.o
-LIBS     = -L"C:/Oss/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib32" -static-libgcc   -s
-INCS     = -I"C:/Oss/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include"
-CXXINCS  = -I"C:/Oss/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include"
+LIBS     = -L"C:/Oss/Dev-Cpp/MinGW64/lib" -L"C:/Oss/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib" -static-libgcc   -s
+INCS     = -I"C:/Oss/Dev-Cpp/MinGW64/include" -I"C:/Oss/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include"
+CXXINCS  = -I"C:/Oss/Dev-Cpp/MinGW64/include" -I"C:/Oss/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Oss/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.7.1/include/c++"
 BIN      = Output.exe
-CXXFLAGS = $(CXXINCS) -O2 -std=c++11 -march=native -mtune=native -Ofast -std=gnu++11
+CXXFLAGS = $(CXXINCS) -march=native -mtune=native -Ofast -std=gnu++11 -O2 -std=c++11
 CFLAGS   = $(INCS) -march=native -mtune=native -Ofast -std=gnu++11
 RM       = rm -f
 
 .PHONY: all all-before all-after clean clean-custom
 
 all: all-before $(BIN) all-after
 
-
 clean: clean-custom
 	${RM} $(OBJ) $(BIN)
 
 $(BIN): $(OBJ)
 	$(CPP) $(LINKOBJ) -o $(BIN) $(LIBS)
 
-output.o: output.cpp sloth.h CodeRefactorRuntime/System_Primitives.h  CodeRefactorRuntime/System_Console.h  CodeRefactorRuntime/System_Primitives.h runtime_base.partcpp
+output.o: output.cpp
 	$(CPP) -c output.cpp -o output.o $(CXXFLAGS)