diff options
| author | Manoj Rajagopalan <manoj@nanorex.com> | 2008-04-02 20:59:14 +0000 |
|---|---|---|
| committer | Manoj Rajagopalan <manoj@nanorex.com> | 2008-04-02 20:59:14 +0000 |
| commit | e90b83b2ebec7bce62dbeb561b1f32b6fb7b893b (patch) | |
| tree | 8e7312c42cfad55790be18e7099a7db0fc13ef46 /cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers | |
| parent | 3954abf6c01da4f72f1c6c6c4ec8e0dd9b8e4a4b (diff) | |
| download | nanoengineer-theirix-e90b83b2ebec7bce62dbeb561b1f32b6fb7b893b.tar.gz nanoengineer-theirix-e90b83b2ebec7bce62dbeb561b1f32b6fb7b893b.zip | |
Revised MMP import-export module.
NV-1 imports file successfully but still does not show any graphics.
Lots of bug fixes and API changes.
Diffstat (limited to 'cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers')
| -rw-r--r-- | cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro index c65591a51..592079110 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer/NXBallAndStickOpenGLRenderer.pro @@ -1,52 +1,37 @@ TEMPLATE = lib -CONFIG += debug_and_release \ -stl \ +CONFIG += stl \ opengl \ dll \ -# plugin -win32: CONFIG -= dll -win32: CONFIG += staticlib + debug_and_release \ + plugin \ + rtti +win32 : CONFIG -= dll +win32 : CONFIG += staticlib QT += opengl -HEADERS += ../../../../../../../include/Nanorex/Interface/NXAtomRenderData.h \ - ../../../../../../../include/Nanorex/Interface/NXBondRenderData.h \ - ../../../../../../../include/Nanorex/Interface/NXRendererPlugin.h \ +HEADERS += ../../../../../../../include/Nanorex/Interface/NXRendererPlugin.h \ ../../../../../../../include/Nanorex/Interface/NXSceneGraph.h \ ../../../../../../Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer.h \ ../../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLMaterial.h \ - ../../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLRendererPlugin.h + ../../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLRendererPlugin.h \ + ../../../../../../../include/Nanorex/Interface/NXAtomData.h \ + ../../../../../../../include/Nanorex/Interface/NXBondData.h -TARGETDEPS += ../../../../../../../lib/libNanorexUtility.so \ -../../../../../../../lib/libNanorexInterface.so \ - ../../../../../../../lib/libNXOpenGLRendererPlugin.so \ - ../../../../../../../lib/libNXOpenGLSceneGraph.a \ - ../../../../../../../lib/libGLT.a -macx : TARGETDEPS ~= s/.so/.dylib/g -win32 : TARGETDEPS ~= s/.so/.a/g +macx : TARGETDEPS ~= s/.so/.dylib/g +win32 : TARGETDEPS ~= s/.so/.a/g DESTDIR = ../../../../../../../lib -INCLUDEPATH += ../../NXOpenGLRendererPlugin \ -../../../../../../../include # qmake puts these library declarations too early in the g++ command on win32 -win32 : LIBS += -lopengl32 -lglu32 -lgdi32 -luser32 +win32 : LIBS += -lopengl32 -lglu32 -lgdi32 -luser32 SOURCES += ../../../../../../Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer.cpp TARGET = NXBallAndStickOpenGLRenderer -LIBS += -L../../../../../../../lib \ - -lNanorexInterface \ - -lNXOpenGLRendererPlugin \ - -lNXOpenGLSceneGraph \ - -lNanorexUtility \ - -lGLT -# qmake puts these library declarations too early in the g++ command on win32 -win32 : LIBS += -lopengl32 -lglu32 -lgdi32 -luser32 - QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG \ -g \ -O0 \ @@ -57,3 +42,20 @@ QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG \ # macx : QMAKE_POST_LINK ~= s/.so/.dylib/g + +TARGETDEPS += ../../../../../../../lib/libNXOpenGLSceneGraph.a \ + ../../../../../../../lib/libGLT.a \ + ../../../../../../../lib/libNanorexInterface.so \ + ../../../../../../../lib/libNanorexUtility.so + + + +INCLUDEPATH += $(OPENBABEL_INCPATH) \ + ../../../../../../../include + +LIBS += -L../../../../../../../lib \ + -lNanorexInterface \ + -lNanorexUtility \ + -lNXOpenGLSceneGraph \ + -lGLT + |