Changeset 46 for trunk


Ignore:
Timestamp:
09/15/07 00:02:19 (12 years ago)
Author:
art
Message:
  • Include changes in *.cpp due to the directory structure change
  • Plugin build fixes (now plugins are build without preinstalling of the engine)
  • ToDo?: Uninstall do not remove the lib*.so files
Location:
trunk
Files:
1 deleted
49 edited

Legend:

Unmodified
Added
Removed
  • trunk/Make/Makedefs

    r32 r46  
     1#----------------------------------------------- 
     2# Global definitions 
     3#----------------------------------------------- 
     4VERSION = 0.0.8 
     5 
    16#----------------------------------------------- 
    27# Find out the platform 
     
    5762MKDIR = mkdir 
    5863MAKE = make 
     64LN = ln -s 
    5965 
    6066INSTALL_DIRS = $(INST_LOCATION_LIB) $(INST_LOCATION_INC) 
  • trunk/Make/Makerules

    r13 r46  
    1414        @ echo -n 'Create $@ ...' 
    1515        @ $(CC) $(CFLAGS) $(addprefix $(BUILDPATH)/,$(OBJECTS) ) -o $@ $(LDFLAGS) 
     16        @ mv $@ $(TOPDIR)/lib 
    1617        @ echo 'OK' 
    1718 
  • trunk/Packages/glfw/Makefile

    r45 r46  
    1717                 
    1818# create the target 
    19 TARGET=  $(TOPDIR)/lib/libnrEngineGLFW.so 
     19TARGET=  libnrEngineGLFW.so 
    2020INCPATH += -I./ -I$(TOPDIR)/include 
    2121CFLAGS += -fPIC 
  • trunk/Plugins/dynamicResources/Makefile

    r45 r46  
    2727 
    2828# installation definitions 
    29 INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine 
     29INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine-$(VERSION) 
    3030INSTALL_SRC_LIB = $(TARGET) 
    31 UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine 
     31UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine-$(VERSION) 
    3232 
    3333#----------------------------------------------- 
  • trunk/Plugins/luaScripting/Makefile

    r45 r46  
    2323 
    2424# installation definitions 
    25 INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine 
     25INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine-$(VERSION) 
    2626INSTALL_SRC_LIB = $(TARGET) 
    27 UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine 
     27UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine-$(VERSION) 
    2828 
    2929#----------------------------------------------- 
  • trunk/include/Makefile

    r45 r46  
    33include $(TOPDIR)/Make/Makedefs 
    44 
    5 SUBDIRS = nrEngine 
     5SUBDIRS = nrEngine nrEngine/events 
    66 
    77include $(TOPDIR)/Make/Makedirrules 
  • trunk/include/nrEngine/Makefile

    r45 r46  
    55#----------------------------------------------- 
    66include $(TOPDIR)/Make/Makedefs 
    7 SUBDIRS = events 
    87 
    98#----------------------------------------------- 
  • trunk/include/nrEngine/events/EngineEvent.h

    r37 r46  
    1818// Includes 
    1919//---------------------------------------------------------------------------------- 
    20 #include "../Prerequisities.h" 
    21 #include "../Event.h" 
    22 #include "ScriptEngine.h" 
     20#include <nrEngine/Prerequisities.h> 
     21#include <nrEngine/Event.h> 
     22#include <nrEngine/ScriptEngine.h> 
    2323 
    2424/*! 
  • trunk/include/nrEngine/events/KernelEvent.h

    r37 r46  
    1818// Includes 
    1919//---------------------------------------------------------------------------------- 
    20 #include "EngineEvent.h" 
    21 #include "../ITask.h" 
    22 #include "../Kernel.h" 
     20#include <nrEngine/events/EngineEvent.h> 
     21#include <nrEngine/ITask.h> 
     22#include <nrEngine/Kernel.h> 
    2323 
    2424namespace nrEngine{ 
  • trunk/include/nrEngine/events/KernelTaskEvent.h

    r37 r46  
    1818// Includes 
    1919//---------------------------------------------------------------------------------- 
    20 #include "KernelEvent.h" 
     20#include <nrEngine/events/KernelEvent.h> 
    2121 
    2222namespace nrEngine{ 
  • trunk/src/nrEngine/Clock.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "Clock.h" 
    17 #include "Log.h" 
     16#include <nrEngine/Clock.h> 
     17#include <nrEngine/Log.h> 
    1818 
    1919//---------------------------------------------------------------------------------- 
  • trunk/src/nrEngine/Engine.cpp

    r45 r46  
    1212 
    1313 
    14 #include "Engine.h" 
    15 #include "Kernel.h" 
    16 #include "Clock.h" 
    17 #include "Profiler.h" 
    18 #include "ResourceManager.h" 
    19 #include "PluginLoader.h" 
    20 #include "FileStreamLoader.h" 
    21 #include "EventManager.h" 
    22 #include "ScriptEngine.h" 
    23 #include "ScriptLoader.h" 
    24 #include "PropertyManager.h" 
     14#include <nrEngine/Engine.h> 
     15#include <nrEngine/Kernel.h> 
     16#include <nrEngine/Clock.h> 
     17#include <nrEngine/Profiler.h> 
     18#include <nrEngine/ResourceManager.h> 
     19#include <nrEngine/PluginLoader.h> 
     20#include <nrEngine/FileStreamLoader.h> 
     21#include <nrEngine/EventManager.h> 
     22#include <nrEngine/ScriptEngine.h> 
     23#include <nrEngine/ScriptLoader.h> 
     24#include <nrEngine/PropertyManager.h> 
    2525#include "DefaultScriptingFunctions.cpp" 
    2626 
  • trunk/src/nrEngine/Event.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "Event.h" 
     16#include <nrEngine/Event.h> 
    1717 
    1818 
  • trunk/src/nrEngine/EventActor.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "EventActor.h" 
    17 #include "EventManager.h" 
    18 #include "EventChannel.h" 
    19 #include "Engine.h" 
     16#include <nrEngine/EventActor.h> 
     17#include <nrEngine/EventManager.h> 
     18#include <nrEngine/EventChannel.h> 
     19#include <nrEngine/Engine.h> 
    2020 
    2121namespace nrEngine{ 
  • trunk/src/nrEngine/EventChannel.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "EventChannel.h" 
    17 #include "Log.h" 
    18 #include "Profiler.h" 
     16#include <nrEngine/EventChannel.h> 
     17#include <nrEngine/Log.h> 
     18#include <nrEngine/Profiler.h> 
    1919 
    2020namespace nrEngine{ 
  • trunk/src/nrEngine/EventFactory.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "EventFactory.h" 
    17 #include "EventManager.h" 
     16#include <nrEngine/EventFactory.h> 
     17#include <nrEngine/EventManager.h> 
    1818 
    1919namespace nrEngine{ 
  • trunk/src/nrEngine/EventManager.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "EventManager.h" 
    17 #include "Log.h" 
    18 #include "Profiler.h" 
    19 #include "ITask.h" 
    20 #include "EventChannel.h" 
    21 #include "Event.h" 
    22 #include "EventFactory.h" 
     16#include <nrEngine/EventManager.h> 
     17#include <nrEngine/Log.h> 
     18#include <nrEngine/Profiler.h> 
     19#include <nrEngine/ITask.h> 
     20#include <nrEngine/EventChannel.h> 
     21#include <nrEngine/Event.h> 
     22#include <nrEngine/EventFactory.h> 
    2323 
    2424 
  • trunk/src/nrEngine/Exception.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "Exception.h" 
    17 #include "Engine.h" 
     16#include <nrEngine/Exception.h> 
     17#include <nrEngine/Engine.h> 
    1818 
    1919namespace nrEngine{ 
  • trunk/src/nrEngine/FileStream.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "FileStream.h" 
    18 #include "Log.h" 
     17#include <nrEngine/FileStream.h> 
     18#include <nrEngine/Log.h> 
    1919 
    2020namespace nrEngine { 
  • trunk/src/nrEngine/FileStreamLoader.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "FileStreamLoader.h" 
    18 #include "Log.h" 
     17#include <nrEngine/FileStreamLoader.h> 
     18#include <nrEngine/Log.h> 
    1919 
    2020namespace nrEngine{ 
  • trunk/src/nrEngine/GetTime.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "GetTime.h" 
     16#include <nrEngine/GetTime.h> 
    1717 
    1818//namespace nrEngine{ 
  • trunk/src/nrEngine/IFileSystem.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "IFileSystem.h" 
     17#include <nrEngine/IFileSystem.h> 
    1818 
    1919namespace nrEngine { 
  • trunk/src/nrEngine/IScript.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "IScript.h" 
    18 #include "Log.h" 
    19 #include "Kernel.h" 
     17#include <nrEngine/IScript.h> 
     18#include <nrEngine/Log.h> 
     19#include <nrEngine/Kernel.h> 
    2020 
    2121namespace nrEngine{ 
  • trunk/src/nrEngine/IStream.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "IStream.h" 
     17#include <nrEngine/IStream.h> 
    1818 
    1919namespace nrEngine { 
  • trunk/src/nrEngine/ITask.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "ITask.h" 
    18 #include "Log.h" 
    19 #include "Kernel.h" 
     17#include <nrEngine/ITask.h> 
     18#include <nrEngine/Log.h> 
     19#include <nrEngine/Kernel.h> 
    2020 
    2121namespace nrEngine{ 
  • trunk/src/nrEngine/IThread.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "IThread.h" 
    18 #include "EventManager.h" 
    19 #include "Log.h" 
     17#include <nrEngine/IThread.h> 
     18#include <nrEngine/EventManager.h> 
     19#include <nrEngine/Log.h> 
    2020#include <boost/bind.hpp> 
    2121 
  • trunk/src/nrEngine/Kernel.cpp

    r45 r46  
    1212 
    1313 
    14 #include "Kernel.h" 
    15 #include "Profiler.h" 
    16 #include "events/KernelTaskEvent.h" 
    17 #include "EventManager.h" 
    18 #include "StdHelpers.h" 
    19 #include "Log.h" 
     14#include <nrEngine/Kernel.h> 
     15#include <nrEngine/Profiler.h> 
     16#include <nrEngine/events/KernelTaskEvent.h> 
     17#include <nrEngine/EventManager.h> 
     18#include <nrEngine/StdHelpers.h> 
     19#include <nrEngine/Log.h> 
    2020 
    2121namespace nrEngine { 
  • trunk/src/nrEngine/KernelEvent.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "events/KernelEvent.h" 
     16#include <nrEngine/events/KernelEvent.h> 
    1717 
    1818namespace nrEngine{ 
  • trunk/src/nrEngine/Log.cpp

    r45 r46  
    1212 
    1313 
    14 #include "Log.h" 
     14#include <nrEngine/Log.h> 
    1515#include <iostream> 
    1616#include <time.h> 
  • trunk/src/nrEngine/Makefile

    r45 r46  
    5454 
    5555# define used vairables 
    56 TARGET = $(TOPDIR)/lib/libnrEngine.so 
     56TARGET = libnrEngine.so 
    5757INCPATH += -I$(TOPDIR)/include 
    5858CFLAGS += -fPIC 
  • trunk/src/nrEngine/Plugin.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "Plugin.h" 
    18 #include "Engine.h" 
     17#include <nrEngine/Plugin.h> 
     18#include <nrEngine/Engine.h> 
    1919 
    2020namespace nrEngine { 
  • trunk/src/nrEngine/PluginLoader.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "PluginLoader.h" 
    18 #include "Log.h" 
     17#include <nrEngine/PluginLoader.h> 
     18#include <nrEngine/Log.h> 
    1919 
    2020namespace nrEngine{ 
  • trunk/src/nrEngine/Profiler.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "Engine.h" 
    18 #include "Profiler.h" 
    19 #include "Exception.h" 
    20 #include "TimeSource.h" 
     17#include <nrEngine/Engine.h> 
     18#include <nrEngine/Profiler.h> 
     19#include <nrEngine/Exception.h> 
     20#include <nrEngine/TimeSource.h> 
    2121 
    2222namespace nrEngine{ 
  • trunk/src/nrEngine/Property.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "Property.h" 
    17 #include "Exception.h" 
    18 #include "Log.h" 
     16#include <nrEngine/Property.h> 
     17#include <nrEngine/Exception.h> 
     18#include <nrEngine/Log.h> 
    1919 
    2020namespace nrEngine { 
  • trunk/src/nrEngine/PropertyManager.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "PropertyManager.h" 
    17 #include "Exception.h" 
     16#include <nrEngine/PropertyManager.h> 
     17#include <nrEngine/Exception.h> 
    1818 
    1919namespace nrEngine { 
  • trunk/src/nrEngine/Resource.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "Resource.h" 
    18 #include "Exception.h" 
    19 #include "Log.h" 
     17#include <nrEngine/Resource.h> 
     18#include <nrEngine/Exception.h> 
     19#include <nrEngine/Log.h> 
    2020 
    2121namespace nrEngine { 
  • trunk/src/nrEngine/ResourceHolder.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "ResourceHolder.h" 
    18 #include "Exception.h" 
    19 #include "ResourceSystem.h" 
    20 #include "Log.h" 
     17#include <nrEngine/ResourceHolder.h> 
     18#include <nrEngine/Exception.h> 
     19#include <nrEngine/ResourceSystem.h> 
     20#include <nrEngine/Log.h> 
    2121 
    2222namespace nrEngine{ 
  • trunk/src/nrEngine/ResourceLoader.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "ResourceLoader.h" 
    18 #include "Log.h" 
    19 #include "Exception.h" 
    20 #include "Engine.h" 
    21 #include "ResourceManager.h" 
     17#include <nrEngine/ResourceLoader.h> 
     18#include <nrEngine/Log.h> 
     19#include <nrEngine/Exception.h> 
     20#include <nrEngine/Engine.h> 
     21#include <nrEngine/ResourceManager.h> 
    2222 
    2323namespace nrEngine{ 
  • trunk/src/nrEngine/ResourceManager.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "ResourceManager.h" 
    17 #include "Log.h" 
    18 #include "Exception.h" 
    19 #include "Engine.h" 
     16#include <nrEngine/ResourceManager.h> 
     17#include <nrEngine/Log.h> 
     18#include <nrEngine/Exception.h> 
     19#include <nrEngine/Engine.h> 
    2020 
    2121namespace nrEngine{ 
  • trunk/src/nrEngine/ResourcePtr.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "ResourcePtr.h" 
    18 #include "Exception.h" 
    19 #include "ResourceSystem.h" 
     17#include <nrEngine/ResourcePtr.h> 
     18#include <nrEngine/Exception.h> 
     19#include <nrEngine/ResourceSystem.h> 
    2020 
    2121namespace nrEngine{ 
  • trunk/src/nrEngine/Script.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "Script.h" 
    18 #include "ScriptEngine.h" 
    19 #include "Clock.h" 
    20 #include "Log.h" 
    21 #include "Kernel.h" 
     17#include <nrEngine/Script.h> 
     18#include <nrEngine/ScriptEngine.h> 
     19#include <nrEngine/Clock.h> 
     20#include <nrEngine/Log.h> 
     21#include <nrEngine/Kernel.h> 
    2222#include <boost/algorithm/string/trim.hpp> 
    2323 
  • trunk/src/nrEngine/ScriptConnector.cpp

    r45 r46  
    1111 ***************************************************************************/ 
    1212 
    13 #include "ScriptConnector.h" 
    14 #include "events/EngineEvent.h" 
    15 #include "ScriptEngine.h" 
    16 #include "Engine.h" 
     13#include <nrEngine/ScriptConnector.h> 
     14#include <nrEngine/events/EngineEvent.h> 
     15#include <nrEngine/ScriptEngine.h> 
     16#include <nrEngine/Engine.h> 
    1717 
    1818namespace nrEngine{ 
  • trunk/src/nrEngine/ScriptEngine.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "ScriptEngine.h" 
    18 #include "Log.h" 
    19 #include "events/EngineEvent.h" 
    20 #include "EventManager.h" 
    21 #include "VariadicArgument.h" 
    22 #include "IScript.h" 
     17#include <nrEngine/ScriptEngine.h> 
     18#include <nrEngine/Log.h> 
     19#include <nrEngine/events/EngineEvent.h> 
     20#include <nrEngine/EventManager.h> 
     21#include <nrEngine/VariadicArgument.h> 
     22#include <nrEngine/IScript.h> 
    2323 
    2424namespace nrEngine{ 
  • trunk/src/nrEngine/ScriptLoader.cpp

    r45 r46  
    1515// Includes 
    1616//---------------------------------------------------------------------------------- 
    17 #include "ScriptLoader.h" 
    18 #include "Log.h" 
    19 #include "FileStream.h" 
    20 #include "Kernel.h" 
     17#include <nrEngine/ScriptLoader.h> 
     18#include <nrEngine/Log.h> 
     19#include <nrEngine/FileStream.h> 
     20#include <nrEngine/Kernel.h> 
    2121 
    2222namespace nrEngine{ 
  • trunk/src/nrEngine/StdHelpers.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "StdHelpers.h" 
    17 #include "ITask.h" 
     16#include <nrEngine/StdHelpers.h> 
     17#include <nrEngine/ITask.h> 
    1818 
    1919#include <time.h> 
  • trunk/src/nrEngine/TimeSource.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "TimeSource.h" 
    17 #include "Log.h" 
     16#include <nrEngine/TimeSource.h> 
     17#include <nrEngine/Log.h> 
    1818 
    1919#include <time.h> 
  • trunk/src/nrEngine/TimeSourceVirtual.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "TimeSourceVirtual.h" 
    17 #include "TimeSource.h" 
    18 #include "Log.h" 
     16#include <nrEngine/TimeSourceVirtual.h> 
     17#include <nrEngine/TimeSource.h> 
     18#include <nrEngine/Log.h> 
    1919 
    2020 
  • trunk/src/nrEngine/Timer.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "Timer.h" 
     16#include <nrEngine/Timer.h> 
    1717 
    1818 
  • trunk/src/nrEngine/VariadicArgument.cpp

    r45 r46  
    1414// Includes 
    1515//---------------------------------------------------------------------------------- 
    16 #include "VariadicArgument.h" 
    17 #include "Exception.h" 
     16#include <nrEngine/VariadicArgument.h> 
     17#include <nrEngine/Exception.h> 
    1818 
    1919namespace nrEngine { 
Note: See TracChangeset for help on using the changeset viewer.