Changeset 46

Timestamp:

09/15/2007 12:02:19 AM (5 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:

• Make/Makedefs (modified) (2 diffs)
• Make/Makerules (modified) (1 diff)
• Packages/glfw/Makefile (modified) (1 diff)
• Plugins/dynamicResources/Makefile (modified) (1 diff)
• Plugins/luaScripting/Makefile (modified) (1 diff)
• include/Makefile (modified) (1 diff)
• include/nrEngine/Makefile (modified) (1 diff)
• include/nrEngine/events/EngineEvent.h (modified) (1 diff)
• include/nrEngine/events/KernelEvent.h (modified) (1 diff)
• include/nrEngine/events/KernelTaskEvent.h (modified) (1 diff)
• nrEngine (deleted)
• src/nrEngine/Clock.cpp (modified) (1 diff)
• src/nrEngine/Engine.cpp (modified) (1 diff)
• src/nrEngine/Event.cpp (modified) (1 diff)
• src/nrEngine/EventActor.cpp (modified) (1 diff)
• src/nrEngine/EventChannel.cpp (modified) (1 diff)
• src/nrEngine/EventFactory.cpp (modified) (1 diff)
• src/nrEngine/EventManager.cpp (modified) (1 diff)
• src/nrEngine/Exception.cpp (modified) (1 diff)
• src/nrEngine/FileStream.cpp (modified) (1 diff)
• src/nrEngine/FileStreamLoader.cpp (modified) (1 diff)
• src/nrEngine/GetTime.cpp (modified) (1 diff)
• src/nrEngine/IFileSystem.cpp (modified) (1 diff)
• src/nrEngine/IScript.cpp (modified) (1 diff)
• src/nrEngine/IStream.cpp (modified) (1 diff)
• src/nrEngine/ITask.cpp (modified) (1 diff)
• src/nrEngine/IThread.cpp (modified) (1 diff)
• src/nrEngine/Kernel.cpp (modified) (1 diff)
• src/nrEngine/KernelEvent.cpp (modified) (1 diff)
• src/nrEngine/Log.cpp (modified) (1 diff)
• src/nrEngine/Makefile (modified) (1 diff)
• src/nrEngine/Plugin.cpp (modified) (1 diff)
• src/nrEngine/PluginLoader.cpp (modified) (1 diff)
• src/nrEngine/Profiler.cpp (modified) (1 diff)
• src/nrEngine/Property.cpp (modified) (1 diff)
• src/nrEngine/PropertyManager.cpp (modified) (1 diff)
• src/nrEngine/Resource.cpp (modified) (1 diff)
• src/nrEngine/ResourceHolder.cpp (modified) (1 diff)
• src/nrEngine/ResourceLoader.cpp (modified) (1 diff)
• src/nrEngine/ResourceManager.cpp (modified) (1 diff)
• src/nrEngine/ResourcePtr.cpp (modified) (1 diff)
• src/nrEngine/Script.cpp (modified) (1 diff)
• src/nrEngine/ScriptConnector.cpp (modified) (1 diff)
• src/nrEngine/ScriptEngine.cpp (modified) (1 diff)
• src/nrEngine/ScriptLoader.cpp (modified) (1 diff)
• src/nrEngine/StdHelpers.cpp (modified) (1 diff)
• src/nrEngine/TimeSource.cpp (modified) (1 diff)
• src/nrEngine/TimeSourceVirtual.cpp (modified) (1 diff)
• src/nrEngine/Timer.cpp (modified) (1 diff)
• src/nrEngine/VariadicArgument.cpp (modified) (1 diff)

trunk/Make/Makedefs

@@ +1 @@
+#-----------------------------------------------
+# Global definitions
+#-----------------------------------------------
+VERSION = 0.0.8
+
 #-----------------------------------------------
 # Find out the platform
@@ -57 +62 @@
 MKDIR = mkdir
 MAKE = make
+LN = ln -s
 
 INSTALL_DIRS = $(INST_LOCATION_LIB) $(INST_LOCATION_INC)

trunk/Make/Makerules

@@ -14 +14 @@
         @ echo -n 'Create $@ ...'
         @ $(CC) $(CFLAGS) $(addprefix $(BUILDPATH)/,$(OBJECTS) ) -o $@ $(LDFLAGS)
+        @ mv $@ $(TOPDIR)/lib
         @ echo 'OK'
 

trunk/Packages/glfw/Makefile

@@ -17 +17 @@
                 
 # create the target
-TARGET=  $(TOPDIR)/lib/libnrEngineGLFW.so
+TARGET=  libnrEngineGLFW.so
 INCPATH += -I./ -I$(TOPDIR)/include
 CFLAGS += -fPIC

trunk/Plugins/dynamicResources/Makefile

@@ -27 +27 @@
 
 # installation definitions
-INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine
+INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine-$(VERSION)
 INSTALL_SRC_LIB = $(TARGET)
-UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine
+UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine-$(VERSION)
 
 #-----------------------------------------------

trunk/Plugins/luaScripting/Makefile

@@ -23 +23 @@
 
 # installation definitions
-INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine
+INSTALL_DST_LIB = $(INST_LOCATION_LIB)/nrEngine-$(VERSION)
 INSTALL_SRC_LIB = $(TARGET)
-UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine
+UNINSTALL_DIR = $(INST_LOCATION_LIB)/nrEngine-$(VERSION)
 
 #-----------------------------------------------

trunk/include/Makefile

@@ -3 +3 @@
 include $(TOPDIR)/Make/Makedefs
 
-SUBDIRS = nrEngine
+SUBDIRS = nrEngine nrEngine/events
 
 include $(TOPDIR)/Make/Makedirrules

trunk/include/nrEngine/Makefile

@@ -5 +5 @@
 #-----------------------------------------------
 include $(TOPDIR)/Make/Makedefs
-SUBDIRS = events
 
 #-----------------------------------------------

trunk/include/nrEngine/events/EngineEvent.h

@@ -18 +18 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "../Prerequisities.h"
-#include "../Event.h"
-#include "ScriptEngine.h"
+#include <nrEngine/Prerequisities.h>
+#include <nrEngine/Event.h>
+#include <nrEngine/ScriptEngine.h>
 
 /*!

trunk/include/nrEngine/events/KernelEvent.h

@@ -18 +18 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "EngineEvent.h"
-#include "../ITask.h"
-#include "../Kernel.h"
+#include <nrEngine/events/EngineEvent.h>
+#include <nrEngine/ITask.h>
+#include <nrEngine/Kernel.h>
 
 namespace nrEngine{

trunk/include/nrEngine/events/KernelTaskEvent.h

@@ -18 +18 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "KernelEvent.h"
+#include <nrEngine/events/KernelEvent.h>
 
 namespace nrEngine{

trunk/src/nrEngine/Clock.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Clock.h"
-#include "Log.h"
+#include <nrEngine/Clock.h>
+#include <nrEngine/Log.h>
 
 //----------------------------------------------------------------------------------

trunk/src/nrEngine/Engine.cpp

@@ -12 +12 @@
 
 
-#include "Engine.h"
-#include "Kernel.h"
-#include "Clock.h"
-#include "Profiler.h"
-#include "ResourceManager.h"
-#include "PluginLoader.h"
-#include "FileStreamLoader.h"
-#include "EventManager.h"
-#include "ScriptEngine.h"
-#include "ScriptLoader.h"
-#include "PropertyManager.h"
+#include <nrEngine/Engine.h>
+#include <nrEngine/Kernel.h>
+#include <nrEngine/Clock.h>
+#include <nrEngine/Profiler.h>
+#include <nrEngine/ResourceManager.h>
+#include <nrEngine/PluginLoader.h>
+#include <nrEngine/FileStreamLoader.h>
+#include <nrEngine/EventManager.h>
+#include <nrEngine/ScriptEngine.h>
+#include <nrEngine/ScriptLoader.h>
+#include <nrEngine/PropertyManager.h>
 #include "DefaultScriptingFunctions.cpp"
 

trunk/src/nrEngine/Event.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Event.h"
+#include <nrEngine/Event.h>
 
 

trunk/src/nrEngine/EventActor.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "EventActor.h"
-#include "EventManager.h"
-#include "EventChannel.h"
-#include "Engine.h"
+#include <nrEngine/EventActor.h>
+#include <nrEngine/EventManager.h>
+#include <nrEngine/EventChannel.h>
+#include <nrEngine/Engine.h>
 
 namespace nrEngine{

trunk/src/nrEngine/EventChannel.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "EventChannel.h"
-#include "Log.h"
-#include "Profiler.h"
+#include <nrEngine/EventChannel.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/Profiler.h>
 
 namespace nrEngine{

trunk/src/nrEngine/EventFactory.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "EventFactory.h"
-#include "EventManager.h"
+#include <nrEngine/EventFactory.h>
+#include <nrEngine/EventManager.h>
 
 namespace nrEngine{

trunk/src/nrEngine/EventManager.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "EventManager.h"
-#include "Log.h"
-#include "Profiler.h"
-#include "ITask.h"
-#include "EventChannel.h"
-#include "Event.h"
-#include "EventFactory.h"
+#include <nrEngine/EventManager.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/Profiler.h>
+#include <nrEngine/ITask.h>
+#include <nrEngine/EventChannel.h>
+#include <nrEngine/Event.h>
+#include <nrEngine/EventFactory.h>
 
 

trunk/src/nrEngine/Exception.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Exception.h"
-#include "Engine.h"
+#include <nrEngine/Exception.h>
+#include <nrEngine/Engine.h>
 
 namespace nrEngine{

trunk/src/nrEngine/FileStream.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "FileStream.h"
-#include "Log.h"
+#include <nrEngine/FileStream.h>
+#include <nrEngine/Log.h>
 
 namespace nrEngine {

trunk/src/nrEngine/FileStreamLoader.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "FileStreamLoader.h"
-#include "Log.h"
+#include <nrEngine/FileStreamLoader.h>
+#include <nrEngine/Log.h>
 
 namespace nrEngine{

trunk/src/nrEngine/GetTime.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "GetTime.h"
+#include <nrEngine/GetTime.h>
 
 //namespace nrEngine{

trunk/src/nrEngine/IFileSystem.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "IFileSystem.h"
+#include <nrEngine/IFileSystem.h>
 
 namespace nrEngine {

trunk/src/nrEngine/IScript.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "IScript.h"
-#include "Log.h"
-#include "Kernel.h"
+#include <nrEngine/IScript.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/Kernel.h>
 
 namespace nrEngine{

trunk/src/nrEngine/IStream.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "IStream.h"
+#include <nrEngine/IStream.h>
 
 namespace nrEngine {

trunk/src/nrEngine/ITask.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "ITask.h"
-#include "Log.h"
-#include "Kernel.h"
+#include <nrEngine/ITask.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/Kernel.h>
 
 namespace nrEngine{

trunk/src/nrEngine/IThread.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "IThread.h"
-#include "EventManager.h"
-#include "Log.h"
+#include <nrEngine/IThread.h>
+#include <nrEngine/EventManager.h>
+#include <nrEngine/Log.h>
 #include <boost/bind.hpp>
 

trunk/src/nrEngine/Kernel.cpp

@@ -12 +12 @@
 
 
-#include "Kernel.h"
-#include "Profiler.h"
-#include "events/KernelTaskEvent.h"
-#include "EventManager.h"
-#include "StdHelpers.h"
-#include "Log.h"
+#include <nrEngine/Kernel.h>
+#include <nrEngine/Profiler.h>
+#include <nrEngine/events/KernelTaskEvent.h>
+#include <nrEngine/EventManager.h>
+#include <nrEngine/StdHelpers.h>
+#include <nrEngine/Log.h>
 
 namespace nrEngine {

trunk/src/nrEngine/KernelEvent.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "events/KernelEvent.h"
+#include <nrEngine/events/KernelEvent.h>
 
 namespace nrEngine{

trunk/src/nrEngine/Log.cpp

@@ -12 +12 @@
 
 
-#include "Log.h"
+#include <nrEngine/Log.h>
 #include <iostream>
 #include <time.h>

trunk/src/nrEngine/Makefile

@@ -54 +54 @@
 
 # define used vairables
-TARGET = $(TOPDIR)/lib/libnrEngine.so
+TARGET = libnrEngine.so
 INCPATH += -I$(TOPDIR)/include
 CFLAGS += -fPIC

trunk/src/nrEngine/Plugin.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Plugin.h"
-#include "Engine.h"
+#include <nrEngine/Plugin.h>
+#include <nrEngine/Engine.h>
 
 namespace nrEngine {

trunk/src/nrEngine/PluginLoader.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "PluginLoader.h"
-#include "Log.h"
+#include <nrEngine/PluginLoader.h>
+#include <nrEngine/Log.h>
 
 namespace nrEngine{

trunk/src/nrEngine/Profiler.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Engine.h"
-#include "Profiler.h"
-#include "Exception.h"
-#include "TimeSource.h"
+#include <nrEngine/Engine.h>
+#include <nrEngine/Profiler.h>
+#include <nrEngine/Exception.h>
+#include <nrEngine/TimeSource.h>
 
 namespace nrEngine{

trunk/src/nrEngine/Property.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Property.h"
-#include "Exception.h"
-#include "Log.h"
+#include <nrEngine/Property.h>
+#include <nrEngine/Exception.h>
+#include <nrEngine/Log.h>
 
 namespace nrEngine {

trunk/src/nrEngine/PropertyManager.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "PropertyManager.h"
-#include "Exception.h"
+#include <nrEngine/PropertyManager.h>
+#include <nrEngine/Exception.h>
 
 namespace nrEngine {

trunk/src/nrEngine/Resource.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Resource.h"
-#include "Exception.h"
-#include "Log.h"
+#include <nrEngine/Resource.h>
+#include <nrEngine/Exception.h>
+#include <nrEngine/Log.h>
 
 namespace nrEngine {

trunk/src/nrEngine/ResourceHolder.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "ResourceHolder.h"
-#include "Exception.h"
-#include "ResourceSystem.h"
-#include "Log.h"
+#include <nrEngine/ResourceHolder.h>
+#include <nrEngine/Exception.h>
+#include <nrEngine/ResourceSystem.h>
+#include <nrEngine/Log.h>
 
 namespace nrEngine{

trunk/src/nrEngine/ResourceLoader.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "ResourceLoader.h"
-#include "Log.h"
-#include "Exception.h"
-#include "Engine.h"
-#include "ResourceManager.h"
+#include <nrEngine/ResourceLoader.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/Exception.h>
+#include <nrEngine/Engine.h>
+#include <nrEngine/ResourceManager.h>
 
 namespace nrEngine{

trunk/src/nrEngine/ResourceManager.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "ResourceManager.h"
-#include "Log.h"
-#include "Exception.h"
-#include "Engine.h"
+#include <nrEngine/ResourceManager.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/Exception.h>
+#include <nrEngine/Engine.h>
 
 namespace nrEngine{

trunk/src/nrEngine/ResourcePtr.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "ResourcePtr.h"
-#include "Exception.h"
-#include "ResourceSystem.h"
+#include <nrEngine/ResourcePtr.h>
+#include <nrEngine/Exception.h>
+#include <nrEngine/ResourceSystem.h>
 
 namespace nrEngine{

trunk/src/nrEngine/Script.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Script.h"
-#include "ScriptEngine.h"
-#include "Clock.h"
-#include "Log.h"
-#include "Kernel.h"
+#include <nrEngine/Script.h>
+#include <nrEngine/ScriptEngine.h>
+#include <nrEngine/Clock.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/Kernel.h>
 #include <boost/algorithm/string/trim.hpp>
 

trunk/src/nrEngine/ScriptConnector.cpp

@@ -11 +11 @@
  ***************************************************************************/
 
-#include "ScriptConnector.h"
-#include "events/EngineEvent.h"
-#include "ScriptEngine.h"
-#include "Engine.h"
+#include <nrEngine/ScriptConnector.h>
+#include <nrEngine/events/EngineEvent.h>
+#include <nrEngine/ScriptEngine.h>
+#include <nrEngine/Engine.h>
 
 namespace nrEngine{

trunk/src/nrEngine/ScriptEngine.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "ScriptEngine.h"
-#include "Log.h"
-#include "events/EngineEvent.h"
-#include "EventManager.h"
-#include "VariadicArgument.h"
-#include "IScript.h"
+#include <nrEngine/ScriptEngine.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/events/EngineEvent.h>
+#include <nrEngine/EventManager.h>
+#include <nrEngine/VariadicArgument.h>
+#include <nrEngine/IScript.h>
 
 namespace nrEngine{

trunk/src/nrEngine/ScriptLoader.cpp

@@ -15 +15 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "ScriptLoader.h"
-#include "Log.h"
-#include "FileStream.h"
-#include "Kernel.h"
+#include <nrEngine/ScriptLoader.h>
+#include <nrEngine/Log.h>
+#include <nrEngine/FileStream.h>
+#include <nrEngine/Kernel.h>
 
 namespace nrEngine{

trunk/src/nrEngine/StdHelpers.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "StdHelpers.h"
-#include "ITask.h"
+#include <nrEngine/StdHelpers.h>
+#include <nrEngine/ITask.h>
 
 #include <time.h>

trunk/src/nrEngine/TimeSource.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "TimeSource.h"
-#include "Log.h"
+#include <nrEngine/TimeSource.h>
+#include <nrEngine/Log.h>
 
 #include <time.h>

trunk/src/nrEngine/TimeSourceVirtual.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "TimeSourceVirtual.h"
-#include "TimeSource.h"
-#include "Log.h"
+#include <nrEngine/TimeSourceVirtual.h>
+#include <nrEngine/TimeSource.h>
+#include <nrEngine/Log.h>
 
 

trunk/src/nrEngine/Timer.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "Timer.h"
+#include <nrEngine/Timer.h>
 
 

trunk/src/nrEngine/VariadicArgument.cpp

@@ -14 +14 @@
 // Includes
 //----------------------------------------------------------------------------------
-#include "VariadicArgument.h"
-#include "Exception.h"
+#include <nrEngine/VariadicArgument.h>
+#include <nrEngine/Exception.h>
 
 namespace nrEngine {