Revision: 44796
http://brlcad.svn.sourceforge.net/brlcad/?rev=44796&view=rev
Author: kunigami
Date: 2011-06-07 13:49:01 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Changed .c to .cpp and now I'm exporting the osl-renderer functions so that C
code can call them
Modified Paths:
--------------
brlcad/trunk/include/osl-renderer.h
brlcad/trunk/src/liboptical/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/src/liboptical/osl-renderer.cpp
Removed Paths:
-------------
brlcad/trunk/src/liboptical/osl-renderer.c
Modified: brlcad/trunk/include/osl-renderer.h
===================================================================
--- brlcad/trunk/include/osl-renderer.h 2011-06-07 13:13:53 UTC (rev 44795)
+++ brlcad/trunk/include/osl-renderer.h 2011-06-07 13:49:01 UTC (rev 44796)
@@ -3,6 +3,15 @@
#include "vmath.h"
-int Renderer(point_t *b);
+#ifdef __cplusplus
+extern "C" {
+#endif
+ int Renderer(point_t *b);
+#ifdef __cplusplus
+}
+#endif
+
+
+
#endif
Modified: brlcad/trunk/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-07 13:13:53 UTC (rev
44795)
+++ brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-07 13:49:01 UTC (rev
44796)
@@ -66,12 +66,10 @@
message("Oslcomp: ${OSLCOMP_LIBRARY}")
message("Oslquery: ${OSLQUERY_LIBRARY}")
- #add_library(osl-renderer osl-renderer.c)
- set (OSLRT_SOURCES osl-renderer.c)
+ set (OSLRT_SOURCES osl-renderer.cpp)
set (OSLRT_LIBS ${OSLEXEC_LIBRARY}
${OSLCOMP_LIBRARY} ${OSLQUERY_LIBRARY} ${OPENIMAGEIO_LIBRARY}
${Boost_LIBRARIES})
- #target_link_libraries(osl-renderer )
BRLCAD_ADDLIB(osl-renderer ${OSLRT_SOURCES} ${OSLRT_LIBS})
Deleted: brlcad/trunk/src/liboptical/osl-renderer.c
===================================================================
--- brlcad/trunk/src/liboptical/osl-renderer.c 2011-06-07 13:13:53 UTC (rev
44795)
+++ brlcad/trunk/src/liboptical/osl-renderer.c 2011-06-07 13:49:01 UTC (rev
44796)
@@ -1,8 +0,0 @@
-#include "osl-renderer.h"
-
-int Renderer(point_t *p){
- (*p)[0] = 1.0;
- (*p)[1] = 0.0;
- (*p)[2] = 1.0;
- return 1;
-}
Added: brlcad/trunk/src/liboptical/osl-renderer.cpp
===================================================================
--- brlcad/trunk/src/liboptical/osl-renderer.cpp
(rev 0)
+++ brlcad/trunk/src/liboptical/osl-renderer.cpp 2011-06-07 13:49:01 UTC
(rev 44796)
@@ -0,0 +1,9 @@
+#include "osl-renderer.h"
+
+int Renderer(point_t *p){
+ (*p)[0] = 0.0;
+ (*p)[1] = 1.0;
+ (*p)[2] = 0.0;
+ return 1;
+}
+
Property changes on: brlcad/trunk/src/liboptical/osl-renderer.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
