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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-12-30 10:32:14 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-12-30 10:32:14 +0300
commitd6e8cd42325d763b65219c6652343a4a4c3a7489 (patch)
tree32e003dbc711302d3003560c9874f8312a0300fe /source/blender/blenloader
parent090807066c58943a817eaea74d7358534fad5070 (diff)
2.5: fix compile error on mac, and a few warnings.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/writefile.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 1b8db72f4ec..836e2dd1958 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2239,10 +2239,11 @@ static int recursive_copy_runtime(char *outname, char *exename, ReportList *repo
{
char *runtime = get_runtime_path(exename);
char command[2 * (FILE_MAXDIR+FILE_MAXFILE) + 32];
- int progfd = -1;
+ int progfd = -1, error= 0;
if (!runtime) {
BKE_report(reports, RPT_ERROR, "Unable to find runtime");
+ error= 1;
goto cleanup;
}
//printf("runtimepath %s\n", runtime);
@@ -2250,6 +2251,7 @@ static int recursive_copy_runtime(char *outname, char *exename, ReportList *repo
progfd= open(runtime, O_BINARY|O_RDONLY, 0);
if (progfd==-1) {
BKE_report(reports, RPT_ERROR, "Unable to find runtime");
+ error= 1;
goto cleanup;
}
@@ -2257,6 +2259,7 @@ static int recursive_copy_runtime(char *outname, char *exename, ReportList *repo
//printf("command %s\n", command);
if (system(command) == -1) {
BKE_report(reports, RPT_ERROR, "Couldn't copy runtime");
+ error= 1;
}
cleanup:
@@ -2265,7 +2268,7 @@ cleanup:
if (runtime)
MEM_freeN(runtime);
- return !BKE_reports_have_error(reports);
+ return !error;
}
int BLO_write_runtime(Main *mainvar, char *file, char *exename, ReportList *reports)