Changeset 45
- Timestamp:
- 09/14/2007 11:20:53 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 4 edited
- 2 copied
- 91 moved
-
Makefile (modified) (1 diff)
-
Packages/glfw/Makefile (modified) (1 diff)
-
Plugins/dynamicResources/Makefile (modified) (1 diff)
-
Plugins/luaScripting/Makefile (modified) (1 diff)
-
include/Makefile (added)
-
include/nrEngine/Binding.h (moved) (moved from trunk/include/Binding.h)
-
include/nrEngine/Clock.h (moved) (moved from trunk/include/Clock.h)
-
include/nrEngine/Engine.h (moved) (moved from trunk/include/Engine.h)
-
include/nrEngine/Event.h (moved) (moved from trunk/include/Event.h)
-
include/nrEngine/EventActor.h (moved) (moved from trunk/include/EventActor.h)
-
include/nrEngine/EventChannel.h (moved) (moved from trunk/include/EventChannel.h)
-
include/nrEngine/EventFactory.h (moved) (moved from trunk/include/EventFactory.h)
-
include/nrEngine/EventManager.h (moved) (moved from trunk/include/EventManager.h)
-
include/nrEngine/Exception.h (moved) (moved from trunk/include/Exception.h)
-
include/nrEngine/FileStream.h (moved) (moved from trunk/include/FileStream.h)
-
include/nrEngine/FileStreamLoader.h (moved) (moved from trunk/include/FileStreamLoader.h)
-
include/nrEngine/FileSystemManager.h (moved) (moved from trunk/include/FileSystemManager.h)
-
include/nrEngine/GetTime.h (moved) (moved from trunk/include/GetTime.h)
-
include/nrEngine/IFileSystem.h (moved) (moved from trunk/include/IFileSystem.h)
-
include/nrEngine/IScript.h (moved) (moved from trunk/include/IScript.h)
-
include/nrEngine/IStream.h (moved) (moved from trunk/include/IStream.h)
-
include/nrEngine/ITask.h (moved) (moved from trunk/include/ITask.h)
-
include/nrEngine/IThread.h (moved) (moved from trunk/include/IThread.h)
-
include/nrEngine/ITimeObserver.h (moved) (moved from trunk/include/ITimeObserver.h)
-
include/nrEngine/Kernel.h (moved) (moved from trunk/include/Kernel.h)
-
include/nrEngine/KeySym.h (moved) (moved from trunk/include/KeySym.h)
-
include/nrEngine/Log.h (moved) (moved from trunk/include/Log.h)
-
include/nrEngine/Makefile (copied) (copied from trunk/include/Makefile) (1 diff)
-
include/nrEngine/Package.h (moved) (moved from trunk/include/Package.h)
-
include/nrEngine/Platform.h (moved) (moved from trunk/include/Platform.h)
-
include/nrEngine/Plugin.h (moved) (moved from trunk/include/Plugin.h)
-
include/nrEngine/PluginLoader.h (moved) (moved from trunk/include/PluginLoader.h)
-
include/nrEngine/Prerequisities.h (moved) (moved from trunk/include/Prerequisities.h)
-
include/nrEngine/Priority.h (moved) (moved from trunk/include/Priority.h)
-
include/nrEngine/Profiler.h (moved) (moved from trunk/include/Profiler.h)
-
include/nrEngine/Property.h (moved) (moved from trunk/include/Property.h)
-
include/nrEngine/PropertyManager.h (moved) (moved from trunk/include/PropertyManager.h)
-
include/nrEngine/Resource.h (moved) (moved from trunk/include/Resource.h)
-
include/nrEngine/ResourceFactory.h (moved) (moved from trunk/include/ResourceFactory.h)
-
include/nrEngine/ResourceHolder.h (moved) (moved from trunk/include/ResourceHolder.h)
-
include/nrEngine/ResourceLoader.h (moved) (moved from trunk/include/ResourceLoader.h)
-
include/nrEngine/ResourceManager.h (moved) (moved from trunk/include/ResourceManager.h)
-
include/nrEngine/ResourcePtr.h (moved) (moved from trunk/include/ResourcePtr.h)
-
include/nrEngine/ResourceSystem.h (moved) (moved from trunk/include/ResourceSystem.h)
-
include/nrEngine/Result.h (moved) (moved from trunk/include/Result.h)
-
include/nrEngine/Script.h (moved) (moved from trunk/include/Script.h)
-
include/nrEngine/ScriptConnector.h (moved) (moved from trunk/include/ScriptConnector.h)
-
include/nrEngine/ScriptEngine.h (moved) (moved from trunk/include/ScriptEngine.h)
-
include/nrEngine/ScriptLoader.h (moved) (moved from trunk/include/ScriptLoader.h)
-
include/nrEngine/SmartPtr.h (moved) (moved from trunk/include/SmartPtr.h)
-
include/nrEngine/StdHeaders.h (moved) (moved from trunk/include/StdHeaders.h)
-
include/nrEngine/StdHelpers.h (moved) (moved from trunk/include/StdHelpers.h)
-
include/nrEngine/TimeSource.h (moved) (moved from trunk/include/TimeSource.h)
-
include/nrEngine/TimeSourceVirtual.h (moved) (moved from trunk/include/TimeSourceVirtual.h)
-
include/nrEngine/Timer.h (moved) (moved from trunk/include/Timer.h)
-
include/nrEngine/VariadicArgument.h (moved) (moved from trunk/include/VariadicArgument.h)
-
include/nrEngine/events (moved) (moved from trunk/include/events)
-
include/nrEngine/nrEngine.h (moved) (moved from trunk/include/nrEngine.h)
-
src/Makefile (added)
-
src/nrEngine (added)
-
src/nrEngine/Clock.cpp (moved) (moved from trunk/src/Clock.cpp)
-
src/nrEngine/DefaultScriptingFunctions.cpp (moved) (moved from trunk/src/DefaultScriptingFunctions.cpp)
-
src/nrEngine/Engine.cpp (moved) (moved from trunk/src/Engine.cpp)
-
src/nrEngine/Event.cpp (moved) (moved from trunk/src/Event.cpp)
-
src/nrEngine/EventActor.cpp (moved) (moved from trunk/src/EventActor.cpp)
-
src/nrEngine/EventChannel.cpp (moved) (moved from trunk/src/EventChannel.cpp)
-
src/nrEngine/EventFactory.cpp (moved) (moved from trunk/src/EventFactory.cpp)
-
src/nrEngine/EventManager.cpp (moved) (moved from trunk/src/EventManager.cpp)
-
src/nrEngine/Exception.cpp (moved) (moved from trunk/src/Exception.cpp)
-
src/nrEngine/FileStream.cpp (moved) (moved from trunk/src/FileStream.cpp)
-
src/nrEngine/FileStreamLoader.cpp (moved) (moved from trunk/src/FileStreamLoader.cpp)
-
src/nrEngine/GetTime.cpp (moved) (moved from trunk/src/GetTime.cpp)
-
src/nrEngine/IFileSystem.cpp (moved) (moved from trunk/src/IFileSystem.cpp)
-
src/nrEngine/IScript.cpp (moved) (moved from trunk/src/IScript.cpp)
-
src/nrEngine/IStream.cpp (moved) (moved from trunk/src/IStream.cpp)
-
src/nrEngine/ITask.cpp (moved) (moved from trunk/src/ITask.cpp)
-
src/nrEngine/IThread.cpp (moved) (moved from trunk/src/IThread.cpp)
-
src/nrEngine/Kernel.cpp (moved) (moved from trunk/src/Kernel.cpp)
-
src/nrEngine/KernelEvent.cpp (moved) (moved from trunk/src/KernelEvent.cpp)
-
src/nrEngine/Log.cpp (moved) (moved from trunk/src/Log.cpp)
-
src/nrEngine/Makefile (copied) (copied from trunk/src/Makefile) (2 diffs)
-
src/nrEngine/Plugin.cpp (moved) (moved from trunk/src/Plugin.cpp)
-
src/nrEngine/PluginLoader.cpp (moved) (moved from trunk/src/PluginLoader.cpp)
-
src/nrEngine/Profiler.cpp (moved) (moved from trunk/src/Profiler.cpp)
-
src/nrEngine/Property.cpp (moved) (moved from trunk/src/Property.cpp)
-
src/nrEngine/PropertyManager.cpp (moved) (moved from trunk/src/PropertyManager.cpp)
-
src/nrEngine/Resource.cpp (moved) (moved from trunk/src/Resource.cpp)
-
src/nrEngine/ResourceHolder.cpp (moved) (moved from trunk/src/ResourceHolder.cpp)
-
src/nrEngine/ResourceLoader.cpp (moved) (moved from trunk/src/ResourceLoader.cpp)
-
src/nrEngine/ResourceManager.cpp (moved) (moved from trunk/src/ResourceManager.cpp)
-
src/nrEngine/ResourcePtr.cpp (moved) (moved from trunk/src/ResourcePtr.cpp)
-
src/nrEngine/Script.cpp (moved) (moved from trunk/src/Script.cpp)
-
src/nrEngine/ScriptConnector.cpp (moved) (moved from trunk/src/ScriptConnector.cpp)
-
src/nrEngine/ScriptEngine.cpp (moved) (moved from trunk/src/ScriptEngine.cpp)
-
src/nrEngine/ScriptLoader.cpp (moved) (moved from trunk/src/ScriptLoader.cpp)
-
src/nrEngine/StdHelpers.cpp (moved) (moved from trunk/src/StdHelpers.cpp)
-
src/nrEngine/TimeSource.cpp (moved) (moved from trunk/src/TimeSource.cpp)
-
src/nrEngine/TimeSourceVirtual.cpp (moved) (moved from trunk/src/TimeSourceVirtual.cpp)
-
src/nrEngine/Timer.cpp (moved) (moved from trunk/src/Timer.cpp)
-
src/nrEngine/VariadicArgument.cpp (moved) (moved from trunk/src/VariadicArgument.cpp)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r41 r45 2 2 include Make/Makedefs 3 3 4 SUBDIRS = nrEnginePackages Plugins4 SUBDIRS = include src Packages Plugins 5 5 6 6 include Make/Makedirrules -
trunk/Packages/glfw/Makefile
r44 r45 18 18 # create the target 19 19 TARGET= $(TOPDIR)/lib/libnrEngineGLFW.so 20 INCPATH += -I./ -I ../../20 INCPATH += -I./ -I$(TOPDIR)/include 21 21 CFLAGS += -fPIC 22 22 LDFLAGS = -shared -Llib -Wl,-Bstatic -lglfw -Wl,-Bdynamic -
trunk/Plugins/dynamicResources/Makefile
r32 r45 20 20 # some definitions 21 21 TARGET = dynamicResources.so 22 INCPATH += -I ../include22 INCPATH += -I$(TOPDIR)/include 23 23 CFLAGS += -fPIC 24 24 LIBS = -
trunk/Plugins/luaScripting/Makefile
r13 r45 16 16 # some definitions 17 17 TARGET = luaScripting.so 18 INCPATH += -I ../include18 INCPATH += -I$(TOPDIR)/include 19 19 CFLAGS += -fPIC 20 20 LIBS = -llua -
trunk/include/nrEngine/Makefile
r40 r45 5 5 #----------------------------------------------- 6 6 include $(TOPDIR)/Make/Makedefs 7 SUBDIRS = events 7 8 8 9 #----------------------------------------------- -
trunk/src/nrEngine/Makefile
r44 r45 9 9 # Create vpath directives 10 10 #----------------------------------------------- 11 VPATH+= events ../include11 #VPATH+= events ../include 12 12 13 13 #----------------------------------------------- … … 54 54 55 55 # define used vairables 56 TARGET = $(TOPDIR)/lib/libnrEngine.so57 INCPATH += -I ../include56 TARGET = $(TOPDIR)/lib/libnrEngine.so 57 INCPATH += -I$(TOPDIR)/include 58 58 CFLAGS += -fPIC 59 59 LIBS += -ldl -lboost_thread
Note: See TracChangeset
for help on using the changeset viewer.
