diff options
Diffstat (limited to 'source/blender/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 14 |
4 files changed, 10 insertions, 16 deletions
diff --git a/source/blender/makesdna/intern/Makefile b/source/blender/makesdna/intern/Makefile index 01c4d87a4fc..55b0c42acda 100644 --- a/source/blender/makesdna/intern/Makefile +++ b/source/blender/makesdna/intern/Makefile @@ -15,7 +15,7 @@ # # 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. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 38819ccdf96..78f5fcaba69 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -50,7 +50,7 @@ targetdir = normpath(root_build_dir + '/makesdna') if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): targetdir = '#' + targetdir -makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_guardedalloc', 'bf_blenlib']) +makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_blenlib']) dna_dict = dna.Dictionary() dna.Depends ('dna.c', makesdna) @@ -60,7 +60,7 @@ if env['OURPLATFORM'] != 'linuxcross': if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") else: - dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") + dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") else: if USE_WINE: dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET") diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 89219b114da..fd98fd4ef08 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -41,9 +41,9 @@ #include "DNA_sdna_types.h" // for SDNA ;-) -/* gcc 4.1 on mingw was complaining that __int64 was alredy defined +/* gcc 4.1 on mingw was complaining that __int64 was already defined actually is saw the line below as typedef long long long long... -Anyhow, since its alredy defined, its safe to do an ifndef here- Cambpell*/ +Anyhow, since its already defined, its safe to do an ifndef here- Cambpell*/ #ifdef FREE_WINDOWS #ifndef __int64 typedef long long __int64; @@ -110,7 +110,7 @@ DONE: - pointer conversion (32-64 bits) IMPORTANT: - - do not use #defines in structs for array lenghts, this cannot be read by the dna functions + - do not use #defines in structs for array lengths, this cannot be read by the dna functions - do not use uint, but unsigned int instead, ushort and ulong are allowed - only use a long in Blender if you want this to be the size of a pointer. so it is 32 bits or 64 bits, dependant at the cpu architecture diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index adcb074461e..4133afffeed 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -57,10 +57,6 @@ #include "BLO_sys_types.h" // for intptr_t support -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #define SDNA_MAX_FILENAME_LENGTH 255 @@ -82,7 +78,6 @@ char *includefiles[] = { "DNA_image_types.h", "DNA_texture_types.h", "DNA_lamp_types.h", - "DNA_wave_types.h", "DNA_material_types.h", "DNA_vfont_types.h", // if you add files here, please add them at the end @@ -142,11 +137,11 @@ int maxdata= 500000, maxnr= 50000; int nr_names=0; int nr_types=0; int nr_structs=0; -char **names, *namedata; /* at adress names[a] is string a */ -char **types, *typedata; /* at adress types[a] is string a */ +char **names, *namedata; /* at address names[a] is string a */ +char **types, *typedata; /* at address types[a] is string a */ short *typelens; /* at typelens[a] is de length of type a */ short *alphalens; /* contains sizes as they are calculated on the DEC Alpha (64 bits) */ -short **structs, *structdata; /* at sp= structs[a] is the first adress of a struct definition +short **structs, *structdata; /* at sp= structs[a] is the first address of a struct definition sp[0] is type number sp[1] is amount of elements sp[2] sp[3] is typenr, namenr (etc) */ @@ -207,7 +202,7 @@ static int calculate_structlens(int); void dna_write(FILE *file, void *pntr, int size); /** - * Report all structures found so far, and print their lenghts. + * Report all structures found so far, and print their lengths. */ void printStructLenghts(void); @@ -1132,7 +1127,6 @@ int main(int argc, char ** argv) #include "DNA_image_types.h" #include "DNA_texture_types.h" #include "DNA_lamp_types.h" -#include "DNA_wave_types.h" #include "DNA_material_types.h" #include "DNA_vfont_types.h" #include "DNA_meta_types.h" |