forked from bartvdbraak/blender
And now blender will link again! However, with a bad stub.c
That's going to be tackled.
This commit is contained in:
parent
878e09396e
commit
97f144b5ff
@ -76,7 +76,8 @@ endif
|
|||||||
# PLUGAPPLIB libs that form the application to be plugged in
|
# PLUGAPPLIB libs that form the application to be plugged in
|
||||||
# Note: the order is important here
|
# 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 += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
|
||||||
GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
|
GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
|
||||||
GRPLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.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 += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
|
||||||
PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
|
PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
|
||||||
PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.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)
|
ifeq ($(NAN_NO_KETSJI),true)
|
||||||
PULIB += $(NAN_MOTO)/lib/libmoto.a
|
PULIB += $(NAN_MOTO)/lib/libmoto.a
|
||||||
|
@ -81,8 +81,6 @@
|
|||||||
/* for stamp drawing to an image */
|
/* for stamp drawing to an image */
|
||||||
#include "BMF_Api.h"
|
#include "BMF_Api.h"
|
||||||
|
|
||||||
#include "blendef.h"
|
|
||||||
#include "BSE_time.h"
|
|
||||||
#include "BDR_drawmesh.h"
|
#include "BDR_drawmesh.h"
|
||||||
|
|
||||||
/* max int, to indicate we don't store sequences in ibuf */
|
/* 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) {
|
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);
|
if (marker) strcpy(text, marker->name);
|
||||||
else strcpy(text, "<none>");
|
else strcpy(text, "<none>");
|
||||||
@ -895,7 +893,7 @@ static void stampdata(StampData *stamp_data, int do_prefix)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (G.scene->r.stamp & R_STAMP_SEQSTRIP) {
|
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);
|
if (seq) strcpy(text, seq->name+2);
|
||||||
else strcpy(text, "<none>");
|
else strcpy(text, "<none>");
|
||||||
|
@ -3579,7 +3579,7 @@ static void lib_link_screen(FileData *fd, Main *main)
|
|||||||
SpaceButs *sbuts= (SpaceButs *)sl;
|
SpaceButs *sbuts= (SpaceButs *)sl;
|
||||||
sbuts->lockpoin= NULL;
|
sbuts->lockpoin= NULL;
|
||||||
sbuts->ri= 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) {
|
else if(sl->spacetype==SPACE_FILE) {
|
||||||
SpaceFile *sfile= (SpaceFile *)sl;
|
SpaceFile *sfile= (SpaceFile *)sl;
|
||||||
|
@ -1587,7 +1587,7 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
|
|||||||
Oops *oopsn= oops->next;
|
Oops *oopsn= oops->next;
|
||||||
if(oops->id==0) {
|
if(oops->id==0) {
|
||||||
BLI_remlink(&so->oops, oops);
|
BLI_remlink(&so->oops, oops);
|
||||||
free_oops(oops);
|
// XXX free_oops(oops);
|
||||||
}
|
}
|
||||||
oops= oopsn;
|
oops= oopsn;
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#
|
#
|
||||||
# Makes module object directory and bounces make to subdirectories.
|
# Makes module object directory and bounces make to subdirectories.
|
||||||
|
|
||||||
LIBNAME = editors_datafiles
|
LIBNAME = ed_area
|
||||||
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
||||||
|
|
||||||
include nan_compile.mk
|
include nan_compile.mk
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#
|
#
|
||||||
# Makes module object directory and bounces make to subdirectories.
|
# Makes module object directory and bounces make to subdirectories.
|
||||||
|
|
||||||
LIBNAME = editors_datafiles
|
LIBNAME = ed_datafiles
|
||||||
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
||||||
|
|
||||||
include nan_compile.mk
|
include nan_compile.mk
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#
|
#
|
||||||
# Makes module object directory and bounces make to subdirectories.
|
# Makes module object directory and bounces make to subdirectories.
|
||||||
|
|
||||||
LIBNAME = editors_datafiles
|
LIBNAME = ed_screen
|
||||||
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
||||||
|
|
||||||
include nan_compile.mk
|
include nan_compile.mk
|
||||||
|
32
source/blender/editors/screen/ed_screen.c
Normal file
32
source/blender/editors/screen/ed_screen.c
Normal file
@ -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 */
|
||||||
|
}
|
@ -28,18 +28,80 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
/* various UI stuff */
|
||||||
void blender_test_break() {}
|
void blender_test_break() {}
|
||||||
void do_render_seq() {}
|
|
||||||
void allqueue() {}
|
|
||||||
void error() {}
|
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 *curarea;
|
||||||
|
void *editNurb;
|
||||||
|
void *editelems;
|
||||||
|
|
||||||
/* blenkernel errors */
|
/* blenkernel errors */
|
||||||
void copy_view3d_lock() {}
|
|
||||||
void PE_recalc_world_cos() {}
|
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_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() {}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user