Windows|Fixed: Build failures, fonts.dei syntax error

skyjake · Sep 10, 2013 · 95ffcf0 · 95ffcf0
1 parent 1fff9c9
commit 95ffcf0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/doomsday/client/data/defaultstyle.pack/fonts.dei b/doomsday/client/data/defaultstyle.pack/fonts.dei
@@ -6,7 +6,9 @@
 
 script { import Version, gui }
 
-group condition "Version.OS == 'windows'" {
+group {
+    condition: Version.OS == 'windows'
+
     font default {
         family: Open Sans
         size: 12pt

diff --git a/doomsday/client/src/ui/widgets/scriptcommandwidget.cpp b/doomsday/client/src/ui/widgets/scriptcommandwidget.cpp
@@ -16,12 +16,13 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#include "ui/widgets/scriptcommandwidget.h"
-#include "ui/widgets/popupwidget.h"
 #include <de/Script>
 #include <de/Process>
 #include <de/ScriptLex>
 
+#include "ui/widgets/scriptcommandwidget.h"
+#include "ui/widgets/popupwidget.h"
+
 using namespace de;
 
 DENG2_PIMPL(ScriptCommandWidget)

diff --git a/doomsday/libdeng2/include/de/data/info.h b/doomsday/libdeng2/include/de/data/info.h
@@ -37,15 +37,15 @@ namespace de {
  *
  * @todo Should use de::Lex internally.
  */
-class Info
+class DENG2_PUBLIC Info
 {
 public:
     class BlockElement;
 
     /**
      * Base class for all elements.
      */
-    class Element {
+    class DENG2_PUBLIC Element {
     public:
         enum Type {
             None,
@@ -110,7 +110,7 @@ class Info
     /**
      * Element that contains a single string value.
      */
-    class KeyElement : public Element {
+    class DENG2_PUBLIC KeyElement : public Element {
     public:
         enum Flag {
             Attribute = 0x1,
@@ -139,7 +139,7 @@ class Info
     /**
      * Element that contains a list of string values.
      */
-    class ListElement : public Element {
+    class DENG2_PUBLIC ListElement : public Element {
     public:
         ListElement(String const &name) : Element(List, name) {}
         void add(Value const &v) { _values << v; }
@@ -154,7 +154,7 @@ class Info
      * a name, each block may have a "block type", which is a case insensitive
      * identifier.
      */
-    class BlockElement : public Element {
+    class DENG2_PUBLIC BlockElement : public Element {
     public:
         DENG2_ERROR(ValuesError);