yake-svn Mailing List for Yake Engine (Page 14)
Status: Beta
Brought to you by:
psyclonist
Menu
▾
▴
yake-svn — svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(17) |
Sep
(51) |
Oct
(2) |
Nov
(18) |
Dec
(66) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(44) |
Feb
(13) |
Mar
(73) |
Apr
(61) |
May
|
Jun
(4) |
Jul
(19) |
Aug
(50) |
Sep
(47) |
Oct
(7) |
Nov
(7) |
Dec
(14) |
| 2008 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(5) |
Jun
(7) |
Jul
(4) |
Aug
|
Sep
(5) |
Oct
|
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
|
Feb
(22) |
Mar
(12) |
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
(4) |
Aug
|
Sep
|
Oct
(17) |
Nov
(3) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(12) |
Apr
(11) |
May
|
Jun
(5) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <psy...@us...> - 2007-04-20 14:40:58
|
Revision: 1712
http://svn.sourceforge.net/yake/?rev=1712&view=rev
Author: psyclonist
Date: 2007-04-20 07:40:52 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
updated make files to Ogre 1.4 and added OIS dependency
Modified Paths:
--------------
trunk/yake/scripts/premake/deps.lua
Modified: trunk/yake/scripts/premake/deps.lua
===================================================================
--- trunk/yake/scripts/premake/deps.lua 2007-04-20 14:36:40 UTC (rev 1711)
+++ trunk/yake/scripts/premake/deps.lua 2007-04-20 14:40:52 UTC (rev 1712)
@@ -9,13 +9,9 @@
-- Dependency package OGRE
--------------------------------------
defDep("ogre")
-defDepIncludePath("ogre", "dependencies/ogrenew/OgreMain/include")
+defDepIncludePath("ogre", "dependencies/ogrenew/include")
defDepIncludePath("ogre", "dependencies/ogrenew/CEGUIRenderer/include")
-defDepLibraryPath("ogre","dependencies/ode/lib/debugdll","Debug")
-defDepLibraryPath("ogre","dependencies/ode/lib/debugdll","DebugLib")
-defDepLibraryPath("ogre","dependencies/ode/lib/releasedll","Release")
-defDepLibraryPath("ogre","dependencies/ode/lib/releasedll","ReleaseLib")
-defDepLibraryPath("ogre","dependencies/ode/lib/releasedll","ReleaseWithSymbols")
+defDepLibraryPath("ogre","dependencies/ogrenew/lib")
defDepLibrary("ogre","OgreMain","Release")
defDepLibrary("ogre","OgreMain","ReleaseWithSymbols")
defDepLibrary("ogre","OgreMain_d","Debug")
@@ -24,6 +20,16 @@
defDepLibrary("ogre","OgreGUIRenderer_d","Debug")
--------------------------------------
+-- Dependency package OIS
+--------------------------------------
+defDep("ois")
+defDepIncludePath("ois", "dependencies/ogrenew/include/OIS")
+defDepLibraryPath("ois","dependencies/ogrenew/lib")
+defDepLibrary("ois","OIS","Release")
+defDepLibrary("ois","OIS","ReleaseWithSymbols")
+defDepLibrary("ois","OIS_d","Debug")
+
+--------------------------------------
-- Dependency package OSM
-- NB Gets compiled into graphicsOGRE.
--------------------------------------
@@ -46,8 +52,8 @@
-- Dependency package CEGUI
--------------------------------------
defDep("cegui")
-defDepIncludePath("cegui", "dependencies/CEGUI/include")
-defDepLibraryPath("cegui","dependencies/CEGUI/lib")
+defDepIncludePath("cegui", "dependencies/ogrenew/include/CEGUI")
+defDepLibraryPath("cegui","dependencies/ogrenew/lib")
defDepLibrary("cegui","CEGUIBase","Release")
defDepLibrary("cegui","CEGUIBase","ReleaseWithSymbols")
defDepLibrary("cegui","CEGUIBase_d","Debug")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-20 14:36:43
|
Revision: 1711
http://svn.sourceforge.net/yake/?rev=1711&view=rev
Author: psyclonist
Date: 2007-04-20 07:36:40 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
small fixes
Modified Paths:
--------------
trunk/yake/documentation/manual/yake-manual.txt
Modified: trunk/yake/documentation/manual/yake-manual.txt
===================================================================
--- trunk/yake/documentation/manual/yake-manual.txt 2007-04-20 14:27:14 UTC (rev 1710)
+++ trunk/yake/documentation/manual/yake-manual.txt 2007-04-20 14:36:40 UTC (rev 1711)
@@ -185,10 +185,16 @@
Please note that this guide expects the developer to be familiar with the build
environment and tools of his choice.
-.. note::
- The build scripts for the various platforms and compilers are generated from
- premake scripts. You either have to install premake yourself. The official
- dependency packages for Yake ship with the executable already in place.
+Builds Script Generation with Premake
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The build scripts for the various platforms and compilers are generated from
+Lua scripts run by the premake utility.
+
+The official dependency packages for Yake ship with the executable already in place.
+
+You can find prebuilt premake packages for various
+platforms at `http://premake.sf.net/`_ .
Configuration
~~~~~~~~~~~~~
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-20 14:27:30
|
Revision: 1710
http://svn.sourceforge.net/yake/?rev=1710&view=rev
Author: psyclonist
Date: 2007-04-20 07:27:14 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
added make_all.cmd for MSVC 2005 (8.0): builds all targets of all projects in yake.sln. output is reduced to the essential (how many warnings/errors per project if any).
Added Paths:
-----------
trunk/yake/scripts/msvc80/make_all.cmd
Added: trunk/yake/scripts/msvc80/make_all.cmd
===================================================================
--- trunk/yake/scripts/msvc80/make_all.cmd (rev 0)
+++ trunk/yake/scripts/msvc80/make_all.cmd 2007-04-20 14:27:14 UTC (rev 1710)
@@ -0,0 +1,33 @@
+@echo off
+rem ----------------------------------------------------------------------------
+rem Uses devenv.com to build all targets of Yake's libraries and plugins.
+rem ----------------------------------------------------------------------------
+if not exist yake.sln (
+ echo ERROR: yake.sln not found. Did you run build.cmd?
+ goto end
+)
+if $"%VS80COMNTOOLS%"$ == $""$ (
+ echo ERROR: System variable VS80COMNTOOLS not set!
+ echo Is Visual Studio 2005 installed?
+ goto end
+)
+if not exist "%VS80COMNTOOLS%..\IDE\devenv.com" (
+ echo ERROR: Could not locate Visual Studio's devenv.com.
+ echo File: %VS80COMNTOOLS%..\IDE\devenv.com
+ echo.
+ goto end
+)
+
+echo Starting build for 'Debug' target...
+call "%VS80COMNTOOLS%..\IDE\devenv.com" /build Debug yake.sln 2>&1 | find "error(s)"
+echo Starting build for 'DebugLib' target...
+call "%VS80COMNTOOLS%..\IDE\devenv.com" /build DebugLib yake.sln 2>&1 | find "error(s)"
+echo Starting build for 'Release' target...
+call "%VS80COMNTOOLS%..\IDE\devenv.com" /build Release yake.sln 2>&1 | find "error(s)"
+echo Starting build for 'ReleaseLib' target...
+call "%VS80COMNTOOLS%..\IDE\devenv.com" /build ReleaseLib yake.sln 2>&1 | find "error(s)"
+echo Starting build for 'ReleaseWithSymbols' target...
+call "%VS80COMNTOOLS%..\IDE\devenv.com" /build ReleaseWithSymbols yake.sln 2>&1 | find "error(s)"
+
+:end
+pause
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-17 22:38:47
|
Revision: 1709
http://svn.sourceforge.net/yake/?rev=1709&view=rev
Author: psyclonist
Date: 2007-04-17 15:38:33 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
updated docs
Modified Paths:
--------------
trunk/yake/BUILD
trunk/yake/documentation/manual/yake-manual.txt
Modified: trunk/yake/BUILD
===================================================================
--- trunk/yake/BUILD 2007-04-17 01:01:34 UTC (rev 1708)
+++ trunk/yake/BUILD 2007-04-17 22:38:33 UTC (rev 1709)
@@ -75,14 +75,14 @@
1.1.3 Requirements
----------------------------------------------------------
- * a recent C++ compiler (MSVC7.1+ or GCC 3.3+)
+ * a recent C++ compiler (MSVC7.1/8.0+ or GCC 3.3/3.4/4.x+)
* a good standard template library (STL)
- * boost 1.32.x or above (not all libraries are needed)
+ * boost 1.33.x or above (not all libraries are needed)
For specific components additional dependencies are required.
These include:
* ODE 0.6/0.7 for physicsODE
- * OGRE 1.2.x+ for graphicsOGRE
+ * OGRE 1.4.x+ for graphicsOGRE
* Lua 5.x for scriptingLua, entLua etc
* Luabind 0.7+ for scriptingLua, entLua etc
* CEGUI 0.5.x
@@ -140,6 +140,8 @@
2.1 Building Yake with premake
------------------------------------------
+* Choose a distribution
+
* Install premake
Note: The build script generation below expects the 'premake' executable
@@ -199,50 +201,13 @@
dependencies dir as it is described in Yake forums to avoid string redefinition (
just comment out Ogre's definitions of additional operators ).
-Next, you have 2 options for building Yake.
-Way 1. SCons [RECOMMENDED]
-Install SCons build system. Just 'emerge scons' if you are on Gentoo like me, or go to www.scons.org or search for
-package for your distro.
+Open a console and navigate to Yake's root directory.
-Then go to yake root dir and run:
-# scons
+ # cd scripts/linux
+ # ./build.sh
+ # make
-That will build everything. After that as root:
-# scons install
-That installs libraries.
-Update dynamic loader cache (as root):
-# ldconfig
-
-Now you will find all demos in common/bin directory ;)
-
-ATTENTION! This is my preferred way to build Yake. It is best supported by me from now on ( 10/2005 ).
-
-Way 2. KDevelop/automake
-#. Execute autogen.sh script - it will create various missing scripts needed for automake & friends.
-
-Now there are two ways of building Yake: automated-command-line and IDE-wise ;)
-If you want command line build then do as usual:
- ./configure
- make
- make install
-
-Else, KDevelop'ers could do:
-#. Run KDevelop and open project file from yake root dir.
-#. Run automake and friends from KDevelop Build menu.
-#. Run configure from Build menu.
-
-#. You can start building libraries now.
-You can just build the whole project.
-
-# Install all built libraries (with root rights). They are all installed in /usr/local/lib by default
-
-# In Project settings change run options. There are absolute paths to the program to run. You should change that
-according to your configuration.
-
-# From now on you're able to run the demos.
-You will need to set up working dir for demo, e.g. create config files and have Ogre's media.
-
3 BUILD INSTRUCTIONS FOR CUSTOM PROJECTS
----------------------------------------
Modified: trunk/yake/documentation/manual/yake-manual.txt
===================================================================
--- trunk/yake/documentation/manual/yake-manual.txt 2007-04-17 01:01:34 UTC (rev 1708)
+++ trunk/yake/documentation/manual/yake-manual.txt 2007-04-17 22:38:33 UTC (rev 1709)
@@ -92,14 +92,14 @@
For specific components/plugins additional dependencies may be required.
1. ODE 0.7/0.8 for physicsODE
-#. OGRE 1.2.x+ for graphicsOGRE
+#. OGRE 1.3/1.4 for graphicsOGRE
#. Lua 5.x for scriptingLua, entLua etc
#. Luabind 0.7+ for scriptingLua, entLua etc
#. CEGUI 0.5.x for graphical UI
#. OpenAL 1.1 SDK for audioOpenAL
#. OpenAL++ for audioOpenAL
-#. TinyXML for data
-#. Enet 1.x for networking
+#. TinyXML 2.5.x for data
+#. Enet 1.0.x for networking
Supported platforms:
@@ -187,7 +187,8 @@
.. note::
The build scripts for the various platforms and compilers are generated from
- premake scripts.
+ premake scripts. You either have to install premake yourself. The official
+ dependency packages for Yake ship with the executable already in place.
Configuration
~~~~~~~~~~~~~
@@ -201,8 +202,8 @@
By default, the configuration is set to build all libraries and demos thereby maximizing
the available feature set.
-Building with Microsoft Visual C++ 7.1/8.0
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Building with Microsoft Visual C++ 2003/2005 (7.1/8.0)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1. Obtain the sources via one of the methods listed previously.
#. Provide dependencies.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-17 01:01:34
|
Revision: 1708
http://svn.sourceforge.net/yake/?rev=1708&view=rev
Author: psyclonist
Date: 2007-04-16 18:01:34 -0700 (Mon, 16 Apr 2007)
Log Message:
-----------
fixed static build targets
Modified Paths:
--------------
trunk/yake/samples/cmdrmayhem/yakeDemo.cpp
trunk/yake/scripts/premake/deps.lua
trunk/yake/scripts/premake/samples.lua
trunk/yake/scripts/premake/tools.lua
trunk/yake/scripts/tools/make_api.pl
trunk/yake/yake/audio/yakeAudioPrerequisites.h
trunk/yake/yake/base/yakePrerequisites.h
trunk/yake/yake/bindings.lua/common/yake.lua.any_converter.h
trunk/yake/yake/bindings.lua/prerequisites.h
trunk/yake/yake/data/yakeDataPrerequisites.h
trunk/yake/yake/ent/prerequisites.h
trunk/yake/yake/file/ftp_file_system/inc/config.hpp
trunk/yake/yake/file/native_file_system/inc/config.hpp
trunk/yake/yake/file/virtual_file_system/inc/config.hpp
trunk/yake/yake/file/virtualfs/inc/config.hpp
trunk/yake/yake/graphics/yakeGraphics.h
trunk/yake/yake/gui/config.h
trunk/yake/yake/gui_adapter/renderer_adapter_base.h
trunk/yake/yake/input/yakePrerequisites.h
trunk/yake/yake/loader/prerequisites.h
trunk/yake/yake/model/prerequisites.h
trunk/yake/yake/net/netPrerequisites.h
trunk/yake/yake/netrepsvc/netEvents.h
trunk/yake/yake/netrepsvc/netPrerequisites.h
trunk/yake/yake/netsvc/netPrerequisites.h
trunk/yake/yake/physics/yakePhysicsPrerequisites.h
trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h
trunk/yake/yake/plugins/ceguiOgreRendererAdapter/plugin.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCore.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h
trunk/yake/yake/plugins/gui_cegui/config.h
trunk/yake/yake/plugins/physicsNX/plugin.h
trunk/yake/yake/plugins/physicsNX/yakePCH.h
trunk/yake/yake/plugins/physicsODE/yakePrerequisites.h
trunk/yake/yake/plugins/registryPluginConcrete/concrete.h
trunk/yake/yake/plugins/renderer_adapter_cegui_ogre/renderer_adapter_cegui_ogre.h
trunk/yake/yake/plugins/scriptingLua/ScriptingSystemLua.h
trunk/yake/yake/raf/yakePrerequisites.h
trunk/yake/yake/reflection/config.h
trunk/yake/yake/registryPluginInterface/interface.h
trunk/yake/yake/scripting/yakeScriptingSystem.h
trunk/yake/yake/task/prerequisites.h
trunk/yake/yake/thread/yakeThreadPrerequisites.h
trunk/yake/yake/vehicle/yakePrerequisites.h
trunk/yake/yake/yappbase/yappPrerequisites.h
trunk/yake/yake/yappmsg/yakeCommon.h
Modified: trunk/yake/samples/cmdrmayhem/yakeDemo.cpp
===================================================================
--- trunk/yake/samples/cmdrmayhem/yakeDemo.cpp 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/samples/cmdrmayhem/yakeDemo.cpp 2007-04-17 01:01:34 UTC (rev 1708)
@@ -460,6 +460,9 @@
// dirMediaRoot+sceneBaseName+".scene", dirMediaRoot+sceneBaseName+".xode", dirMediaRoot+sceneBaseName+".link" );
// create player/avatar
+ YAKE_ASSERT( getGraphicalWorld() );
+ YAKE_ASSERT( getPhysicalWorld() );
+ YAKE_ASSERT( this );
mPlayer.reset( new ControllableCharacter(*this,*getGraphicalWorld(),*getPhysicalWorld()) );
//mPlayer->setPosition( Point3(0,-52,0) ); // 2 meters above the 50 m radius sphere
mPlayer->setPosition( Point3(-25.967,44.376,0.9326) );
Modified: trunk/yake/scripts/premake/deps.lua
===================================================================
--- trunk/yake/scripts/premake/deps.lua 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/scripts/premake/deps.lua 2007-04-17 01:01:34 UTC (rev 1708)
@@ -72,7 +72,9 @@
defDepLibraryPath("lua","dependencies/lua/lib")
defDepLibrary("lua","lua","Release")
defDepLibrary("lua","lua","ReleaseWithSymbols")
+defDepLibrary("lua","lua","ReleaseLib")
defDepLibrary("lua","luad","Debug")
+defDepLibrary("lua","luad","DebugLib")
--------------------------------------
-- Dependency package Luabind
@@ -81,8 +83,10 @@
defDepIncludePath("luabind", "dependencies/luabind")
defDepLibraryPath("luabind","dependencies/luabind/lib")
defDepLibrary("luabind","luabind","Release")
+defDepLibrary("luabind","luabind","ReleaseLib")
defDepLibrary("luabind","luabind","ReleaseWithSymbols")
defDepLibrary("luabind","luabindd","Debug")
+defDepLibrary("luabind","luabindd","DebugLib")
--------------------------------------
-- Dependency package OpenAL++
Modified: trunk/yake/scripts/premake/samples.lua
===================================================================
--- trunk/yake/scripts/premake/samples.lua 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/scripts/premake/samples.lua 2007-04-17 01:01:34 UTC (rev 1708)
@@ -24,6 +24,8 @@
"Debug",
"ReleaseWithSymbols",
"Release",
+ "DebugLib",
+ "ReleaseLib",
}
end
@@ -186,3 +188,6 @@
useDep("luabind")
end
end
+
+
+priv_finishSample()
Modified: trunk/yake/scripts/premake/tools.lua
===================================================================
--- trunk/yake/scripts/premake/tools.lua 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/scripts/premake/tools.lua 2007-04-17 01:01:34 UTC (rev 1708)
@@ -4,6 +4,38 @@
--------------------------------------
--------------------------------------
+-- INTERNAL
+--------------------------------------
+g_libs = {}
+function store_current_lib()
+ --this just references: g_libs[package.name] = package
+ -- we have to 'copy' (!) to avoid a yake.vcproj and other junk.
+
+ g_libs[package.name] = {}
+ g_libs[package.name].links = {}
+ g_libs[package.name].config = {}
+
+ for k,lib in package.links do
+ table.insert( g_libs[package.name].links, lib )
+ end
+
+ --print("LIB " .. package.name)
+ for cfg,v in pairs(package.config) do
+ if type(cfg) == "string" then
+ table.insert( g_libs[package.name].config, cfg )
+
+ g_libs[package.name].config[cfg] = {}
+ g_libs[package.name].config[cfg].links = {}
+ if package.config[cfg].links then
+ for k,lib in pairs(package.config[cfg].links) do
+ table.insert( g_libs[package.name].config[cfg].links, lib )
+ end
+ end
+ end
+ end
+end
+
+--------------------------------------
-- PUBLIC
--------------------------------------
@@ -73,10 +105,28 @@
"Debug",
"ReleaseWithSymbols",
"Release",
+ "DebugLib",
+ "ReleaseLib"
}
end
+local g_first_package = true
function makePackage(name)
+
+ -- The following test is very important.
+ -- If 'package' is referenced (e.g. via print(package.name))
+ -- then this results automatically in a yake.vcproj
+ -- being generated (on msvc).
+ -- So we want to run store_current_lib() for every one of
+ -- our libraries/components but we ignore the very first
+ -- one called "yake" as that seems to be a premake dummy component.
+ --if name ~= "base" then
+ if g_first_package then
+ g_first_package = false
+ else
+ store_current_lib()
+ end
+
package = newpackage()
package.name = name
package.kind = "dll"
@@ -145,13 +195,13 @@
debugLib = package.config.DebugLib
debugLib.kind = "lib"
debugLib.target = (LIBFILE_PREFIX)..name.."_s"..(DEBUG_DLL_SUFFIX)
- debugLib.defines = {"_DEBUG"}
+ debugLib.defines = {"_DEBUG","YAKE_STATIC"}
debugLib.buildflags = {}
releaseLib = package.config.ReleaseLib
releaseLib.kind = "lib"
releaseLib.target = (LIBFILE_PREFIX)..name.."_s"
- releaseLib.defines = {}
+ releaseLib.defines = {"YAKE_STATIC"}
releaseLib.buildflags = {
"no-symbols",
"optimize-speed",
@@ -277,10 +327,86 @@
--------------------------------------
function sampleUsesConsole()
if windows then
- package.kind = "exe"
+ package.kind = "exe" -- "exe" is the console application, "winexe" the one without the console
end
end
+
+-- In case of static EXE targets we have to link to the
+-- dependencies of the immediate dependencies, too.
+-- For example, it's necessary to link to lua.lib if the
+-- EXE project depends on 'scriptingLua'.
+-- Therefore, this function searches these libraries and
+-- adds them as dependencies to the EXE project for the given target.
+function priv_finishSample_Target(target)
+ --print(" TARGET " .. package.name .. " " .. target)
+
+ local linkscopy = {}
+ for k,v in pairs(package.links) do
+ linkscopy[v] = v
+ end
+ if package.config[target] and package.config[target].links then
+ for k,v in pairs(package.config[target].links) do
+ linkscopy[v] = v
+ end
+ end
+
+ local linksdone = {}
+
+ for k,lib in pairs(linkscopy) do
+ if linksdone[lib] then
+ --print(" skipping " .. lib)
+ else
+ --print(" applying " .. lib)
+ linksdone[lib] = true
+
+ if g_libs[lib] then -- it's a Yake library
+ if g_libs[lib].config[target] and g_libs[lib].config[target].links then
+ for a,b in g_libs[lib].config[target].links do
+ if not g_libs[b] and not linksdone[b] then -- only non-Yake libraries as Yake libraries are already bound.
+ --print(" dep " .. b)
+ --addDependency(b,target)
+ linksdone[b] = true
+ end
+ end
+ end
+ for a,b in g_libs[lib].links do
+ if not g_libs[b] and not linksdone[b] then -- only non-Yake libraries as Yake libraries are already bound.
+ --print(" dep " .. b)
+ addDependency(b,target)
+ linksdone[b] = true
+ end
+ end
+ else -- it's an external lib
+ --print(" depx " .. lib)
+ addDependency(lib,target)
+ linksdone[lib] = true
+ end
+ end
+ end
+end
+function priv_finishSample()
+ -- for static link targets only
+ priv_finishSample_Target("DebugLib")
+ priv_finishSample_Target("ReleaseLib")
+end
+
+local g_first_sample = true
function makeSample(name,path)
+ -- See makePackage() for more details on this hack!
+ if g_first_sample then
+ g_first_sample = false
+ else
+ if package then
+ if package.kind == "lib" or package.kind == "dll" then
+ store_current_lib()
+ end
+ if package.kind == "exe" or package.kind == "winexe" then
+ priv_finishSample()
+ end
+ end
+ end
+
+ -- create the package
package = newpackage()
package.name = name
if windows then
@@ -307,8 +433,8 @@
end
- package.config.DebugLib = nil
- package.config.ReleaseLib = nil
+ --package.config.DebugLib = nil
+ --package.config.ReleaseLib = nil
debug = package.config.Debug
debug.target = rootdir.."samples/bin/debug/"..name.."_d"..(EXEFILE_SUFFIX)
@@ -331,6 +457,16 @@
"no-frame-pointer"
}
+ debugLib = package.config.DebugLib
+ debugLib.target = rootdir.."samples/bin/debug/"..name.."_s_d"..(EXEFILE_SUFFIX)
+ debugLib.defines = {"_DEBUG","YAKE_STATIC"}
+ debugLib.buildflags = {}
+
+ releaseLib = package.config.ReleaseLib
+ releaseLib.target = rootdir.."samples/bin/release/"..name.."_s"..(EXEFILE_SUFFIX)
+ releaseLib.defines = {"YAKE_STATIC"}
+ releaseLib.buildflags = {}
+
-- add sources
addMatching(path.."/*.cpp")
addMatching(path.."/*.h")
@@ -338,6 +474,7 @@
-- core dependencies
useDep("boost")
+
end
-- Mostly used in samples.lua and custom.lua
Modified: trunk/yake/scripts/tools/make_api.pl
===================================================================
--- trunk/yake/scripts/tools/make_api.pl 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/scripts/tools/make_api.pl 2007-04-17 01:01:34 UTC (rev 1708)
@@ -1,14 +1,6 @@
print "Generating API reference...\n\n";
-# Windows: where returns 256 for 'not found' and 0 for 'found'.
-`where /q doxygen`;
-if ($? == 256)
-{
- print("Error: Could not locate doxygen. Bailing out.\n");
- exit
-}
-
+#`cd ../..` or die("Error: could not change directory.");
+#`doxygen documentation/api/doxyfile` or die("Error: Failed to run doxygen.")
`cd ../.. && doxygen documentation/api/doxyfile`;
-print $? . " \n"
-
Modified: trunk/yake/yake/audio/yakeAudioPrerequisites.h
===================================================================
--- trunk/yake/yake/audio/yakeAudioPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/audio/yakeAudioPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -30,11 +30,9 @@
#include <yake/base/yakePrerequisites.h>
#ifdef YAKE_AUDIO_EXPORTS
-# pragma message("Exporting yake::audio")
-# define YAKE_AUDIO_API DLLEXPORT
+# define YAKE_AUDIO_API YAKE_EXPORT_API
#else
-# pragma message("Importing yake::audio")
-# define YAKE_AUDIO_API DLLIMPORT
+# define YAKE_AUDIO_API YAKE_IMPORT_API
#endif
#endif
Modified: trunk/yake/yake/base/yakePrerequisites.h
===================================================================
--- trunk/yake/yake/base/yakePrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/base/yakePrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -82,11 +82,21 @@
//============================================================================
// Yake
+// YAKE_IMPORT_API and YAKE_EXPORT_API
+#if defined(YAKE_STATIC)
+# define YAKE_IMPORT_API
+# define YAKE_EXPORT_API
+#else
+# define YAKE_IMPORT_API DLLIMPORT
+# define YAKE_EXPORT_API DLLEXPORT
+#endif
+
// YAKE_BASE_API
+
#if defined( YAKE_BASE_EXPORTS )
-# define YAKE_BASE_API DLLEXPORT
+# define YAKE_BASE_API YAKE_EXPORT_API
#else
-# define YAKE_BASE_API DLLIMPORT
+# define YAKE_BASE_API YAKE_IMPORT_API
#endif
// YAKE_DEBUG
Modified: trunk/yake/yake/bindings.lua/common/yake.lua.any_converter.h
===================================================================
--- trunk/yake/yake/bindings.lua/common/yake.lua.any_converter.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/bindings.lua/common/yake.lua.any_converter.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -48,11 +48,9 @@
typedef std::map<const std::type_info*, void(*)(lua_State*, const boost::any&)> any_converter_map;
#if defined(YAKE_EXPORT_LUA_ANY_CONVERTER)
-# pragma message("dllexport")
-# define YAKE_LUA_ANY_CONVERTER_API DLLEXPORT
+# define YAKE_LUA_ANY_CONVERTER_API YAKE_EXPORT_API
#else
-# pragma message("dllimport")
-# define YAKE_LUA_ANY_CONVERTER_API DLLIMPORT
+# define YAKE_LUA_ANY_CONVERTER_API YAKE_IMPORT_API
#endif
YAKE_LUA_ANY_CONVERTER_API any_converter_map& any_converters();
Modified: trunk/yake/yake/bindings.lua/prerequisites.h
===================================================================
--- trunk/yake/yake/bindings.lua/prerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/bindings.lua/prerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -31,9 +31,9 @@
#include <yake/base/yakePrerequisites.h>
#if defined(YAKE_BINDINGS_LUA_EXPORTS)
-# define YAKE_BINDINGS_LUA_API DLLEXPORT
+# define YAKE_BINDINGS_LUA_API YAKE_EXPORT_API
#else
-# define YAKE_BINDINGS_LUA_API DLLIMPORT
+# define YAKE_BINDINGS_LUA_API YAKE_IMPORT_API
#endif
struct lua_State;
Modified: trunk/yake/yake/data/yakeDataPrerequisites.h
===================================================================
--- trunk/yake/yake/data/yakeDataPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/data/yakeDataPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -27,13 +27,12 @@
#ifndef YAKE_DATA_PREREQUISITES_H
#define YAKE_DATA_PREREQUISITES_H
+#include <yake/base/yakePrerequisites.h>
+
#ifdef YAKE_DATA_EXPORTS
-# define YAKE_DATA_API DLLEXPORT
+# define YAKE_DATA_API YAKE_EXPORT_API
#else
-# define YAKE_DATA_API DLLIMPORT
-# if YAKE_PLATFORM == PLATFORM_WIN32
-//# pragma comment( lib, "data" )
-# endif
+# define YAKE_DATA_API YAKE_IMPORT_API
#endif
#endif
Modified: trunk/yake/yake/ent/prerequisites.h
===================================================================
--- trunk/yake/yake/ent/prerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/ent/prerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -35,9 +35,9 @@
#include "yake/object/yakeObjects.h"
#if defined(YAKE_ENT_EXPORTS)
-# define YAKE_ENT_API DLLEXPORT
+# define YAKE_ENT_API YAKE_EXPORT_API
#else
-# define YAKE_ENT_API DLLIMPORT
+# define YAKE_ENT_API YAKE_IMPORT_API
#endif
namespace yake {
Modified: trunk/yake/yake/file/ftp_file_system/inc/config.hpp
===================================================================
--- trunk/yake/yake/file/ftp_file_system/inc/config.hpp 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/file/ftp_file_system/inc/config.hpp 2007-04-17 01:01:34 UTC (rev 1708)
@@ -4,9 +4,9 @@
#include <yake/base/yakePrerequisites.h>
#if defined( YAKE_FTP_EXPORTS )
-# define YAKE_FTP_API DLLEXPORT
+# define YAKE_FTP_API YAKE_EXPORT_API
#else
-# define YAKE_FTP_API DLLIMPORT
+# define YAKE_FTP_API YAKE_IMPORT_API
#endif
namespace filesystem
Modified: trunk/yake/yake/file/native_file_system/inc/config.hpp
===================================================================
--- trunk/yake/yake/file/native_file_system/inc/config.hpp 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/file/native_file_system/inc/config.hpp 2007-04-17 01:01:34 UTC (rev 1708)
@@ -5,9 +5,9 @@
#include <yake/base/templates/yakePointer.h>
#if defined( YAKE_NFS_EXPORTS )
-# define YAKE_NFS_API DLLEXPORT
+# define YAKE_NFS_API YAKE_EXPORT_API
#else
-# define YAKE_NFS_API DLLIMPORT
+# define YAKE_NFS_API YAKE_IMPORT_API
#endif
namespace filesystem
Modified: trunk/yake/yake/file/virtual_file_system/inc/config.hpp
===================================================================
--- trunk/yake/yake/file/virtual_file_system/inc/config.hpp 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/file/virtual_file_system/inc/config.hpp 2007-04-17 01:01:34 UTC (rev 1708)
@@ -8,9 +8,9 @@
#include <yake/base/templates/yakePointer.h>
#if defined( YAKE_VFS_EXPORTS )
-# define YAKE_VFS_API DLLEXPORT
+# define YAKE_VFS_API YAKE_EXPORT_API
#else
-# define YAKE_VFS_API DLLIMPORT
+# define YAKE_VFS_API YAKE_IMPORT_API
#endif
namespace filesystem
Modified: trunk/yake/yake/file/virtualfs/inc/config.hpp
===================================================================
--- trunk/yake/yake/file/virtualfs/inc/config.hpp 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/file/virtualfs/inc/config.hpp 2007-04-17 01:01:34 UTC (rev 1708)
@@ -20,9 +20,9 @@
#include <yake/base/yakePrerequisites.h>
#if defined( YAKE_VIRTUALFS_EXPORTS )
-# define YAKE_VIRTUALFS_API DLLEXPORT
+# define YAKE_VIRTUALFS_API YAKE_EXPORT_API
#else
-# define YAKE_VIRTUALFS_API DLLIMPORT
+# define YAKE_VIRTUALFS_API YAKE_IMPORT_API
#endif
//============================================================================
Modified: trunk/yake/yake/graphics/yakeGraphics.h
===================================================================
--- trunk/yake/yake/graphics/yakeGraphics.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/graphics/yakeGraphics.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -27,16 +27,11 @@
#ifndef YAKE_GRAPHICS_H
#define YAKE_GRAPHICS_H
-#if YAKE_PLATFORM == PLATFORM_WIN32
#if defined( YAKE_GRAPHICSINTERFACE_EXPORTS )
-# define YAKE_GRAPHICS_INTERFACE_API DLLEXPORT
+# define YAKE_GRAPHICS_INTERFACE_API YAKE_EXPORT_API
#else
-# define YAKE_GRAPHICS_INTERFACE_API DLLIMPORT
-//# pragma comment( lib, "graphics" )
+# define YAKE_GRAPHICS_INTERFACE_API YAKE_IMPORT_API
#endif
-#else
-# define YAKE_GRAPHICS_INTERFACE_API
-#endif
#ifndef YAKE_BASE_PREREQUISITES_H
#include <yake/base/yakePrerequisites.h>
Modified: trunk/yake/yake/gui/config.h
===================================================================
--- trunk/yake/yake/gui/config.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/gui/config.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -30,9 +30,9 @@
/* compile time flags */
// dll import/export
#if defined(YAPP_GUI_EXPORTS)
-# define YAPP_GUI_API DLLEXPORT
+# define YAPP_GUI_API YAKE_EXPORT_API
#else
-# define YAPP_GUI_API DLLIMPORT
+# define YAPP_GUI_API YAKE_IMPORT_API
#endif
Modified: trunk/yake/yake/gui_adapter/renderer_adapter_base.h
===================================================================
--- trunk/yake/yake/gui_adapter/renderer_adapter_base.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/gui_adapter/renderer_adapter_base.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -33,9 +33,9 @@
#include <yapp/gui/config.h>
#if defined(YAPP_GUI_RENDERER_ADAPTER_BASE_EXPORTS)
-# define YAPP_GUI_ADAPTER_API DLLEXPORT
+# define YAPP_GUI_ADAPTER_API YAKE_EXPORT_API
#else
-# define YAPP_GUI_ADAPTER_API DLLIMPORT
+# define YAPP_GUI_ADAPTER_API YAKE_IMPORT_API
#endif
namespace yake
Modified: trunk/yake/yake/input/yakePrerequisites.h
===================================================================
--- trunk/yake/yake/input/yakePrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/input/yakePrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -28,9 +28,9 @@
#define YAKE_INPUT_PREREQUISITES_H
#if defined( YAKE_INPUT_EXPORTS )
-# define YAKE_INPUT_API DLLEXPORT
+# define YAKE_INPUT_API YAKE_EXPORT_API
#else
-# define YAKE_INPUT_API DLLIMPORT
+# define YAKE_INPUT_API YAKE_IMPORT_API
#endif
#endif
Modified: trunk/yake/yake/loader/prerequisites.h
===================================================================
--- trunk/yake/yake/loader/prerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/loader/prerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -27,15 +27,13 @@
#ifndef YAKE_LOADER_PREREQUISITES_H
#define YAKE_LOADER_PREREQUISITES_H
-#if (YAKE_PLATFORM == PLATFORM_WIN32)
+#include <yake/base/yakePrerequisites.h>
+
#if defined(YAKE_LOADER_EXPORTS)
-# define YAKE_LOADER_API DLLEXPORT
+# define YAKE_LOADER_API YAKE_EXPORT_API
#else
-# define YAKE_LOADER_API DLLIMPORT
+# define YAKE_LOADER_API YAKE_IMPORT_API
#endif
-#else
-# define YAKE_LOADER_API
-#endif
#if (YAKE_PLATFORM == PLATFORM_WIN32) && !defined(YAKE_LOADER_EXPORTS)
//#pragma comment(lib,"loader.lib")
Modified: trunk/yake/yake/model/prerequisites.h
===================================================================
--- trunk/yake/yake/model/prerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/model/prerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -28,9 +28,9 @@
#define YAKE_MODEL_PREREQUISITES_H
#if defined(YAKE_MODEL_EXPORTS)
-# define YAKE_MODEL_API DLLEXPORT
+# define YAKE_MODEL_API YAKE_EXPORT_API
#else
-# define YAKE_MODEL_API DLLIMPORT
+# define YAKE_MODEL_API YAKE_IMPORT_API
#endif
#if (YAKE_PLATFORM == PLATFORM_WIN32) && !defined(YAKE_MODEL_EXPORTS)
Modified: trunk/yake/yake/net/netPrerequisites.h
===================================================================
--- trunk/yake/yake/net/netPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/net/netPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -33,22 +33,9 @@
#define YAKE_NET_DLL
#ifdef YAKE_NET_EXPORTS
-# ifdef YAKE_NET_DLL
-# define NET_API DLLEXPORT
-# else
-# define NET_API
-# endif
+# define NET_API YAKE_EXPORT_API
#else
-# ifdef YAKE_NET_DLL
-# define NET_API DLLIMPORT
-# else
-# define NET_API
-# endif
-# if defined( _DEBUG )
-//# pragma comment(lib,"yake_net-vc80-d.lib")
-# else
-//# pragma comment(lib,"yake_net-vc80.lib")
-# endif
+# define NET_API YAKE_IMPORT_API
#endif
#include <cassert>
Modified: trunk/yake/yake/netrepsvc/netEvents.h
===================================================================
--- trunk/yake/yake/netrepsvc/netEvents.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/netrepsvc/netEvents.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -35,69 +35,84 @@
namespace yake {
namespace net {
- struct NETREPSVC_API s2cEvtClassTable : public yake::net::NetEvent
+ struct NETREPSVC_API s2cEvtClassTable : public NetEvent
{
DECLARE_EVENT( s2cEvtClassTable, 10 );
- virtual bool pack(yake::net::obitstream& out) const
+ virtual bool pack(obitstream& out) const
{
- std::map<int,int> c;
- c[1] = 2;
- c[3] = 46;
- out << c;
out << globalClassIds_;
return true;
}
- virtual bool unpack(yake::net::ibitstream& in)
+ virtual bool unpack(ibitstream& in)
{
- std::map<int,int> c;
- in >> c;
in >> globalClassIds_;
return true;
}
//uint8 numClassIdBits_;
- std::map<std::string,yake::ent::ClassId> globalClassIds_;
+ std::map<std::string,ent::ClassId> globalClassIds_;
void copyTo(s2cEvtClassTable& other) const
{
if (&other != this)
other.globalClassIds_ = this->globalClassIds_;
}
};
- struct NETREPSVC_API s2cEvtCreateObject : public yake::net::NetEvent
+ struct NETREPSVC_API s2cEvtCreateObject : public NetEvent
{
DECLARE_EVENT( s2cEvtCreateObject, 20 );
- virtual bool pack(yake::net::obitstream& out) const
+ virtual bool pack(obitstream& out) const
{
out << objId_.classId() << objId_.serialNo();
+ //@todo out << initialUpdate_;
return true;
}
- virtual bool unpack(yake::net::ibitstream& in)
+ virtual bool unpack(ibitstream& in)
{
- yake::ent::ObjectId::ClassId clsId;
- yake::ent::ObjectId::SerialNo serNo;
+ ent::ObjectId::ClassId clsId;
+ ent::ObjectId::SerialNo serNo;
in >> clsId >> serNo;
- objId_ = yake::ent::ObjectId(clsId,serNo);
+ objId_ = ent::ObjectId(clsId,serNo);
+ //@todo in >> initialUpdate_;
return true;
}
- yake::ent::ObjectId objId_;
+ ent::ObjectId objId_;
+ //@todo bitchunk initialUpdate_; //length+data
};
- struct s2cEvtDestroyObject : public yake::net::NetEvent
+ struct s2cEvtDestroyObject : public NetEvent
{
DECLARE_EVENT( s2cEvtDestroyObject, 21 );
- virtual bool pack(yake::net::obitstream& out) const
+ virtual bool pack(obitstream& out) const
{
out << objId_.classId() << objId_.serialNo();
return true;
}
- virtual bool unpack(yake::net::ibitstream& in)
+ virtual bool unpack(ibitstream& in)
{
- yake::ent::ObjectId::ClassId clsId;
- yake::ent::ObjectId::SerialNo serNo;
+ ent::ObjectId::ClassId clsId;
+ ent::ObjectId::SerialNo serNo;
in >> clsId >> serNo;
- objId_ = yake::ent::ObjectId(clsId,serNo);
+ objId_ = ent::ObjectId(clsId,serNo);
return true;
}
- yake::ent::ObjectId objId_;
+ ent::ObjectId objId_;
};
+ struct s2cEvtUpdateObject : public NetEvent
+ {
+ DECLARE_EVENT( s2cEvtUpdateObject, 22 );
+ virtual bool pack(obitstream& out) const
+ {
+ out << objId_.classId() << objId_.serialNo();
+ return true;
+ }
+ virtual bool unpack(ibitstream& in)
+ {
+ ent::ObjectId::ClassId clsId;
+ ent::ObjectId::SerialNo serNo;
+ in >> clsId >> serNo;
+ objId_ = ent::ObjectId(clsId,serNo);
+ return true;
+ }
+ ent::ObjectId objId_;
+ };
} // namespace net
} // namespace yake
Modified: trunk/yake/yake/netrepsvc/netPrerequisites.h
===================================================================
--- trunk/yake/yake/netrepsvc/netPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/netrepsvc/netPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -33,24 +33,10 @@
#include <yake/netsvc/netSvc.h>
#include <yake/ent/ent.h>
-#if YAKE_PLATFORM == PLATFORM_WIN32 && defined(_USRDLL)
-# define YAKE_NETREPSVC_DLL
-#endif
-
#ifdef YAKE_NETREPSVC_EXPORTS
-# ifdef YAKE_NETREPSVC_DLL
-# pragma message("dllexport")
-# define NETREPSVC_API DLLEXPORT
-# else
-# pragma message("lib")
-# define NETREPSVC_API
-# endif
+# define NETREPSVC_API YAKE_EXPORT_API
#else
-# ifdef YAKE_NETREPSVC_DLL
-# define NETREPSVC_API DLLIMPORT
-# else
-# define NETREPSVC_API
-# endif
+# define NETREPSVC_API YAKE_IMPORT_API
#endif
#endif
Modified: trunk/yake/yake/netsvc/netPrerequisites.h
===================================================================
--- trunk/yake/yake/netsvc/netPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/netsvc/netPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -34,22 +34,9 @@
#define YAKE_NETSVC_DLL
#ifdef YAKE_NETSVC_EXPORTS
-# ifdef YAKE_NETSVC_DLL
-# define NETSVC_API DLLEXPORT
-# else
-# define NETSVC_API
-# endif
+# define NETSVC_API YAKE_EXPORT_API
#else
-# ifdef YAKE_NETSVC_DLL
-# define NETSVC_API DLLIMPORT
-# else
-# define NETSVC_API
-# endif
-# if defined( _DEBUG )
-//# pragma comment(lib,"yake_netsvc-vc80-d.lib")
-# else
-//# pragma comment(lib,"yake_netsvc-vc80.lib")
-# endif
+# define NETSVC_API YAKE_IMPORT_API
#endif
/** @todo move out */
Modified: trunk/yake/yake/physics/yakePhysicsPrerequisites.h
===================================================================
--- trunk/yake/yake/physics/yakePhysicsPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/physics/yakePhysicsPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -43,9 +43,9 @@
// --
#if defined( YAKE_PHYSICS_EXPORTS )
-# define YAKE_PHYSICS_API DLLEXPORT
+# define YAKE_PHYSICS_API YAKE_EXPORT_API
#else
-# define YAKE_PHYSICS_API DLLIMPORT
+# define YAKE_PHYSICS_API YAKE_IMPORT_API
#endif
#include <boost/any.hpp>
Modified: trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h
===================================================================
--- trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -29,10 +29,10 @@
#ifdef YAKE_AUDIO_OPENAL_EXPORTS
# pragma message("Exporting yake::audio::openalpp")
-# define YAKE_AUDIO_OPENAL_API DLLEXPORT
+# define YAKE_AUDIO_OPENAL_API YAKE_EXPORT_API
#else
# pragma message("Importing yake::audio::openalpp")
-# define YAKE_AUDIO_OPENAL_API DLLIMPORT
+# define YAKE_AUDIO_OPENAL_API YAKE_IMPORT_API
#endif
namespace yake {
Modified: trunk/yake/yake/plugins/ceguiOgreRendererAdapter/plugin.h
===================================================================
--- trunk/yake/yake/plugins/ceguiOgreRendererAdapter/plugin.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/ceguiOgreRendererAdapter/plugin.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -25,9 +25,9 @@
------------------------------------------------------------------------------------
*/
#ifdef YAKE_CEGUIRENDERERADAPTER_OGRE_EXPORTS
-#define CEGUIADAPTEROGRE_API DLLEXPORT
+#define CEGUIADAPTEROGRE_API YAKE_EXPORT_API
#else
-#define CEGUIADAPTEROGRE_API DLLIMPORT
+#define CEGUIADAPTEROGRE_API YAKE_IMPORT_API
#endif
extern "C"
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCore.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCore.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCore.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -27,11 +27,7 @@
#ifndef YAKE_GRAPHICSSYSTEMOGRE_CORE_H
#define YAKE_GRAPHICSSYSTEMOGRE_CORE_H
-#if defined( YAKE_GRAPHICSCONCRETEAPI_EXPORTS )
-# define YAKE_GRAPHICS_CONCRETE_API DLLEXPORT
-#else
-# define YAKE_GRAPHICS_CONCRETE_API DLLIMPORT
-#endif
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
namespace Ogre {
class SceneManager;
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -28,9 +28,9 @@
#define YAKE_GRAPHICS_OGRE_PREREQUISITES_H
#if defined( YAKE_GRAPHICSCONCRETEAPI_EXPORTS )
-# define YAKE_GRAPHICS_CONCRETE_API DLLEXPORT
+# define YAKE_GRAPHICS_CONCRETE_API YAKE_EXPORT_API
#else
-# define YAKE_GRAPHICS_CONCRETE_API DLLIMPORT
+# define YAKE_GRAPHICS_CONCRETE_API YAKE_IMPORT_API
#endif
#if YAKE_PLATFORM == PLATFORM_WIN32
Modified: trunk/yake/yake/plugins/gui_cegui/config.h
===================================================================
--- trunk/yake/yake/plugins/gui_cegui/config.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/gui_cegui/config.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -30,9 +30,9 @@
/* compile time flags */
// dll import/export
#if defined(YAPP_GUI_CEGUI_EXPORTS)
-# define YAPP_GUI_CEGUI_API DLLEXPORT
+# define YAPP_GUI_CEGUI_API YAKE_EXPORT_API
#else
-# define YAPP_GUI_CEGUI_API DLLIMPORT
+# define YAPP_GUI_CEGUI_API YAKE_IMPORT_API
#endif
#endif // _YAPP_GUI_CEGUI_CONFIG_H_
Modified: trunk/yake/yake/plugins/physicsNX/plugin.h
===================================================================
--- trunk/yake/yake/plugins/physicsNX/plugin.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/physicsNX/plugin.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -31,9 +31,9 @@
// SCRIPTINGLUA_API functions as being imported from a DLL, whereas this DLL sees symbols
// defined with this macro as being exported.
#ifdef YAKE_PHYSICS_NX_EXPORTS
-# define PHYSICSODE_API DLLEXPORT
+# define PHYSICSODE_API YAKE_EXPORT_API
#else
-# define PHYSICSODE_API DLLIMPORT
+# define PHYSICSODE_API YAKE_IMPORT_API
#endif
#include <yake/plugins/physicsODE/PhysicsSystemODE.h>
Modified: trunk/yake/yake/plugins/physicsNX/yakePCH.h
===================================================================
--- trunk/yake/yake/plugins/physicsNX/yakePCH.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/physicsNX/yakePCH.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -36,9 +36,9 @@
#include <yake/physics/yakePhysics.h>
#ifdef YAKE_PHYSICS_NX_EXPORTS
-# define YAKE_PHYSICSNX_API DLLEXPORT
+# define YAKE_PHYSICSNX_API YAKE_EXPORT_API
#else
-# define YAKE_PHYSICSNX_API DLLIMPORT
+# define YAKE_PHYSICSNX_API YAKE_IMPORT_API
#endif
namespace yake {
Modified: trunk/yake/yake/plugins/physicsODE/yakePrerequisites.h
===================================================================
--- trunk/yake/yake/plugins/physicsODE/yakePrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/physicsODE/yakePrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -28,13 +28,9 @@
#define YAKE_PHYSICS_ODE_PREREQUISITES_H
#ifdef YAKEPHYSICSODE_EXPORTS
-# define YAKE_PHYSICSODE_API DLLEXPORT
+# define YAKE_PHYSICSODE_API YAKE_EXPORT_API
#else
-# pragma message("Importing yake::physicsOde")
-# define YAKE_PHYSICSODE_API DLLIMPORT
-# if YAKE_PLATFORM == PLATFORM_WIN32
-//# pragma comment(lib,"physicsODE")
-# endif
+# define YAKE_PHYSICSODE_API YAKE_IMPORT_API
#endif
#endif
Modified: trunk/yake/yake/plugins/registryPluginConcrete/concrete.h
===================================================================
--- trunk/yake/yake/plugins/registryPluginConcrete/concrete.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/registryPluginConcrete/concrete.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -33,9 +33,9 @@
#include <yake/registryPluginInterface/interface.h>
#if defined( YAKE_REGISTRYPLUGINCONCRETE_EXPORTS )
-# define YAKE_REGISTRY_PLUGIN_CONCRETE_API DLLEXPORT
+# define YAKE_REGISTRY_PLUGIN_CONCRETE_API YAKE_EXPORT_API
#else
-# define YAKE_REGISTRY_PLUGIN_CONCRETE_API DLLIMPORT
+# define YAKE_REGISTRY_PLUGIN_CONCRETE_API YAKE_IMPORT_API
#endif
//============================================================================
Modified: trunk/yake/yake/plugins/renderer_adapter_cegui_ogre/renderer_adapter_cegui_ogre.h
===================================================================
--- trunk/yake/yake/plugins/renderer_adapter_cegui_ogre/renderer_adapter_cegui_ogre.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/renderer_adapter_cegui_ogre/renderer_adapter_cegui_ogre.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -35,9 +35,9 @@
#include <yapp/plugins/gui_cegui/gui_system.h>
#ifdef YAPP_CONCRETE_GUI_ADAPTER_EXPORTS
-# define YAPP_CONCRETE_GUI_ADAPTER_API DLLEXPORT
+# define YAPP_CONCRETE_GUI_ADAPTER_API YAKE_EXPORT_API
#else
-# define YAPP_CONCRETE_GUI_ADAPTER_API DLLIMPORT
+# define YAPP_CONCRETE_GUI_ADAPTER_API YAKE_IMPORT_API
#endif
namespace yake
Modified: trunk/yake/yake/plugins/scriptingLua/ScriptingSystemLua.h
===================================================================
--- trunk/yake/yake/plugins/scriptingLua/ScriptingSystemLua.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/plugins/scriptingLua/ScriptingSystemLua.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -33,9 +33,9 @@
#include <boost/noncopyable.hpp>
#if defined( YAKE_SCRIPTINGLUA_EXPORTS )
-# define YAKE_SCRIPTINLUA_API DLLEXPORT
+# define YAKE_SCRIPTINLUA_API YAKE_EXPORT_API
#else
-# define YAKE_SCRIPTINLUA_API DLLIMPORT
+# define YAKE_SCRIPTINLUA_API YAKE_IMPORT_API
#endif
struct lua_State;
Modified: trunk/yake/yake/raf/yakePrerequisites.h
===================================================================
--- trunk/yake/yake/raf/yakePrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/raf/yakePrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -27,17 +27,10 @@
#ifndef YAKE_RAF_PREREQUISITES_H
#define YAKE_RAF_PREREQUISITES_H
-#if YAKE_PLATFORM == PLATFORM_WIN32
-# if defined(YAKE_RAF_EXPORTS)
-# define YAKE_RAF_API DLLEXPORT
-# else
-# define YAKE_RAF_API DLLIMPORT
-# if YAKE_PLATFORM == PLATFORM_WIN32
-//# pragma comment(lib,"raf.lib")
-# endif
-# endif
+#if defined(YAKE_RAF_EXPORTS)
+# define YAKE_RAF_API YAKE_EXPORT_API
#else
-# define YAKE_RAF_API
+# define YAKE_RAF_API YAKE_IMPORT_API
#endif
// configuration
Modified: trunk/yake/yake/reflection/config.h
===================================================================
--- trunk/yake/yake/reflection/config.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/reflection/config.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -36,9 +36,9 @@
/* compile time flags */
// dll import/export
#if defined( YAKE_REFLECTION_EXPORTS )
-# define YAKE_REFLECTION_API DLLEXPORT
+# define YAKE_REFLECTION_API YAKE_EXPORT_API
#else
-# define YAKE_REFLECTION_API DLLIMPORT
+# define YAKE_REFLECTION_API YAKE_IMPORT_API
#endif
// luabind versions
Modified: trunk/yake/yake/registryPluginInterface/interface.h
===================================================================
--- trunk/yake/yake/registryPluginInterface/interface.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/registryPluginInterface/interface.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -33,9 +33,9 @@
#include <yake/base/yakePCH.h>
#if defined( YAKE_REGISTRYPLUGININTERFACE_EXPORTS )
-# define YAKE_REGISTRY_PLUGIN_INTERFACE_API DLLEXPORT
+# define YAKE_REGISTRY_PLUGIN_INTERFACE_API YAKE_EXPORT_API
#else
-# define YAKE_REGISTRY_PLUGIN_INTERFACE_API DLLIMPORT
+# define YAKE_REGISTRY_PLUGIN_INTERFACE_API YAKE_IMPORT_API
#endif
//============================================================================
Modified: trunk/yake/yake/scripting/yakeScriptingSystem.h
===================================================================
--- trunk/yake/yake/scripting/yakeScriptingSystem.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/scripting/yakeScriptingSystem.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -36,11 +36,9 @@
#include <yake/base/templates/yakeRegistry.h>
#if defined( YAKE_SCRIPTING_EXPORTS )
-# pragma message("Exporting yake::scripting")
-# define YAKE_SCRIPTING_API DLLEXPORT
+# define YAKE_SCRIPTING_API YAKE_EXPORT_API
#else
-# pragma message("Importing yake::scripting")
-# define YAKE_SCRIPTING_API DLLIMPORT
+# define YAKE_SCRIPTING_API YAKE_IMPORT_API
#endif
namespace yake {
Modified: trunk/yake/yake/task/prerequisites.h
===================================================================
--- trunk/yake/yake/task/prerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/task/prerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -30,9 +30,9 @@
#include <yake/base/yakePrerequisites.h>
#if defined( YAKE_TASK_EXPORTS )
-# define YAKE_TASK_API DLLEXPORT
+# define YAKE_TASK_API YAKE_EXPORT_API
#else
-# define YAKE_TASK_API DLLIMPORT
+# define YAKE_TASK_API YAKE_IMPORT_API
#endif
#endif
Modified: trunk/yake/yake/thread/yakeThreadPrerequisites.h
===================================================================
--- trunk/yake/yake/thread/yakeThreadPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/thread/yakeThreadPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -28,9 +28,9 @@
#define YAKE_THREAD_PREREQUISITES_H
#ifdef YAKE_THREAD_EXPORTS
-# define YAKE_THREAD_API DLLEXPORT
+# define YAKE_THREAD_API YAKE_EXPORT_API
#else
-# define YAKE_THREAD_API DLLIMPORT
+# define YAKE_THREAD_API YAKE_IMPORT_API
#endif
#define YAKE_THREAD_COMMON_POINTERS( CLASS ) \
Modified: trunk/yake/yake/vehicle/yakePrerequisites.h
===================================================================
--- trunk/yake/yake/vehicle/yakePrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/vehicle/yakePrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -28,9 +28,9 @@
#define YAKE_VEHICLE_PREREQUISITES_H
#if defined(YAKE_VEHICLE_EXPORTS)
-# define YAKE_VEH_API DLLEXPORT
+# define YAKE_VEH_API YAKE_EXPORT_API
#else
-# define YAKE_VEH_API DLLIMPORT
+# define YAKE_VEH_API YAKE_IMPORT_API
#endif
#include <yake/model/model.h>
Modified: trunk/yake/yake/yappbase/yappPrerequisites.h
===================================================================
--- trunk/yake/yake/yappbase/yappPrerequisites.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/yappbase/yappPrerequisites.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -28,15 +28,15 @@
#define YAPP_PREREQUISITES_H
#if defined(YAPP_BASE_EXPORTS)
-# define YAPP_BASE_API DLLEXPORT
+# define YAPP_BASE_API YAKE_EXPORT_API
#else
-# define YAPP_BASE_API DLLIMPORT
+# define YAPP_BASE_API YAKE_IMPORT_API
#endif
#if defined(YAPP_GUI_EXPORTS)
-# define YAPP_GUI_API DLLEXPORT
+# define YAPP_GUI_API YAKE_EXPORT_API
#else
-# define YAPP_GUI_API DLLIMPORT
+# define YAPP_GUI_API YAKE_IMPORT_API
#endif
#define YAKE_MEMBER_SIGNAL( NAME, TYPE, ACCESS ) \
Modified: trunk/yake/yake/yappmsg/yakeCommon.h
===================================================================
--- trunk/yake/yake/yappmsg/yakeCommon.h 2007-04-16 20:43:47 UTC (rev 1707)
+++ trunk/yake/yake/yappmsg/yakeCommon.h 2007-04-17 01:01:34 UTC (rev 1708)
@@ -27,15 +27,10 @@
#ifndef YAKE_MSG_COMMON_H
#define YAKE_MSG_COMMON_H
-#if YAKE_PLATFORM == PLATFORM_WIN32
-# if defined(YAKE_MSG_EXPORTS)
-# define YAKE_MSG_API DLLEXPORT
-# else
-# define YAKE_MSG_API DLLIMPORT
-//# pragma comment(lib, "msg.lib")
-# endif
+#if defined(YAKE_MSG_EXPORTS)
+# define YAKE_MSG_API YAKE_EXPORT_API
#else
-# define YAKE_MSG_API
+# define YAKE_MSG_API YAKE_IMPORT_API
#endif
namespace yake {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-16 20:44:37
|
Revision: 1707
http://svn.sourceforge.net/yake/?rev=1707&view=rev
Author: psyclonist
Date: 2007-04-16 13:43:47 -0700 (Mon, 16 Apr 2007)
Log Message:
-----------
deprecated
Removed Paths:
-------------
trunk/yake/scripts/premake/copy_bin_to_samples.cmd
Deleted: trunk/yake/scripts/premake/copy_bin_to_samples.cmd
===================================================================
--- trunk/yake/scripts/premake/copy_bin_to_samples.cmd 2007-04-16 16:50:25 UTC (rev 1706)
+++ trunk/yake/scripts/premake/copy_bin_to_samples.cmd 2007-04-16 20:43:47 UTC (rev 1707)
@@ -1,3 +0,0 @@
-@echo off
-xcopy /y ..\..\common\bin\*_d.dll ..\..\samples\bin\debug\
-pause
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-16 16:52:07
|
Revision: 1706
http://svn.sourceforge.net/yake/?rev=1706&view=rev
Author: psyclonist
Date: 2007-04-16 09:50:25 -0700 (Mon, 16 Apr 2007)
Log Message:
-----------
new audio sample,
improved audio interfaces,
fixed small include order issues,
moved YAKE_LIB define
Modified Paths:
--------------
trunk/yake/documentation/manual/yake-manual.txt
trunk/yake/samples/audio/demo1/demo.cpp
trunk/yake/scripts/premake/samples.lua
trunk/yake/src/plugins/audioOpenAL/yakeAudioSourceOpenAL.cpp
trunk/yake/src/plugins/audioOpenAL/yakeAudioWorldOpenAL.cpp
trunk/yake/yake/audio/yakeAudioPrerequisites.h
trunk/yake/yake/audio/yakeAudioSystem.h
trunk/yake/yake/base/templates/yakeManager.h
trunk/yake/yake/base/yakeLibrary.h
trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h
trunk/yake/yake/raf/yakeApplication.h
Removed Paths:
-------------
trunk/yake/samples/audio/demo1/pch.cpp
Modified: trunk/yake/documentation/manual/yake-manual.txt
===================================================================
--- trunk/yake/documentation/manual/yake-manual.txt 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/documentation/manual/yake-manual.txt 2007-04-16 16:50:25 UTC (rev 1706)
@@ -91,7 +91,7 @@
For specific components/plugins additional dependencies may be required.
-1. ODE 0.6/0.7 for physicsODE
+1. ODE 0.7/0.8 for physicsODE
#. OGRE 1.2.x+ for graphicsOGRE
#. Lua 5.x for scriptingLua, entLua etc
#. Luabind 0.7+ for scriptingLua, entLua etc
Modified: trunk/yake/samples/audio/demo1/demo.cpp
===================================================================
--- trunk/yake/samples/audio/demo1/demo.cpp 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/samples/audio/demo1/demo.cpp 2007-04-16 16:50:25 UTC (rev 1706)
@@ -1,4 +1,5 @@
-#include <yake/samples/audio/demo1/pch.h>
+#include <yake/audio/yakeAudio.h>
+#include <yake/base/yakeLibrary.h>
int main(int argc,char* argv[])
{
@@ -7,44 +8,58 @@
// loading & starting plugin
using namespace yake;
- SharedPtr<base::Library> pLib( new base::Library( "audioOpenAL" ) );
+ SharedPtr<base::Library> pLib( new base::Library( YAKE_LIB("audioOpenAL") ) );
SharedPtr<audio::IAudioSystem> pAudio = templates::create_default<audio::IAudioSystem>();
// create world
- SharedPtr<audio::IWorld> pWorld;
- pWorld.reset( pAudio->createWorld() );
+ audio::WorldPtr world = pAudio->createWorld();
+ /*
// init listener
- SharedPtr<audio::IListener> pListener;
- pListener.reset( pWorld->createListener() );
- pWorld->setActiveListener( pListener.get() );
+ audio::ListenerPtr listener = world->createListener();
+ world->setActiveListener( listener );
// load audio data
- SharedPtr<audio::ISource> pSource1;
- pSource1.reset( pWorld->createSource() );
+ //audio::SourcePtr source = world->createSource();
+ audio::SourcePtr sourceSong = world->createSource();
// create sound souce & attach audio data
- SharedPtr<audio::ISoundData> pData1;
- pData1.reset( pWorld->createSoundDataFromFile("../../media/audio/Forest1.L.wav") );
+ //audio::SoundDataPtr sound1 = world->createSoundDataFromFile("../../../common/media/audio/voice.wav");
+ //sound1->setLoopMode( audio::ISoundData::SLM_LOOP_OFF );
+ //std::cin.get();
+ //audio::SoundDataPtr song = world->createSoundDataFromFile("../../../common/media/audio/stop.ogg",true);
+ audio::SoundDataPtr song = world->createSoundDataFromFile("../../../common/media/audio/test1.ogg",true);
- pSource1->setSoundData( pData1.get() );
+ //std::cin.get();
+ sourceSong->setSoundData( song );
+ //source->setSoundData( sound1 );
+
+ //std::cin.get();
+
// start playing
- pSource1->play();
+ //source->play();
+ sourceSong->play();
+ std::cout << "waiting for play...\n";
+ while (sourceSong->getState() != audio::ISource::Playing)
+ //usleep(1000);
+ Sleep(0);
// wait for stop
std::cout << "running...\npress a key to stop...\n";
- while (!_kbhit())
- ::Sleep(10);
- _getch();
+ std::cin.get();
- pSource1.reset();
- pData1.reset();
- pListener.reset();
- pWorld.reset();
+ song.reset();
+ //sound1.reset();
+ //source.reset();
+ sourceSong.reset();
+ listener.reset();
+ world.reset();
pAudio.reset();
pLib.reset();
- } catch (yake::Exception& e)
+ */
+ }
+ catch (yake::Exception& e)
{
std::cerr << "Caught YAKE Exception:\n" << e.what();
}
Deleted: trunk/yake/samples/audio/demo1/pch.cpp
===================================================================
--- trunk/yake/samples/audio/demo1/pch.cpp 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/samples/audio/demo1/pch.cpp 2007-04-16 16:50:25 UTC (rev 1706)
@@ -1 +0,0 @@
-#include <yake/samples/audio/demo1/pch.h>
Modified: trunk/yake/scripts/premake/samples.lua
===================================================================
--- trunk/yake/scripts/premake/samples.lua 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/scripts/premake/samples.lua 2007-04-16 16:50:25 UTC (rev 1706)
@@ -46,6 +46,13 @@
useComponent("entLua")
--------------------------------------
+makeSample("sampleAudio1","samples/audio/demo1")
+sampleUsesConsole()
+useComponent("base")
+useComponent("audio")
+--useComponent("audioOpenAL")
+
+--------------------------------------
makeSample("samplePhysics1","samples/physics/demo")
useComponent("base")
useComponent("physics")
Modified: trunk/yake/src/plugins/audioOpenAL/yakeAudioSourceOpenAL.cpp
===================================================================
--- trunk/yake/src/plugins/audioOpenAL/yakeAudioSourceOpenAL.cpp 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/src/plugins/audioOpenAL/yakeAudioSourceOpenAL.cpp 2007-04-16 16:50:25 UTC (rev 1706)
@@ -42,6 +42,19 @@
YAKE_EXCEPT(String("Caught OpenAL++ exception:\n") + e.what());
}
}
+ SoundDataStream::SoundDataStream(const String & filename) :
+ SoundDataOpenALBase(kStream,SLM_LOOP_OFF)
+ {
+ try {
+ mSoundData = new openalpp::FileStream( filename.c_str() );
+ openalpp::FileStream* fs = static_cast<openalpp::FileStream*>( mSoundData.get() );
+ YAKE_ASSERT( mSoundData.valid() );
+ }
+ catch (const openalpp::Error& e)
+ {
+ YAKE_EXCEPT(String("Caught OpenAL++ exception:\n") + e.what());
+ }
+ }
SourceOpenAL::SourceOpenAL() : mSoundData( 0 )
{
@@ -91,23 +104,38 @@
return Vector3( x, y, z );
}
- void SourceOpenAL::setSoundData( ISoundData* pSoundData )
+ void SourceOpenAL::setSoundData( SoundDataPtr pSoundData )
{
- YAKE_ASSERT( pSoundData ).debug("Need a valid pointer to sound data!");
if (!pSoundData)
+ {
+ this->stop();
+ mSoundDataPtr.reset();
+ mSoundData = 0;
return;
- mSoundData = static_cast< SoundDataOpenALBase* >( pSoundData );
+ }
+
+ mSoundDataPtr = pSoundData;
+ mSoundData = static_cast< SoundDataOpenALBase* >( pSoundData.get() );
YAKE_ASSERT( mSoundData ).debug("Very bad! Need sound data matching to audio system!");
if (!mSoundData)
return;
YAKE_ASSERT( mSource.valid() );
+ openalpp::Source* source = static_cast<openalpp::Source*>(mSource.get());
if (mSoundData->getType_() == SoundDataOpenALBase::kStream)
- static_cast<openalpp::Source*>(mSource.get())->setSound( static_cast< openalpp::Stream* >( mSoundData->getSoundData_().get() ) );
+ {
+ source->setSound( static_cast< openalpp::Stream* >( mSoundData->getSoundData_().get() ) );
+ source->setAmbient( true ); //@todo make configurable via interface
+ }
else
+ {
if (mSoundData->getType_() == SoundDataOpenALBase::kSample)
- static_cast<openalpp::Source*>(mSource.get())->setSound( static_cast< openalpp::Sample* >( mSoundData->getSoundData_().get() ) );
+ {
+ source->setSound( static_cast< openalpp::Sample* >( mSoundData->getSoundData_().get() ) );
+ source->setAmbient( false ); //@todo make configurable via interface
+ }
+ }
if (mSoundData->getLoopMode() == ISoundData::SLM_LOOP_ON)
mSource->setLooping( true );
Modified: trunk/yake/src/plugins/audioOpenAL/yakeAudioWorldOpenAL.cpp
===================================================================
--- trunk/yake/src/plugins/audioOpenAL/yakeAudioWorldOpenAL.cpp 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/src/plugins/audioOpenAL/yakeAudioWorldOpenAL.cpp 2007-04-16 16:50:25 UTC (rev 1706)
@@ -39,9 +39,9 @@
AudioSystemOpenAL::~AudioSystemOpenAL()
{
}
- IWorld* AudioSystemOpenAL::createWorld()
+ WorldPtr AudioSystemOpenAL::createWorld()
{
- return new WorldOpenAL();
+ return WorldPtr( new WorldOpenAL() );
}
WorldOpenAL::WorldOpenAL() : mEnv(0)
@@ -63,9 +63,9 @@
{
}
- ISoundData* WorldOpenAL::createSoundDataFromFile( const String & filename )
+ SoundDataPtr WorldOpenAL::createSoundDataFromFile( const String & filename, const bool streaming /*= false*/ )
{
- return new SoundDataFile( filename );
+ return streaming ? SoundDataPtr( new SoundDataStream( filename ) ) : SoundDataPtr( new SoundDataFile( filename ) );
}
/*
@@ -79,18 +79,19 @@
return 0;
}*/
- IListener* WorldOpenAL::createListener()
+ ListenerPtr WorldOpenAL::createListener()
{
- return new ListenerOpenAL();
+ return ListenerPtr( new ListenerOpenAL() );
}
- ISource* WorldOpenAL::createSource()
+ SourcePtr WorldOpenAL::createSource()
{
- return new SourceOpenAL();
+ return SourcePtr( new SourceOpenAL() );
}
- void WorldOpenAL::setActiveListener( IListener* pListener )
+ void WorldOpenAL::setActiveListener( ListenerPtr pListener )
{
+ YAKE_ASSERT( false ).warning("setActiveListener: not supported");
}
void WorldOpenAL::setDopplerFactor( real factor )
Modified: trunk/yake/yake/audio/yakeAudioPrerequisites.h
===================================================================
--- trunk/yake/yake/audio/yakeAudioPrerequisites.h 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/yake/audio/yakeAudioPrerequisites.h 2007-04-16 16:50:25 UTC (rev 1706)
@@ -27,6 +27,8 @@
#ifndef YAKE_AUDIOPREREQUISITES_H
#define YAKE_AUDIOPREREQUISITES_H
+#include <yake/base/yakePrerequisites.h>
+
#ifdef YAKE_AUDIO_EXPORTS
# pragma message("Exporting yake::audio")
# define YAKE_AUDIO_API DLLEXPORT
Modified: trunk/yake/yake/audio/yakeAudioSystem.h
===================================================================
--- trunk/yake/yake/audio/yakeAudioSystem.h 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/yake/audio/yakeAudioSystem.h 2007-04-16 16:50:25 UTC (rev 1706)
@@ -28,6 +28,11 @@
#define INC_YAKE_AUDIOSYSTEM_H
#include <yake/audio/yakeAudioPrerequisites.h>
+#include <yake/base/yakeMovable.h>
+#include <yake/base/yakeString.h>
+#include <yake/base/templates/yakeManager.h>
+#include <yake/base/templates/yakeRegistry.h>
+#include <yake/base/templates/yakePointer.h>
namespace yake {
namespace audio {
@@ -68,6 +73,7 @@
//virtual getChannelMode() const = 0;
//virtual getDataMode() const = 0;
};
+ typedef SharedPtr<ISoundData> SoundDataPtr;
/** Represents an emitter of sound.
*/
@@ -78,7 +84,7 @@
virtual void setVelocity( const math::Vector3 & velocity ) = 0;
virtual math::Vector3 getVelocity() const = 0;
- virtual void setSoundData( ISoundData* pSoundData ) = 0;
+ virtual void setSoundData( SoundDataPtr pSoundData ) = 0;
//virtual void setSoundData( const String & resourceName ) = 0;
virtual void play() = 0;
virtual void stop() = 0;
@@ -96,6 +102,7 @@
virtual Quaternion getDerivedOrientation() const
{ return this->getOrientation(); }
};
+ typedef SharedPtr<ISource> SourcePtr;
/** A listener in a world.
*/
@@ -111,6 +118,7 @@
virtual Quaternion getDerivedOrientation() const
{ return this->getOrientation(); }
};
+ typedef SharedPtr<IListener> ListenerPtr;
/** Represents an environment in which an audio simulation takes place.
It also is responsible for creating and managing audio sources and listeners.
@@ -120,7 +128,7 @@
public:
virtual ~IWorld() {}
- virtual ISoundData* createSoundDataFromFile( const String & filename ) = 0;
+ virtual SoundDataPtr createSoundDataFromFile( const String & filename, const bool streaming = false ) = 0;
/*virtual ISoundData* createSoundData( bool b3D,
ISoundData::LoopMode loopMode = ISoundData::SLM_LOOP_OFF,
ISoundData::ChannelMode channelMode = ISoundData::SCM_AUTOSELECT,
@@ -128,17 +136,18 @@
/** Create a listener and return a pointer to it. Ownership remains with the creator.
*/
- virtual IListener* createListener() = 0;
+ virtual ListenerPtr createListener() = 0;
/** Create an audio source. Ownership remains with the creator.
*/
- virtual ISource* createSource() = 0;
+ virtual SourcePtr createSource() = 0;
- virtual void setActiveListener( IListener* pListener ) = 0;
+ virtual void setActiveListener( ListenerPtr pListener ) = 0;
virtual void setDopplerFactor( real factor ) = 0;
virtual void setSoundVelocity( real velocity ) = 0;
};
+ typedef SharedPtr<IWorld> WorldPtr;
/** Audio system interface.
*/
@@ -146,7 +155,7 @@
{
public:
virtual ~IAudioSystem();
- virtual IWorld* createWorld() = 0;
+ virtual WorldPtr createWorld() = 0;
YAKE_DECLARE_REGISTRY_0( IAudioSystem, yake::String )
};
Modified: trunk/yake/yake/base/templates/yakeManager.h
===================================================================
--- trunk/yake/yake/base/templates/yakeManager.h 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/yake/base/templates/yakeManager.h 2007-04-16 16:50:25 UTC (rev 1706)
@@ -37,6 +37,7 @@
// Yake
#include <yake/base/templates/yakeFastMap.h>
#include <yake/base/mpl/null_type.h>
+#include <yake/base/yakeException.h>
//============================================================================
// INTERFACE STRUCTURES / UTILITY CLASSES
Modified: trunk/yake/yake/base/yakeLibrary.h
===================================================================
--- trunk/yake/yake/base/yakeLibrary.h 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/yake/base/yakeLibrary.h 2007-04-16 16:50:25 UTC (rev 1706)
@@ -28,9 +28,6 @@
#define YAKE_BASE_LIBRARY_H
//============================================================================
-// IMPLEMENTATION HEADERS
-//============================================================================
-// Standard headers
#include <yake/base/yakePrerequisites.h>
// Yake
#include <yake/base/yakeString.h>
@@ -38,8 +35,15 @@
#include <yake/base/native/yakeNative.h>
//============================================================================
-// INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
+
+// Define YAKE_LIB() to be used by Configuration objects.
+#if defined(YAKE_DEBUG)
+# define YAKE_LIB_SUFFIX "_d"
+#else
+# define YAKE_LIB_SUFFIX ""
+#endif
+#define YAKE_LIB(NAME) String(String("yake_")+NAME+YAKE_LIB_SUFFIX)
+
namespace yake {
namespace base {
Modified: trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h
===================================================================
--- trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/yake/plugins/audioOpenAL/yakeAudioSystemOpenAL.h 2007-04-16 16:50:25 UTC (rev 1706)
@@ -83,6 +83,11 @@
public:
SoundDataFile( const String & filename );
};
+ class SoundDataStream : public SoundDataOpenALBase
+ {
+ public:
+ SoundDataStream( const String & source );
+ };
class SourceOpenAL : public ISource
{
@@ -92,7 +97,7 @@
virtual void setVelocity( const Vector3 & velocity );
virtual Vector3 getVelocity() const;
- virtual void setSoundData( ISoundData* pSoundData );
+ virtual void setSoundData( SoundDataPtr pSoundData );
//virtual void setSoundData( const String & resourceName );
virtual void play();
virtual void stop();
@@ -107,6 +112,7 @@
protected:
openalpp::ref_ptr<openalpp::SourceBase> mSource;
SoundDataOpenALBase* mSoundData;
+ SoundDataPtr mSoundDataPtr;
Quaternion mOrientation;
};
@@ -134,17 +140,17 @@
WorldOpenAL();
virtual ~WorldOpenAL();
- virtual ISoundData* createSoundDataFromFile( const String & filename );
- /*virtual ISoundData* createSoundData( bool b3D,
+ virtual SoundDataPtr createSoundDataFromFile( const String & filename, const bool streaming = false );
+ /*virtual SoundDataPtr createSoundData( bool b3D,
ISoundData::LoopMode loopMode = ISoundData::SLM_LOOP_OFF,
ISoundData::ChannelMode channelMode = ISoundData::SCM_AUTOSELECT,
ISoundData::DataMode dataMode = ISoundData::SDM_16BITS);*/
- virtual IListener* createListener();
+ virtual ListenerPtr createListener();
- virtual ISource* createSource();
+ virtual SourcePtr createSource();
- virtual void setActiveListener( IListener* pListener );
+ virtual void setActiveListener( ListenerPtr listener );
virtual void setDopplerFactor( real factor );
virtual void setSoundVelocity( real velocity );
@@ -158,7 +164,7 @@
public:
AudioSystemOpenAL();
virtual ~AudioSystemOpenAL();
- virtual IWorld* createWorld();
+ virtual WorldPtr createWorld();
YAKE_DECLARE_CONCRETE( AudioSystemOpenAL, "openalpp" )
};
Modified: trunk/yake/yake/raf/yakeApplication.h
===================================================================
--- trunk/yake/yake/raf/yakeApplication.h 2007-04-15 17:24:40 UTC (rev 1705)
+++ trunk/yake/yake/raf/yakeApplication.h 2007-04-16 16:50:25 UTC (rev 1706)
@@ -27,15 +27,8 @@
#ifndef YAKE_RAF_APPLICATION_H
#define YAKE_RAF_APPLICATION_H
-// Define YAKE_LIB() to be used by Configuration objects.
-#if defined(YAKE_DEBUG)
-# define YAKE_LIB_SUFFIX "_d"
-#else
-# define YAKE_LIB_SUFFIX ""
-#endif
-#define YAKE_LIB(NAME) String(String("yake_")+NAME+YAKE_LIB_SUFFIX)
+#include <yake/base/yakeLibrary.h>
-
namespace yake {
namespace audio {
class IAudioSystem;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-15 17:24:39
|
Revision: 1705
http://svn.sourceforge.net/yake/?rev=1705&view=rev
Author: psyclonist
Date: 2007-04-15 10:24:40 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/yake/dependencies/DEPENDENCIES
Modified: trunk/yake/dependencies/DEPENDENCIES
===================================================================
--- trunk/yake/dependencies/DEPENDENCIES 2007-04-15 17:18:06 UTC (rev 1704)
+++ trunk/yake/dependencies/DEPENDENCIES 2007-04-15 17:24:40 UTC (rev 1705)
@@ -8,7 +8,7 @@
libogg-1.1/
libvorbis-1.0/
luabind/ Luabind SVN HEAD (stable)
-ode/ ode 0.6/0.7
+ode/ ODE 0.8
ogrenew/ OGRE 1.2 (aka Dagon)
cegui/ CEGUI 0.5+
OpenAL/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-15 17:18:12
|
Revision: 1704
http://svn.sourceforge.net/yake/?rev=1704&view=rev
Author: psyclonist
Date: 2007-04-15 10:18:06 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
added proper DLL export for graphicsOgre classes
Modified Paths:
--------------
trunk/yake/src/plugins/graphicsOgre/graphicsOgreNode.cpp
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCamera.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreEntity.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreGeometryAccess.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreLight.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreNode.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreParticleSystem.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreSkeleton.h
trunk/yake/yake/plugins/graphicsOgre/graphicsOgreViewport.h
trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsSystem.h
trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsWorld.h
trunk/yake/yake/plugins/physicsODE/OdeAvatar.h
Added Paths:
-----------
trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h
Modified: trunk/yake/src/plugins/graphicsOgre/graphicsOgreNode.cpp
===================================================================
--- trunk/yake/src/plugins/graphicsOgre/graphicsOgreNode.cpp 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/src/plugins/graphicsOgre/graphicsOgreNode.cpp 2007-04-15 17:18:06 UTC (rev 1704)
@@ -307,15 +307,15 @@
OgreLight* pL = static_cast<OgreLight*>( pLight );
try {
- mSceneNode->getAttachedObject( pL->getLight_()->getName() );
+ mSceneNode->attachObject( pL->getLight_() );
+ //mSceneNode->getAttachedObject( pL->getLight_()->getName() );
}
catch (Ogre::Exception& e)
{
- if (e.getNumber() != Ogre::Exception::ERR_ITEM_NOT_FOUND)
+ //if (e.getNumber() != Ogre::Exception::ERR_ITEM_NOT_FOUND)
{
YAKE_EXCEPT(String("Caught OGRE exception: ") + e.getFullDescription().c_str());
}
- mSceneNode->attachObject( pL->getLight_() );
}
mLights.push_back( pLight );
}
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCamera.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCamera.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreCamera.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -27,11 +27,13 @@
#ifndef INC_YAKE_GRAPHICOGRECAMERA_H
#define INC_YAKE_GRAPHICOGRECAMERA_H
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
+
namespace yake {
namespace graphics {
namespace ogre3d {
- class OgreCamera : public ICamera
+ class YAKE_GRAPHICS_CONCRETE_API OgreCamera : public ICamera
{
OgreCamera();
OgreCamera( const OgreCamera & );
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreEntity.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreEntity.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreEntity.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -32,7 +32,7 @@
namespace ogre3d {
class OgreNode;
- class OgreEntity : public graphics::IEntity
+ class YAKE_GRAPHICS_CONCRETE_API OgreEntity : public graphics::IEntity
{
OgreEntity();
OgreEntity( const OgreEntity& );
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreGeometryAccess.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreGeometryAccess.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreGeometryAccess.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -34,7 +34,7 @@
namespace graphics {
namespace ogre3d {
- class OgreMeshGeometryAccess : public IMeshGeometryAccess
+ class YAKE_GRAPHICS_CONCRETE_API OgreMeshGeometryAccess : public IMeshGeometryAccess
{
private:
Ogre::MeshPtr mMesh;
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreLight.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreLight.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreLight.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -31,7 +31,7 @@
namespace graphics {
namespace ogre3d {
- class OgreLight : public graphics::ILight
+ class YAKE_GRAPHICS_CONCRETE_API OgreLight : public graphics::ILight
{
public:
OgreLight( Ogre::SceneManager* sceneMgr );
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreNode.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreNode.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreNode.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -27,13 +27,15 @@
#ifndef INC_YAKE_GRAPHICOGRENODE_H
#define INC_YAKE_GRAPHICOGRENODE_H
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
+
namespace yake {
namespace graphics {
namespace ogre3d {
class OgreEntity;
class GraphicalWorld;
- class OgreNode : public graphics::ISceneNode
+ class YAKE_GRAPHICS_CONCRETE_API OgreNode : public graphics::ISceneNode
{
public:
OgreNode( GraphicalWorld& owningWorld, Ogre::SceneManager * sceneMgr, const String& name = "" );
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreParticleSystem.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreParticleSystem.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreParticleSystem.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -27,10 +27,12 @@
#ifndef INC_YAKE_GRAPHICOGREPARTICLESYSTEM_H
#define INC_YAKE_GRAPHICOGREPARTICLESYSTEM_H
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
+
namespace yake {
namespace graphics {
- class OgreParticleSystem : public graphics::IParticleSystem
+ class YAKE_GRAPHICS_CONCRETE_API OgreParticleSystem : public graphics::IParticleSystem
{
public:
// for Ogre 1.1.0 "Dagon" compatibility
Added: trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h (rev 0)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -0,0 +1,44 @@
+/*
+ ------------------------------------------------------------------------------------
+ This file is part of YAKE
+ Copyright (c) 2004 - 2008 The YAKE Team
+ For the latest information visit http://www.yake.org
+ ------------------------------------------------------------------------------------
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License along with
+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+ http://www.gnu.org/copyleft/lesser.txt.
+ ------------------------------------------------------------------------------------
+ If you are interested in another license model contact the Yake Team via
+ E-Mail: te...@ya....
+ For more information see the LICENSE file in the root directory of the
+ source code distribution.
+ ------------------------------------------------------------------------------------
+*/
+#ifndef YAKE_GRAPHICS_OGRE_PREREQUISITES_H
+#define YAKE_GRAPHICS_OGRE_PREREQUISITES_H
+
+#if defined( YAKE_GRAPHICSCONCRETEAPI_EXPORTS )
+# define YAKE_GRAPHICS_CONCRETE_API DLLEXPORT
+#else
+# define YAKE_GRAPHICS_CONCRETE_API DLLIMPORT
+#endif
+
+#if YAKE_PLATFORM == PLATFORM_WIN32
+# define YAKE_USE_OSM
+# pragma message("Compiling graphicsOGRE with OSM support.")
+#else
+# pragma message("Compiling graphicsOGRE without OSM support.")
+#endif
+
+#endif
+
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreSkeleton.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreSkeleton.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreSkeleton.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -27,11 +27,13 @@
#ifndef INC_YAKE_GRAPHICSOGRESKELETON_H
#define INC_YAKE_GRAPHICSOGRESKELETON_H
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
+
namespace yake {
namespace graphics {
namespace ogre3d {
- class OgreSkeleton : public graphics::ISkeleton
+ class YAKE_GRAPHICS_CONCRETE_API OgreSkeleton : public graphics::ISkeleton
{
public:
OgreSkeleton( Ogre::Entity& rEntity );
Modified: trunk/yake/yake/plugins/graphicsOgre/graphicsOgreViewport.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/graphicsOgreViewport.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/graphicsOgreViewport.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -27,13 +27,15 @@
#ifndef INC_YAKE_GRAPHICOGREVIEWPORT_H
#define INC_YAKE_GRAPHICOGREVIEWPORT_H
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
+
namespace yake {
namespace graphics {
namespace ogre3d {
class OgreCore;
class OgreCamera;
- class OgreViewport : public graphics::IViewport
+ class YAKE_GRAPHICS_CONCRETE_API OgreViewport : public graphics::IViewport
{
public:
OgreViewport( OgreCore* pCore, OgreCamera* pCamera );
Modified: trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsSystem.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsSystem.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsSystem.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -27,26 +27,9 @@
#ifndef YAKE_PLUGINS_GRAPHICSSYSTEM_H
#define YAKE_PLUGINS_GRAPHICSSYSTEM_H
-//============================================================================
-// IMPLEMENTATION HEADERS
-//============================================================================
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
#include <yake/graphics/yakeGraphicsSystem.h>
#include <yake/graphics/yakeGraphicalWorld.h>
-
-#if defined( YAKE_GRAPHICSCONCRETEAPI_EXPORTS )
-# define YAKE_GRAPHICS_CONCRETE_API DLLEXPORT
-#else
-# define YAKE_GRAPHICS_CONCRETE_API DLLIMPORT
-#endif
-
-#if YAKE_PLATFORM == PLATFORM_WIN32
-# define YAKE_USE_OSM
-# pragma message("Compiling graphicsOGRE with OSM support.")
-#else
-# pragma message("Compiling graphicsOGRE without OSM support.")
-#endif
-
-
#include <yake/plugins/graphicsOgre/yakeGraphicsWorld.h>
//============================================================================
Modified: trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsWorld.h
===================================================================
--- trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsWorld.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/graphicsOgre/yakeGraphicsWorld.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -28,14 +28,11 @@
#define YAKE_PLUGINS_GRAPHICSWORLD_H
//============================================================================
-// IMPLEMENTATION HEADERS
-//============================================================================
+#include <yake/plugins/graphicsOgre/graphicsOgrePrerequisites.h>
#include <yake/graphics/yakeGraphicalWorld.h>
#include <yake/plugins/graphicsOgre/yakeGraphicsSystem.h>
//============================================================================
-// INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
namespace Ogre {
class MeshPtr;
class RaySceneQuery;
Modified: trunk/yake/yake/plugins/physicsODE/OdeAvatar.h
===================================================================
--- trunk/yake/yake/plugins/physicsODE/OdeAvatar.h 2007-04-13 17:08:41 UTC (rev 1703)
+++ trunk/yake/yake/plugins/physicsODE/OdeAvatar.h 2007-04-15 17:18:06 UTC (rev 1704)
@@ -68,6 +68,19 @@
virtual IWorld& getCreator() const;
+ virtual void setSpeed(const real speed)
+ { mSpeed = speed; }
+ virtual real getSpeed() const
+ { return mSpeed; }
+
+ virtual void setAcceleration(const real acc)
+ { mAcceleration = acc; }
+
+ virtual real getAcceleration() const
+ { return mAcceleration; }
+
+ virtual void getShapeSize(real& radius, real& height);
+
YAKE_MEMBERSIGNAL_VIRTUALIMPL(public, void(bool), OnJump)
YAKE_MEMBERSIGNAL_FIRE_FN1(public, OnJump, jumping, bool)
@@ -99,6 +112,7 @@
bool mDucking;
OdeActor* mActor;
+ OdeGeom* mShape;
OdeWorld* mOdeWorld;
OdeRay* mRay;
double mRayLength;
@@ -107,10 +121,15 @@
double mSphereRadius;
Vector3 mSphereOffset;
+ real mCapsuleHeight;
+ real mCapsuleHeightDuck;
real mHeightAboveGround;
real mHeightAboveGroundDuck;
+ real mSpeed;
+ real mAcceleration;
+
yake::SignalConnection mPreStepConn;
yake::SignalConnection mPostStepConn;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-13 17:08:41
|
Revision: 1703
http://svn.sourceforge.net/yake/?rev=1703&view=rev
Author: psyclonist
Date: 2007-04-13 10:08:41 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
logging related fixes
Modified Paths:
--------------
trunk/yake/samples/physics/demo/yakeDemo.cpp
trunk/yake/src/base/yakeLog.cpp
trunk/yake/src/raf/yakeApplication.cpp
Modified: trunk/yake/samples/physics/demo/yakeDemo.cpp
===================================================================
--- trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-04-12 16:04:41 UTC (rev 1702)
+++ trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-04-13 17:08:41 UTC (rev 1703)
@@ -484,8 +484,12 @@
int main(int,char**)
{
+ typedef SharedPtr<logging::log_listener> log_listener_ptr;
+ log_listener_ptr toFile( new yake::logging::file_listener("yake.log") );
+ yake::logging::addListener( toFile.get() );
try
{
+
std::cout << std::endl << "A simple demo :) provided for YAKE by Stephan Kaiser" << std::endl;
std::cout << "For a more sophisticated demo have a look at the Yapp demos," << std::endl << "'sync1' and 'dotLink' and 'dotModel'." << std::endl;
@@ -496,12 +500,13 @@
}
catch (const yake::Exception & e)
{
- std::cout << std::endl << e.what() << std::endl;
+ YAKE_LOG_WARNING("demo", e.what());
+ std::cerr << std::endl << e.what() << std::endl;
}
catch (...)
{
- //YAKE_LOG_ERROR("YAKE catched an unhandled exception");
- std::cout << std::endl << "YAKE catched an unhandled exception." << std::endl;
+ YAKE_LOG_ERROR("demo","YAKE caught an unhandled exception");
+ std::cout << std::endl << "YAKE caught an unhandled exception." << std::endl;
}
#if defined( YAKE_DEBUG_BUILD )
std::cout << std::endl << "Waiting for you...";
Modified: trunk/yake/src/base/yakeLog.cpp
===================================================================
--- trunk/yake/src/base/yakeLog.cpp 2007-04-12 16:04:41 UTC (rev 1702)
+++ trunk/yake/src/base/yakeLog.cpp 2007-04-13 17:08:41 UTC (rev 1703)
@@ -105,6 +105,8 @@
if (!l)
return;
scoped_lock lock;
+ if (instance().targets_.empty())
+ return;
instance().targets_.erase( std::find(instance().targets_.begin(), instance().targets_.end(), l) );
}
void logger::log(const severity_t sev, const char *logId, const char *msg)
Modified: trunk/yake/src/raf/yakeApplication.cpp
===================================================================
--- trunk/yake/src/raf/yakeApplication.cpp 2007-04-12 16:04:41 UTC (rev 1702)
+++ trunk/yake/src/raf/yakeApplication.cpp 2007-04-13 17:08:41 UTC (rev 1703)
@@ -435,9 +435,7 @@
mLibs.clear();
//
- YAKE_LOG_INFORMATION("raf","removing logger.");
- YAKE_FOR_EACH(LogListeners::iterator,itLogListener,mLogListeners)
- logging::removeListener( (*itLogListener).get() );
+ YAKE_LOG_INFORMATION("raf","removing logger(s).");
mLogListeners.clear();
return ret;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-12 16:04:54
|
Revision: 1702
http://svn.sourceforge.net/yake/?rev=1702&view=rev
Author: psyclonist
Date: 2007-04-12 09:04:41 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
updated documentation and scripts
Modified Paths:
--------------
trunk/yake/documentation/api/Doxyfile
Added Paths:
-----------
trunk/yake/documentation/index.html
trunk/yake/scripts/tools/
trunk/yake/scripts/tools/make_api.pl
Modified: trunk/yake/documentation/api/Doxyfile
===================================================================
--- trunk/yake/documentation/api/Doxyfile 2007-04-03 15:09:18 UTC (rev 1701)
+++ trunk/yake/documentation/api/Doxyfile 2007-04-12 16:04:41 UTC (rev 1702)
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.1-p1
+# Doxyfile 1.5.2
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project
@@ -14,6 +14,14 @@
# Project related configuration options
#---------------------------------------------------------------------------
+# This tag specifies the encoding used for all characters in the config file that
+# follow. The default is UTF-8 which is also the encoding used for all text before
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
+# possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
@@ -53,16 +61,6 @@
OUTPUT_LANGUAGE = English
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING = YES
-
# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
# include brief member descriptions after the members that are listed in
# the file and class documentation (similar to JavaDoc).
@@ -214,6 +212,11 @@
BUILTIN_STL_SUPPORT = NO
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
# tag is set to YES, then doxygen will reuse the documentation of the first
# member in the group (if any) for the other members of the group. By default
@@ -471,6 +474,13 @@
INPUT = yake
+# This tag can be used to specify the character encoding of the source files that
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
@@ -514,7 +524,10 @@
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
-EXCLUDE = yake/reflection yake/samples yake/thread yake/yappmsg
+EXCLUDE = yake/reflection \
+ yake/samples \
+ yake/thread \
+ yake/yappmsg
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -530,6 +543,13 @@
EXCLUDE_PATTERNS =
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the output.
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
# the \include command).
@@ -1119,6 +1139,14 @@
CLASS_DIAGRAMS = YES
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to
+# be found in the default search path.
+
+MSCGEN_PATH =
+
# If set to YES, the inheritance and collaboration graphs will hide
# inheritance and usage relations if the target is undocumented
# or is not a class.
@@ -1213,7 +1241,7 @@
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
-DOT_PATH =
+DOT_PATH =
# The DOTFILE_DIRS tag can be used to specify one or more directories that
# contain dot files that are included in the documentation (see the
@@ -1221,34 +1249,14 @@
DOTFILE_DIRS =
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen will always
+# show the root nodes and its direct children regardless of this setting.
-MAX_DOT_GRAPH_WIDTH = 1024
+DOT_GRAPH_MAX_NODES = 50
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that a graph may be further truncated if the graph's
-# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH
-# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default),
-# the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH = 1000
-
# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
# background. This is disabled by default, which results in a white background.
# Warning: Depending on the platform used, enabling this option may lead to
Added: trunk/yake/documentation/index.html
===================================================================
--- trunk/yake/documentation/index.html (rev 0)
+++ trunk/yake/documentation/index.html 2007-04-12 16:04:41 UTC (rev 1702)
@@ -0,0 +1,19 @@
+<html>
+ <head>
+ <title>Yake Documentation Overview</title>
+ <link type="text/css" href="manual/yake-manual.css" rel="stylesheet">
+ </head>
+ <body>
+ <h1>Documentation</h1>
+ <p>If this is a source release package (as downloaded from the Yake website)
+ or if you have generated the documentation yourself then you can use the
+ following two links to navigate to the main documentation items.
+ </p>
+ <p>
+ <ul>
+ <li><a style="font-weight:bold" href="manual/yake-manual.html">Manual</a></li>
+ <li><a style="font-weight:bold" href="api/html/index.html">API Reference</a></li>
+ </ul>
+ </p>
+ </body>
+</html>
Added: trunk/yake/scripts/tools/make_api.pl
===================================================================
--- trunk/yake/scripts/tools/make_api.pl (rev 0)
+++ trunk/yake/scripts/tools/make_api.pl 2007-04-12 16:04:41 UTC (rev 1702)
@@ -0,0 +1,14 @@
+print "Generating API reference...\n\n";
+
+# Windows: where returns 256 for 'not found' and 0 for 'found'.
+`where /q doxygen`;
+if ($? == 256)
+{
+ print("Error: Could not locate doxygen. Bailing out.\n");
+ exit
+}
+
+`cd ../.. && doxygen documentation/api/doxyfile`;
+print $? . " \n"
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-03 15:09:18
|
Revision: 1701
http://svn.sourceforge.net/yake/?rev=1701&view=rev
Author: psyclonist
Date: 2007-04-03 08:09:18 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
updated dependencies
Modified Paths:
--------------
trunk/yake/dependencies/DEPENDENCIES
Modified: trunk/yake/dependencies/DEPENDENCIES
===================================================================
--- trunk/yake/dependencies/DEPENDENCIES 2007-04-03 15:06:58 UTC (rev 1700)
+++ trunk/yake/dependencies/DEPENDENCIES 2007-04-03 15:09:18 UTC (rev 1701)
@@ -1,19 +1,28 @@
+--------------------------------------------------
+dependencies
+--------------------------------------------------
-boost/ <= 1.33.1 (1.33.0 and 1.32.x *should* work, too)
-cegui_mk2/
-enet/ <= enet 1.0
+boost/ 1.33.x (1.32.x should work, too)
+lua/ Lua 5.1.x
+enet/ enet 1.0
libogg-1.1/
libvorbis-1.0/
-loki/
-lua/ <= Lua 5.1.1
-luabind/ <= Luabind 0.7 patched for lua 5.1.1 compatibility
-ode/ <= ode 0.6 (0.5 should work)
-ogrenew/ <= OGRE 1.2 (aka Dagon)
+luabind/ Luabind SVN HEAD (stable)
+ode/ ode 0.6/0.7
+ogrenew/ OGRE 1.2 (aka Dagon)
+cegui/ CEGUI 0.5+
OpenAL/
openalpp/
OpenThreads/
-oSceneLoaderLib/ <= pseudo-.scene loader :P (for OGRE 1.2 Dagon)
+oSceneLoaderLib/ pseudo-.scene loader :P (used with Ogre)
tinyxml/
+freealut/ freealut 1.1.0
+
+
+--------------------------------------------------
+deprecated dependencies (i.e. not in use anymore)
+--------------------------------------------------
+
ttl/
zThread/
-freealut/ <= freealut 1.1.0
+loki/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-03 15:06:59
|
Revision: 1700
http://svn.sourceforge.net/yake/?rev=1700&view=rev
Author: psyclonist
Date: 2007-04-03 08:06:58 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
updated build scripts
Modified Paths:
--------------
trunk/yake/scripts/premake/deps.lua
trunk/yake/scripts/premake/samples.lua
trunk/yake/scripts/premake/tools.lua
trunk/yake/scripts/premake/yake.lua
Modified: trunk/yake/scripts/premake/deps.lua
===================================================================
--- trunk/yake/scripts/premake/deps.lua 2007-04-03 15:06:19 UTC (rev 1699)
+++ trunk/yake/scripts/premake/deps.lua 2007-04-03 15:06:58 UTC (rev 1700)
@@ -1,4 +1,11 @@
--------------------------------------
+-- Dependency package boost
+--------------------------------------
+defDep("boost")
+defDepIncludePath("boost","dependencies/boost")
+defDepLibraryPath("boost","dependencies/boost/stage/lib")
+
+--------------------------------------
-- Dependency package OGRE
--------------------------------------
defDep("ogre")
@@ -61,7 +68,7 @@
-- Dependency package Lua
--------------------------------------
defDep("lua")
-defDepIncludePath("lua", "dependencies/lua/include")
+defDepIncludePath("lua", "dependencies/lua/src")
defDepLibraryPath("lua","dependencies/lua/lib")
defDepLibrary("lua","lua","Release")
defDepLibrary("lua","lua","ReleaseWithSymbols")
@@ -90,11 +97,11 @@
if (windows) then
defDepLibraryPath("oalpp","dependencies/OpenThreads/lib/win32")
end
-defDepLibraryPath("oalpp","dependencies/openalpp/lib")
+defDepLibraryPath("oalpp","dependencies/openalpp/lib")
if (windows) then
defDepLibrary("oalpp","oalpp","Release")
defDepLibrary("oalpp","oalpp","ReleaseWithSymbols")
defDepLibrary("oalpp","oalppd","Debug")
-elseif (linux) then
- defDepLibrary("oalpp","libopenalpp")
-end
+elseif (linux) then
+ defDepLibrary("oalpp","libopenalpp")
+end
Modified: trunk/yake/scripts/premake/samples.lua
===================================================================
--- trunk/yake/scripts/premake/samples.lua 2007-04-03 15:06:19 UTC (rev 1699)
+++ trunk/yake/scripts/premake/samples.lua 2007-04-03 15:06:58 UTC (rev 1700)
@@ -124,7 +124,6 @@
useComponent("netrepsvc")
useComponent("model")
useComponent("ent")
- addIncludePath("dependencies/boost")
addMatching("samples/net/roclient/roclient*")
addMatching("samples/net/roserver/roserver*")
end
@@ -148,7 +147,7 @@
useComponent("net")
useComponent("netsvc")
addIncludePath("dependencies/boost")
- addMatching("samples/net/roclient/roclient*")
+addMatching("samples/net/roclient/roclient*")
end
--------------------------------------
@@ -175,5 +174,8 @@
useComponent("task")
useComponent("scripting")
useComponent("bindings.lua")
+ useComponent("scriptingLua")
+ useDep("lua")
+ useDep("luabind")
end
end
Modified: trunk/yake/scripts/premake/tools.lua
===================================================================
--- trunk/yake/scripts/premake/tools.lua 2007-04-03 15:06:19 UTC (rev 1699)
+++ trunk/yake/scripts/premake/tools.lua 2007-04-03 15:06:58 UTC (rev 1700)
@@ -256,6 +256,7 @@
if (exportDefine) then
tinsert(package.defines,exportDefine)
end
+ useDep("boost")
end
--------------------------------------
@@ -334,6 +335,9 @@
addMatching(path.."/*.cpp")
addMatching(path.."/*.h")
addMatching(path.."/*.inl")
+
+ -- core dependencies
+ useDep("boost")
end
-- Mostly used in samples.lua and custom.lua
Modified: trunk/yake/scripts/premake/yake.lua
===================================================================
--- trunk/yake/scripts/premake/yake.lua 2007-04-03 15:06:19 UTC (rev 1699)
+++ trunk/yake/scripts/premake/yake.lua 2007-04-03 15:06:58 UTC (rev 1700)
@@ -105,6 +105,7 @@
elseif (linux) then
addMatching("src/base/native/Linux/*.cpp")
end
+ useDep("boost")
--------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-03 15:06:39
|
Revision: 1699
http://svn.sourceforge.net/yake/?rev=1699&view=rev
Author: psyclonist
Date: 2007-04-03 08:06:19 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
removed explicit linking via pragmas for demo 'sampleTaskLua1'
Modified Paths:
--------------
trunk/yake/samples/task/lua1/demo.cpp
Modified: trunk/yake/samples/task/lua1/demo.cpp
===================================================================
--- trunk/yake/samples/task/lua1/demo.cpp 2007-04-03 15:05:47 UTC (rev 1698)
+++ trunk/yake/samples/task/lua1/demo.cpp 2007-04-03 15:06:19 UTC (rev 1699)
@@ -3,10 +3,6 @@
#include <yake/bindings.lua/bindings.lua.h>
#include <luabind/luabind.hpp>
-#pragma comment(lib,"luabindd.lib")
-#pragma comment(lib,"luad.lib")
-#pragma comment(lib,"yake_bindings.lua_d.lib")
-#pragma comment(lib,"yake_scriptingLua_d.lib")
void main()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-04-03 15:05:57
|
Revision: 1698
http://svn.sourceforge.net/yake/?rev=1698&view=rev
Author: psyclonist
Date: 2007-04-03 08:05:47 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
removed warning
Modified Paths:
--------------
trunk/yake/src/base/native/win32/yakeConfig.cpp
Modified: trunk/yake/src/base/native/win32/yakeConfig.cpp
===================================================================
--- trunk/yake/src/base/native/win32/yakeConfig.cpp 2007-03-28 15:32:45 UTC (rev 1697)
+++ trunk/yake/src/base/native/win32/yakeConfig.cpp 2007-04-03 15:05:47 UTC (rev 1698)
@@ -48,7 +48,6 @@
} // native
} // yake
-#pragma message("WARNING: g_hInstance is not set")
BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID )
{
if( dwReason == DLL_PROCESS_ATTACH )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 15:32:45
|
Revision: 1697
http://svn.sourceforge.net/yake/?rev=1697&view=rev
Author: psyclonist
Date: 2007-03-28 08:32:45 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
physicsOde: ray stores reference to hit actor (modified patch #19)
Modified Paths:
--------------
trunk/yake/src/plugins/physicsODE/OdeRay.cpp
trunk/yake/yake/plugins/physicsODE/OdeRay.h
Modified: trunk/yake/src/plugins/physicsODE/OdeRay.cpp
===================================================================
--- trunk/yake/src/plugins/physicsODE/OdeRay.cpp 2007-03-28 15:27:09 UTC (rev 1696)
+++ trunk/yake/src/plugins/physicsODE/OdeRay.cpp 2007-03-28 15:32:45 UTC (rev 1697)
@@ -27,6 +27,7 @@
#include <yake/plugins/physicsODE/yakePCH.h>
#include <yake/plugins/physicsODE/OdeWorld.h>
#include <yake/plugins/physicsODE/OdeRay.h>
+#include <yake/plugins/physicsODE/OdeActor.h>
namespace yake {
namespace physics {
@@ -35,7 +36,8 @@
//-----------------------------------------------------
OdeRay::OdeRay(OdeWorld* world, const real length) :
mWorld(world),
- mLength(length)
+ mLength(length),
+ mIntersectionActor(0)
{
YAKE_ASSERT( mWorld );
YAKE_ASSERT( length > 0 );
@@ -71,6 +73,9 @@
// As we have passed dCollide the ray as the first parameter, the normal
// is oriented correctly for ray deflection from the surface.
mIntersectionNormal = Vector3( real(contact.geom.normal[0]), real(contact.geom.normal[1]), real(contact.geom.normal[2]) );
+ //Store the actor the ray collide with.
+ void* data = dGeomGetData( geomOther );
+ mIntersectionActor = data ? static_cast<OdeGeom*>( data )->getOwner() : 0;
}
}
real OdeRay::length() const
@@ -132,6 +137,10 @@
}
return Quaternion::kIdentity;
}
+ IActor* OdeRay::intersectionActor() const
+ {
+ return mIntersectionActor;
+ }
} // physics
} // yake
Modified: trunk/yake/yake/plugins/physicsODE/OdeRay.h
===================================================================
--- trunk/yake/yake/plugins/physicsODE/OdeRay.h 2007-03-28 15:27:09 UTC (rev 1696)
+++ trunk/yake/yake/plugins/physicsODE/OdeRay.h 2007-03-28 15:32:45 UTC (rev 1697)
@@ -48,6 +48,7 @@
real intersectionDepth() const;
math::Vector3 intersectionPoint() const;
math::Vector3 intersectionNormal() const;
+ IActor* intersectionActor() const;
virtual void setPosition( math::Vector3 const& rPosition);
virtual math::Vector3 getPosition() const;
@@ -86,6 +87,8 @@
typedef std::deque<dGeomID> GeomIdList;
GeomIdList mIgnoreGeoms;
+
+ OdeActor* mIntersectionActor;
};
} // physics
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 15:27:09
|
Revision: 1696
http://svn.sourceforge.net/yake/?rev=1696&view=rev
Author: psyclonist
Date: 2007-03-28 08:27:09 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
fixed static-vs-static actor bug (patch),
improved exception safety,
new parameters for OdeWorld: num_iterations, ERP, CFM (patch)
Modified Paths:
--------------
trunk/yake/src/plugins/physicsODE/OdeWorld.cpp
trunk/yake/yake/plugins/physicsODE/OdeWorld.h
Modified: trunk/yake/src/plugins/physicsODE/OdeWorld.cpp
===================================================================
--- trunk/yake/src/plugins/physicsODE/OdeWorld.cpp 2007-03-28 15:24:23 UTC (rev 1695)
+++ trunk/yake/src/plugins/physicsODE/OdeWorld.cpp 2007-03-28 15:27:09 UTC (rev 1696)
@@ -43,30 +43,29 @@
//-----------------------------------------------------
OdeWorld::OdeWorld() : mNextMeshId( 0 ), mTimeOverflow(0.)
{
- //TODO make these settings configurable for user
//simulation
mStepSize = real( 1./50. );
- mOdeWorld = new dWorld();
- YAKE_ASSERT( mOdeWorld );
+ mOdeWorld.reset( new dWorld() );
- mOdeSpace = new dSimpleSpace( 0 );
- YAKE_ASSERT( mOdeSpace );
+ //mOdeSpace.reset( new dSimpleSpace( 0 ) );
+ mOdeSpace.reset( new dHashSpace( 0 ) );
+ //dHashSpaceSetLevels (mOdeSpace->id(),10, 20);
- mOdeContactGroup = new dJointGroup( 0 );
+ mOdeContactGroup.reset( new dJointGroup( 0 ) );
mOdeWorld->setAutoDisableFlag( 1 );
mOdeWorld->setAutoDisableAngularThreshold( dReal(0.01) ); // ODE default: 0.01
mOdeWorld->setAutoDisableLinearThreshold( dReal(0.01) ); // ODE default: 0.01
mOdeWorld->setAutoDisableSteps( 10 ); // ODE default: 10
- mOdeWorld->setAutoDisableTime( 0 ); // ODE default: 0. (= ignore time)
+ mOdeWorld->setAutoDisableTime( 0 ); // ODE default: 0. (= ignore time)*/
// We do not set any default gravity setting
// as we don't want to enforce a specific coordinate system.
// mOdeWorld->setGravity( 0., -9.81, 0. );
- // Global ERP and CFM values should be configurable via some (properties?) interface
+ // Global ERP and CFM values are configurable via the properties interface
// Individual values ( for joints and such ) should also be accessable
// perhaps via direct_ode access.
mOdeWorld->setCFM( dReal(0.001) );
@@ -77,7 +76,6 @@
dWorldSetContactMaxCorrectingVel( mOdeWorld->id(), dReal(2.) );
dWorldSetContactSurfaceLayer( mOdeWorld->id(), dReal(0.01) );
-
mTime = real(0.);
mMaterials["default"] = SharedPtr<OdeMaterial>(new OdeMaterial("default"));
@@ -103,9 +101,9 @@
YAKE_SAFE_DELETE_ARRAY( mesh_data.normals );
}
- YAKE_SAFE_DELETE( mOdeContactGroup );
- YAKE_SAFE_DELETE( mOdeSpace );
- YAKE_SAFE_DELETE( mOdeWorld );
+ mOdeContactGroup.reset();
+ mOdeSpace.reset();
+ mOdeWorld.reset();
}
//-----------------------------------------------------
@@ -210,6 +208,18 @@
{
mStepSize = boost::any_cast<real>(rValue);
}
+ else if (rName == "num_iterations")
+ {
+ dWorldSetQuickStepNumIterations( mOdeWorld->id(), boost::any_cast<int>(rValue));
+ }
+ else if (rName == "ERP")
+ {
+ mOdeWorld->setERP(boost::any_cast<real>(rValue));
+ }
+ else if (rName == "CFM")
+ {
+ mOdeWorld->setCFM(boost::any_cast<real>(rValue));
+ }
} catch (boost::bad_any_cast& e)
{
YAKE_EXCEPT(String("Failed to set solver parameter! (") + e.what() + ")");
@@ -516,6 +526,8 @@
if ( b1 && b2 && dAreConnected( b1, b2 ) )
return;
+
+
void* data1 = dGeomGetData( o1 );
void* data2 = dGeomGetData( o2 );
@@ -533,12 +545,12 @@
{
OdeActor* pA = static_cast<OdeGeom*>( data1 )->getOwner();
OdeActor* pB = static_cast<OdeGeom*>( data2 )->getOwner();
-
+
if (!pA || !pB)
return;
// collision between two static objects: do nothing
- if ((pA->getType() == ACTOR_STATIC) && (pA->getType() == ACTOR_STATIC))
+ if ((pA->getType() == ACTOR_STATIC) && (pB->getType() == ACTOR_STATIC))
{
return;
}
Modified: trunk/yake/yake/plugins/physicsODE/OdeWorld.h
===================================================================
--- trunk/yake/yake/plugins/physicsODE/OdeWorld.h 2007-03-28 15:24:23 UTC (rev 1695)
+++ trunk/yake/yake/plugins/physicsODE/OdeWorld.h 2007-03-28 15:27:09 UTC (rev 1696)
@@ -88,10 +88,10 @@
// helpers
dWorldID _getOdeID() const;
dJointGroup* _getOdeContactJointGroup() const
- { return mOdeContactGroup; }
+ { return mOdeContactGroup.get(); }
dSpace* _getOdeSpace() const
- { return mOdeSpace; }
+ { return mOdeSpace.get(); }
dSpaceID _getOdeSpaceID() const
{ return mOdeSpace->id(); }
@@ -110,9 +110,9 @@
real mTimeOverflow;
real mTime;
real mStepSize;
- dWorld* mOdeWorld;
- dJointGroup* mOdeContactGroup;
- dSpace* mOdeSpace;
+ SharedPtr<dWorld> mOdeWorld;
+ SharedPtr<dJointGroup> mOdeContactGroup;
+ SharedPtr<dSpace> mOdeSpace;
typedef std::vector< OdeBody* > BodyList;
BodyList mBodies;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 15:24:27
|
Revision: 1695
http://svn.sourceforge.net/yake/?rev=1695&view=rev
Author: psyclonist
Date: 2007-03-28 08:24:23 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
added physics::IActor::getType() (part of patch #18)
Modified Paths:
--------------
trunk/yake/yake/physics/yakePhysicsActor.h
trunk/yake/yake/plugins/physicsODE/OdeActor.h
Modified: trunk/yake/yake/physics/yakePhysicsActor.h
===================================================================
--- trunk/yake/yake/physics/yakePhysicsActor.h 2007-03-28 15:09:56 UTC (rev 1694)
+++ trunk/yake/yake/physics/yakePhysicsActor.h 2007-03-28 15:24:23 UTC (rev 1695)
@@ -115,6 +115,8 @@
virtual void setEnabled(const bool enabled) = 0;
virtual bool isEnabled() const = 0;
+ virtual ActorType getType() const = 0;
+
YAKE_MEMBERSIGNAL_PUREINTERFACE( public, void(const ActorCollisionInfo&), CollisionEntered )
YAKE_MEMBERSIGNAL_PUREINTERFACE( public, void(const ActorCollisionInfo&), CollisionExited )
};
Modified: trunk/yake/yake/plugins/physicsODE/OdeActor.h
===================================================================
--- trunk/yake/yake/plugins/physicsODE/OdeActor.h 2007-03-28 15:09:56 UTC (rev 1694)
+++ trunk/yake/yake/plugins/physicsODE/OdeActor.h 2007-03-28 15:24:23 UTC (rev 1695)
@@ -77,7 +77,7 @@
bool isSpaceEmpty();
- ActorType getType() const
+ virtual ActorType getType() const
{ return type_; }
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 15:09:56
|
Revision: 1694
http://svn.sourceforge.net/yake/?rev=1694&view=rev
Author: psyclonist
Date: 2007-03-28 08:09:56 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
added comment
Modified Paths:
--------------
trunk/yake/src/net/detail/netEventConnection.cpp
Modified: trunk/yake/src/net/detail/netEventConnection.cpp
===================================================================
--- trunk/yake/src/net/detail/netEventConnection.cpp 2007-03-28 15:07:48 UTC (rev 1693)
+++ trunk/yake/src/net/detail/netEventConnection.cpp 2007-03-28 15:09:56 UTC (rev 1694)
@@ -210,7 +210,7 @@
return; //@FIXME increase error count !?
}
- // copy data
+ // copy data //@todo optimize away copy of packet data?!
bitstream_data data;
data.resize( dataLen );
for (size_t i=0; i<dataLen; ++i)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 15:07:49
|
Revision: 1693
http://svn.sourceforge.net/yake/?rev=1693&view=rev
Author: psyclonist
Date: 2007-03-28 08:07:48 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
replaced hash_map with map (fixed issue: #0000013)
Modified Paths:
--------------
trunk/yake/src/base/templates/yakeSmartAssert.cpp
Modified: trunk/yake/src/base/templates/yakeSmartAssert.cpp
===================================================================
--- trunk/yake/src/base/templates/yakeSmartAssert.cpp 2007-03-28 14:57:22 UTC (rev 1692)
+++ trunk/yake/src/base/templates/yakeSmartAssert.cpp 2007-03-28 15:07:48 UTC (rev 1693)
@@ -132,7 +132,7 @@
}
// output values
- for ( HashMap< String, String, _StringHash >::const_iterator it = mValueMap.begin();
+ for ( ValueMapT::const_iterator it = mValueMap.begin();
it != mValueMap.end();
++it )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 14:57:26
|
Revision: 1692
http://svn.sourceforge.net/yake/?rev=1692&view=rev
Author: psyclonist
Date: 2007-03-28 07:57:22 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
replaced hash_map with map (fixed issue: #0000013)
Modified Paths:
--------------
trunk/yake/yake/base/prerequisites/yakePrerequisitesGCC.h
trunk/yake/yake/base/prerequisites/yakePrerequisitesGCCWin.h
trunk/yake/yake/base/prerequisites/yakePrerequisitesVC.h
trunk/yake/yake/base/prerequisites/yakeStringGCC.h
trunk/yake/yake/base/prerequisites/yakeStringGCCWin.h
trunk/yake/yake/base/prerequisites/yakeStringHashFun.h
trunk/yake/yake/base/prerequisites/yakeStringVC71.h
trunk/yake/yake/base/prerequisites/yakeStringVC8.h
trunk/yake/yake/base/templates/yakeSmartAssert.h
trunk/yake/yake/base/yakeString.h
Modified: trunk/yake/yake/base/prerequisites/yakePrerequisitesGCC.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakePrerequisitesGCC.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakePrerequisitesGCC.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -51,9 +51,6 @@
# endif
#endif
-#include "yakeStringGCC.h"
-//# include "yakePrerequisitesGCCTypes.h"
-
//============================================================================
// INTERFACE STRUCTURES / UTILITY CLASSES
//============================================================================
@@ -65,14 +62,14 @@
namespace yake
{
-typedef signed char int8;
-typedef unsigned char uint8;
-typedef signed short int16;
-typedef unsigned short uint16;
-typedef signed int int32;
-typedef unsigned int uint32;
-typedef long long int64;
-typedef unsigned long long uint64;
+ typedef signed char int8;
+ typedef unsigned char uint8;
+ typedef signed short int16;
+ typedef unsigned short uint16;
+ typedef signed int int32;
+ typedef unsigned int uint32;
+ typedef long long int64;
+ typedef unsigned long long uint64;
}
// Stl workarounds
@@ -86,15 +83,6 @@
# error("Yake: No configuration file set for the selected platform/compiler!")
#endif
-// String specialization
-#if !defined ( _STLP_HASH_FUN_H )
-# include "yakeStringGCC.h"
-#else
-# include "yakeStringHashFun.h"
-#endif
-
-
-
//============================================================================
// INTERFACE STRUCTURES / UTILITY CLASSES
//============================================================================
Modified: trunk/yake/yake/base/prerequisites/yakePrerequisitesGCCWin.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakePrerequisitesGCCWin.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakePrerequisitesGCCWin.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -32,15 +32,14 @@
//============================================================================
// GCC specific headers
#include <wchar.h>
-#include "yakeStringGCCWin.h"
// Include platform specific configuration files
#if (YAKE_PLATFORM == PLATFORM_WIN32) && (YAKE_COMPILER == COMPILER_GNUC)
# pragma message("Yake platform/compiler config: yake.base.prerequisites.GCCWin")
//# include "yakePrerequisitesGCCWarnings.h"
//# include <wchar.h>
-# include <ext/hash_map>
-# include <ext/hash_fun.h>
+//# include <ext/hash_map>
+//# include <ext/hash_fun.h>
//# include "yakePrerequisitesGCCTypes.h"
//============================================================================
@@ -54,15 +53,15 @@
namespace yake
{
-typedef signed char int8;
-typedef unsigned char uint8;
-typedef signed short int16;
-typedef unsigned short uint16;
-typedef signed int int32;
-typedef unsigned int uint32;
-typedef long long int64;
-typedef unsigned long long uint64;
-typedef float real;
+ typedef signed char int8;
+ typedef unsigned char uint8;
+ typedef signed short int16;
+ typedef unsigned short uint16;
+ typedef signed int int32;
+ typedef unsigned int uint32;
+ typedef long long int64;
+ typedef unsigned long long uint64;
+ typedef float real;
}
// Stl workarounds
@@ -76,15 +75,7 @@
# error("Yake: GCC/Win32: No configuration file set for the selected platform/compiler!")
#endif
-// String specialization
-#if !defined ( _STLP_HASH_FUN_H )
-# include "yakeStringGCC.h"
-#else
-# include "yakeStringHashFun.h"
-#endif
-
-
//============================================================================
// INTERFACE STRUCTURES / UTILITY CLASSES
//============================================================================
Modified: trunk/yake/yake/base/prerequisites/yakePrerequisitesVC.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakePrerequisitesVC.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakePrerequisitesVC.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -54,16 +54,6 @@
# error("Yake platform/compiler error: no configuration file set for the selected platform/compiler!")
#endif
-// String specialization
-#if !defined( _STLP_HASH_FUN_H ) && ( YAKE_COMP_VER == 1310 )
-# include "yakeStringVC71.h"
-#elif !defined ( _STLP_HASH_FUN_H ) && ( YAKE_COMP_VER == 1400 )
-# include "yakeStringVC8.h"
-#else
-# include "yakeStringHashFun.h"
-#endif
-
-
//============================================================================
// INTERFACE STRUCTURES / UTILITY CLASSES
//============================================================================
Modified: trunk/yake/yake/base/prerequisites/yakeStringGCC.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakeStringGCC.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakeStringGCC.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -41,36 +41,9 @@
namespace yake
{
-typedef std::string YAKE_BASE_STRING;
+ typedef std::string YAKE_BASE_STRING;
} // yake
-#ifndef GNU_STD_EXTENSION_HASH_STRING
-#define GNU_STD_EXTENSION_HASH_STRING
-namespace __gnu_cxx
-{
-template <> struct hash< yake::YAKE_BASE_STRING >
-{
-size_t operator()( const yake::YAKE_BASE_STRING _stringBase ) const
-{
- /* This is the PRO-STL way, but it seems to cause problems with VC7.1
- * and in some other cases (although I can't recreate it)
- * hash<const char*> H;
- * return H(_stringBase.c_str());
- */
- /** This is our custom way */
- register size_t ret = 0;
- for( yake::YAKE_BASE_STRING::const_iterator it = _stringBase.begin(); it != _stringBase.end(); ++it )
- ret = 5 * ret + *it;
- return ret;
-}
-};
-
-} // __gnu_cxx
-#endif //GNU_STD_EXTENSION_HASH_STRING
-
-typedef ::__gnu_cxx::hash < yake::YAKE_BASE_STRING > _StringHash;
-
-
#endif
Modified: trunk/yake/yake/base/prerequisites/yakeStringGCCWin.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakeStringGCCWin.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakeStringGCCWin.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -41,38 +41,9 @@
namespace yake
{
-typedef std::string YAKE_BASE_STRING;
+ typedef std::string YAKE_BASE_STRING;
} // yake
-#include <ext/hash_fun.h>
-#ifndef GNU_STD_EXTENSION_HASH_STRING
-#define GNU_STD_EXTENSION_HASH_STRING
-namespace __gnu_cxx
-{
-
-template <> struct hash< yake::YAKE_BASE_STRING >
-{
-size_t operator()( const yake::YAKE_BASE_STRING _stringBase ) const
-{
- /* This is the PRO-STL way, but it seems to cause problems with VC7.1
- * and in some other cases (although I can't recreate it)
- * hash<const char*> H;
- * return H(_stringBase.c_str());
- */
- /** This is our custom way */
- register size_t ret = 0;
- for( yake::YAKE_BASE_STRING::const_iterator it = _stringBase.begin(); it != _stringBase.end(); ++it )
- ret = 5 * ret + *it;
- return ret;
-}
-};
-
-} // __gnu_cxx
-#endif //GNU_STD_EXTENSION_HASH_STRING
-
-typedef ::__gnu_cxx::hash < yake::YAKE_BASE_STRING > _StringHash;
-
-
#endif
Modified: trunk/yake/yake/base/prerequisites/yakeStringHashFun.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakeStringHashFun.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakeStringHashFun.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -32,7 +32,6 @@
namespace yake {
typedef std::string YAKE_BASE_STRING;
- typedef std::hash< YAKE_BASE_STRING > _StringHash;
} // yake
Modified: trunk/yake/yake/base/prerequisites/yakeStringVC71.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakeStringVC71.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakeStringVC71.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -32,7 +32,6 @@
namespace yake {
typedef std::string YAKE_BASE_STRING;
- typedef stdext::hash_compare< YAKE_BASE_STRING, std::less< YAKE_BASE_STRING > > _StringHash;
} // yake
Modified: trunk/yake/yake/base/prerequisites/yakeStringVC8.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakeStringVC8.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/prerequisites/yakeStringVC8.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -33,7 +33,6 @@
{
typedef std::string YAKE_BASE_STRING;
- typedef stdext::hash_compare< YAKE_BASE_STRING, std::less< YAKE_BASE_STRING > > _StringHash;
} // yake
Modified: trunk/yake/yake/base/templates/yakeSmartAssert.h
===================================================================
--- trunk/yake/yake/base/templates/yakeSmartAssert.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/templates/yakeSmartAssert.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -66,7 +66,7 @@
String mFile;
int32 mLine;
String mExpr;
- typedef HashMap< String, String, _StringHash > ValueMapT;
+ typedef AssocVector< String, String > ValueMapT;
ValueMapT mValueMap;
std::vector< String > mMsgs;
AssertionLevel mLevel;
Modified: trunk/yake/yake/base/yakeString.h
===================================================================
--- trunk/yake/yake/base/yakeString.h 2007-03-28 09:47:36 UTC (rev 1691)
+++ trunk/yake/yake/base/yakeString.h 2007-03-28 14:57:22 UTC (rev 1692)
@@ -40,9 +40,7 @@
//============================================================================
namespace yake {
-//typedef std::string YAKE_BASE_STRING;
-
- typedef YAKE_BASE_API YAKE_BASE_STRING String;
+ typedef YAKE_BASE_API std::string String;
typedef YAKE_BASE_API std::stringstream StrStream;
template<typename T>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 09:47:35
|
Revision: 1691
http://svn.sourceforge.net/yake/?rev=1691&view=rev
Author: psyclonist
Date: 2007-03-28 02:47:36 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/yake/documentation/api/makeDocs.cmd
Deleted: trunk/yake/documentation/api/makeDocs.cmd
===================================================================
--- trunk/yake/documentation/api/makeDocs.cmd 2007-03-28 09:47:16 UTC (rev 1690)
+++ trunk/yake/documentation/api/makeDocs.cmd 2007-03-28 09:47:36 UTC (rev 1691)
@@ -1,7 +0,0 @@
-@echo off
-echo Building YAKE API Reference...
-REM echo NOTE: You need to have doxygen.exe in your path!
-echo NOTE: You need to have doxys[.exe] in your path!
-pushd ..\..
-doxys documentation\api\DoxySfile
-popd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-28 09:47:17
|
Revision: 1690
http://svn.sourceforge.net/yake/?rev=1690&view=rev
Author: psyclonist
Date: 2007-03-28 02:47:16 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/yake/documentation/api/DoxySfile
trunk/yake/documentation/api/Doxyfile
Modified: trunk/yake/documentation/api/DoxySfile
===================================================================
--- trunk/yake/documentation/api/DoxySfile 2007-03-27 22:24:58 UTC (rev 1689)
+++ trunk/yake/documentation/api/DoxySfile 2007-03-28 09:47:16 UTC (rev 1690)
@@ -1,12 +1,11 @@
-# DoxySfile 0.90b ShortConfig -- Do not remove or edit this line please --
+# DoxySfile 0.95 ShortConfig -- Do not remove or edit this line please --
#---------------------------------------------------------------------------
# General configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = YAKE
PROJECT_NUMBER = 0.6.0-dev
-#INPUT = yake/msg
-INPUT = documentation/api yake/base/math yake/base/mpl yake/base/native yake/base/templates yake/base yake/audio yake/data yake/ent yake/file yake/graphics yake/input yake/net yake/netsvc yake/object yake/physics yake/prop yake/scripting yake/statemachine yake/msg yake/model yapp/raf
+INPUT = documentation/api yake/audio yake/base/math yake/base/mpl yake/base/native yake/base/templates yake/base yake/bindings.lua yake/common yake/data yake/ent yake/file yake/graphics yake/gui yake/gui_adapter yake/gui_addons yake/input yake/loader yake/model yake/msg yake/net yake/netsvc yake/netrepsvc yake/object yake/physics yake/prop yake/property yake/raf yake/scripting yake/statemachine yake/task yake/vehicle yake/yappbase
OUTPUT_DIRECTORY = documentation/api/html
GENERATE_DOXYS_HELP = YES
HTML_FILE_EXTENSION = .html
@@ -30,6 +29,7 @@
SEARCH_FUNCTIONS = YES
SEARCH_VARIABLES = YES
SEARCH_TYPEDEFS_ETC = YES
+AUTO_KEYWORD_LIMIT = 2
#---------------------------------------------------------------------------
# Specify what is included in the output
#---------------------------------------------------------------------------
@@ -42,6 +42,8 @@
EXTRACT_LOCAL_CLASSES = YES
HIDE_UNDOC_NAMESPACES = NO
HIDE_UNDOC_CLASSES = NO
+HIDE_UNDOC_STRUCTS = NO
+HIDE_UNDOC_UNIONS = NO
HIDE_UNDOC_FUNCTIONS = NO
HIDE_UNDOC_VARIABLES = NO
HIDE_UNDOC_ENUMS = NO
@@ -65,9 +67,10 @@
HIDE_CLASS_METHODS_IN_OVERVIEW = NO
CONCATENATE_DECL_AND_DEFINITION_DOC = YES
#---------------------------------------------------------------------------
-# Customize layout for pure text projects (ie containing no code)
+# Controlling the DocParser (wiki style parser)
#---------------------------------------------------------------------------
PAGE_DOCUMENTATION_MODE = NO
+ENABLE_HARD_SOFT_LINE_BREAKS = YES
#---------------------------------------------------------------------------
# Options to control how the input is parsed
#---------------------------------------------------------------------------
@@ -76,15 +79,17 @@
ALIASES =
ENABLED_SECTIONS =
IGNORE_CLASS_PREFIX =
+AUTO_BRIEF_ENDS_AT_FIRST_NEWLINE = YES
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
MESSAGE_LEVEL_SCREEN = Messages Warnings
-OUTPUT_PREFIX_SCREEN = Warnings Errors
OUTPUT_PATTERNS_SCREEN = Progress Preprocessor Scanner Generator Docparser Dot Definition Configfile Undocumented Unknown
-MESSAGE_SCREEN_LOGFILE =
+OUTPUT_PREFIX_LEVEL_SCREEN = Warnings Errors
+OUTPUT_PREFIX_PATTERNS_SCREEN =
MESSAGE_LEVEL_HTML_FILE = Messages Warnings Errors Debug
OUTPUT_PATTERNS_HTML_FILE = Progress Preprocessor Scanner Generator Docparser Dot Definition Configfile Undocumented Unknown
+MESSAGE_SCREEN_LOGFILE =
QUIET = YES
#---------------------------------------------------------------------------
# Configuration options related to the input files
@@ -115,6 +120,7 @@
EXPAND_COLLAPSE_SECTIONS = YES
EXPAND_COLLAPSE_TABLE_SECTIONS_ONLY = YES
CENTER_ALIGN_IMAGES = NO
+OPTIMIZE_OUTPUT_FOR_C = NO
#---------------------------------------------------------------------------
# Configuration options related to Left Menu layout
#---------------------------------------------------------------------------
@@ -127,6 +133,7 @@
LEFT_MENU_DIRECTORIES = YES
LEFT_MENU_PAGES = YES
LEFT_MENU_CLASSES = YES
+LEFT_MENU_STRUCTS = YES
LEFT_MENU_FUNCTIONS = NO
LEFT_MENU_MACROS = NO
LEFT_MENU_DEFINES = NO
@@ -189,1100 +196,1291 @@
-# - # DoxySfile 0.90b LongConfig -- Do not remove or edit this line please --
+# - # DoxySfile 0.90b ShortConfig -- Do not remove or edit this line please --
# -
-# - # This file describes the settings to be used by the documentation system
-# - # DoxyS (www.DoxyS.org) for a project
-# - #
-# - # All text after a hash (#) is considered a comment and will be ignored
-# - # The format is:
-# - # TAG = value [value, ...]
-# - # For lists items can also be appended using:
-# - # TAG += value [value, ...]
-# - # Values that contain spaces should be placed between quotes (" ")
-# -
# - #---------------------------------------------------------------------------
# - # General configuration options
# - #---------------------------------------------------------------------------
-# -
-# - # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# - # by quotes) that should identify the project.
-# -
# - PROJECT_NAME = YAKE
-# -
-# - # The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# - # This could be handy for archiving the generated documentation or
-# - # if some version control system is used.
-# -
# - PROJECT_NUMBER = 0.6.0-dev
-# -
-# - # The INPUT tag can be used to specify the files and/or directories that contain
-# - # documented source files. You may enter file names like "myfile.cpp" or
-# - # directories like "/usr/src/myproject". Separate the files or directories
-# - # with spaces.
-# -
-# - INPUT = ../../yake ../../yapp
-# -
-# - # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# - # base path where the generated documentation will be put.
-# - # If a relative path is entered, it will be relative to the location
-# - # where DoxyS was started. If left blank 'doxys_doc' will be used.
-# -
-# - OUTPUT_DIRECTORY = doxys_docs/
-# -
-# - # If the GENERATE_DOXYS_HELP tag is set to YES, DoxyS will
-# - # generate help pages for DoxyS itself along with to the project documentation
-# -
+# - #INPUT = yake/msg
+# - INPUT = documentation/api yake/audio yake/base/math yake/base/mpl yake/base/native yake/base/templates yake/base yake/bindings.lua yake/common yake/data yake/ent yake/file yake/graphics yake/gui yake/gui_adapter yake/gui_addons yake/input yake/loader yake/model yake/msg yake/net yake/netsvc yake/netrepsvc yake/object yake/physics yake/prop yake/property yake/raf yake/scripting yake/statemachine yake/task yake/vehicle yake/yappbase
+# - OUTPUT_DIRECTORY = documentation/api/html
# - GENERATE_DOXYS_HELP = YES
-# -
-# - # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# - # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# - # DoxyS will generate files with .html extension.
-# -
# - HTML_FILE_EXTENSION = .html
-# -
-# - # The CUSTOM_DIR tag is used to specify where the custom directory is.
-# - # The custom directory is used to place a $#logo.gif#$, $#logo.jpg#$ or
-# - # $#logo.png#$. This logo file is used on all the pages.
-# - # A style sheet file can be placed here if you want a different setup then the default.
-# - # Run DoxyS, copy the style sheet file from the common dir and you are ready to go.
-# -
# - CUSTOM_DIR =
-# -
-# - # The SERVER_STATISTICS tag is used to specify where the server statistics file is.
-# - # If left blank, server statistics is turned off.
-# - # To use server statistics, you will need a script on a server to collect the data
-# - # from the static HTML pages. Script can be found at http://www.doxys.dk under Download.
-# - # Make your own script and database.
-# - # Make a database with these filds:
-# - # Id, Definitiontype, Pagename, Pagetype, Projectname, Date, Requestpage
-# - # A script that can receive these posted arguments:
-# - # projectname, definitiontype, pagename, pagetypeand add the date and HTTP_REFERER your self when putting it all into the database.
-# -
# - SERVER_STATISTICS =
-# -
-# - # The HTML_HELP_SERVER_PATH tag is used to specify where the root of the
-# - # HTML files will be placed on the server. Used when generating XML-file
-# - # for integration with MS.NET.
-# -
# - HTML_HELP_SERVER_PATH =
-# -
-# - # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# - # DoxyS to hide any special comment blocks from generated source code
-# - # fragments. Normal C and C++ comments will always remain visible.
-# -
# - STRIP_CODE_COMMENTS = YES
-# -
# - #---------------------------------------------------------------------------
# - # Special options (rarely changed)
# - #---------------------------------------------------------------------------
-# -
-# - # If the DELETE_OUTPUT_DIRECTORY tag is set to YES, then the output directory will be
-# - # deleted before writing the new output. This can save time in some cases
-# -
# - DELETE_OUTPUT_DIRECTORY = YES
-# -
-# - # If the MS_DOT_NET_INTEGRATION tag is set to YES then a XML file
-# - # for use with MS Visual Studio .Net will be placed in 'OUT_DIR'
-# - #
-# - # How to: Taken from Microsofts homepage.
-# - # Save the file as 'HelpTest2.xml' in Microsoft Visual Studio .NET/Common7/IDE/HTML/XMLLinks/[LCID], where [LCID] depends upon your language, such as English or French. For example, the English LCID is 1033.
-# - # If it is not already open, display the Dynamic Help window by pressing CTRL+F1.
-# - # Notice that two new links appear in the Dynamic Help window. One is under a link group called 'Samples' and is called 'Sample: Intro to Visual Studio .NET' and another link called 'Direct Link to MSDN' is under a custom link group called 'Custom Help.'
-# - #
-# - # Creating custom link groups allows you to have special categories in which to display your links. Professors and other academic instructors might, for example, create a custom link group called 'Homework' or 'CS101 Projects.' They could then put links to their topics under the custom link group. IT managers and group leads might want to create a custom link group, for example, named 'Coding Policies' that contains links to Help topics on corporate coding policy. For more information, see Creating Custom Link Groups.
-# -
# - MS_DOT_NET_INTEGRATION = NO
-# -
-# - # The MS_DOT_NET_INTEGRATION_PATH tag is used to specify where the MS DOT NET integration xml is to be put.
-# - # Usaualy "/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE/HTML/XMLLinks/1033"
-# - # If left empty the xml will be put on documentation root.
-# -
# - MS_DOT_NET_INTEGRATION_PATH =
-# -
-# - # If GENERATE_HTMLHELP1 tag is set to YES, then HtmlHelp1 project(hhp) will be generated.
-# - # Output will be put on documentation root.
-# -
# - GENERATE_HTMLHELP1 = NO
-# -
-# - # If GENERATE_STATISTICS tag is set to YES, there will be generated a statistics page.
-# - # Output will be in documentation root/common/statistics.
-# - # Information, warnings, errors and statistics can be found here.
-# -
-# - GENERATE_STATISTICS = YES
-# -
+# - GENERATE_STATISTICS = NO
# - #---------------------------------------------------------------------------
# - # Search page options
# - #---------------------------------------------------------------------------
-# -
-# - # If the CREATE_SEARCHPAGE tag is set to YES DoxyS will create
-# - # a searchpage. WARNING, if the project is very large (+500.000 lines),
-# - # it is recomended to reduce the searchpage by adjusting some of the
-# - # following options. Other options include using #Mozilla FireFox# browser
-# - # which seems to execute the Java search-script 3-4 times faster than Opera
-# - # and Internet Explorer.
-# -
# - CREATE_SEARCHPAGE = YES
-# -
-# - # If set to YES DoxyS will include data to search in all the
-# - # brief descriptions for all types and pages. The brief description
-# - # is to the first full stop of the description. In case the project
-# - # is very large setting this option to $NO$ could improve search speed
-# - # significantly.
-# -
# - SEARCH_BRIEF_DESCRIPTION = YES
-# -
-# - # If set to YES DoxyS will include data to search in all the functions
-# - # and macros in the project.
-# -
# - SEARCH_FUNCTIONS = YES
-# -
-# - # If set to YES DoxyS will include data to search in all the variables
-# - # in the project. Tis includes member varibles as well as global variables,
-# - # but not automatic variables.
-# -
# - SEARCH_VARIABLES = YES
-# -
-# - # If set to YES DoxyS will include data to search in all the typedefs,
-# - # enumerations, enum values, defines etc. Basically all C++ entities which
-# - # are {not{ covered by the aboveoptions.
-# -
# - SEARCH_TYPEDEFS_ETC = YES
-# -
# - #---------------------------------------------------------------------------
# - # Specify what is included in the output
# - #---------------------------------------------------------------------------
-# -
-# - # If set to YES DoxyS will create Documentation for files. Documentation for files
-# - # features #included files# and #included by diagrams#, if $INCLUDE_GRAPH$ and
-# - # $INCLUDED_BY_GRAPH$ are set to YES.
-# -
# - CREATE_DOC_FOR_FILES = YES
-# -
-# - # If the CREATE_SOURCECODE_FOR_FILES tag is set to YES and CREATE_DOC_FOR_FILES is set to YES
-# - # DoxyS will create the tab 'Source' that holds the sourcecode for the hole file.
-# -
# - CREATE_SOURCECODE_FOR_FILES = NO
-# -
-# - # If the CREATE_SOURCECODE_FOR_MEMBERS tag is set to YES
-# - # DoxyS will create the tab 'Source' that holds the sourcecode for the member.
-# -
-# - CREATE_SOURCECODE_FOR_MEMBERS = YES
-# -
-# - # If set to YES all private members of a class will be included in the documentation.
-# -
-# - EXTRACT_PRIVATE = YES
-# -
-# - # If the EXTRACT_PROTECTED tag is set to YES all protected members of a class
-# - # will be included in the documentation.
-# -
+# - CREATE_SOURCECODE_FOR_MEMBERS = NO
+# - EXTRACT_PRIVATE = NO
# - EXTRACT_PROTECTED = YES
-# -
-# - # If the EXTRACT_STATIC tag is set to YES all static members of a file
-# - # will be included in the documentation.
-# -
# - EXTRACT_STATIC = YES
-# -
-# - # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# - # defined locally in source files will be included in the documentation.
-# - # If set to NO only classes defined in header files are included.
-# -
# - EXTRACT_LOCAL_CLASSES = YES
-# -
-# - # If the HIDE_UNDOC_NAMESPACES tag is set to YES, DoxyS will hide all undocumented namespaces.
-# -
# - HIDE_UNDOC_NAMESPACES = NO
-# -
-# - # If the HIDE_UNDOC_CLASSES tag is set to YES, DoxyS will hide all
-# - # undocumented classes that are normally visible in the class hierarchy.
-# - # If set to NO (the default) these classes will be included in the various
-# - # overviews. This option has no effect if EXTRACT_ALL is enabled.
-# -
# - HIDE_UNDOC_CLASSES = NO
-# -
-# - # If set to YES, DoxyS will hide all undocumented functions
-# - # inside classes, files or namespaces.
-# -
# - HIDE_UNDOC_FUNCTIONS = NO
-# -
-# - # If set to YES, DoxyS will hide all undocumented variables
-# - # inside classes, files or namespaces.
-# -
# - HIDE_UNDOC_VARIABLES = NO
-# -
-# - # If set to YES, DoxyS will hide all undocumented enummerations
-# - # inside classes, files or namespaces.
-# -
# - HIDE_UNDOC_ENUMS = NO
-# -
-# - # If set to YES, DoxyS will hide all undocumented enum values
-# - # inside classes, files or namespaces.
-# -
# - HIDE_UNDOC_ENUM_VALUES = NO
-# -
-# - # If set to YES, DoxyS will hide all undocumented typedefs
-# - # inside classes, files or namespaces.
-# -
# - HIDE_UNDOC_TYPEDEFS = NO
-# -
-# - # If set to YES, DoxyS will hide all undocumented defines.
-# -
# - HIDE_UNDOC_MACROS = NO
-# -
-# - # If set to YES, DoxyS will hide all undocumented defines.
-# -
# - HIDE_UNDOC_DEFINES = YES
-# -
-# - # The GENERATE_TODOLIST tag can be used to enable (YES) or
-# - # disable (NO) the todo list. This list is created by putting odo
-# - # commands in the documentation.
-# -
# - GENERATE_TODOLIST = YES
-# -
-# - # The GENERATE_BUGLIST tag can be used to enable (YES) or
-# - # disable (NO) the bug list. This list is created by putting \bug
-# - # commands in the documentation.
-# -
# - GENERATE_BUGLIST = YES
-# -
-# - # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# - # disable (NO) the deprecated list. This list is created by putting
-# - # \deprecated commands in the documentation.
-# -
# - GENERATE_DEPRECATEDLIST = YES
-# -
# - #---------------------------------------------------------------------------
# - # Customize how the documentation is generated
# - #---------------------------------------------------------------------------
-# -
-# - # If the MEMBER_SAME_FILE_RELATE_TO_CLASSES tag is set to YES DoxyS will relate all free
-# - # functions, types, defines etc. To the class(es) defined in the same file.
-# -
# - MEMBER_SAME_FILE_RELATE_TO_CLASSES = YES
-# -
-# - # If the MEMBER_SAME_FILE_RELATE_TO_STRUCTS tag is set to YES DoxyS will relate all free
-# - # functions, types, defines etc. To the struct(s) defined in the same file.
-# -
# - MEMBER_SAME_FILE_RELATE_TO_STRUCTS = NO
-# -
-# - # If the FULL_PATH_NAMES tag is set to YES then DoxyS will prepend the full
-# - # path before files name in the file list and in the header files. If set
-# - # to NO the shortest path that makes the file name unique will be used.
-# -
# - FULL_PATH_NAMES = NO
-# -
-# - # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# - # can be used to strip a user-defined part of the path. Stripping is
-# - # only done if one of the specified strings matches the left-hand part of
-# - # the path. It is allowed to use relative paths in the argument list.
-# -
# - STRIP_FROM_PATH =
-# -
-# - # The INTERNAL_DOCS tag determines if documentation
-# - # that is typed after a \internal command is included. If the tag is set
-# - # to NO (the default) then the documentation will be excluded.
-# - # Set it to YES to include the internal documentation.
-# -
# - INTERNAL_DOCS = NO
-# -
-# - # Determines whehter documentation
-# - # that is typed after a \todo command is included. If the tag is set
-# - # to NO then the documentation will be excluded.
-# - # Set it to YES to include the internal documentation.
-# -
# - TODO_DOCS = YES
-# -
-# - # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# - # member inherits the documentation from any documented member that it
-# - # reimplements.
-# -
# - INHERIT_DOCS = YES
-# -
-# - # If set to true then member functions (methods)
-# - # of classes will be hidden from all functions tab.
-# -
# - HIDE_CLASS_METHODS_IN_OVERVIEW = NO
-# -
-# - # For functions: If set to true then the documentation from the
-# - # declaration (header-file) and from the implementation/definition .
-# - # (cpp-file) are concatenated. Brief description from header is
-# - # concatenated with brief description from cpp-file and same with.
-# - # main documentation. If set to NO, only one of the two are used
-# - # prefering the one from the definition/cpp-file.
-# -
# - CONCATENATE_DECL_AND_DEFINITION_DOC = YES
-# -
# - #---------------------------------------------------------------------------
# - # Customize layout for pure text projects (ie containing no code)
# - #---------------------------------------------------------------------------
-# -
-# - # Mainly for projects that contains no source code, but only pages and directories.
-# - # The overview, info classes etc. tabs on mainpage and directories will be disabled.
-# - # Other tabs are not affected, so it's still possible to have source code in the project,
-# - # but mainpage and directories have only Description tabs displayed.
-# -
# - PAGE_DOCUMENTATION_MODE = NO
-# -
# - #---------------------------------------------------------------------------
# - # Options to control how the input is parsed
# - #---------------------------------------------------------------------------
-# -
-# - # If the HIDE_IN_BODY_DOCS tag is set to YES, DoxyS will hide any
-# - # documentation blocks found inside the body of a function.
-# - # If set to NO (the default) these blocks will be appended to the
-# - # function's detailed documentation block.
-# -
-# - HIDE_IN_BODY_DOCS = NO
-# -
-# - # The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# - # DoxyS uses this value to replace tabs by spaces in code fragments.
-# -
+# - HIDE_IN_BODY_DOCS = YES
# - TAB_SIZE = 4
-# -
-# - # This tag can be used to specify a number of aliases that acts
-# - # as commands in the documentation. An alias has the form "name=value".
-# - # For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# - # put the command \sideeffect (or @sideeffect) in the documentation, which
-# - # will result in a user-defined paragraph with heading "Side Effects:".
-# - # You can put \n's in the value part of an alias to insert newlines.
-# -
# - ALIASES =
-# -
-# - # The ENABLED_SECTIONS tag can be used to enable conditional
-# - # documentation sections, marked by \if sectionname ... \endif.
-# -
# - ENABLED_SECTIONS =
-# -
-# - # In case all classes in a project start with a common prefix, all
-# - # classes will be put under the same header in the alphabetical index.
-# - # The IGNORE_CLASS_PREFIX tag can be used to specify one or more prefixes that
-# - # should be ignored while generating the index headers.
-# -
# - IGNORE_CLASS_PREFIX =
-# -
# - #---------------------------------------------------------------------------
# - # configuration options related to warning and progress messages
# - #---------------------------------------------------------------------------
-# -
-# - # The message level that will be printed on the stdout.
-# - # Errors will always be printed on stderr.
-# - # Options avalible:
-# - # Messages Warnings Debug
-# -
# - MESSAGE_LEVEL_SCREEN = Messages Warnings
-# -
-# - # Prefix messages for the screen.
-# - # Options avalible:
-# - # Messages Warnings Errors Debug
-# -
# - OUTPUT_PREFIX_SCREEN = Warnings Errors
-# -
-# - # Patterns for the output.
-# - # Options avalible:
-# - # Progress Preprocessor Scanner Generator Docparser Dot Definition Configfile Undocumented Unknown
-# -
# - OUTPUT_PATTERNS_SCREEN = Progress Preprocessor Scanner Generator Docparser Dot Definition Configfile Undocumented Unknown
-# -
-# - # The MESSAGE_SCREEN_LOGFILE tag can be used to specify a file to which all messages
-# - # that is shown on the screen should be written. If left blank, no output to log file.
-# - # Use MESSAGE_LEVEL_SCREEN and OUTPUT_PATTERNS_SCREEN to reduce the number of messages.
-# -
# - MESSAGE_SCREEN_LOGFILE =
-# -
-# - # The message level that will be writen in the HTML statistics.
-# - # options avalible:
-# - # Messages Warnings Errors Debug
-# -
# - MESSAGE_LEVEL_HTML_FILE = Messages Warnings Errors Debug
-# -
-# - # Patterns for the output.
-# - # Options avalible:
-# - # Progress Preprocessor Scanner Generator Docparser Dot Definition Configfile Undocumented Unknown
-# -
# - OUTPUT_PATTERNS_HTML_FILE = Progress Preprocessor Scanner Generator Docparser Dot Definition Configfile Undocumented Unknown
-# -
-# - # With the QUIET tag on, only Progress and Errors will be printed to the screen.
-# - # Anything else will be as a ' . '.
-# - # Possible values are YES and NO. If left blank NO is used.
-# -
# - QUIET = YES
-# -
# - #---------------------------------------------------------------------------
# - # Configuration options related to the input files
# - #---------------------------------------------------------------------------
-# -
-# - # The IGNORE_FILE_NAME tag can be used to specify a possible textfile in each
-# - # directory which is searched for files/subdirs to exclude. The default value
-# - # is 'DoxyS.ignore'. It works like '.cvsignore'. The file is a simple textfile listing
-# - # one file/subdir per line relative to the directory of the 'DoxyS.ignore' file.
-# - # Like this:
-# - # #$file_to_ignore.cpp$#
-# -
# - IGNORE_FILE_NAME = DoxyS.ignore
-# -
-# - # If the value of the INPUT tag contains directories, you can use the
-# - # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# - # and *.h) to filter out the source-files in the directories. If left
-# - # blank the following patterns are tested:
-# - # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# - # *.h++ *.idl *.odl *.cs *.page *.dir *.dxd *.doc
-# -
# - FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp *.h++ *.idl *.odl *.cs *.page *.dir *.dxd *.doc
-# -
-# - # The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# - # should be searched for input files as well. Possible values are YES and NO.
-# - # If left blank YES is used.
-# -
-# - RECURSIVE = YES
-# -
-# - # The EXCLUDE tag can be used to specify files and/or directories that should
-# - # excluded from the INPUT source files. This way you can easily exclude a
-# - # subdirectory from a directory tree whose root is specified with the INPUT tag.
-# -
-# - EXCLUDE = doxys_docs/
-# -
-# - # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# - # that are symbolic links (a Unix filesystem feature) are excluded from the input.
-# -
+# - RECURSIVE = NO
+# - EXCLUDE = yake/reflection/ yake/samples
# - EXCLUDE_SYMLINKS = NO
-# -
-# - # If the value of the INPUT tag contains directories, you can use the
-# - # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# - # certain files from those directories.
-# -
# - EXCLUDE_PATTERNS =
-# -
-# - # If the example is not found relatively to current directory,
-# - # then try to prepend the EXAMPLE_PATH to see if the example is found here!
-# -
# - EXAMPLE_PATH =
-# -
-# - # If the image is not found relatively to current directory,
-# - # then try to prepend the IMAGE_PATH to see if the image is found here!
-# -
# - IMAGE_PATH =
-# -
-# - # The INPUT_FILTER tag can be used to specify a program that DoxyS should
-# - # invoke to filter for each input file. DoxyS will invoke the filter program
-# - # by executing (via popen()) the command: $filter input-file$, where $filter$
-# - # is the value of the INPUT_FILTER tag, and $input-file$ is the name of an
-# - # input file. DoxyS will then use the output that the filter program writes
-# - # to standard output.
-# -
# - INPUT_FILTER =
-# -
-# - # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# - # INPUT_FILTER) will be used to filter the input files when producing source
-# - # files to browse.
-# -
# - FILTER_SOURCE_FILES = NO
-# -
# - #---------------------------------------------------------------------------
# - # Configuration options related to the HTML layout
# - #---------------------------------------------------------------------------
-# -
-# - # The NAVIGATION_CHAR_LENGTH tag is the maximum of charters there must be
-# - # before we are cutting
-# - # This is done to prevent the left menu from taking op to much space
-# -
# - NAVIGATION_CHAR_LENGTH = 25
-# -
-# - # If the number of entries in an overview table exceeds this number, then the
-# - # the table will be shown in compact mode. Compact mode means that the table
-# - # will contain COLS_IN_OVERVIEW_TABLES coloumns in each row and only the definitions
-# - # name will be shown. The brief description will be be shown via mouse over effect.
-# -
# - LIMIT_COMPACT_IN_OVERVIEW_TABLES = 100
-# -
-# - # Number of coloumns in all the overview tables in case some of them
-# - # contains so many elements that they need to swich to compact mode.
-# -
# - COLS_IN_OVERVIEW_TABLES = 4
-# -
-# - # If the number of entries in an overview table exceeds this number, then the
-# - # the an alphabetical index will be generated.
-# -
# - LIMIT_ALFA_INDEX_IN_OVERVIEW_TABLES = 200
-# -
-# - # The COMPACT_CHAR_LENGTH tag is the maximum of charters there must be
-# - # before we are cutting the name in compact mode
-# - # This is done to prevent the name from being to long
-# -
# - COMPACT_CHAR_LENGTH = 25
-# -
-# - # Enables the info icon in non compact mode (ie. tables with brief description).
-# - # A mouse over will be shown with same type of info as on diagrams. Brief, public members etc.
-# -
# - INFO_ON_OVERVIEW_TABLES_NORMAL = YES
-# -
-# - # Enables the info icon in compact mode (ie. tables with no brief description).
-# - # A mouse over will be shown with same type of info as on diagrams. Brief, public members etc.
-# -
# - INFO_ON_OVERVIEW_TABLES_COMPACT = YES
-# -
-# - # If true the brief description is included in the header of the description.
-# - # If both this tag and INCLUDE_BRIEF_IN_DESCRIPTION are set to NO then brief
-# - # description will }not} appear on the decription pages.
-# -
# - INCLUDE_BRIEF_IN_HEADER = YES
-# -
-# - # If true the brief description is repeated in the description section.
-# - # If both this tag and INCLUDE_BRIEF_IN_HEADER are set to NO then brief
-# - # description will }not} appear on the decription pages.
-# -
# - INCLUDE_BRIEF_IN_DESCRIPTION = YES
-# -
-# - # If true the desciption will not contain type info.Ex:(Page),(Class),(Namespace).
-# -
# - HIDE_TYPE_ON_DESCRIPTION = NO
-# -
-# - # Enables the collapse / expand icons on the description page.
-# - # All sections can now be collapsed. See also EXPAND_COLLAPSE_TABLE_SECTIONS_ONLY
-# -
# - EXPAND_COLLAPSE_SECTIONS = YES
-# -
-# - # Enables the collapse / expand icons on syntax, parameters etc.
-# - # This tag depends on EXPAND_COLLAPSE_SECTIONS is set to YES.
-# - # If this is set to true, then only syntax/parameters, reimplements etc.
-# - # sections will have expand collapse icons. Description, todo, etc.
-# - # }cannot} be collapsed.
-# -
# - EXPAND_COLLAPSE_TABLE_SECTIONS_ONLY = YES
-# -
-# - # If set to YES, then included images (and their captions) are centered.
-# - # Otherwise the images and captions will be left-aligned.
-# -
# - CENTER_ALIGN_IMAGES = NO
-# -
# - #---------------------------------------------------------------------------
# - # Configuration options related to Left Menu layout
# - #---------------------------------------------------------------------------
-# -
-# - # If set to YES then left menu will be generated.
-# - # If set to NO leftmemu and logo will not be included.
-# - # This option disables all left menus in all types of pages and ignores the other SHOW_LEFT_MENU_XXXX.
-# -
# - SHOW_LEFT_MENU = YES
-# -
-# - # If set to YES then left menu will be generated for main page.
-# - # If set to NO leftmemu and logo will not be included
-# -
# - SHOW_LEFT_MENU_MAINDIR = YES
-# -
-# - # If set to YES then left menu will be generated for search pages.
-# - # If set to NO leftmemu and logo will not be included
-# -
# - SHOW_LEFT_MENU_SEARCH = YES
-# -
-# - # If set to YES then left menu will be generated for search pages.
-# - # If set to NO leftmemu and logo will not be included
-# -
# - SHOW_LEFT_MENU_DIRECTORY = YES
-# -
-# - # If set to YES then left menu will be generated for the rest of documentation pages (not above).
-# - # If set to NO leftmemu and logo will not be included
-# -
# - SHOW_LEFT_MENU_DOC = YES
-# -
-# - # If set to YES and SHOW_LEFT_MENU set to yes then the logo will be displayed.
-# -
# - SHOW_LOGO = YES
-# -
-# - # If set to YES directories will be shown on left menu.
-# -
# - LEFT_MENU_DIRECTORIES = YES
-# -
-# - # If set to YES pages will be shown on left menu.
-# -
# - LEFT_MENU_PAGES = YES
-# -
-# - # If set to YES classes will be shown on left menu.
-# -
# - LEFT_MENU_CLASSES = YES
-# -
-# - # If set to YES functions will be shown on left menu.
-# -
# - LEFT_MENU_FUNCTIONS = NO
-# -
-# - # If set to YES macros will be shown on left menu.
-# -
# - LEFT_MENU_MACROS = NO
-# -
-# - # If set to YES defines will be shown on left menu.
-# -
# - LEFT_MENU_DEFINES = NO
-# -
-# - # If set to YES attributes will be shown on left menu.
-# -
# - LEFT_MENU_ATTRIBUTES = NO
-# -
-# - # If set to YES types will be shown on left menu.
-# -
# - LEFT_MENU_TYPES = NO
-# -
-# - # If set to YES units will be shown on left menu.
-# -
# - LEFT_MENU_UNITS = YES
-# -
-# - # If set to YES statistics will be shown on left menu.
-# -
# - LEFT_MENU_STATISTICS = YES
-# -
-# - # If set to YES, a link to statistics will be on the main page.
-# - # If set to NO then locate the statistics under the common directory.
-# -
# - STATISTICS_LINK_ON_MAIN_PAGE = YES
-# -
# - #---------------------------------------------------------------------------
# - # Configuration options related to header and footer layout
# - #---------------------------------------------------------------------------
-# -
-# - # Mainly for projects that contains no source code, but only pages and directories.
-# - # The header part of pages and directories will be disabled if set to true.
-# - # This setting can also be used in projects containing code as it's not
-# - # dependent on PAGE_DOCUMENTATION_MODE.
-# -
# - HIDE_HEADER_ON_DIRS_AND_PAGES = NO
-# -
-# - # Mainly for projects that contains no source code, but only pages and directories.
-# - # The footer part of pages and directories will be disabled if set to true.
-# - # This setting can also be used in projects containing code as it's not
-# - # dependent on PAGE_DOCUMENTATION_MODE.
-# -
# - HIDE_FOOTER_ON_DIRS_AND_PAGES = NO
-# -
-# - # The header part will be disabled if set to true.
-# - # If set to yes you may also whant to set HIDE_HEADER_ON_DIRS_AND_PAGES to yes
-# -
# - HIDE_HEADER_ON_CLASS_AND_MEMBERS = NO
-# -
-# - # The footer part will be disabled if set to true.
-# - # If set to yes you may also whant to set HIDE_FOOTER_ON_DIRS_AND_PAGES to yes
-# -
# - HIDE_FOOTER_ON_CLASS_AND_MEMBERS = NO
-# -
-# - # The header part will be disabled if set to true.
-# - # If set to yes you may also whant to set HIDE_HEADER_ON_DIRS_AND_PAGES to yes
-# -
# - HIDE_HEADER_ON_UNITS = NO
-# -
-# - # The footer part will be disabled if set to true.
-# - # If set to yes you may also whant to set HIDE_FOOTER_ON_DIRS_AND_PAGES to yes
-# -
# - HIDE_FOOTER_ON_UNITS = NO
-# -
# - #---------------------------------------------------------------------------
# - # Configuration options related to the preprocessor
# - #---------------------------------------------------------------------------
-# -
-# - # If the ENABLE_PREPROCESSING tag is set to YES (the default) DoxyS will
-# - # evaluate all C-preprocessor directives found in the sources and include
-# - # files.
-# -
# - ENABLE_PREPROCESSING = YES
-# -
-# - # If the MACRO_EXPANSION tag is set to YES DoxyS will expand all macro
-# - # names in the source code. If set to NO only conditional
-# - # compilation will be performed. Macro expansion can be done in a controlled
-# - # way by setting EXPAND_ONLY_PREDEF to YES (the default).
-# -
# - MACRO_EXPANSION = YES
-# -
-# - # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# - # then the macro expansion is limited to the macros specified with the
-# - # PREDEFINED and EXPAND_AS_PREDEFINED tags.
-# -
# - EXPAND_ONLY_PREDEF = NO
-# -
-# - # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# - # in the INCLUDE_PATH (see below) will be search if a $\include$ command is found.
-# -
-# - SEARCH_INCLUDES = YES
-# -
-# - # The INCLUDE_PATH tag can be used to specify one or more directories that
-# - # contain include files that are not input files but should be processed by
-# - # the preprocessor.
-# -
+# - SEARCH_INCLUDES = NO
# - INCLUDE_PATH =
-# -
-# - # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# - # patterns (like *.h and *.hpp) to filter out the header-files in the
-# - # directories. If left blank, the patterns specified with FILE_PATTERNS will
-# - # be used.
-# -
# - INCLUDE_FILE_PATTERNS =
-# -
-# - # The PREDEFINED tag can be used to specify one or more macro names that
-# - # are defined before the preprocessor is started (similar to the -D option of
-# - # gcc). The argument of the tag is a list of macros of the form: name
-# - # or name=definition (no spaces). If the definition and the = are
-# - # omitted =1 is assumed.
-# -
# - PREDEFINED =
-# -
-# - # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# - # this tag can be used to specify a list of macro names that should be expanded.
-# - # The macro definition that is found in the sources will be used.
-# - # Use the PREDEFINED tag if you want to use a different macro definition.
-# -
# - EXPAND_AS_DEFINED =
-# -
-# - # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# - # DoxyS's preprocessor will remove all function-like macros that are alone
-# - # on a line, have an all uppercase name, and do not end with a semicolon. Such
-# - # function macros are typically used for boiler-plate code, and will confuse the
-# - # parser if not removed.
-# -
# - SKIP_FUNCTION_MACROS = YES
-# -
# - #---------------------------------------------------------------------------
# - # Configuration options related to the dot tool
# - #---------------------------------------------------------------------------
-# -
-# - # If set to YES then DoxyS will assume the dot tool is
-# - # available from the path. This tool is part of Graphviz, a graph visualization
-# - # toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# - # have no effect if this option is set to NO.
-# -
# - ENABLE_DOT_GRAPHS = YES
-# -
-# - # The tag DOT_PATH can be used to specify the path where the dot tool can be
-# - # found. If left blank, it is assumed the dot tool can be found on the path.
-# -
# - DOT_PATH =
-# -
-# - # If the CLASS_DIAGRAMS tag is set to YES (the default) DoxyS will
-# - # generate a inheritance diagram for classes with base or
-# - # super classes. Setting the tag to NO turns the diagrams off. Note that this
-# - # option is superceded by the ENABLE_DOT_GRAPHS option below. This is only a fallback. It is
-# - # recommended to install and use dot, since it yields more powerful graphs.
-# -
# - CLASS_DIAGRAMS = YES
-# -
-# - # If set to YES, the inheritance and collaboration graphs will hide
-# - # inheritance and usage relations if the target is undocumented
-# - # or is not a class.
-# -
# - HIDE_UNDOC_RELATIONS = YES
-# -
-# - # If the CLASS_GRAPH and ENABLE_DOT_GRAPHS tags are set to YES then DoxyS
-# - # will generate a graph for each documented class showing the direct and
-# - # indirect inheritance relations. Setting this tag to YES will force the
-# - # the CLASS_DIAGRAMS tag to NO.
-# -
# - CLASS_GRAPH = YES
-# -
-# - # If the COLLABORATION_GRAPH and ENABLE_DOT_GRAPHS tags are set to YES then DoxyS
-# - # will generate a graph for each documented class showing the direct and
-# - # indirect implementation dependencies (inheritance, containment, and
-# - # class references variables) of the class with other documented classes.
-# -
# - COLLABORATION_GRAPH = YES
-# -
-# - # If the UML_LOOK tag is set to YES DoxyS will generate inheritance and
-# - # collaboration diagrams in a style similiar to the OMG's Unified Modeling
-# - # Language.
-# -
# - UML_LOOK = NO
-# -
-# - # If set to YES, the inheritance and collaboration graphs will show the
-# - # relations between templates and their instances.
-# -
# - TEMPLATE_RELATIONS = YES
-# -
-# - # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and ENABLE_DOT_GRAPHS
-# - # tags are set to YES then DoxyS will generate a graph for each documented
-# - # file showing the direct and indirect include dependencies of the file with
-# - # other documented files.
-# -
# - INCLUDE_GRAPH = YES
-# -
-# - # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# - # ENABLE_DOT_GRAPHS tags are set to YES then DoxyS will generate a graph for each
-# - # documented header file showing the documented files that directly or
-# - # indirectly include this file.
-# -
# - INCLUDED_BY_GRAPH = YES
-# -
-# - # If the CALL_GRAPH and ENABLE_DOT_GRAPHS tags are set to YES then DoxyS will
-# - # generate a call dependency graph for every global function or class method.
-# - # Note that enabling this option will significantly increase the time of a run.
-# - # So in most cases it will be better to enable call graphs for selected
-# - # functions only using the \callgraph command.
-# -
# - CALL_GRAPH = YES
-# -
-# - # If the CALL_GRAPH and ENABLE_DOT_GRAPHS tags are set to YES then DoxyS will
-# - # generate a directory graph for for every directory.
-# -
# - DIR_GRAPH = YES
-# -
-# - # If the GRAPHICAL_HIERARCHY and ENABLE_DOT_GRAPHS tags are set to YES then DoxyS
-# - # will graphical hierarchy of all classes instead of a textual one.
-# -
# - GRAPHICAL_HIERARCHY = YES
-# -
-# - # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# - # generated by dot. Possible values are png, jpg, or gif.
-# - # If left blank png will be used.
-# -
# - DOT_IMAGE_FORMAT = png
-# -
-# - # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# - # contain dot files that are included in the documentation (see the
-# - # dotfile command).
-# -
# - DOTFILE_DIRS =
-# -
-# - # The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# - # (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# - # this value, DoxyS will try to truncate the graph, so that it fits within
-# - # the specified constraint. Beware that most browsers cannot cope with very
-# - # large images.
-# -
# - MAX_DOT_GRAPH_WIDTH = 1024
-# -
-# - # The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# - # (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# - # this value, DoxyS will try to truncate the graph, so that it fits within
-# - # the specified constraint. Beware that most browsers cannot cope with very
-# - # large images.
-# -
# - MAX_DOT_GRAPH_HEIGHT = 1024
-# -
-# - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# - # graphs generated by dot. A depth value of 3 means that only nodes reachable
-# - # from the root by following a path via at most 3 edges will be shown. Nodes that
-# - # lay further from the root node will be omitted. Note that setting this option to
-# - # 1 or 2 may greatly reduce the computation time needed for large code bases. Also
-# - # note that a graph may be further truncated if the graph's image dimensions are
-# - # not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
-# - # If 0 is used for the depth value (the default), the graph is not depth-constrained.
-# -
# - MAX_DOT_GRAPH_DEPTH = 0
-# -
-# - # If set to YES, then all dot images are centered.
-# - # Otherwise the images will be left-aligned.
-# -
# - CENTER_ALIGN_DOT_IMAGES = NO
-# -
-# - # If the DOT_CLEANUP tag is set to YES (the default) DoxyS will
-# - # remove the intermediate dot files that are used to generate
-# - # the various graphs.
-# -
# - DOT_CLEANUP = YES
-# -
# - #---------------------------------------------------------------------------
# - # Language options
# - #---------------------------------------------------------------------------
-# -
-# - # The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# - # documentation generated by DoxyS is written. DoxyS will use this
-# - # information to generate all constant output in the proper language.
-# - # The default language is English, other supported languages are:
-# - # Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
-# - # Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en
-# - # (Japanese with English messages), Korean, Norwegian, Polish, Portuguese,
-# - # Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-# -
# - OUTPUT_LANGUAGE = English
-# -
-# - # This tag can be used to specify the encoding used in the generated output.
-# - # The encoding is not always determined by the language that is chosen,
-# - # but also whether or not the output is meant for Windows or non-Windows users.
-# - # In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# - # forces the Windows encoding (this is the default for the Windows binary),
-# - # whereas setting the tag to NO uses a Unix-style encoding (the default for
-# - # all platforms other than Windows).
-# -
# - USE_WINDOWS_ENCODING = YES
# -
# -
# -
# -
# -
-# - # - # DoxySfile 0.90b ShortConfig -- Do not remove or edit this line please --
+# - # - # DoxySfile 0.90b LongConfig -- Do not remove or edit this line please --
# - # -
+# - # - # This file describes the settings to be used by the documentation system
+# - # - # DoxyS (www.DoxyS.org) for a project
+# - # - #
+# - # - # All text after a hash (#) is considered a comment and will be ignored
+# - # - # The format is:
+# - # - # TAG = value [value, ...]
+# - # - # For lists items can also be appended using:
+# - # - # TAG += value [value, ...]
+# - # - # Values that contain spaces should be placed between quotes (" ")
+# - # -
# - # - #---------------------------------------------------------------------------
# - # - # General configuration options
# - # - #---------------------------------------------------------------------------
-# - # - PROJECT_NAME = DefaultProjectName
-# - # - PROJECT_NUMBER =
-# - # - INPUT = .
+# - # -
+# - # - # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# - # - # by quotes) that should identify the project.
+# - # -
+# - # - PROJECT_NAME = YAKE
+# - # -
+# - # - # The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# - # - # This could be handy for archiving the generated documentation or
+# - # - # if some version control system is used.
+# - # -
+# - # - PROJECT_NUMBER = 0.6.0-dev
+# - # -
+# - # - # The INPUT tag can be used to specify the files and/or directories that contain
+# - # - # documented source files. You may enter file names like "myfile.cpp" or
+# - # - # directories like "/usr/src/myproject". Separate the files or directories
+# - # - # with spaces.
+# - # -
+# - # - INPUT = ../../yake ../../yapp
+# - # -
+# - # - # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# - # - # base path where the generated documentation will be put.
+# - # - # If a relative path is entered, it will be relative to the location
+# - # - # where DoxyS was started. If left blank 'doxys_doc' will be used.
+# - # -
# - # - OUTPUT_DIRECTORY = doxys_docs/
+# - # -
+# - # - # If the GENERATE_DOXYS_HELP tag is set to YES, DoxyS will
+# - # - # generate help pages for DoxyS itself along with to the project documentation
+# - # -
# - # - GENERATE_DOXYS_HELP = YES
+# - # -
+# - # - # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# - # - # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# - # - # DoxyS will generate files with .html extension.
+# - # -
# - # - HTML_FILE_EXTENSION = .html
+# - # -
+# - # - # The CUSTOM_DIR tag is used to specify where the custom directory is.
+# - # - # The custom directory is used to place a $#logo.gif#$, $#logo.jpg#$ or
+# - # - # $#logo.png#$. This logo file is used on all the pages.
+# - # - # A style sheet file can be placed here if you want a different setup then the default.
+# - # - # Run DoxyS, copy the style sheet file from the common dir and you are ready to go.
+# - # -
# - # - CUSTOM_DIR =
+# - # -
+# - # - # The SERVER_STATISTICS tag is used to specify where the server statistics file is.
+# - # - # If left blank, server statistics is turned off.
+# - # - # To use server statistics, you will need a script on a server to collect the data
+# - # - # from the static HTML pages. Script can be found at http://www.doxys.dk under Download.
+# - # - # Make your own script and database.
+# - # - # Make a database with these filds:
+# - # - # Id, Definitiontype, Pagename, Pagetype, Projectname, Date, Requestpage
+# - # - # A script that can receive these posted arguments:
+# - # - # projectname, definitiontype, pagename, pagetypeand add the date and HTTP_REFERER your self when putting it all into the database.
+# - # -
# - # - SERVER_STATISTICS =
+# - # -
+# - # - # The HTML_HELP_SERVER_PATH tag is used to specify where the root of the
+# - # - # HTML files will be placed on the server. Used when generating XML-file
+# - # - # for integration with MS.NET.
+# - # -
# - # - HTML_HELP_SERVER_PATH =
+# - # -
+# - # - # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# - # - # DoxyS to hide any special comment blocks from generated source code
+# - # - # fragments. Normal C and C++ comments will always remain visible.
+# - # -
# - # - STRIP_CODE_COMMENTS = YES
+# - # -
# - # - #---------------------------------------------------------------------------
# - # - # Special options (rarely changed)
# - # - #---------------------------------------------------------------------------
-# - # - DELETE_OUTPUT_DIRECTORY = NO
+# - # -
+# - # - # If the DELETE_OUTPUT_DIRECTORY tag is set to YES, then the output directory will be
+# - # - # deleted before writing the new output. This can save time in some cases
+# - # -
+# - # - DELETE_OUTPUT_DIRECTORY = YES
+# - # -
+# - # - # If the MS_DOT_NET_INTEGRATION tag is set to YES then a XML file
+# - # - # for use with MS Visual Studio .Net will be placed in 'OUT_DIR'
+# - # - #
+# - # - # How to: Taken from Microsofts homepage.
+# - # - # Save the file as 'HelpTest2.xml' in Microsoft Visual Studio .NET/Common7/IDE/HTML/XMLLinks/[LCID], where [LCID] depends upon your language, such as English or French. For example, the English LCID is 1033.
+# - # - # If it is not already open, display the Dynamic Help window by pressing CTRL+F1.
+# - # - # Notice that two new links appear in the Dynamic Help window. One is under a link group called 'Samples' and is called 'Sample: Intro to Visual Studio .NET' and another link called 'Direct Link to MSDN' is under a custom link group called 'Custom Help.'
+# - # - #
+# - # - # Creating custom link groups allows you to have special categories in which to display your links. Professors and other academic instructors might, for example, create a custom link group called 'Homework' or 'CS101 Projects.' They could then put links to their topics under the custom link group. IT managers and group leads might want to create a custom link group, for example, named 'Coding Policies' that contains links to Help topics on corporate coding policy. For more information, see Creating Custom Link Groups.
+# - # -
# - # - MS_DOT_NET_INTEGRATION = NO
+# - # -
+# - # - # The MS_DOT_NET_INTEGRATION_PATH tag is used to specify where the MS DOT NET integration xml is to be put.
+# - # - # Usaualy "/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE/HTML/XMLLinks/1033"
+# - # - # If left empty the xml will be put on documentation root.
+# - # -
# - # - MS_DOT_NET_INTEGRATION_PATH =
+# - # -
+# - # - # If GENERATE_HTMLHELP1 tag is set to YES, then HtmlHelp1 project(hhp) will be generated.
+# - # - # Output will be put on documentation root.
+# - # -
# - # - GENERATE_HTMLHELP1 = NO
+# - # -
+# - # - # If GENERATE_STATISTICS tag is set to YES, there will be generated a statistics page.
+# - # - # Output will be in documentation root/common/statistics.
+# - # - # Information, warnings, errors and statistics can be found here.
+# - # -
# - # - GENERATE_STATISTICS = YES
+# - # -
# - # - #---------------------------------------------------------------------------
# - # - # Search page options
# - # - #---------------------------------------------------------------------------
+# - # -
+# - # - # If the CREATE_SEARCHPAGE tag is set to YES DoxyS will create
+# - # - # a searchpage. WARNING, if the project is very large (+500.000 lines),
+# - # - # it is recomended to reduce the searchpage by adjusting some of the
+# - # - # following options. Other options include using #Mozilla FireFox# browser
+# - # - # which seems to execute the Java search-script 3-4 times faster than Opera
+# - # - # and Internet Explorer.
+# - # -
# - # - CREATE_SEARCHPAGE = YES
+# - # -
+# - # - # If set to YES DoxyS will include data to search in all the
+# - # - # brief descriptions for all types and pages. The brief description
+# - # - # is to the first full stop of the description. In case the project
+# - # - # is very large setting this option to $NO$ could improve search speed
+# - # - # significantly.
+# - # -
# - # - SEARCH_BRIEF_DESCRIPTION = YES
+# - # -
+# - # - # If set to YES DoxyS will include data to search in all the functions
+# - # - # and macros in the project.
+# - # -
# - # - SEARCH_FUNCTIONS = YES
+# - # -
+# - # - # If set to YES DoxyS will include data to search in all the variables
+# - # - # in the project. Tis includes member varibles as well as global variables,
+# - # - # but not automatic variables.
+# - # -
# - # - SEARCH_VARIABLES = YES
+# - # -
+# - # - # If set to YES DoxyS will include data to search in all the typedefs,
+# - # - # enumerations, enum values, defines etc. Basically all C++ entities which
+# - # - # are {not{ covered by the aboveoptions.
+# - # -
# - # - SEARCH_TYPEDEFS_ETC = YES
+# - # -
# - # - #---------------------------------------------------------------------------
# - # - # Specify what is included in the output
# - # - #---------------------------------------------------------------------------
+# - # -
+# - # - # If set to YES DoxyS will create Documentation for files. Documentation for files
+# - # - # features #included files# and #included by diagrams#, if $INCLUDE_GRAPH$ and
+# - # - # $INCLUDED_BY_GRAPH$ are set to YES.
+# - # -
# - # - CREATE_DOC_FOR_FILES = YES
+# - # -
+# - # - # If the CREATE_SOURCECODE_FOR_FILES tag is set to YES and CREATE_DOC_FOR_FILES is set to YES
+# - # - # DoxyS will create the tab 'Source' that holds the sourcecode for the hole file.
+# - # -
# - # - CREATE_SOURCECODE_FOR_FILES = NO
+# - # -
+# - # - # If the CREATE_SOURCECODE_FOR_MEMBERS tag is set to YES
+# - # - # DoxyS will create the tab 'Source' that holds the sourcecode for the member.
+# - # -
# - # - CREATE_SOURCECODE_FOR_MEMBERS = YES
+# - # -
+# - # - # If set to YES all private members of a class will be included in the documentation.
+# - # -
# - # - EXTRACT_PRIVATE = YES
+# - # -
+# - # - # If the EXTRACT_PROTECTED tag is set to YES all protected members of a class
+# - # - # will be included in the documentation.
+# - # -
# - # - EXTRACT_PROTECTED = YES
+# - # -
+# - # - # If the EXTRACT_STATIC tag is set to YES all static members of a file
+# - # - # will be included in the documentation.
+# - # -
# - # - EXTRACT_STATIC = YES
+# - # -
+# - # - # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# - # - # defined locally in source files will be included in the documentation.
+# - # - # If set to NO only classes defined in header files are included.
+# - # -
# - # - EXTRACT_LOCAL_CLASSES = YES
+# - # -
+# - # - # If the HIDE_UNDOC_NAMESPACES tag is set to YES, DoxyS will hide all undocumented namespaces.
+# - # -
# - # - HIDE_UNDOC_NAMESPACES = NO
+# - # -
+# - # - # If the HIDE_UNDOC_CLASSES tag is set to YES, DoxyS will hide all
+# - # - # undocumented classes that are normally visible in the class hierarchy.
+# - # - # If set to NO (the default...
[truncated message content] |
|
From: <psy...@us...> - 2007-03-27 22:24:59
|
Revision: 1689
http://svn.sourceforge.net/yake/?rev=1689&view=rev
Author: psyclonist
Date: 2007-03-27 15:24:58 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
rst2html related changes
Modified Paths:
--------------
trunk/yake/documentation/manual/yake-manual.css
Modified: trunk/yake/documentation/manual/yake-manual.css
===================================================================
--- trunk/yake/documentation/manual/yake-manual.css 2007-03-27 16:40:45 UTC (rev 1688)
+++ trunk/yake/documentation/manual/yake-manual.css 2007-03-27 22:24:58 UTC (rev 1689)
@@ -60,9 +60,12 @@
*/
pre.programlisting, pre.literal-block
{
- border: 1px solid #707070;
+ border-left: 3px solid #707070;
+ border-right: 1px solid #707070;
+ border-top: 1px solid #707070;
+ border-bottom: 1px solid #707070;
background-color: #ffffd5;
- margin-left: 5%;
+ margin-left: 7.5%;
margin-right: 5%;
padding: 6px;
color: #000000;
@@ -73,7 +76,7 @@
border: 2px solid #00a0f0; /* blue border */
background-color: #e0e0ff; /* light blue background */
margin-bottom: 5px;
- margin-left: 5%;
+ margin-left: 7.5%;
margin-right: 5%;
padding-top: 5px;
padding-bottom: 5px;
@@ -107,7 +110,7 @@
{
border: 2px solid red;
background-color: #ffe0b0; /* light orange background */
- margin-left: 5%;
+ margin-left: 7.5%;
margin-right: 5%;
margin-bottom: 5px;
padding-top: 5px;
@@ -189,8 +192,8 @@
/* when generated by rst2html */
table.docutils
{
- width: 90%;
- margin-left: 5%; /* align with paragraph text */
+ width: 87.5%;
+ margin-left: 7.5%; /* align with paragraph text */
margin-right: 5%;
border: 1px solid gray;
border-collapse: collapse;
@@ -215,6 +218,11 @@
/*padding: 0;*/
vertical-align: top;
}
+table.docutils th
+{
+ border-bottom: 2px solid gray;
+ background-color: #f0f0f0;
+}
/*--------- Tables in <section>s ----------------*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-03-27 16:40:49
|
Revision: 1688
http://svn.sourceforge.net/yake/?rev=1688&view=rev
Author: psyclonist
Date: 2007-03-27 09:40:45 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
css compatibility with rst2html,
updated installation instructions for pc/windows+msvc
Modified Paths:
--------------
trunk/yake/documentation/manual/yake-manual.css
trunk/yake/documentation/manual/yake-manual.txt
Modified: trunk/yake/documentation/manual/yake-manual.css
===================================================================
--- trunk/yake/documentation/manual/yake-manual.css 2007-03-21 23:35:45 UTC (rev 1687)
+++ trunk/yake/documentation/manual/yake-manual.css 2007-03-27 16:40:45 UTC (rev 1688)
@@ -32,13 +32,14 @@
}
h1
{
- font-family: Georgia "Times New Roman", serif;
- color: #004090;
+ font-family: Georgia "Times New Roman", serif;
+ color: #004090;
+ border-bottom: 3px solid;
}
h2
{
- font-family: Georgia "Times New Roman", serif;
- color: #004090;
+ font-family: Georgia "Times New Roman", serif;
+ color: #004090;
border-bottom: 3px solid;
}
div h4.title /* 3rd level */
@@ -54,11 +55,14 @@
color: #004090;
}
-pre.programlisting
+/* generated by docbook->html: pre.programlisting
+ generated by rst2html: pre.literal-block
+*/
+pre.programlisting, pre.literal-block
{
border: 1px solid #707070;
background-color: #ffffd5;
- margin-left:5%;
+ margin-left: 5%;
margin-right: 5%;
padding: 6px;
color: #000000;
@@ -66,17 +70,25 @@
.tip,.note
{
- border: 2px solid #00a0f0; /* blue border */
- background-color: #e0e0ff; /* light blue background */
+ border: 2px solid #00a0f0; /* blue border */
+ background-color: #e0e0ff; /* light blue background */
margin-bottom: 5px;
+ margin-left: 5%;
+ margin-right: 5%;
padding-top: 5px;
padding-bottom: 5px;
}
-div.note h3.title
+div.note h3.title /** header in case of docbook generator */
{
margin-left: 2%;
margin-top: 10px;
}
+/*div.note*/ p.admonition-title /** header in case of rst2html */
+{
+ margin-left: 2%;
+ margin-top: 10px;
+ font-weight: bold;
+}
div.warning h3.title
{
margin-left: 2%;
@@ -93,8 +105,10 @@
}
.warning
{
- border: 2px solid red;
- background-color: #ffe0b0; /* light orange background */
+ border: 2px solid red;
+ background-color: #ffe0b0; /* light orange background */
+ margin-left: 5%;
+ margin-right: 5%;
margin-bottom: 5px;
padding-top: 5px;
padding-bottom: 5px;
@@ -172,7 +186,38 @@
}
/*--------- Tables in <section>s ----------------*/
+/* when generated by rst2html */
+table.docutils
+{
+ width: 90%;
+ margin-left: 5%; /* align with paragraph text */
+ margin-right: 5%;
+ border: 1px solid gray;
+ border-collapse: collapse;
+}
+table.docutils tbody
+{
+ border: 1px solid gray;
+ padding: 0;
+ margin: 0;
+}
+table.docutils tbody tr
+{
+ border: 0;
+ margin: 0;
+ padding: 0;
+}
+table.docutils td
+{
+ border: 1px solid gray;
+ padding-left: 1em;
+ padding-right: 1em;
+ /*padding: 0;*/
+ vertical-align: top;
+}
+/*--------- Tables in <section>s ----------------*/
+
div.informaltable
{
font-size: small;
@@ -238,3 +283,22 @@
margin: 0;
/*padding: 0;*/
}
+
+/** When using rst2html: document information
+*/
+table.docinfo
+{
+ margin-left: 5%;
+ margin-right: 5%;
+ border-collapse:collapse;
+ border: 1px solid gray;
+}
+table.docinfo th
+{
+ text-align: right;
+}
+table.docinfo td
+{
+ text-align: left;
+ padding-left: 1em;
+}
Modified: trunk/yake/documentation/manual/yake-manual.txt
===================================================================
--- trunk/yake/documentation/manual/yake-manual.txt 2007-03-21 23:35:45 UTC (rev 1687)
+++ trunk/yake/documentation/manual/yake-manual.txt 2007-03-27 16:40:45 UTC (rev 1688)
@@ -2,13 +2,22 @@
Yake 0.6.x Manual
+++++++++++++++++
+.. |date| date:: %d %b %Y
+
:Author: Stephan Kaiser
-:Date: $Date$
+:Generated on: |date|
+:Status: Draft
.. section-numbering::
:depth: 2
:start: 1
+
+.. contents:: Table of Contents
+ :depth: 3
+.. meta::
+ :description: The official manual for the Yake libraries.
+
Introduction
============
@@ -70,6 +79,9 @@
Installation
============
+.. contents:: Table of Contents
+ :local:
+
Requirements
------------
@@ -80,14 +92,19 @@
For specific components/plugins additional dependencies may be required.
1. ODE 0.6/0.7 for physicsODE
-2. OGRE 1.2.x+ for graphicsOGRE
-3. Lua 5.x for scriptingLua, entLua etc
-4. Luabind 0.7+ for scriptingLua, entLua etc
-5. CEGUI 0.5.x for graphical UI
-6. OpenAL 1.1 SDK for audioOpenAL
-7. OpenAL++ for audioOpenAL
-8. TinyXML for data
-9. Enet 1.x for networking
+#. OGRE 1.2.x+ for graphicsOGRE
+#. Lua 5.x for scriptingLua, entLua etc
+#. Luabind 0.7+ for scriptingLua, entLua etc
+#. CEGUI 0.5.x for graphical UI
+#. OpenAL 1.1 SDK for audioOpenAL
+#. OpenAL++ for audioOpenAL
+#. TinyXML for data
+#. Enet 1.x for networking
+
+Supported platforms:
+
+* PC/Windows: 32-Bit (64-Bit untested)
+* PC/Linux: 32-Bit (64-Bit untested)
Pre-built dependencies packages
-------------------------------
@@ -172,6 +189,18 @@
The build scripts for the various platforms and compilers are generated from
premake scripts.
+Configuration
+~~~~~~~~~~~~~
+
+There are a several options that are used to control the way the actual build files
+created as well as the way the Yake libraries are built.
+
+Open ``scripts/premake/config.lua`` in your favorite text editor and have a look at the
+configuration options and adjust them to your needs.
+
+By default, the configuration is set to build all libraries and demos thereby maximizing
+the available feature set.
+
Building with Microsoft Visual C++ 7.1/8.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -179,25 +208,36 @@
#. Provide dependencies.
You have two options:
+
1. Extract the matching prebuilt dependencies package over the Yake directory.
- 2. Obtain and build the dependencies yourself and copy them in the appropriate directories in ``yake/dependencies``.
+ 2. Obtain and build the dependencies yourself and copy them in the appropriate directories in ``dependencies``.
#. Install premake
Premake is used to create the build scripts (.vcproj and .sln).
- The easiest way is to copy ``premake.exe`` into ``yake/scripts/premake/``
+ The easiest way to install is to copy ``premake.exe`` into ``scripts/premake/``
+
+#. (optional) Edit ``scripts/premake/config.lua`` to suit your needs.
+
#. Create the build scripts by running premake
- Run ``yake/scripts/msvc[71|80]/build.cmd`` and ``yake/scripts/msvc[71|80]/build_samples.cmd``.
+ Run ``scripts/msvc[71|80]/build.cmd``.
-#. Build Yake libraries
+#. Build Yake
- Open ``yake/scripts/msvc[71|80]/yake.sln`` in the MSVC IDE and run "Build All".
+ Open ``scripts/msvc[71|80]/yake.sln`` in the MSVC IDE and run "Build All".
+If you have disabled ``SAMPLES_INCLUDED_IN_CORE_SOLUTION`` in ``scripts/premake/config.lua``
+then you have to complete the following steps in order to build the samples.
+
+#. Create the build scripts for the demos by running premake
+
+ Run ``scripts/msvc[71|80]/build_samples.cmd``.
+
#. Build Yake demos
- Open ``yake/scripts/msvc[71|80]/yake_samples.sln`` in the MSVC IDE and run "Build All".
+ Open ``scripts/msvc[71|80]/yake_samples.sln`` in the MSVC IDE and run "Build All".
Building with GCC on PC/Linux
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -706,6 +746,7 @@
~~~~~~~~
Fire event with and without parameter::
+
event ev;
ev(42); // parameter is of type 'int'
ev(true); // parameter is of type 'bool'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
