summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-12 07:21:22 -0400
committerOz Linden <oz@lindenlab.com>2011-09-12 07:21:22 -0400
commit9df77524fce4dd0df7f63e2909e0b5f6170d24db (patch)
treeabd5ed14a416b4403b28932ec42e3b2e1adbbe0a /scripts
parent49d0e291d83f66d7e1ed393e03eb1b50a2abc560 (diff)
only include the h file when it is being created, and make the #endif in the h file safer for picky compilers
Diffstat (limited to 'scripts')
-rw-r--r--scripts/templates/template-cpp.cpp3
-rw-r--r--scripts/templates/template-h.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/templates/template-cpp.cpp b/scripts/templates/template-cpp.cpp
index 7a8797698a..35d8441c87 100644
--- a/scripts/templates/template-cpp.cpp
+++ b/scripts/templates/template-cpp.cpp
@@ -26,4 +26,5 @@
*/
-#'%c'%35#include "#filename#.h"
+#'' if ( skip_h ) else '%cinclude "%s.h"' % (35,filename)#
+
diff --git a/scripts/templates/template-h.h b/scripts/templates/template-h.h
index de40a8e071..ce7b4ddc87 100644
--- a/scripts/templates/template-h.h
+++ b/scripts/templates/template-h.h
@@ -28,4 +28,4 @@
#'%c'%35#define LL_#filename.upper().replace('-','_')#_H
-#'%c'%35#endif LL_#filename.upper().replace('-','_')#_H
+#'%c'%35#endif // LL_#filename.upper().replace('-','_')#_H