diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-11 22:35:27 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-11 22:35:27 +0300 |
| commit | 7a1100c8b536a63a72f3a28947f31c9cf94480d5 (patch) | |
| tree | b7db0519bf1a9b9b39bdf754cb62a3ef4b4df148 /source/Makefile | |
| parent | d39b43aa2010c9b5262428b4afedebd1686307ba (diff) | |
2.5
Today's progress; half working, but i better commit to prevent
conflicts tomorrow :)
- added storage for regions in spacedata
- added space switching (unfinished, gives mem-free errors)
- bugfix: icon of timewindow gave error on split-area
- cleaned interface_icons.c a bit, no warnings
- first work on space new() callbacks, they have to make regions too
NOTE: probably files saved with 2.5 crash now. Have to look at
patching this.
NOTE2: the Makefiles required libeditor screen twice... scons too?
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile index 73e97ff58fd..b975d9bae32 100644 --- a/source/Makefile +++ b/source/Makefile @@ -230,6 +230,7 @@ ifeq ($(WITH_OPENEXR), true) COMLIB += $(NAN_OPENEXR_LIBS) endif +# silly: libed_screen.a twice :( PULIB = $(NAN_MOTO)/lib/libmoto.a PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a @@ -241,6 +242,7 @@ PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a PULIB += $(OCGDIR)/blender/ed_util/libed_util.a PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a +PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a |