[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34989] trunk/blender: set main() argv functions to be const char *
Campbell Barton
ideasman42 at gmail.com
Sat Feb 19 13:05:21 CET 2011
Revision: 34989
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34989
Author: campbellbarton
Date: 2011-02-19 12:05:20 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
set main() argv functions to be const char *
also set minimum cmake version to 2.8
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/BKE_sound.h
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/blenlib/BLI_args.h
trunk/blender/source/blender/blenlib/intern/BLI_args.c
trunk/blender/source/blender/python/BPY_extern.h
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/CMakeLists.txt 2011-02-19 12:05:20 UTC (rev 34989)
@@ -28,8 +28,7 @@
#-----------------------------------------------------------------------------
# We don't allow in-source builds. This causes no end of troubles because
# all out-of-source builds will use the CMakeCache.txt file there and even
-# build the libs and objects in it. It will also conflict with the current
-# Makefile system for Blender
+# build the libs and objects in it.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
@@ -39,11 +38,11 @@
cd ..
mkdir cmake-make
cd cmake-make
- cmake -G \"Unix Makefiles\" ../blender
+ cmake ../blender
")
endif()
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
Modified: trunk/blender/source/blender/blenkernel/BKE_sound.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sound.h 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/blenkernel/BKE_sound.h 2011-02-19 12:05:20 UTC (rev 34989)
@@ -49,7 +49,7 @@
void sound_exit(void);
void sound_force_device(int device);
-int sound_define_from_str(char *str);
+int sound_define_from_str(const char *str);
struct bSound* sound_new_file(struct Main *main, const char *filename);
Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c 2011-02-19 12:05:20 UTC (rev 34989)
@@ -55,7 +55,7 @@
}
#endif
-int sound_define_from_str(char *str)
+int sound_define_from_str(const char *str)
{
if (BLI_strcaseeq(str, "NULL"))
return AUD_NULL_DEVICE;
Modified: trunk/blender/source/blender/blenlib/BLI_args.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_args.h 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/blenlib/BLI_args.h 2011-02-19 12:05:20 UTC (rev 34989)
@@ -39,9 +39,9 @@
typedef struct bArgs bArgs;
/* returns the number of extra arguments consumed by the function. 0 is normal value, -1 stops parsing arguments, other negative indicates skip */
-typedef int (*BA_ArgCallback)(int argc, char **argv, void *data);
+typedef int (*BA_ArgCallback)(int argc, const char **argv, void *data);
-struct bArgs *BLI_argsInit(int argc, char **argv);
+struct bArgs *BLI_argsInit(int argc, const char **argv);
void BLI_argsFree(struct bArgs *ba);
/* pass starts at 1, -1 means valid all the time
@@ -57,6 +57,6 @@
void BLI_argsPrintOtherDoc(struct bArgs *ba);
void BLI_argsPrint(struct bArgs *ba);
-char **BLI_argsArgv(struct bArgs *ba);
+const char **BLI_argsArgv(struct bArgs *ba);
#endif
Modified: trunk/blender/source/blender/blenlib/intern/BLI_args.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_args.c 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/blenlib/intern/BLI_args.c 2011-02-19 12:05:20 UTC (rev 34989)
@@ -67,7 +67,7 @@
ListBase docs;
GHash *items;
int argc;
- char **argv;
+ const char **argv;
int *passes;
};
@@ -113,7 +113,7 @@
return BLI_ghash_lookup(ba->items, &key);
}
-bArgs *BLI_argsInit(int argc, char **argv)
+bArgs *BLI_argsInit(int argc, const char **argv)
{
bArgs *ba = MEM_callocN(sizeof(bArgs), "bArgs");
ba->passes = MEM_callocN(sizeof(int) * argc, "bArgs passes");
@@ -146,7 +146,7 @@
}
}
-char **BLI_argsArgv(struct bArgs *ba)
+const char **BLI_argsArgv(struct bArgs *ba)
{
return ba->argv;
}
Modified: trunk/blender/source/blender/python/BPY_extern.h
===================================================================
--- trunk/blender/source/blender/python/BPY_extern.h 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/python/BPY_extern.h 2011-02-19 12:05:20 UTC (rev 34989)
@@ -60,7 +60,7 @@
int BPY_is_pyconstraint(struct Text *text);
// void BPY_free_pyconstraint_links(struct Text *text);
//
-void BPY_python_start( int argc, char **argv );
+void BPY_python_start(int argc, const char **argv);
void BPY_python_end( void );
// void init_syspath( int first_time );
// void syspath_append( char *dir );
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2011-02-19 12:05:20 UTC (rev 34989)
@@ -217,7 +217,7 @@
};
/* call BPY_context_set first */
-void BPY_python_start( int argc, char **argv )
+void BPY_python_start(int argc, const char **argv)
{
PyThreadState *py_tstate = NULL;
Modified: trunk/blender/source/blender/windowmanager/WM_api.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_api.h 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/windowmanager/WM_api.h 2011-02-19 12:05:20 UTC (rev 34989)
@@ -70,7 +70,7 @@
void WM_setinitialstate_fullscreen(void);
void WM_setinitialstate_normal(void);
-void WM_init (struct bContext *C, int argc, char **argv);
+void WM_init (struct bContext *C, int argc, const char **argv);
void WM_exit (struct bContext *C);
void WM_main (struct bContext *C);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2011-02-19 12:05:20 UTC (rev 34989)
@@ -112,7 +112,7 @@
/* only called once, for startup */
-void WM_init(bContext *C, int argc, char **argv)
+void WM_init(bContext *C, int argc, const char **argv)
{
if (!G.background) {
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2011-02-19 11:59:01 UTC (rev 34988)
+++ trunk/blender/source/creator/creator.c 2011-02-19 12:05:20 UTC (rev 34989)
@@ -131,8 +131,8 @@
#endif
/* Local Function prototypes */
-static int print_help(int argc, char **argv, void *data);
-static int print_version(int argc, char **argv, void *data);
+static int print_help(int argc, const char **argv, void *data);
+static int print_version(int argc, const char **argv, void *data);
/* for the callbacks: */
@@ -185,7 +185,7 @@
}
#endif
-static int print_version(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
printf (BLEND_VERSION_STRING_FMT);
#ifdef BUILD_DATE
@@ -204,7 +204,7 @@
return 0;
}
-static int print_help(int UNUSED(argc), char **UNUSED(argv), void *data)
+static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data)
{
bArgs *ba = (bArgs*)data;
@@ -338,30 +338,30 @@
}
}*/
-static int end_arguments(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int end_arguments(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
return -1;
}
-static int enable_python(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
G.f |= G_SCRIPT_AUTOEXEC;
return 0;
}
-static int disable_python(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int disable_python(int UNUSED(argc), const const char **UNUSED(argv), void *UNUSED(data))
{
G.f &= ~G_SCRIPT_AUTOEXEC;
return 0;
}
-static int background_mode(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int background_mode(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
G.background = 1;
return 0;
}
-static int debug_mode(int UNUSED(argc), char **UNUSED(argv), void *data)
+static int debug_mode(int UNUSED(argc), const char **UNUSED(argv), void *data)
{
G.f |= G_DEBUG; /* std output printf's */
printf(BLEND_VERSION_STRING_FMT);
@@ -375,7 +375,7 @@
return 0;
}
-static int set_fpe(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int set_fpe(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
#if defined(__sgi) || defined(__linux__) || defined(_WIN32) || OSX_SSE_FPE
/* zealous but makes float issues a heck of a lot easier to find!
@@ -400,19 +400,19 @@
return 0;
}
-static int set_factory_startup(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int set_factory_startup(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
G.factory_startup= 1;
return 0;
}
-static int set_env(int argc, char **argv, void *UNUSED(data))
+static int set_env(int argc, const char **argv, void *UNUSED(data))
{
/* "--env-system-scripts" --> "BLENDER_SYSTEM_SCRIPTS" */
char env[64]= "BLENDER";
char *ch_dst= env + 7; /* skip BLENDER */
- char *ch_src= argv[0] + 5; /* skip --env */
+ const char *ch_src= argv[0] + 5; /* skip --env */
if (argc < 2) {
printf("%s requires one argument\n", argv[0]);
@@ -428,7 +428,7 @@
return 1;
}
-static int playback_mode(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int playback_mode(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
/* not if -b was given first */
if (G.background == 0) {
@@ -440,7 +440,7 @@
return -2;
}
-static int prefsize(int argc, char **argv, void *UNUSED(data))
+static int prefsize(int argc, const char **argv, void *UNUSED(data))
{
int stax, stay, sizx, sizy;
@@ -459,19 +459,19 @@
return 4;
}
-static int with_borders(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int with_borders(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
WM_setinitialstate_normal();
return 0;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list