Warning fixes and copyright update.

[evaf] / www / pswgen05.html
diff --git a/www/pswgen05.html b/www/pswgen05.html

index bc6b5d6545d1b5d70f1065cce92d414c537efd85..3db173b67e7951fa67631afe5e0ebc9f19f3ace1 100644 (file)
--- a/www/pswgen05.html
+++ b/www/pswgen05.html
@@ -13,6 +13,8 @@
  
      <body>
  
+        <p>Next: <a href="pswgen06.html">06 - Storage Module</a>, Previous: <a href="pswgen04.html">04 - Generator Module</a></p>
+
          <h1>eVaf Tutorial</h1>
  
          <h2>05 - Building Generator Module</h2>
@@ -34,11 +36,6 @@
  <pre class="hl"><span class="hl kwa">set</span><span class="hl opt">(</span>QT_DONT_USE_QTGUI TRUE<span class="hl opt">)</span>
  <span class="hl kwa">include</span><span class="hl opt">(</span><span class="hl kwd">${QT_USE_FILE}</span><span class="hl opt">)</span></pre>
  
-        <p>The next line adds the <tt>PSWGEN_GENERATOR_LIBRARY</tt> definition to the compiler (remember the <tt>lib.h</tt> file and
-        the <tt>PSWGEN_GENERATOR_EXPORT</tt> macro in the <tt>igeneraror.h</tt> file?):
-
-<pre class="hl"><span class="hl kwa">add_definitions</span><span class="hl opt">(</span>-DPSWGEN_GENERATOR_LIBRARY<span class="hl opt">)</span></pre>
-
          <p>Add all the eVaf include directories to the compiler. The variable <tt>eVaf_INCLUDE</tt> contains all the eVaf include
          directories and is already initialized with proper values when this <tt>CMakeLists.txt</tt> file is processed.</p>
  
@@ -61,7 +58,6 @@
          during the build, do not include here any other header files.</p>
  
  <pre class="hl"><span class="hl kwa">set</span><span class="hl opt">(</span>MOC_HDRS
-    igenerator.h
      module.h
  <span class="hl opt">)</span></pre>
  
@@ -93,9 +89,6 @@
  <span class="hl kwa">set</span><span class="hl opt">(</span>QT_DONT_USE_QTGUI TRUE<span class="hl opt">)</span>
  <span class="hl kwa">include</span><span class="hl opt">(</span><span class="hl kwd">${QT_USE_FILE}</span><span class="hl opt">)</span>
  
-<span class="hl com"># Needed for exporting symbols from this library</span>
-<span class="hl kwa">add_definitions</span><span class="hl opt">(</span>-DPSWGEN_GENERATOR_LIBRARY<span class="hl opt">)</span>
-
  <span class="hl com"># Include directories</span>
  <span class="hl kwa">include_directories</span><span class="hl opt">(</span><span class="hl kwd">${eVaf_INCLUDE}<span class="hl opt">)</span>
  
@@ -103,14 +96,12 @@
  <span class="hl kwa">set</span><span class="hl opt">(</span>eVaf_LIBRARIES CommonLib PluginsLib<span class="hl opt">)</span>
  
  <span class="hl com"># Source files</span>
-<span class="hl kwa">set</span><span class="hl opt">(</span>MOC_HDRS
-    igenerator.h
-    module.h
+<span class="hl kwa">set</span><span class="hl opt">(</span>SRCS
+    module.cpp
  <span class="hl opt">)</span>
  
  <span class="hl com"># Header files for the Qt meta-object compiler</span>
  <span class="hl kwa">set</span><span class="hl opt">(</span>MOC_HDRS
-    igenerator.h
      module.h
  <span class="hl opt">)</span>