#5231: Compilation in gcc working, this will likely fail when at runt…

…ime pretty fast.

Makefile.am

@@ -38,8 +38,4 @@ scripts_DATA = $(top_srcdir)/install/scripts/*.py
 commandsdir = $(scriptsdir)/commands
 commands_DATA = $(top_srcdir)/install/scripts/commands/*.py
 
-# Install sourceviewer synax and colour files
-#sourceviewerdir = $(pkglibdir)/sourceviewer
-#sourceviewer_DATA = $(top_srcdir)/install/sourceviewer/*
-
 EXTRA_DIST = config.rpath

libs/module/Makefile.am

@@ -1,8 +1,8 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs 
 AM_CXXFLAGS = -fPIC
 
-pkglib_LTLIBRARIES = libmodules.la
-libmodules_la_LDFLAGS = -release @PACKAGE_VERSION@
-libmodules_la_SOURCES = CoreModule.cpp \
+pkglib_LTLIBRARIES = libmodule.la
+libmodule_la_LDFLAGS = -release @PACKAGE_VERSION@
+libmodule_la_SOURCES = CoreModule.cpp \
                      DynamicLibrary.cpp \
 					 StaticModule.cpp

radiant/Makefile.am

@@ -62,7 +62,6 @@ darkradiant_SOURCES = main.cpp \
                       camera/CamRenderer.cpp \
                       camera/CamWnd.cpp \
                       camera/FloatingCamWnd.cpp \
-                      commandsystem/CommandSystem.cpp \
                       eclassmgr/Doom3EntityClass.cpp \
                       eclassmgr/EClassManager.cpp \
                       entity/ShaderParms.cpp \

radiant/darkradiant

@@ -0,0 +1,210 @@
+#! /bin/bash
+
+# darkradiant - temporary wrapper script for .libs/darkradiant
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-11
+#
+# The darkradiant program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' ../libs/scene/libscenegraph.la ../libs/wxutil/libwxutil.la ../libs/xmlutil/libxmlutil.la ../libs/math/libmath.la ../libs/module/libmodule.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ../libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "darkradiant:darkradiant:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-11" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "darkradiant:darkradiant:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "darkradiant:darkradiant:$LINENO: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case " $* " in
+  *\ --lt-*)
+    for lt_wr_arg
+    do
+      case $lt_wr_arg in
+      --lt-*) ;;
+      *) set x "$@" "$lt_wr_arg"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='darkradiant'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu:/home/greebo/Darkradiant/libs/scene/.libs:/home/greebo/Darkradiant/libs/wxutil/.libs:/home/greebo/Darkradiant/libs/xmlutil/.libs:/home/greebo/Darkradiant/libs/math/.libs:/home/greebo/Darkradiant/libs/module/.libs:$LD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`
+
+    export LD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi

radiant/log/Console.cpp

@@ -2,6 +2,7 @@
 
 #include "iuimanager.h"
 #include "igroupdialog.h"
+#include "iradiant.h"
 
 #include "wxutil/ConsoleView.h"
 #include <wx/sizer.h>

radiant/ui/prefdialog/GameSetupPageIdTech.cpp

@@ -13,6 +13,7 @@
 #include <wx/panel.h>
 
 #include "string/trim.h"
+#include "registry/registry.h" 
 #include "os/file.h"
 #include "os/path.h"
 #include "settings/Win32Registry.h"

radiant/ui/prefdialog/GameSetupPageTdm.cpp

@@ -4,6 +4,7 @@
 #include <regex>
 #include "i18n.h"
 #include "imodule.h"
+#include "iregistry.h"
 #include "itextstream.h"
 #include "igame.h"
 
@@ -17,6 +18,7 @@
 #include <wx/panel.h>
 
 #include "string/trim.h"
+#include "registry/registry.h"
 #include "string/encoding.h"
 #include "os/file.h"
 #include "os/path.h"

radiantcore/Makefile.am

@@ -1,7 +1,7 @@
-coredir = $(pkglibdir)/
-core_LTLIBRARIES = core.la
+radiantcoredir = $(pkglibdir)
+radiantcore_LTLIBRARIES = radiantcore.la
 
-core_la_CPPFLAGS = -DPKGLIBDIR='"$(pkglibdir)"' \
+radiantcore_la_CPPFLAGS = -DPKGLIBDIR='"$(pkglibdir)"' \
               -DPKGDATADIR='"$(pkgdatadir)"' \
               -DLOCALEDIR='"$(localedir)"' \
               -DHTMLDIR='"$(htmldir)"' \
@@ -11,12 +11,12 @@ core_la_CPPFLAGS = -DPKGLIBDIR='"$(pkglibdir)"' \
               $(XML_CFLAGS) \
               $(FTGL_CFLAGS)
 
-core_la_LIBADD = $(top_builddir)/libs/scene/libscenegraph.la \
+radiantcore_la_LIBADD = $(top_builddir)/libs/scene/libscenegraph.la \
              $(top_builddir)/libs/wxutil/libwxutil.la \
              $(top_builddir)/libs/xmlutil/libxmlutil.la \
              $(top_builddir)/libs/math/libmath.la
 
-core_la_LDFLAGS = -module -avoid-version \
+radiantcore_la_LDFLAGS = -module -avoid-version \
                     $(XML_LIBS) \
                     $(GLEW_LIBS) \
                     $(GL_LIBS) \
@@ -31,7 +31,7 @@ core_la_LDFLAGS = -module -avoid-version \
                     $(WX_LIBS) \
                     $(Z_LIBS)
 
-core_la_SOURCES = Radiant.cpp \
+radiantcore_la_SOURCES = Radiant.cpp \
                 commandsystem/CommandSystem.cpp \
                 log/COutRedirector.cpp \
                 log/LogFile.cpp \

radiantcore/settings/GameManager.cpp

@@ -22,7 +22,6 @@
 
 #include "wxutil/dialog/MessageBox.h"
 #include "module/StaticModule.h"
-#include "modulesystem/ApplicationContextImpl.h"
 #include "GameConfigNeededMessage.h"
 
 #include <sigc++/bind.h>