Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2007-12-29 19:12:35 +0300
committerTon Roosendaal <ton@blender.org>2007-12-29 19:12:35 +0300
commit97f144b5ff2ec803b67d6aa2065cd7240e7c6e99 (patch)
tree78fe41ffbb7560c179ad21598f4855703279c8bc /source/Makefile
parent878e09396e74f14c73bd1e97b01d5406b17ed858 (diff)
And now blender will link again! However, with a bad stub.c
That's going to be tackled.
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/Makefile b/source/Makefile
index 770b09a44fd..8910b558e04 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -76,7 +76,8 @@ endif
# PLUGAPPLIB libs that form the application to be plugged in
# Note: the order is important here
-GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a
+GRPLIB = $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)DNA.o
+GRPLIB += $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a
GRPLIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
GRPLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
@@ -227,7 +228,8 @@ 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/windowmanager/$(DEBUG_DIR)libwindowmanager.a
-PULIB += $(OCGDIR)/blender/editors_datafiles/libeditors_datafiles.a
+PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a
+PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a
ifeq ($(NAN_NO_KETSJI),true)
PULIB += $(NAN_MOTO)/lib/libmoto.a