diff options
author | Ton Roosendaal <ton@blender.org> | 2008-12-12 13:18:26 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-12-12 13:18:26 +0300 |
commit | 7f3a34d16c9eeda100a6b84d8374d848074702a2 (patch) | |
tree | 65d585aeae7cbc3868ae4e829cf6e4d88dd7e2d9 /source/Makefile | |
parent | 6f6eee09238a751c42aad9df84d7f8b2f131841c (diff) |
2.5
Resolved cyclic calls for editors.
Now there's a space_api/ module, here you can use functions calling
other editor modules. The functions in the module are only used by
the WindowManager module to initialize space types.
Note for sconzers and MSVC and cmake: the proper linking order for
editors is:
- space_api
- space_xxx
- object / mesh / transform / etc
- interface
- util / datafiles
- screen
Diffstat (limited to 'source/Makefile')
-rw-r--r-- | source/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/Makefile b/source/Makefile index b975d9bae32..5c78c27bbc6 100644 --- a/source/Makefile +++ b/source/Makefile @@ -230,19 +230,19 @@ ifeq ($(WITH_OPENEXR), true) COMLIB += $(NAN_OPENEXR_LIBS) endif -# silly: libed_screen.a twice :( +# note: space_api.a in begin of editors, screen.a in end PULIB = $(NAN_MOTO)/lib/libmoto.a PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a -PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a +PULIB += $(OCGDIR)/blender/ed_space/libed_space.a PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a PULIB += $(OCGDIR)/blender/ed_time/libed_time.a PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a 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/windowmanager/libwindowmanager.a PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a |