Merge pull request #9 from NREL/coretrace-vscode

Coretrace files for VSCode
NREL · Mar 12, 2018 · 197e093 · 197e093
2 parents 5618e2c + 239b616
commit 197e093
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 37 deletions.
diff --git a/coretrace/.vscode/c_cpp_properties.json b/coretrace/.vscode/c_cpp_properties.json
@@ -0,0 +1,45 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include/c++/5",
+                "/usr/include/x86_64-linux-gnu/c++/5",
+                "/usr/include/c++/5/backward",
+                "/usr/lib/gcc/x86_64-linux-gnu/5/include",
+                "/usr/local/include",
+                "/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+                "/usr/include/x86_64-linux-gnu",
+                "/usr/include",
+                "${workspaceRoot}",
+                "~/local/wx-3.1.0/lib/wx/include/gtk2-unicode-static-3.1",
+                "~/local/wx-3.1.0/include/wx-3.1",
+                "${workspaceRoot}/../../lk/include",
+                "${workspaceRoot}/../../wex/include"
+
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include/c++/5",
+                    "/usr/include/x86_64-linux-gnu/c++/5",
+                    "/usr/include/c++/5/backward",
+                    "/usr/lib/gcc/x86_64-linux-gnu/5/include",
+                    "/usr/local/include",
+                    "/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+                    "/usr/include/x86_64-linux-gnu",
+                    "/usr/include",
+                    "${workspaceRoot}",
+                    "~/local/wx-3.1.0/lib/wx/include/gtk2-unicode-static-3.1",
+                    "~/local/wx-3.1.0/include/wx-3.1",
+                    "${workspaceRoot}/../../lk/include",
+                    "${workspaceRoot}/../../wex/include"
+                    ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 3
+}
diff --git a/coretrace/.vscode/tasks.json b/coretrace/.vscode/tasks.json
@@ -0,0 +1,36 @@
+{
+    "version": "0.1.0",
+    "command": "make",
+    "isShellCommand": true,
+    "options": {
+        "cwd": "${workspaceRoot}/build_linux",
+    },
+    "tasks": [
+        {
+            "taskName": "Makefile",
+
+            // Make this the default build command.
+            "isBuildCommand": true,
+
+            // Show the output window only if unrecognized errors occur.
+            "showOutput": "always",
+
+            // No args
+            "args": ["all"],
+
+            // Use the standard less compilation problem matcher.
+            "problemMatcher": {
+                "owner": "cpp",
+                "fileLocation": ["relative", "${workspaceRoot}"],
+                "pattern": {
+                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            }
+        }
+    ]
+}
diff --git a/coretrace/build_linux/Makefile b/coretrace/build_linux/Makefile
@@ -1,39 +1,5 @@
-VPATH = ..
-CC = gcc
-CXX = g++
-CFLAGS = -fPIC -Wall -g -O3 -I../ 
-CXXFLAGS = -std=c++11 $(CFLAGS)
-
-OBJECTS = \
-	treemesh.o \
-	apertureplane.o \
-	determineelementintersectionnew.o \
-	dumpsys.o \
-	errors.o \
-	generateray.o \
-	input.o \
-	interaction.o \
-	intersect.o \
-	mathproc.o \
-	newzstartforcubicsplinesurf.o \
-	quadricsurfaceclosedform.o \
-	root432.o \
-	spencerandmurtysurfaceclosedform.o \
-	stapi.o \
-	suntoprimarystage.o \
-	surface.o \
-	surfacenormalerrors.o \
-	surfacezatxypair.o \
-	torusclosedform.o \
-	raytrace.o \
-	types.o \
-	vshot.o
-
-
-TARGET=coretrace.a
-
-$(TARGET):$(OBJECTS)
-	ar rs $(TARGET) $(OBJECTS)
+all:
+	make -f Makefile-coretrace -j2
 
 clean:
-	rm -rf $(TARGET) $(OBJECTS)
+	make -f Makefile-coretrace clean
diff --git a/coretrace/build_linux/Makefile-coretrace b/coretrace/build_linux/Makefile-coretrace
@@ -0,0 +1,39 @@
+VPATH = ..
+CC = gcc
+CXX = g++
+CFLAGS = -fPIC -Wall -g -O3 -I../ 
+CXXFLAGS = -std=c++11 $(CFLAGS)
+
+OBJECTS = \
+	treemesh.o \
+	apertureplane.o \
+	determineelementintersectionnew.o \
+	dumpsys.o \
+	errors.o \
+	generateray.o \
+	input.o \
+	interaction.o \
+	intersect.o \
+	mathproc.o \
+	newzstartforcubicsplinesurf.o \
+	quadricsurfaceclosedform.o \
+	root432.o \
+	spencerandmurtysurfaceclosedform.o \
+	stapi.o \
+	suntoprimarystage.o \
+	surface.o \
+	surfacenormalerrors.o \
+	surfacezatxypair.o \
+	torusclosedform.o \
+	raytrace.o \
+	types.o \
+	vshot.o
+
+
+TARGET=coretrace.a
+
+$(TARGET):$(OBJECTS)
+	ar rs $(TARGET) $(OBJECTS)
+
+clean:
+	rm -rf $(TARGET) $(OBJECTS)