From 97f144b5ff2ec803b67d6aa2065cd7240e7c6e99 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 29 Dec 2007 16:12:35 +0000 Subject: And now blender will link again! However, with a bad stub.c That's going to be tackled. --- source/Makefile | 6 ++- source/blender/blenkernel/intern/image.c | 6 +-- source/blender/blenloader/intern/readfile.c | 2 +- source/blender/blenloader/intern/writefile.c | 2 +- source/blender/editors/area/Makefile | 2 +- source/blender/editors/datafiles/Makefile | 2 +- source/blender/editors/screen/Makefile | 2 +- source/blender/editors/screen/ed_screen.c | 32 +++++++++++++ source/blender/editors/screen/stubs.c | 68 ++++++++++++++++++++++++++-- 9 files changed, 108 insertions(+), 14 deletions(-) create mode 100644 source/blender/editors/screen/ed_screen.c (limited to 'source') 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 diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 31323e003bd..6b0586ab62c 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -81,8 +81,6 @@ /* for stamp drawing to an image */ #include "BMF_Api.h" -#include "blendef.h" -#include "BSE_time.h" #include "BDR_drawmesh.h" /* max int, to indicate we don't store sequences in ibuf */ @@ -833,7 +831,7 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_MARKER) { - TimeMarker *marker = get_frame_marker(CFRA); + TimeMarker *marker = NULL; // XXX get_frame_marker(G.scene->r.cfra); if (marker) strcpy(text, marker->name); else strcpy(text, ""); @@ -895,7 +893,7 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_SEQSTRIP) { - Sequence *seq = get_forground_frame_seq(CFRA); + Sequence *seq = get_forground_frame_seq(G.scene->r.cfra); if (seq) strcpy(text, seq->name+2); else strcpy(text, ""); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index da1ec9ac538..14aab7f4d47 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3579,7 +3579,7 @@ static void lib_link_screen(FileData *fd, Main *main) SpaceButs *sbuts= (SpaceButs *)sl; sbuts->lockpoin= NULL; sbuts->ri= NULL; - if(main->versionfile<132) set_rects_butspace(sbuts); +// XXX if(main->versionfile<132) set_rects_butspace(sbuts); } else if(sl->spacetype==SPACE_FILE) { SpaceFile *sfile= (SpaceFile *)sl; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 1fe8258ab3b..5e0c551078a 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1587,7 +1587,7 @@ static void write_screens(WriteData *wd, ListBase *scrbase) Oops *oopsn= oops->next; if(oops->id==0) { BLI_remlink(&so->oops, oops); - free_oops(oops); +// XXX free_oops(oops); } oops= oopsn; } diff --git a/source/blender/editors/area/Makefile b/source/blender/editors/area/Makefile index 302267be505..8e41651294a 100644 --- a/source/blender/editors/area/Makefile +++ b/source/blender/editors/area/Makefile @@ -28,7 +28,7 @@ # # Makes module object directory and bounces make to subdirectories. -LIBNAME = editors_datafiles +LIBNAME = ed_area DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk diff --git a/source/blender/editors/datafiles/Makefile b/source/blender/editors/datafiles/Makefile index 302267be505..4162125623e 100644 --- a/source/blender/editors/datafiles/Makefile +++ b/source/blender/editors/datafiles/Makefile @@ -28,7 +28,7 @@ # # Makes module object directory and bounces make to subdirectories. -LIBNAME = editors_datafiles +LIBNAME = ed_datafiles DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk diff --git a/source/blender/editors/screen/Makefile b/source/blender/editors/screen/Makefile index 302267be505..bd6319cc7a0 100644 --- a/source/blender/editors/screen/Makefile +++ b/source/blender/editors/screen/Makefile @@ -28,7 +28,7 @@ # # Makes module object directory and bounces make to subdirectories. -LIBNAME = editors_datafiles +LIBNAME = ed_screen DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk diff --git a/source/blender/editors/screen/ed_screen.c b/source/blender/editors/screen/ed_screen.c new file mode 100644 index 00000000000..ca3e11d1d64 --- /dev/null +++ b/source/blender/editors/screen/ed_screen.c @@ -0,0 +1,32 @@ +/** + * $Id: + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2007 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +void unlink_screen() +{ + /* bad level to blenkernel, solve */ +} \ No newline at end of file diff --git a/source/blender/editors/screen/stubs.c b/source/blender/editors/screen/stubs.c index c9725e672f0..879a9e83b48 100644 --- a/source/blender/editors/screen/stubs.c +++ b/source/blender/editors/screen/stubs.c @@ -28,18 +28,80 @@ #include +/* various UI stuff */ void blender_test_break() {} -void do_render_seq() {} -void allqueue() {} void error() {} +void notice() {} +void set_timecursor() {} +void screen_swapbuffers() {} +void waitcursor() {} +void get_qual() {} +void mainqenter() {} +void saveover() {} +void texstr() {} +void pupmenu() {} void *curarea; +void *editNurb; +void *editelems; /* blenkernel errors */ -void copy_view3d_lock() {} void PE_recalc_world_cos() {} +void PE_free_particle_edit() {} +void PE_get_colors() {} +/* python, will come back */ +void BPY_post_start_python() {} +void BPY_run_python_script() {} +void BPY_start_python() {} +void BPY_copy_scriptlink() {} +void BPY_free_scriptlink() {} +void BPY_do_all_scripts() {} +void BPY_call_importloader() {} +void BPY_do_pyscript() {} +void BPY_pydriver_eval() {} +void BPY_pydriver_get_objects() {} void BPY_clear_script() {} +void BPY_free_compiled_text() {} +void BPY_pyconstraint_eval() {} +void BPY_pyconstraint_target() {} + +/* areas */ +void allqueue() {} +void scrarea_do_windraw() {} +void areawinset() {} +void mywinget() {} +void copy_view3d_lock() {} +void persp() {} + +/* seq */ +void do_render_seq() {} +void free_editing() {} +void get_forground_frame_seq() {} +void build_seqar() {} + +/* tools */ +void delete_obj() {} +void deselectall() {} + +/* sculpt */ +void sculptmode_free_all() {} +void sculptmode_init() {} +void multires_level_n() {} +void multires_set_level() {} +void multires_update_levels() {} +void multires_copy() {} +void multires_free() {} +void sculpt_reset_curve() {} + +void free_realtime_image() {} + +void fluidsimSettingsCopy() {} +void fluidsimSettingsFree() {} + +void NewBooleanDerivedMesh() {} +void harmonic_coordinates_bind() {} +void BIF_filelist_freelib() {} -- cgit v1.2.3