Menu
▾
▴
[Iaeditor-commits] SF.net SVN: iaeditor: [351] trunk
|
From: <ob...@us...> - 2007-12-17 18:17:34
|
Revision: 351
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=351&view=rev
Author: obi666
Date: 2007-12-17 10:17:37 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Msvc projects reconfiguration. Code updates for cs "shared libs" version.
Modified Paths:
--------------
trunk/configure
trunk/configure.ac
trunk/msvc/7/appiaeditor.vcproj
trunk/msvc/7/libpropgrid.vcproj
trunk/msvc/7/wksiaeditor.sln
trunk/msvc/71/appiaeditor.vcproj
trunk/msvc/71/libpropgrid.vcproj
trunk/msvc/71/wksiaeditor.sln
trunk/msvc/8/appiaeditor.vcproj
trunk/msvc/8/libpropgrid.vcproj
trunk/msvc/8/plgbehaviourlayer.vcproj
trunk/msvc/8/plgcsobjects.vcproj
trunk/msvc/8/plgforce_script.vcproj
trunk/msvc/8/plgpfcharacter.vcproj
trunk/msvc/8/plgpfguiactor.vcproj
trunk/msvc/8/plgpfobj_properties.vcproj
trunk/msvc/8/plgpfodedynamics.vcproj
trunk/msvc/8/wksiaeditor.sln
trunk/msvc/appiaeditor.manifest
trunk/msvc/appiaeditor.rc
trunk/msvc/plgbehaviourlayer.rc
trunk/msvc/plgcsobjects.rc
trunk/msvc/plgforce_script.rc
trunk/msvc/plgpfcharacter.rc
trunk/msvc/plgpfguiactor.rc
trunk/msvc/plgpfobj_properties.rc
trunk/msvc/plgpfodedynamics.rc
trunk/src/apps/editor/gui/widgets/iaMainFrame.cpp
trunk/src/apps/editor/iaCSApplication.cpp
trunk/src/plugins/dynamics/ode_dynamics/body.h
trunk/src/plugins/dynamics/ode_dynamics/collider.h
trunk/src/plugins/dynamics/ode_dynamics/ode_joint.cpp
trunk/src/plugins/dynamics/ode_dynamics/ode_joint.h
Modified: trunk/configure
===================================================================
--- trunk/configure 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/configure 2007-12-17 18:17:37 UTC (rev 351)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for iaeditor 0.0.
+# Generated by GNU Autoconf 2.61 for iaeditor 0.3.
#
# Report bugs to <obr...@gm...>.
#
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='iaeditor'
PACKAGE_TARNAME='iaeditor'
-PACKAGE_VERSION='0.0'
-PACKAGE_STRING='iaeditor 0.0'
+PACKAGE_VERSION='0.3'
+PACKAGE_STRING='iaeditor 0.3'
PACKAGE_BUGREPORT='obr...@gm...'
ac_unique_file="mk/jam/build.jam"
@@ -1234,7 +1234,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures iaeditor 0.0 to adapt to many kinds of systems.
+\`configure' configures iaeditor 0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1299,7 +1299,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of iaeditor 0.0:";;
+ short | recursive ) echo "Configuration of iaeditor 0.3:";;
esac
cat <<\_ACEOF
@@ -1440,7 +1440,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-iaeditor configure 0.0
+iaeditor configure 0.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1454,7 +1454,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by iaeditor $as_me 0.0, which was
+It was created by iaeditor $as_me 0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -11247,7 +11247,7 @@
# Y is even (stable version): X.Y, X.Y+2, X.Y+1
# Y is odd (development version): X.Y, X.Y+1, X.Y+3, X.Y+2
-cs_version_desired=1.2
+cs_version_desired=1.1
sed_expr_base=\\\([0-9]\\\+\\\)\.\\\([0-9]\\\+\\\).*
cs_version_major=`echo $cs_version_desired | sed "s/$sed_expr_base/\1/"`
cs_version_minor=`echo $cs_version_desired | sed "s/$sed_expr_base/\2/"`
@@ -11493,9 +11493,9 @@
# Still do cs-config version check - this one will also take the release
# component into account. Also needed for legacy cs-config.
- { echo "$as_me:$LINENO: checking if Crystal Space version >= 1.2" >&5
-echo $ECHO_N "checking if Crystal Space version >= 1.2... $ECHO_C" >&6; }
-if test "${cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated+set}" = set; then
+ { echo "$as_me:$LINENO: checking if Crystal Space version >= 1.1" >&5
+echo $ECHO_N "checking if Crystal Space version >= 1.1... $ECHO_C" >&6; }
+if test "${cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cs_prog_Crystal_Space_is_version=
@@ -11519,10 +11519,10 @@
-test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.2 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.1 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_min_version" && test -z $cs_prog_Crystal_Space_min_suffix_done && { cs_prog_Crystal_Space_min_suffix_done=yes ; cs_prog_Crystal_Space_min_suffix= ; }
-test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.2 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.1 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_min_version" && test -z $cs_prog_Crystal_Space_min_suffix_done && { cs_prog_Crystal_Space_min_suffix_done=yes ; cs_prog_Crystal_Space_min_suffix=.0 ; }
@@ -11534,39 +11534,39 @@
cs_prog_Crystal_Space_min_ver_2=`echo $cs_prog_Crystal_Space_min_version${cs_prog_Crystal_Space_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
cs_prog_Crystal_Space_min_ver_3=`echo $cs_prog_Crystal_Space_min_version${cs_prog_Crystal_Space_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
-cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=''
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=''
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_1" ">=" "$cs_prog_Crystal_Space_min_ver_1" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_1" ">=" "$cs_prog_Crystal_Space_is_ver_1" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_2" ">=" "$cs_prog_Crystal_Space_min_ver_2" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_2" ">=" "$cs_prog_Crystal_Space_is_ver_2" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_3" ">=" "$cs_prog_Crystal_Space_min_ver_3" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_3" ">=" "$cs_prog_Crystal_Space_is_ver_3" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes ; }
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes ; }
-if test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok"; then
- cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes
+if test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok"; then
+ cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes
fi
-if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" = yes; then
+if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" = yes; then
cs_prog_Crystal_Space_version_ok=yes
else
cs_prog_Crystal_Space_version_ok=no
fi
-cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok"
+cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok"
if test -n "$cs_prog_Crystal_Space_is_version"; then
- cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated (version $cs_prog_Crystal_Space_is_version)"
+ cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated (version $cs_prog_Crystal_Space_is_version)"
cs_prog_Crystal_Space_version="$cs_prog_Crystal_Space_is_version"
else
cs_prog_Crystal_Space_version=''
@@ -11574,9 +11574,9 @@
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated" >&5
-echo "${ECHO_T}$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated" >&6; }
-if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" = yes; then
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated" >&5
+echo "${ECHO_T}$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated" >&6; }
+if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" = yes; then
cs_sdk=yes
else
cs_sdk=no
@@ -11585,7 +11585,7 @@
if test $cs_sdk = yes; then
cs_liblist="crystalspace"
- cs_optlibs=`echo xcrystalspace_opengl | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_optlibs=`echo x$cs_opt_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_optlibs"; then
cs_optlibs=`$cfg --available-libs $cs_optlibs`
cs_liblist="$cs_liblist $cs_optlibs"
@@ -14479,7 +14479,7 @@
"
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ;
"
- for cs_veritem in 0 0; do
+ for cs_veritem in 0 3; do
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ;
"
done
@@ -14890,7 +14890,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by iaeditor $as_me 0.0, which was
+This file was extended by iaeditor $as_me 0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14943,7 +14943,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-iaeditor config.status 0.0
+iaeditor config.status 0.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/configure.ac 2007-12-17 18:17:37 UTC (rev 351)
@@ -1,408 +1,408 @@
-#----------------------------------------------------------------------------
-# Autoconf input script. Invoke the ./autogen.sh script to generate a
-# configure script from this file.
-#----------------------------------------------------------------------------
-AC_PREREQ([2.54])
-
-#----------------------------------------------------------------------------
-# Initialize Autoconf.
-#----------------------------------------------------------------------------
-AC_INIT(
- [iaeditor],
- [0.0],
- [obr...@gm...])
-CS_PACKAGEINFO(
- [IAEditor],
- [Piotr Obrzut],
- [http://www.sourceforge.net/projects/iaeditor/])
-AC_CONFIG_SRCDIR([mk/jam/build.jam])
-AC_CONFIG_AUX_DIR([mk/autoconf])
-AC_CANONICAL_HOST
-
-#----------------------------------------------------------------------------
-# Setup for the configuration header.
-#----------------------------------------------------------------------------
-AC_CONFIG_HEADERS([config.h])
-
-#----------------------------------------------------------------------------
-# Check for tools.
-#----------------------------------------------------------------------------
-CS_PROG_CC
-AS_IF([test -z "$CC"],
- [AC_MSG_ERROR([Could not find a usable C compiler.])])
-CS_PROG_CXX
-AS_IF([test -z "$CXX"],
- [AC_MSG_ERROR([Could not find a usable C++ compiler.])])
-CS_PROG_LINK
-
-# The default RANLIB in Jambase is wrong on some platforms, and is also
-# unsuitable during cross-compilation, so we set the value unconditionally
-# (sixth argument of CS_EMIT_BUILD_PROPERTY).
-AC_PROG_RANLIB
-CS_EMIT_BUILD_PROPERTY([RANLIB], [$RANLIB], [], [], [], [Y])
-
-CS_CHECK_TOOLS([WINDRES], [windres])
-CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES])
-
-CS_CHECK_PROGS([DOXYGEN], [doxygen])
-CS_EMIT_BUILD_PROPERTY([CMD.DOXYGEN], [$DOXYGEN])
-
-CS_CHECK_TOOLS([DOT], [dot])
-CS_EMIT_BUILD_PROPERTY([CMD.DOT], [$DOT])
-
-CS_CHECK_PROGS([TEXI2DVI], [texi2dvi])
-CS_EMIT_BUILD_PROPERTY([CMD.TEXI2DVI], [$TEXI2DVI])
-
-CS_CHECK_PROGS([TEXI2PDF], [texi2pdf])
-CS_EMIT_BUILD_PROPERTY([CMD.TEXI2PDF], [$TEXI2PDF])
-
-CS_CHECK_PROGS([DVIPS], [dvips])
-CS_EMIT_BUILD_PROPERTY([CMD.DVIPS], [$DVIPS])
-
-CS_CHECK_PROGS([DVIPDF], [dvipdf])
-CS_EMIT_BUILD_PROPERTY([CMD.DVIPDF], [$DVIPDF])
-
-CS_CHECK_PROGS([MAKEINFO], [makeinfo])
-CS_EMIT_BUILD_PROPERTY([CMD.MAKEINFO], [$MAKEINFO])
-
-CS_CHECK_PROGS([INSTALL], [install])
-CS_EMIT_BUILD_PROPERTY([INSTALL], [$INSTALL])
-
-CS_CHECK_LIBTOOL
-CS_EMIT_BUILD_PROPERTY([LIBTOOL], [$LIBTOOL])
-CS_EMIT_BUILD_PROPERTY([APPLE_LIBTOOL], [$APPLE_LIBTOOL])
-
-CS_CHECK_MKDIR
-CS_EMIT_BUILD_PROPERTY([CMD.MKDIR], [$MKDIR])
-CS_EMIT_BUILD_PROPERTY([CMD.MKDIRS], [$MKDIRS])
-
-CS_CHECK_PROGS([PERL], [perl5 perl])
-CS_EMIT_BUILD_PROPERTY([PERL], [$PERL])
-
-CS_CHECK_TEMPLATE_TOOLKIT2([emit])
-
-CS_CHECK_PROGS([SWIG], [swig])
-AS_IF([test -n "$SWIG"],
- [CS_CHECK_PROG_VERSION([swig], [$SWIG -version 2>&1], [1.3.21],
- [9.9|.9], [CS_EMIT_BUILD_PROPERTY([CMD.SWIG], [$SWIG])])])
-
-#----------------------------------------------------------------------------
-# Determine system type
-#----------------------------------------------------------------------------
-CS_CHECK_HOST
-
-#----------------------------------------------------------------------------
-# Check for syntax problems / header files
-#----------------------------------------------------------------------------
-# Nothing yet.
-
-#----------------------------------------------------------------------------
-# Check for external libraries
-#----------------------------------------------------------------------------
-CS_CHECK_CPPUNIT([emit])
-
-#------------------------------------------------------------------------------
-# Check for BSD-style socket support. Also test for presence of type
-# socklen_t. Note that we must not include both <winsock.h> and the Unix
-# socket-related headers at the same time on Cygwin even though they both exist
-# since the inclusion of both results in errors about structures and functions
-# defined differently between <winsock.h> and the other headers. Therefore, if
-# <winsock.h> is present, we include only it, otherwise we include the Unix
-# socket-related headers. A related problem also occurs with the check for
-# presence of <winsock.h> on Cygwin, thus this check is handled specially. For
-# this check, the "default-includes" normally used by AC_CHECK_HEADER() are
-# suppressed. This prevents complaints about structures and functions in
-# <winsock.h> being defined differently by <sys/types.h> and <unistd.h>
-#------------------------------------------------------------------------------
-m4_define([cs_socket_flags],
- [CS_CREATE_TUPLE() \
- CS_CREATE_TUPLE([], [], [-lsocket]) \
- CS_CREATE_TUPLE([], [], [-lsocket -lnsl]) \
- CS_CREATE_TUPLE([], [], [-lwsock32])])
-
-AC_CHECK_HEADERS([winsock.h], [], [], [/* no default includes */])
-
-AC_CHECK_HEADERS(
- [unistd.h \
- sys/types.h \
- sys/socket.h \
- sys/ioctl.h \
- netinet/in.h \
- arpa/inet.h \
- netdb.h])
-
-CS_CHECK_BUILD([for socket support], [cs_cv_sys_socket],
- [AC_LANG_PROGRAM(
- [[#if HAVE_WINSOCK_H
- #include <winsock.h>
- #else
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #if HAVE_ARPA_INET_H
- #include <arpa/inet.h>
- #endif
- #if HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
- #endif]],
- [struct in_addr a; inet_ntoa(a); socket(0,0,0);])],
- [cs_socket_flags], [],
- [CS_EMIT_BUILD_RESULT([cs_cv_sys_socket], [SOCKET])])
-
-AS_IF([test $cs_cv_sys_socket = yes],
- [AC_CHECK_TYPE([socklen_t],
- [CS_HEADER_PROPERTY([CS_HAVE_SOCKLEN_T])],
- [],
- [[#if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #if HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
- #if HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #if HAVE_NETDB_H
- #include <netdb.h>
- #endif
- ]])])
-
-#------------------------------------------------------------------------------
-# Check if STL is available. Although STL is not used heavily in Crystal Space,
-# a few plugin modules take advantage of it, so they need to know if it is
-# available.
-#------------------------------------------------------------------------------
-CS_CHECK_BUILD([for STL], [cs_cv_libstl],
- [AC_LANG_PROGRAM(
- [[#include <map>
- #include <string>]],
- [[std::map<std::string,int> m; m.begin();]])],
- [], [C++], [CS_EMIT_BUILD_RESULT([cs_cv_libstl], [STL])])
-
-
-#------------------------------------------------------------------------------
-# Check for wxWidgets. Also check if it was built with OpenGL support since it
-# is required by the Crystal Space wxWidgets canvas.
-#
-# IMPLEMENTATION NOTE
-#
-# On Windows, wx-config's --gl-libs options incorrectly emits a reference to a
-# non-existent library (wxmsw_glxxx.lib). To handle this broken case, we first
-# try the result of --libs and --gl-libs together; if that fails, then we try
-# only --libs augmented with the results of our own OpenGL checks. On more
-# recent WX versions it seems that on Win32 both the libraries from --gl-libs
-# and the OpenGL checks are needed - the last case.
-#------------------------------------------------------------------------------
-CS_CHECK_LIB_WITH([wx],
- [AC_LANG_PROGRAM(
- [[#include "wx/wxprec.h"
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
- #ifndef WX_PRECOMP
- #include "wx/wx.h"
- #endif
- ]],
- [[wxWindow* p = 0; int w,h; p->GetClientSize(&w,&h);]])],
- [], [C++])
-
-AS_IF([test $cs_cv_libwx = yes],
- [AS_IF([test -z "$cs_cv_libwx_opengl"],
- [AS_IF([test -n "$CONFIG_WX"],
- [cs_cv_libwx_gllibs=CS_RUN_PATH_NORMALIZE([$CONFIG_WX --gl-libs])],
- [cs_cv_libwx_gllibs=''])])
- CS_CHECK_BUILD([if wxWidgets is built with OpenGL support],
- [cs_cv_libwx_opengl],
- [AC_LANG_PROGRAM(
- [[#include "wx/wxprec.h"
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
- #ifndef WX_PRECOMP
- #include "wx/wx.h"
- #endif
- #include "wx/glcanvas.h"
- ]],
- [wxGLCanvas* f = new wxGLCanvas(0, wxID_ANY, wxPoint()); glVertex3f(0,0,0)])],
- [CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags],
- [$cs_cv_libwx_lflags],
- [$cs_cv_libwx_libs $cs_cv_libwx_gllibs]) \
- CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
- [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
- [$cs_cv_libwx_libs $cs_cv_libglu_libs]) \
- CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
- [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
- [$cs_cv_libwx_libs $cs_cv_libwx_gllibs $cs_cv_libglu_libs])],
- [C++])],
- [cs_cv_libwx_opengl=no])
-
-AS_IF([test $cs_cv_libwx_opengl = yes],
- [CS_EMIT_BUILD_RESULT([cs_cv_libwx_opengl], [WX])])
-
-AS_IF([test $cs_cv_libwx = yes],
- [CS_CHECK_BUILD([if wxWidgets is built with wxAUI support],
- [cs_cv_libwx_aui],
- [AC_LANG_PROGRAM(
- [[#include "wx/wxprec.h"
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
- #ifndef WX_PRECOMP
- #include "wx/wx.h"
- #endif
- #include "wx/aui/aui.h"
- ]],
- [wxAuiManager mgr; wxWindow* w;
- mgr.SetManagedWindow(w);
- mgr.AddPane(w, wxAuiPaneInfo());])],
- [CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags],
- [$cs_cv_libwx_lflags],
- [$cs_cv_libwx_libs])],
- [C++])],
- [cs_cv_libwx_aui=no])
-
-AS_IF([test $cs_cv_libwx_aui = yes],
- [CS_EMIT_BUILD_RESULT([cs_cv_libwx_aui], [WX.AUI])])
-
-
-#----------------------------------------------------------------------------
-# Check for Crystal Space (CS)
-#----------------------------------------------------------------------------
-AC_ARG_WITH([cs], [AC_HELP_STRING([--without-cs],
- [do not look for an installed Crystal Space SDK; this option is useful only
- if you need to perform routine maintenance tasks, such as generating
- project files or converting documentation, without having the Crystal Space
- SDK installed])])
-AS_IF([test -z "$with_cs"], [with_cs=yes])
-
-AS_IF([test $with_cs != no],
-[CS_PATH_CRYSTAL_EMIT([1.2], [],
- [AC_MSG_ERROR([
-*** Crystal Space could not be found or was unusable. The latest version is
-*** always available from http://www.crystalspace3d.org/
-*** Also, be sure that you have either installed Crystal Space or set the
-*** CRYSTAL environment variable properly.
-])], [crystalspace], [crystalspace_opengl])])
-
-#----------------------------------------------------------------------------
-# Check for Crystal Entity Layer (CEL)
-#----------------------------------------------------------------------------
-m4_define([cel_desired], [yes])
-CS_EMIT_BUILD_PROPERTY([CEL.DESIRED], [cel_desired])
-m4_if(cel_desired, [yes],
-[AC_ARG_WITH([cel], [AC_HELP_STRING([--without-cel],
- [do not look for an installed Crystal Entity Layer SDK; this option is useful
- only if you need to perform routine maintenance tasks, such as generating
- project files or converting documentation, without having the CEL SDK
- installed])])
-AS_IF([test -z "$with_cel"], [with_cel=yes])
-
-AS_IF([test $with_cel != no],
-[CS_PATH_CEL_EMIT([1.2], [],
- [AC_MSG_ERROR([
-*** CEL could not be found or was unusable. The latest version is always
-*** available from http://cel.crystalspace3d.org/
-])])
-AC_DEFINE([USE_CEL], [], [Define to enable CEL.])
-AC_DEFINE_UNQUOTED([CEL_PLUGIN_DIR], ["$CEL_PLUGIN_DIR"],
- [Define with path to CEL plugins.])
-])])
-
-
-#------------------------------------------------------------------------------
-# Determine whether link libraries should be static or shared.
-#------------------------------------------------------------------------------
-AC_MSG_CHECKING([whether to build shared libraries])
-case $host_os in
- mingw*|cygwin*|linux*) enable_shared_default=yes ;;
- *) enable_shared_default=no ;;
-esac
-AC_ARG_ENABLE([shared], [AC_HELP_STRING([--enable-shared],
- [enable creation of shared libraries (default YES on Win32 and Linux,
- NO otherwise)])],
- [], [enable_shared=$enable_shared_default])
-AC_MSG_RESULT([$enable_shared])
-CS_EMIT_BUILD_PROPERTY([BUILD_SHARED_LIBS], [$enable_shared])
-AS_IF([test $enable_shared = yes],
- [CS_HEADER_PROPERTY([CS_BUILD_SHARED_LIBS])])
-
-
-
-#------------------------------------------------------------------------------
-# Determine if the "make" emulation layer should be synthesized.
-#------------------------------------------------------------------------------
-AC_MSG_CHECKING([whether to emulate makefiles])
-AC_ARG_ENABLE([make-emulation],
- [AC_HELP_STRING([--enable-make-emulation],
- [enable emulation layer allowing project to be built with `make', in
- addition to `jam' (default YES)])],
- [], [enable_make_emulation=yes])
-AC_MSG_RESULT([$enable_make_emulation])
-
-#------------------------------------------------------------------------------
-# Determine if plugin meta-information should be embedded directly into plugin
-# modules or if it should exist in stand-alone .csplugin files. On Unix,
-# embedding is accomplished via libbfd which carries a GPL license. If your
-# project is compatible with GPL, then set gpl_compatible to "yes". This will
-# cause embedding to be enabled on Unix by default. Otherwise, set it to "no",
-# which will cause embedding to be disabled by default on Unix. (In any event,
-# the user can override the default setting with the
-# --enable-meta-info-embedding option.)
-#------------------------------------------------------------------------------
-m4_define([gpl_compatible], [yes])
-CS_META_INFO_EMBED([emit], gpl_compatible)
-AS_IF([test $enable_meta_info_embedding = yes],
- [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
- [AS_ESCAPE([$(EMBED_META.CFLAGS)])], [+])
- CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS],
- [AS_ESCAPE([$(EMBED_META.LFLAGS)])], [+])])
-
-#----------------------------------------------------------------------------
-# Package configuration switches.
-#----------------------------------------------------------------------------
-AC_ARG_ENABLE([debug],
- [AC_HELP_STRING([--enable-debug],
- [build with debugging information (default NO)])],
- [], [enable_debug=no])
-
-AC_MSG_CHECKING([build mode])
-AS_IF([test $enable_debug = yes], [build_mode=debug], [build_mode=optimize])
-AC_MSG_RESULT([$build_mode])
-
-CS_EMIT_BUILD_PROPERTY([MODE], [$build_mode])
-
-#-----------------------------------------------------------------------------
-# Emit install paths and package information.
-#-----------------------------------------------------------------------------
-CS_OUTPUT_INSTALLDIRS
-CS_EMIT_PACKAGEINFO
-
-#----------------------------------------------------------------------------
-# Emit generated files.
-#----------------------------------------------------------------------------
-CS_JAMCONFIG_OUTPUT([Jamconfig])
-AC_CONFIG_FILES([Jamfile])
-AC_OUTPUT
-
-AC_MSG_NOTICE([
-
-Please note that this project uses Jam as its build tool,
-therefore you must type 'jam' to build the project.
-
-Jam home: http://www.perforce.com/jam/jam.html
-Jam source: ftp://ftp.perforce.com/jam/
-])
+#----------------------------------------------------------------------------
+# Autoconf input script. Start the ./autogen.sh script for producing a
+# the configure script.
+#----------------------------------------------------------------------------
+AC_PREREQ([2.54])
+
+#----------------------------------------------------------------------------
+# Initialize Autoconf.
+#----------------------------------------------------------------------------
+AC_INIT(
+ [iaeditor],
+ [0.3],
+ [obr...@gm...])
+CS_PACKAGEINFO(
+ [IAEditor],
+ [Piotr Obrzut],
+ [http://www.sourceforge.net/projects/iaeditor/])
+AC_CONFIG_SRCDIR([mk/jam/build.jam])
+AC_CONFIG_AUX_DIR([mk/autoconf])
+AC_CANONICAL_HOST
+
+#----------------------------------------------------------------------------
+# Setup for the configuration header.
+#----------------------------------------------------------------------------
+AC_CONFIG_HEADERS([config.h])
+
+#----------------------------------------------------------------------------
+# Check for tools.
+#----------------------------------------------------------------------------
+CS_PROG_CC
+AS_IF([test -z "$CC"],
+ [AC_MSG_ERROR([Could not find a usable C compiler.])])
+CS_PROG_CXX
+AS_IF([test -z "$CXX"],
+ [AC_MSG_ERROR([Could not find a usable C++ compiler.])])
+CS_PROG_LINK
+
+# The default RANLIB in Jambase is wrong on some platforms, and is also
+# unsuitable during cross-compilation, so we set the value unconditionally
+# (sixth argument of CS_EMIT_BUILD_PROPERTY).
+AC_PROG_RANLIB
+CS_EMIT_BUILD_PROPERTY([RANLIB], [$RANLIB], [], [], [], [Y])
+
+CS_CHECK_TOOLS([WINDRES], [windres])
+CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES])
+
+CS_CHECK_PROGS([DOXYGEN], [doxygen])
+CS_EMIT_BUILD_PROPERTY([CMD.DOXYGEN], [$DOXYGEN])
+
+CS_CHECK_TOOLS([DOT], [dot])
+CS_EMIT_BUILD_PROPERTY([CMD.DOT], [$DOT])
+
+CS_CHECK_PROGS([TEXI2DVI], [texi2dvi])
+CS_EMIT_BUILD_PROPERTY([CMD.TEXI2DVI], [$TEXI2DVI])
+
+CS_CHECK_PROGS([TEXI2PDF], [texi2pdf])
+CS_EMIT_BUILD_PROPERTY([CMD.TEXI2PDF], [$TEXI2PDF])
+
+CS_CHECK_PROGS([DVIPS], [dvips])
+CS_EMIT_BUILD_PROPERTY([CMD.DVIPS], [$DVIPS])
+
+CS_CHECK_PROGS([DVIPDF], [dvipdf])
+CS_EMIT_BUILD_PROPERTY([CMD.DVIPDF], [$DVIPDF])
+
+CS_CHECK_PROGS([MAKEINFO], [makeinfo])
+CS_EMIT_BUILD_PROPERTY([CMD.MAKEINFO], [$MAKEINFO])
+
+CS_CHECK_PROGS([INSTALL], [install])
+CS_EMIT_BUILD_PROPERTY([INSTALL], [$INSTALL])
+
+CS_CHECK_LIBTOOL
+CS_EMIT_BUILD_PROPERTY([LIBTOOL], [$LIBTOOL])
+CS_EMIT_BUILD_PROPERTY([APPLE_LIBTOOL], [$APPLE_LIBTOOL])
+
+CS_CHECK_MKDIR
+CS_EMIT_BUILD_PROPERTY([CMD.MKDIR], [$MKDIR])
+CS_EMIT_BUILD_PROPERTY([CMD.MKDIRS], [$MKDIRS])
+
+CS_CHECK_PROGS([PERL], [perl5 perl])
+CS_EMIT_BUILD_PROPERTY([PERL], [$PERL])
+
+CS_CHECK_TEMPLATE_TOOLKIT2([emit])
+
+CS_CHECK_PROGS([SWIG], [swig])
+AS_IF([test -n "$SWIG"],
+ [CS_CHECK_PROG_VERSION([swig], [$SWIG -version 2>&1], [1.3.21],
+ [9.9|.9], [CS_EMIT_BUILD_PROPERTY([CMD.SWIG], [$SWIG])])])
+
+#----------------------------------------------------------------------------
+# Determine system type
+#----------------------------------------------------------------------------
+CS_CHECK_HOST
+
+#----------------------------------------------------------------------------
+# Check for syntax problems / header files
+#----------------------------------------------------------------------------
+# Nothing yet.
+
+#----------------------------------------------------------------------------
+# Check for external libraries
+#----------------------------------------------------------------------------
+CS_CHECK_CPPUNIT([emit])
+
+#------------------------------------------------------------------------------
+# Check for BSD-style socket support. Also test for presence of type
+# socklen_t. Note that we must not include both <winsock.h> and the Unix
+# socket-related headers at the same time on Cygwin even though they both exist
+# since the inclusion of both results in errors about structures and functions
+# defined differently between <winsock.h> and the other headers. Therefore, if
+# <winsock.h> is present, we include only it, otherwise we include the Unix
+# socket-related headers. A related problem also occurs with the check for
+# presence of <winsock.h> on Cygwin, thus this check is handled specially. For
+# this check, the "default-includes" normally used by AC_CHECK_HEADER() are
+# suppressed. This prevents complaints about structures and functions in
+# <winsock.h> being defined differently by <sys/types.h> and <unistd.h>
+#------------------------------------------------------------------------------
+m4_define([cs_socket_flags],
+ [CS_CREATE_TUPLE() \
+ CS_CREATE_TUPLE([], [], [-lsocket]) \
+ CS_CREATE_TUPLE([], [], [-lsocket -lnsl]) \
+ CS_CREATE_TUPLE([], [], [-lwsock32])])
+
+AC_CHECK_HEADERS([winsock.h], [], [], [/* no default includes */])
+
+AC_CHECK_HEADERS(
+ [unistd.h \
+ sys/types.h \
+ sys/socket.h \
+ sys/ioctl.h \
+ netinet/in.h \
+ arpa/inet.h \
+ netdb.h])
+
+CS_CHECK_BUILD([for socket support], [cs_cv_sys_socket],
+ [AC_LANG_PROGRAM(
+ [[#if HAVE_WINSOCK_H
+ #include <winsock.h>
+ #else
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ #if HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #endif]],
+ [struct in_addr a; inet_ntoa(a); socket(0,0,0);])],
+ [cs_socket_flags], [],
+ [CS_EMIT_BUILD_RESULT([cs_cv_sys_socket], [SOCKET])])
+
+AS_IF([test $cs_cv_sys_socket = yes],
+ [AC_CHECK_TYPE([socklen_t],
+ [CS_HEADER_PROPERTY([CS_HAVE_SOCKLEN_T])],
+ [],
+ [[#if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #if HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #endif
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ #if HAVE_NETDB_H
+ #include <netdb.h>
+ #endif
+ ]])])
+
+#------------------------------------------------------------------------------
+# Check if STL is available. Although STL is not used heavily in Crystal Space,
+# a few plugin modules take advantage of it, so they need to know if it is
+# available.
+#------------------------------------------------------------------------------
+CS_CHECK_BUILD([for STL], [cs_cv_libstl],
+ [AC_LANG_PROGRAM(
+ [[#include <map>
+ #include <string>]],
+ [[std::map<std::string,int> m; m.begin();]])],
+ [], [C++], [CS_EMIT_BUILD_RESULT([cs_cv_libstl], [STL])])
+
+
+#------------------------------------------------------------------------------
+# Check for wxWidgets. Also check if it was built with OpenGL support since it
+# is required by the Crystal Space wxWidgets canvas.
+#
+# IMPLEMENTATION NOTE
+#
+# On Windows, wx-config's --gl-libs options incorrectly emits a reference to a
+# non-existent library (wxmsw_glxxx.lib). To handle this broken case, we first
+# try the result of --libs and --gl-libs together; if that fails, then we try
+# only --libs augmented with the results of our own OpenGL checks. On more
+# recent WX versions it seems that on Win32 both the libraries from --gl-libs
+# and the OpenGL checks are needed - the last case.
+#------------------------------------------------------------------------------
+CS_CHECK_LIB_WITH([wx],
+ [AC_LANG_PROGRAM(
+ [[#include "wx/wxprec.h"
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+ #ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #endif
+ ]],
+ [[wxWindow* p = 0; int w,h; p->GetClientSize(&w,&h);]])],
+ [], [C++])
+
+AS_IF([test $cs_cv_libwx = yes],
+ [AS_IF([test -z "$cs_cv_libwx_opengl"],
+ [AS_IF([test -n "$CONFIG_WX"],
+ [cs_cv_libwx_gllibs=CS_RUN_PATH_NORMALIZE([$CONFIG_WX --gl-libs])],
+ [cs_cv_libwx_gllibs=''])])
+ CS_CHECK_BUILD([if wxWidgets is built with OpenGL support],
+ [cs_cv_libwx_opengl],
+ [AC_LANG_PROGRAM(
+ [[#include "wx/wxprec.h"
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+ #ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #endif
+ #include "wx/glcanvas.h"
+ ]],
+ [wxGLCanvas* f = new wxGLCanvas(0, wxID_ANY, wxPoint()); glVertex3f(0,0,0)])],
+ [CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags],
+ [$cs_cv_libwx_lflags],
+ [$cs_cv_libwx_libs $cs_cv_libwx_gllibs]) \
+ CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
+ [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
+ [$cs_cv_libwx_libs $cs_cv_libglu_libs]) \
+ CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
+ [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
+ [$cs_cv_libwx_libs $cs_cv_libwx_gllibs $cs_cv_libglu_libs])],
+ [C++])],
+ [cs_cv_libwx_opengl=no])
+
+AS_IF([test $cs_cv_libwx_opengl = yes],
+ [CS_EMIT_BUILD_RESULT([cs_cv_libwx_opengl], [WX])])
+
+AS_IF([test $cs_cv_libwx = yes],
+ [CS_CHECK_BUILD([if wxWidgets is built with wxAUI support],
+ [cs_cv_libwx_aui],
+ [AC_LANG_PROGRAM(
+ [[#include "wx/wxprec.h"
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+ #ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #endif
+ #include "wx/aui/aui.h"
+ ]],
+ [wxAuiManager mgr; wxWindow* w;
+ mgr.SetManagedWindow(w);
+ mgr.AddPane(w, wxAuiPaneInfo());])],
+ [CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags],
+ [$cs_cv_libwx_lflags],
+ [$cs_cv_libwx_libs])],
+ [C++])],
+ [cs_cv_libwx_aui=no])
+
+AS_IF([test $cs_cv_libwx_aui = yes],
+ [CS_EMIT_BUILD_RESULT([cs_cv_libwx_aui], [WX.AUI])])
+
+
+#----------------------------------------------------------------------------
+# Check for Crystal Space (CS)
+#----------------------------------------------------------------------------
+AC_ARG_WITH([cs], [AC_HELP_STRING([--without-cs],
+ [do not look for an installed Crystal Space SDK; this option is useful only
+ if you need to perform routine maintenance tasks, such as generating
+ project files or converting documentation, without having the Crystal Space
+ SDK installed])])
+AS_IF([test -z "$with_cs"], [with_cs=yes])
+
+AS_IF([test $with_cs != no],
+ [CS_PATH_CRYSTAL_EMIT([1.1], [],
+ [AC_MSG_ERROR([
+*** Crystal Space could not be found or was unusable. The latest version is
+*** always available from http://www.crystalspace3d.org/
+*** Also, be sure that you have either installed Crystal Space or set the
+*** CRYSTAL environment variable properly.
+])], [crystalspace], [$cs_opt_libs])])
+
+#----------------------------------------------------------------------------
+# Check for Crystal Entity Layer (CEL)
+#----------------------------------------------------------------------------
+m4_define([cel_desired], [yes])
+CS_EMIT_BUILD_PROPERTY([CEL.DESIRED], [cel_desired])
+m4_if(cel_desired, [yes],
+[AC_ARG_WITH([cel], [AC_HELP_STRING([--without-cel],
+ [do not look for an installed Crystal Entity Layer SDK; this option is useful
+ only if you need to perform routine maintenance tasks, such as generating
+ project files or converting documentation, without having the CEL SDK
+ installed])])
+AS_IF([test -z "$with_cel"], [with_cel=yes])
+
+AS_IF([test $with_cel != no],
+[CS_PATH_CEL_EMIT([1.2], [],
+ [AC_MSG_ERROR([
+*** CEL could not be found or was unusable. The latest version is always
+*** available from http://cel.crystalspace3d.org/
+])])
+AC_DEFINE([USE_CEL], [], [Define to enable CEL.])
+AC_DEFINE_UNQUOTED([CEL_PLUGIN_DIR], ["$CEL_PLUGIN_DIR"],
+ [Define with path to CEL plugins.])
+])])
+
+
+#------------------------------------------------------------------------------
+# Determine whether link libraries should be static or shared.
+#------------------------------------------------------------------------------
+AC_MSG_CHECKING([whether to build shared libraries])
+case $host_os in
+ mingw*|cygwin*|linux*) enable_shared_default=yes ;;
+ *) enable_shared_default=no ;;
+esac
+AC_ARG_ENABLE([shared], [AC_HELP_STRING([--enable-shared],
+ [enable creation of shared libraries (default YES on Win32 and Linux,
+ NO otherwise)])],
+ [], [enable_shared=$enable_shared_default])
+AC_MSG_RESULT([$enable_shared])
+CS_EMIT_BUILD_PROPERTY([BUILD_SHARED_LIBS], [$enable_shared])
+AS_IF([test $enable_shared = yes],
+ [CS_HEADER_PROPERTY([CS_BUILD_SHARED_LIBS])])
+
+
+
+#------------------------------------------------------------------------------
+# Determine if the "make" emulation layer should be synthesized.
+#------------------------------------------------------------------------------
+AC_MSG_CHECKING([whether to emulate makefiles])
+AC_ARG_ENABLE([make-emulation],
+ [AC_HELP_STRING([--enable-make-emulation],
+ [enable emulation layer allowing project to be built with `make', in
+ addition to `jam' (default YES)])],
+ [], [enable_make_emulation=yes])
+AC_MSG_RESULT([$enable_make_emulation])
+
+#------------------------------------------------------------------------------
+# Determine if plugin meta-information should be embedded directly into plugin
+# modules or if it should exist in stand-alone .csplugin files. On Unix,
+# embedding is accomplished via libbfd which carries a GPL license. If your
+# project is compatible with GPL, then set gpl_compatible to "yes". This will
+# cause embedding to be enabled on Unix by default. Otherwise, set it to "no",
+# which will cause embedding to be disabled by default on Unix. (In any event,
+# the user can override the default setting with the
+# --enable-meta-info-embedding option.)
+#------------------------------------------------------------------------------
+m4_define([gpl_compatible], [yes])
+CS_META_INFO_EMBED([emit], gpl_compatible)
+AS_IF([test $enable_meta_info_embedding = yes],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
+ [AS_ESCAPE([$(EMBED_META.CFLAGS)])], [+])
+ CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS],
+ [AS_ESCAPE([$(EMBED_META.LFLAGS)])], [+])])
+
+#----------------------------------------------------------------------------
+# Package configuration switches.
+#----------------------------------------------------------------------------
+AC_ARG_ENABLE([debug],
+ [AC_HELP_STRING([--enable-debug],
+ [build with debugging information (default NO)])],
+ [], [enable_debug=no])
+
+AC_MSG_CHECKING([build mode])
+AS_IF([test $enable_debug = yes], [build_mode=debug], [build_mode=optimize])
+AC_MSG_RESULT([$build_mode])
+
+CS_EMIT_BUILD_PROPERTY([MODE], [$build_mode])
+
+#-----------------------------------------------------------------------------
+# Emit install paths and package information.
+#-----------------------------------------------------------------------------
+CS_OUTPUT_INSTALLDIRS
+CS_EMIT_PACKAGEINFO
+
+#----------------------------------------------------------------------------
+# Emit generated files.
+#----------------------------------------------------------------------------
+CS_JAMCONFIG_OUTPUT([Jamconfig])
+AC_CONFIG_FILES([Jamfile])
+AC_OUTPUT
+
+AC_MSG_NOTICE([
+
+Please note that this project uses Jam as its build tool,
+therefore you must type 'jam' to build the project.
+
+Jam home: http://www.perforce.com/jam/jam.html
+Jam source: ftp://ftp.perforce.com/jam/
+])
Modified: trunk/msvc/7/appiaeditor.vcproj
===================================================================
--- trunk/msvc/7/appiaeditor.vcproj 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/7/appiaeditor.vcproj 2007-12-17 18:17:37 UTC (rev 351)
@@ -53,7 +53,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="2"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib libceltool.lib"
+ AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib libceltool.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\release\libs;$(CEL)\out\release\libs;$(CEL)\libs"
@@ -101,7 +101,7 @@
DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;WIN32"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -124,7 +124,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="1"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib libceltool_d.lib"
+ AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib libceltool_d.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\debug\libs;$(CEL)\out\debug\libs;$(CEL)\libs"
@@ -135,7 +135,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -149,7 +149,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
Culture="1033"/>
<Tool
@@ -166,15 +166,15 @@
RelativePath="..\..\src\apps\editor\application.cpp">
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.cpp">
- </File>
- <File
RelativePath="..\..\src\apps\editor\gui\utils\stringutils.cpp">
</File>
<File
RelativePath="..\..\src\apps\editor\gui\utils\typeconv.cpp">
</File>
<File
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.cpp">
+ </File>
+ <File
RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectTree.cpp">
</File>
<File
@@ -215,18 +215,18 @@
RelativePath="..\..\src\apps\editor\gui\gui_common.h">
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.h">
- </File>
- <File
RelativePath="..\..\src\apps\editor\gui\utils\stringutils.h">
</File>
<File
RelativePath="..\..\src\apps\editor\gui\utils\typeconv.h">
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\widgets\ia_propgrid.h">
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.h">
</File>
<File
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectsManager.h">
+ </File>
+ <File
RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectTree.h">
</File>
<File
Modified: trunk/msvc/7/libpropgrid.vcproj
===================================================================
--- trunk/msvc/7/libpropgrid.vcproj 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/7/libpropgrid.vcproj 2007-12-17 18:17:37 UTC (rev 351)
@@ -49,7 +49,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
AdditionalOptions=" "
- AdditionalDependencies="wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib"
+ AdditionalDependencies="wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -97,7 +97,7 @@
DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;WIN32"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -118,7 +118,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
AdditionalOptions=" "
- AdditionalDependencies="wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib"
+ AdditionalDependencies="wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -130,7 +130,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -144,7 +144,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
Modified: trunk/msvc/7/wksiaeditor.sln
===================================================================
--- trunk/msvc/7/wksiaeditor.sln 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/7/wksiaeditor.sln 2007-12-17 18:17:37 UTC (rev 351)
@@ -1,11 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 7.00
# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -26,13 +34,19 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
+ {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
+ {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -42,18 +56,34 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: trunk/msvc/71/appiaeditor.vcproj
===================================================================
--- trunk/msvc/71/appiaeditor.vcproj 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/71/appiaeditor.vcproj 2007-12-17 18:17:37 UTC (rev 351)
@@ -53,7 +53,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="2"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib libceltool.lib"
+ AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib libceltool.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release71\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\release\libs;$(CEL)\out\release\libs;$(CEL)\libs"
@@ -101,7 +101,7 @@
DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;WIN32"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -124,7 +124,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="1"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib libceltool_d.lib"
+ AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib libceltool_d.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug71\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\debug\libs;$(CEL)\out\debug\libs;$(CEL)\libs"
@@ -135,7 +135,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -149,7 +149,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;PROJECTGEN_VERSION=71"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=71"
AdditionalIncl...
[truncated message content] |
