summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2014-03-21 16:38:12 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2014-03-21 16:38:12 +0000
commit9bff50878971225d72f147db58ebc6d696b888f8 (patch)
treefb4e892b2c6df94e9ceed0c0adca0e0fbbffc398
parent6845de111873cff3790da205718ee2a00ae50c72 (diff)
downloadMPC-9bff50878971225d72f147db58ebc6d696b888f8.tar.gz
ChangeLogTag: Fri Mar 21 16:32:10 UTC 2014 Adam Mitz <mitza@ociweb.com>
-rw-r--r--ChangeLog11
-rw-r--r--config/sqlapi.mpb7
-rw-r--r--docs/templates/make.txt3
-rw-r--r--templates/make.mpd6
4 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b7b36ca7..fbc2af82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Mar 21 16:32:10 UTC 2014 Adam Mitz <mitza@ociweb.com>
+
+ * config/sqlapi.mpb:
+
+ Added base project for SQLAPI (www.sqlapi.com).
+
+ * docs/templates/make.txt:
+ * templates/make.mpd:
+
+ Added a template variable 'default_configuration'.
+
Sun Mar 16 21:50:26 UTC 2014 James H. Hill <hillj@cs.iupui.edu>
* config/pintool.mpb:
diff --git a/config/sqlapi.mpb b/config/sqlapi.mpb
new file mode 100644
index 00000000..7d7b611c
--- /dev/null
+++ b/config/sqlapi.mpb
@@ -0,0 +1,7 @@
+// $Id$
+
+project {
+ includes += $(SQLAPI_ROOT)/include
+ libpaths += $(SQLAPI_ROOT)/lib
+ lit_libs += sqlapi
+}
diff --git a/docs/templates/make.txt b/docs/templates/make.txt
index 2facfbff..95f63390 100644
--- a/docs/templates/make.txt
+++ b/docs/templates/make.txt
@@ -27,6 +27,9 @@ cpu = This can be used with the Wind River specific compilers to specify the CPU
cputype = This can be used with the Wind River specific compilers to specify the CPU type.
cxx = Holds the C++ compiler.
cxxint = This is Green Hills specific and specifies the type of integration.
+default_configuration = If multiple platforms/configurations are used, this
+variable can be set to determine which configuration is active when CFG is not
+set on the command line.
delete = A utility to delete a file.
depgen = A utility to generate make dependencies.
depgen_flags = Flags to be passed to the dependency generator utility.
diff --git a/templates/make.mpd b/templates/make.mpd
index 015b22da..41273edc 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -3,6 +3,9 @@
#----------------------------------------------------------------------------
<%marker(top)%>
<%if(multiple(configurations) || multiple(platforms))%>
+<%if(default_configuration)%>
+CFG = <%default_configuration%>
+<%else%>
<%foreach(configurations)%>
<%if(forfirst)%>
<%if(multiple(platforms))%>
@@ -14,10 +17,11 @@ CFG = <%platform%> <%configuration%>
<%else%>
CFG = <%configuration%>
<%endif%>
-
<%endif%>
<%endfor%>
<%endif%>
+
+<%endif%>
<%foreach(compilers)%>
<%foreach(platforms)%>
<%foreach(configurations)%>