Changeset 2403Tweet

Timestamp:

Feb 13, 2013, 2:26:04 PM (7 years ago)

Author:

sam

Message:

sys: add the base source directory to the list of search directories
on automake platforms, too.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/debug/fps.cpp (modified) (1 diff)
• src/lol/sys/init.h (modified) (2 diffs)
• src/sys/init.cpp (modified) (4 diffs)
• tutorial/11_fractal.cpp (modified) (1 diff)

trunk/configure.ac

@@ -379 +379 @@
 dnl  How to use the Lol Engine inside this tree
 AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src"
-AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_SOURCE_SUBDIR=\\\"\$(subdir)\\\""
+AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_CONFIG_SOURCESUBDIR=\\\"\$(subdir)\\\""
 AM_CPPFLAGS="${AM_CPPFLAGS} ${LOL_CFLAGS}"
 AM_LDFLAGS="${AM_LDFLAGS} ${LOL_DEPENDENCIES}"

trunk/src/debug/fps.cpp

@@ -45 +45 @@
     for (int i = 0; i < 5; i ++)
     {
-        data->lines[i] = new Text(NULL, "src/data/font/ascii.png");
+        data->lines[i] = new Text(NULL, "data/font/ascii.png");
         data->lines[i]->SetPos(ivec3(x, y + (i ? 8 : 0) + 16 * i, 0));
         Ticker::Ref(data->lines[i]);
     }
 #else
-    data->lines[0] = new Text(NULL, "src/data/font/ascii.png");
+    data->lines[0] = new Text(NULL, "data/font/ascii.png");
     data->lines[0]->SetPos(ivec3(x, y, 100));
     Ticker::Ref(data->lines[0]);

trunk/src/lol/sys/init.h

@@ -35 +35 @@
 #endif
 
+#if !defined LOL_CONFIG_SOURCESUBDIR
+#   define LOL_CONFIG_SOURCESUBDIR ""
+#endif
+
 /*
  * System namespace. The platform-specific stuff in there makes the API
@@ -45 +49 @@
 extern void Init(int argc, char *argv[],
                  String const &projectdir = LOL_CONFIG_PROJECTDIR,
-                 String const &solutiondir = LOL_CONFIG_SOLUTIONDIR);
+                 String const &solutiondir = LOL_CONFIG_SOLUTIONDIR,
+                 String const &sourcesubdir = LOL_CONFIG_SOURCESUBDIR);
 
 extern void AddDataDir(String const &dir);

trunk/src/sys/init.cpp

@@ -39 +39 @@
 
 void Init(int argc, char *argv[],
-          String const &projectdir, String const &solutiondir)
+          String const &projectdir,
+          String const &solutiondir,
+          String const &sourcesubdir)
 {
     using namespace std;
@@ -77 +79 @@
             if (i)
             {
-                String rootdir = projectdir;
+                String rootdir = solutiondir;
+                if (rootdir.Last() != SEPARATOR)
+                    rootdir += SEPARATOR;
+                rootdir += "../../src/"; /* FIXME: use SEPARATOR? */
+                AddDataDir(rootdir);
+
+                rootdir = projectdir;
                 if (rootdir.Last() != SEPARATOR)
                     rootdir += SEPARATOR;
                 AddDataDir(rootdir);
+
                 got_rootdir = true;
             }
@@ -90 +99 @@
     if (!got_rootdir)
     {
-        AddDataDir(binarydir);
+        String rootdir = binarydir;
+        if (rootdir.Last() != SEPARATOR)
+            rootdir += SEPARATOR;
+        for (int i = 1; i < sourcesubdir.Count(); ++i)
+        {
+            if ((sourcesubdir[i] == SEPARATOR
+                  && sourcesubdir[i - 1] != SEPARATOR)
+                 || i == sourcesubdir.Count() - 1)
+                rootdir += "../";
+        }
+        rootdir += "src/";
+        AddDataDir(rootdir);
+
+        rootdir = binarydir;
+        AddDataDir(rootdir);
+
         got_rootdir = true;
     }
@@ -114 +138 @@
 
     for (int i = 0; i < data_dir.Count(); ++i)
-        ret << data_dir[0] + file;
+        ret << data_dir[i] + file;
 
     if (ret.Count() == 0)

trunk/tutorial/11_fractal.cpp

@@ -105 +105 @@
 
 #if !defined __native_client__
-        m_centertext = new Text(NULL, "src/data/font/ascii.png");
+        m_centertext = new Text(NULL, "data/font/ascii.png");
         m_centertext->SetPos(ivec3(5, m_window_size.y - 15, 1));
         Ticker::Ref(m_centertext);
 
-        m_mousetext = new Text(NULL, "src/data/font/ascii.png");
+        m_mousetext = new Text(NULL, "data/font/ascii.png");
         m_mousetext->SetPos(ivec3(5, m_window_size.y - 29, 1));
         Ticker::Ref(m_mousetext);
 
-        m_zoomtext = new Text(NULL, "src/data/font/ascii.png");
+        m_zoomtext = new Text(NULL, "data/font/ascii.png");
         m_zoomtext->SetPos(ivec3(5, m_window_size.y - 43, 1));
         Ticker::Ref(m_zoomtext);