Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on May 05, 2014
@lynxlynxlynx lynxlynxlynx remove last uses of PLUGINDIR
long live PLUGIN_DIR!
735723c
@lynxlynxlynx lynxlynxlynx remove last uses of SYSCONFDIR vs SYSCONF_DIR
now all three paths in config.h get populated
4b192c6
View
4 cmake/cmake_config.h.in
@@ -7,9 +7,9 @@
#cmakedefine HAVE_STRNDUP 1
#cmakedefine HAVE_STRLCPY 1
#cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1
-#cmakedefine PLUGINDIR "${PLUGIN_DIR}"
+#cmakedefine PLUGIN_DIR "${PLUGIN_DIR}"
#cmakedefine DATA_DIR "${DATA_DIR}"
-#cmakedefine SYSCONFDIR "${SYSCONF_DIR}"
+#cmakedefine SYSCONF_DIR "${SYSCONF_DIR}"
#cmakedefine NOCOLOR ${NOCOLOR}
#cmakedefine USE_OPENGL ${USE_OPENGL}
#cmakedefine NOFPSLIMIT ${NOFPSLIMIT}
View
2  configure.in
@@ -206,7 +206,7 @@ AC_REPLACE_FNMATCH
AC_STRUCT_TM
AC_TYPE_SIZE_T
-CPPFLAGS="$CPPFLAGS -DSYSCONFDIR=\\\"\$(sysconfdir)\\\" -DDATA_DIR=\\\"\$(moddir)\\\" -DPLUGINDIR=\\\"\$(plugindir)\\\""
+CPPFLAGS="$CPPFLAGS -DSYSCONF_DIR=\\\"\$(sysconfdir)\\\" -DDATA_DIR=\\\"\$(moddir)\\\" -DPLUGIN_DIR=\\\"\$(plugindir)\\\""
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/gemrb/includes -I\$(top_srcdir)/gemrb/core"
CXXFLAGS="$CXXFLAGS -Wall -W -Wpointer-arith -Wcast-align -pedantic -Wno-format-y2k -Wno-long-long -fno-strict-aliasing"
View
4 gemrb/core/Interface.cpp
@@ -1565,8 +1565,8 @@ int Interface::Init(InterfaceConfig* config)
CONFIG_PATH("GemRBOverridePath", GemRBOverridePath, GemRBPath);
CONFIG_PATH("GemRBUnhardcodedPath", GemRBUnhardcodedPath, GemRBPath);
-#ifdef PLUGINDIR
- CONFIG_PATH("PluginsPath", PluginsPath, PLUGINDIR);
+#ifdef PLUGIN_DIR
+ CONFIG_PATH("PluginsPath", PluginsPath, PLUGIN_DIR);
#else
CONFIG_PATH("PluginsPath", PluginsPath, "");
if (!PluginsPath[0]) {
View
8 gemrb/core/InterfaceConfig.cpp
@@ -145,8 +145,8 @@ if (config->Open(path) \
ATTEMPT_INIT;
-#ifdef SYSCONFDIR
- PathJoinExt( path, SYSCONFDIR, name, "cfg" );
+#ifdef SYSCONF_DIR
+ PathJoinExt( path, SYSCONF_DIR, name, "cfg" );
ATTEMPT_INIT
#endif
@@ -156,8 +156,8 @@ if (config->Open(path) \
ATTEMPT_INIT;
-#ifdef SYSCONFDIR
- PathJoinExt( path, SYSCONFDIR, PACKAGE, "cfg" );
+#ifdef SYSCONF_DIR
+ PathJoinExt( path, SYSCONF_DIR, PACKAGE, "cfg" );
ATTEMPT_INIT;
#endif
}

No commit comments for this range

Something went wrong with that request. Please try again.