Menu
▾
▴
ftm-svn — FTM SVN logs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(42) |
Aug
(91) |
Sep
(97) |
Oct
(69) |
Nov
(16) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(74) |
Feb
(109) |
Mar
(117) |
Apr
(86) |
May
(84) |
Jun
(47) |
Jul
(30) |
Aug
(25) |
Sep
(39) |
Oct
(59) |
Nov
(42) |
Dec
(38) |
| 2010 |
Jan
(30) |
Feb
(43) |
Mar
(59) |
Apr
(67) |
May
(29) |
Jun
(47) |
Jul
(48) |
Aug
(22) |
Sep
(22) |
Oct
(36) |
Nov
(40) |
Dec
(3) |
| 2011 |
Jan
(39) |
Feb
(21) |
Mar
(36) |
Apr
(35) |
May
(8) |
Jun
|
Jul
(14) |
Aug
(4) |
Sep
(10) |
Oct
(27) |
Nov
(1) |
Dec
|
| 2012 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
(9) |
May
(1) |
Jun
(1) |
Jul
(7) |
Aug
|
Sep
(15) |
Oct
(1) |
Nov
(3) |
Dec
(6) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
(2) |
Jul
|
Aug
(5) |
Sep
(15) |
Oct
|
Nov
|
Dec
(1) |
| 2014 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(5) |
Mar
|
Apr
(4) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
(19) |
Oct
|
Nov
|
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
(2) |
| 2017 |
Jan
(16) |
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(7) |
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
(7) |
Apr
(14) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
(3) |
Dec
|
| 2023 |
Jan
(1) |
Feb
|
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <di...@us...> - 2018-05-23 14:02:19
|
Revision: 3732
http://sourceforge.net/p/ftm/code/3732
Author: diemo
Date: 2018-05-23 14:02:09 +0000 (Wed, 23 May 2018)
Log Message:
-----------
heavy debug option: print mess text before eval. TODO: switch on by message
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.mess.c
Modified: trunk/ftm/externals/max5/ftm.mess.c
===================================================================
--- trunk/ftm/externals/max5/ftm.mess.c 2018-05-23 13:59:15 UTC (rev 3731)
+++ trunk/ftm/externals/max5/ftm.mess.c 2018-05-23 14:02:09 UTC (rev 3732)
@@ -54,7 +54,8 @@
static void debug_post(const char *format, ...){}
#endif
-// #define DEBUG_REF_COUNT 1
+// #define DEBUG_REF_COUNT 1 // print ref counts
+// #define DEBUG_EVAL 1 // print expressions before evaluating
#define MAX_LINES 1024
#define MAX_CHARS 4096
@@ -1413,10 +1414,21 @@
//fts_log ("ftm.mess %p%s eval '%s'\n", self, indent, self->text.ptr);
fts_post("ftm.mess %p %d%s eval '%s'\n", self, nest, indent, self->text.ptr);
#endif
-
+
+#ifdef DEBUG_EVAL
+#define expr_log printf
+ expr_log("ftm.mess eval '%s'", self->n_lines > 0 ? fts_symbol_name(self->lines[0]) : "");
+ for (int i = 1; i < self->n_lines; i++)
+ expr_log("\n '%s'", fts_symbol_name(self->lines[i]));
+#endif
+
fts_expression_set_privates(self->messexpression, &self->privates);
status = fts_expression_reduce(self->messexpression, scope, n, values, expression_callback, (void *)self);
-
+
+#ifdef DEBUG_EVAL
+ expr_log("...done\n");
+#endif
+
if(status != fts_ok && status != fts_ignore)
{
ftmext_error((ftmext_t *)self, "%s in \"%s\"", fts_status_get_description(status), self->text.ptr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2018-05-23 13:59:18
|
Revision: 3731
http://sourceforge.net/p/ftm/code/3731
Author: diemo
Date: 2018-05-23 13:59:15 +0000 (Wed, 23 May 2018)
Log Message:
-----------
fix crash when lookup index data is nan, also check env size
Modified Paths:
--------------
trunk/ftm/ftmlib/classes/fvec.c
Modified: trunk/ftm/ftmlib/classes/fvec.c
===================================================================
--- trunk/ftm/ftmlib/classes/fvec.c 2018-03-19 16:08:09 UTC (rev 3730)
+++ trunk/ftm/ftmlib/classes/fvec.c 2018-05-23 13:59:15 UTC (rev 3731)
@@ -729,8 +729,8 @@
{
double f_index = ptr[i];
- if(f_index < 0.0)
- ptr[i] = env[0];
+ if (!isfinite(f_index) || f_index < 0.0)
+ ptr[i] = env_size > 0 ? env[0] : 0;
else
{
double i_index = floor(f_index);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2018-03-19 16:08:13
|
Revision: 3730
http://sourceforge.net/p/ftm/code/3730
Author: borghesi
Date: 2018-03-19 16:08:09 +0000 (Mon, 19 Mar 2018)
Log Message:
-----------
ftmdatagui: updated to last changes in guiinterfaces
Modified Paths:
--------------
trunk/ftm/ftmlib/classes/ftmdatagui.c
Modified: trunk/ftm/ftmlib/classes/ftmdatagui.c
===================================================================
--- trunk/ftm/ftmlib/classes/ftmdatagui.c 2018-03-19 16:05:52 UTC (rev 3729)
+++ trunk/ftm/ftmlib/classes/ftmdatagui.c 2018-03-19 16:08:09 UTC (rev 3730)
@@ -33,6 +33,14 @@
*
*/
+static const float InitMax = -FLT_MAX;
+static const float InitMin = FLT_MAX;
+
+static bool notInfNorNaN(float val)
+{
+ return (!isinf(val) && !isnan(val));
+}
+
static int
not_inf_nor_nan(float value)
{
@@ -1449,8 +1457,9 @@
return duration;
}
+
static void *
-mat_gui_score_get_by_index(void *obj, void *context, int index, double *time, double *pitch, double *duration)
+mat_gui_score_get_by_index(void *obj, void *context, int index, double *time, double *pitch, double *duration, double *color, int colorColumnIndex)
{
mat_t *self = (mat_t *)obj;
int m = mat_get_m(self);
@@ -1472,8 +1481,14 @@
if(fts_is_number(val)) *pitch = fts_get_number_float(val);
/* duration */
val = mat_get_element( (mat_t *)obj, index, 2);
- if(fts_is_number(val)) *duration = fts_get_number_float(val);
+ if(fts_is_number(val)) *duration = fts_get_number_float(val);
+ if(colorColumnIndex >= 0 && colorColumnIndex < n)
+ {
+ val = mat_get_element( (mat_t *)obj, index, colorColumnIndex);
+ if(fts_is_number(val)) *color = fts_get_number_float(val);
+ }
+
mat_unlock(self);
}
return NULL;
@@ -1960,7 +1975,7 @@
}
static void
-fmat_gui_wave_get_ptr(void *obj, void *context, int onset, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTale)
+fmat_gui_wave_get_ptr(void *obj, void *context, int onset, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTile, double *ringOffset)
{
fmat_t *self = (fmat_t *)obj;
@@ -1969,7 +1984,8 @@
*stride = self->n;
*ringIndex = -1;
*ringSize = 0;
- *ringTale = 0;
+ *ringTile = 0;
+ *ringOffset = 0;
}
static void
@@ -2159,8 +2175,9 @@
return self->m;
}
+
static void
-fmat_gui_multiwave_get_ptr(void *obj, void *context, int index, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTale)
+fmat_gui_multiwave_get_ptr(void *obj, void *context, int index, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTale, double *ringOffset)
{
fmat_t *self = (fmat_t *)obj;
@@ -2170,6 +2187,7 @@
*ringIndex = -1;
*ringSize = 0;
*ringTale = 0;
+ *ringOffset = 0;
}
static void
@@ -2314,12 +2332,13 @@
return self->m;
}
-static void
-fmat_gui_sonogram_get_values(void *obj, void *context, int *rows, int *cols, float **ptr, int *ringIndex, int *ringSize, int *ringTale)
+static void
+fmat_gui_sonogram_get_values(void *obj, void *context, int *rows, int *cols, float **ptr, double **timeTags, int *ringIndex, int *ringSize, int *ringTale)
{
fmat_t *self = (fmat_t *)obj;
*ptr = fmat_lock(self);
+ *timeTags = NULL;
*rows = self->m;
*cols = self->n;
*ringIndex = -1;
@@ -2864,30 +2883,105 @@
fmat_unlock(self);
}
-static double
-fmat_gui_pixels_get_max_value(void *obj, void *context)
+static void
+fmat_gui_pixels_get_min_max(void *obj, void *context, double *min, double *max)
{
fmat_t *self = (fmat_t *)obj;
- double value;
+ float tempmax, tempmin;
fmat_lock(self);
- value = fm_get_max_value_in_range(self, 0, self->m * self->n, 1, 0);
+ tempmax = fm_get_max_value_in_range(self, 0, self->m * self->n, 1, 0);
+ tempmin = fm_get_min_value_in_range(self, 0, self->m * self->n, 1, 0);
fmat_unlock(self);
+
+ *min = tempmin;
+ *max = tempmax;
+}
+static void
+fmat_gui_pixels_get_two_min_max(void *obj, void *context, double *min1, double *max1, double *min2, double *max2)
+{
+ fmat_t *self = (fmat_t *)obj;
+ double vmax1 = 1.0;
+ double vmin1 = 0.0;
+ double vmax2 = 1.0;
+ double vmin2 = 0.0;
+ int size = self->m * self->n;
- return value;
+ if(size > 0 && self->values != NULL)
+ {
+ int i;
+ double val;
+ float *ptr = fmat_get_ptr(self);
+
+ vmax2 = vmax1 = InitMax;
+ vmin1 = vmin2 = InitMin;
+
+ for(i = 0; i < size; i++)
+ {
+ val = ptr[i];
+ if(notInfNorNaN(val))
+ {
+ if(val > vmax2)
+ vmax2 = val;
+ if(val < vmin2)
+ vmin2 = val;
+ }
+ }
+
+ for(i = 0; i < size; i++)
+ {
+ val = ptr[i];
+ if(notInfNorNaN(val))
+ {
+ if(val > vmax1 && val < vmax2)
+ vmax1 = val;
+ if(val < vmin1 && val > vmin2)
+ vmin1 = val;
+ }
+ }
+ }
+
+ *max1 = vmax1;
+ *min1 = vmin1;
+ *max2 = vmax2;
+ *min2 = vmin2;
}
-
-static double
-fmat_gui_pixels_get_min_value(void *obj, void *context)
+static void
+fmat_gui_pixels_get_mean_stddev(void *obj, void *context, double *mean, double *stddev)
{
fmat_t *self = (fmat_t *)obj;
- double value;
+ int size = self->m * self->n;
+ double vmean = 0.0;
+ double vstddev = 0.0;
- fmat_lock(self);
- value = fm_get_min_value_in_range(self, 0, self->m * self->n, 1, 0);
- fmat_unlock(self);
+ if(size > 0 && self->values != NULL)
+ {
+ fmat_lock(self);
+ float *ptr = fmat_get_ptr(self);
+ double meanOfSquare = 0.0;
+ double squareOfmean = 0.0;
+ double norm = 1.0 / (double)size;
+ int i;
+
+ for(i = 0; i < size; i++)
+ {
+ double val = ptr[i];
+ vmean += val;
+ meanOfSquare += val * val;
+ }
+
+ vmean *= norm;
+ meanOfSquare *= norm;
+ squareOfmean = vmean * vmean;
+
+ if(meanOfSquare > squareOfmean)
+ vstddev = sqrt(meanOfSquare - squareOfmean);
+
+ fmat_unlock(self);
+ }
- return value;
+ *mean = vmean;
+ *stddev = vstddev;
}
static void
@@ -2908,8 +3002,9 @@
fmat_gui_interface_pixels.getValue = fmat_gui_pixels_get_value;
fmat_gui_interface_pixels.setValue = fmat_gui_pixels_set_value;
fmat_gui_interface_pixels.releaseValues = fmat_gui_pixels_release_values;
- fmat_gui_interface_pixels.getMaxValue = fmat_gui_pixels_get_max_value;
- fmat_gui_interface_pixels.getMinValue = fmat_gui_pixels_get_min_value;
+ fmat_gui_interface_pixels.getMinMax = fmat_gui_pixels_get_min_max;
+ fmat_gui_interface_pixels.getTwoMinMax = fmat_gui_pixels_get_two_min_max;
+ fmat_gui_interface_pixels.getMeanStdDev = fmat_gui_pixels_get_mean_stddev;
fts_class_instantiate(fmat_class);
fts_class_gui_interface(fmat_class, fts_s_pixels, &fmat_gui_interface_pixels);
@@ -3479,12 +3574,13 @@
}
static void
-fvec_gui_wave_get_ptr(void *obj, void *context, int onset, float ** ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTale)
+fvec_gui_wave_get_ptr(void *obj, void *context, int onset, float ** ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTale, double *ringOffset)
{
fvec_vector_lock((fvec_t *)obj, ptr, size, stride);
*ringIndex = -1;
*ringSize = 0;
*ringTale = 0;
+ *ringOffset = 0.0;
}
static void
@@ -4886,9 +4982,8 @@
return (void *)event;
}
-
static void *
-sequence_gui_score_get_by_index(void *obj, void *context, int the_index, double *time, double *pitch, double *duration)
+sequence_gui_score_get_by_index(void *obj, void *context, int the_index, double *time, double *pitch, double *duration, double *color, int colorColumnIndex)
{
event_t *evt;
sequence_t *self = (sequence_t *)obj;
@@ -4908,6 +5003,9 @@
/*duration*/
*duration = event_get_duration(evt);
+
+ /*color*/
+ *color = scoob_get_velocity(scoob);
}
else
{
@@ -4914,6 +5012,7 @@
*time = -1.0f;
*pitch = -1.0f;
*duration = -1.0f;
+ *color = -1.0f;
}
sequence_unlock(self);
@@ -7340,7 +7439,7 @@
}
static void *
-track_gui_score_get_by_index(void *obj, void *context, int the_index, double *time, double *pitch, double *duration)
+track_gui_score_get_by_index(void *obj, void *context, int the_index, double *time, double *pitch, double *duration, double *color, int colorColumnIndex)
{
sequence_t *sequence = track_get_events((track_t *)obj);
event_t *evt;
@@ -7361,6 +7460,8 @@
/*duration*/
*duration = event_get_duration(evt);
+
+ *color = scoob_get_velocity(scoob);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2018-03-19 16:05:56
|
Revision: 3729
http://sourceforge.net/p/ftm/code/3729
Author: borghesi
Date: 2018-03-19 16:05:52 +0000 (Mon, 19 Mar 2018)
Log Message:
-----------
ftm.mess: fixed click graphical feedback
ftm.editor: updated to last changes of guiinterfaces
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.editor.cpp
trunk/ftm/externals/max5/ftm.mess.c
Modified: trunk/ftm/externals/max5/ftm.editor.cpp
===================================================================
--- trunk/ftm/externals/max5/ftm.editor.cpp 2018-03-16 15:59:55 UTC (rev 3728)
+++ trunk/ftm/externals/max5/ftm.editor.cpp 2018-03-19 16:05:52 UTC (rev 3729)
@@ -608,7 +608,9 @@
}
}
- void outputCursor(double position, double value, ImtrTypes::mouse_interaction mouse)
+ void listenObject(void *obj, bool listen){}
+
+ void outputCursor(double position, double value, double ringOffset, ImtrTypes::mouse_interaction mouse)
{
t_atom a;
atom_setfloat(&a, position);
Modified: trunk/ftm/externals/max5/ftm.mess.c
===================================================================
--- trunk/ftm/externals/max5/ftm.mess.c 2018-03-16 15:59:55 UTC (rev 3728)
+++ trunk/ftm/externals/max5/ftm.mess.c 2018-03-19 16:05:52 UTC (rev 3729)
@@ -966,11 +966,17 @@
static void
ftmmess_mousedown(ftmmess_t *self, t_object *patcherview, t_pt pt, long modifiers)
{
+ t_object *textfield = jbox_get_textfield((t_object*) self);
+
fts_mutex_lock(&self->mutex);
ftmmess_messexpression_evaluate(self);
fts_mutex_unlock(&self->mutex);
self->pressed = 1;
+
+ if (textfield)
+ textfield_set_textmargins(textfield, 4, 3, 1, 1);
+
jbox_redraw((t_jbox *)self);
}
@@ -977,7 +983,13 @@
static void
ftmmess_mouseup(ftmmess_t *self, t_object *patcherview, t_pt pt, long modifiers)
{
+ t_object *textfield = jbox_get_textfield((t_object*) self);
+
self->pressed = 0;
+
+ if (textfield)
+ textfield_set_textmargins(textfield, 3, 2, 2, 2);
+
jbox_redraw((t_jbox *)self);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2018-03-16 15:59:57
|
Revision: 3728
http://sourceforge.net/p/ftm/code/3728
Author: diemo
Date: 2018-03-16 15:59:55 +0000 (Fri, 16 Mar 2018)
Log Message:
-----------
update for 2.7.x
Modified Paths:
--------------
trunk/ftm/distrib/ReleaseNotes.txt
Modified: trunk/ftm/distrib/ReleaseNotes.txt
===================================================================
--- trunk/ftm/distrib/ReleaseNotes.txt 2018-03-16 15:29:45 UTC (rev 3727)
+++ trunk/ftm/distrib/ReleaseNotes.txt 2018-03-16 15:59:55 UTC (rev 3728)
@@ -6,8 +6,25 @@
* \xA9 Copyright 2004-2009 IRCAM - Centre Pompidou
*
+____________________________________________________
+RELEASE NOTES for FTM & Co 2.7.1 (16/03/2018)
+ftmlib:
+- use new patch to libsndfile 1.0.28 to revive marker import for wav and aiff
+ (issue #1385: https://forge.ircam.fr/p/ftm-and-co/issues/1385)
+
+ftm.object, ftm.mess:
+- observe now presentation mode position
+
____________________________________________________
+RELEASE NOTES for FTM & Co 2.7.0 (30/12/2016)
+
+- 64bit build
+
+ftm.message, ftm.object:
+- fixed MRO bug with #1, #2, ...
+
+____________________________________________________
RELEASE NOTES for FTM & Co 2.6.1 (xx/xx/2014)
fmat class:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2018-03-16 15:29:47
|
Revision: 3727
http://sourceforge.net/p/ftm/code/3727
Author: diemo
Date: 2018-03-16 15:29:45 +0000 (Fri, 16 Mar 2018)
Log Message:
-----------
erm, this version should be actually called 2.7.1-64bit
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2018-03-16 15:27:51 UTC (rev 3726)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2018-03-16 15:29:45 UTC (rev 3727)
@@ -2748,9 +2748,9 @@
VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
- VERSION_MINOR = 6;
- VERSION_RELEASE = 2;
- VERSION_TAG = "\\\"BETA\\\"";
+ VERSION_MINOR = 7;
+ VERSION_RELEASE = 1;
+ VERSION_TAG = "\\\"64bit\\\"";
};
name = Debug_optimised;
};
@@ -2970,9 +2970,9 @@
VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
- VERSION_MINOR = 6;
- VERSION_RELEASE = 2;
- VERSION_TAG = "\\\"BETA\\\"";
+ VERSION_MINOR = 7;
+ VERSION_RELEASE = 1;
+ VERSION_TAG = "\\\"64bit\\\"";
};
name = Debug;
};
@@ -3046,9 +3046,9 @@
VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
- VERSION_MINOR = 6;
- VERSION_RELEASE = 2;
- VERSION_TAG = "\\\"BETA\\\"";
+ VERSION_MINOR = 7;
+ VERSION_RELEASE = 1;
+ VERSION_TAG = "\\\"64bit\\\"";
WARNING_LDFLAGS = "";
};
name = Release;
@@ -3306,9 +3306,9 @@
VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
- VERSION_MINOR = 6;
- VERSION_RELEASE = 2;
- VERSION_TAG = "\\\"BETA\\\"";
+ VERSION_MINOR = 7;
+ VERSION_RELEASE = 1;
+ VERSION_TAG = "\\\"64bit\\\"";
};
name = Debug_harder;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2018-03-16 15:28:03
|
Revision: 3726
http://sourceforge.net/p/ftm/code/3726
Author: diemo
Date: 2018-03-16 15:27:51 +0000 (Fri, 16 Mar 2018)
Log Message:
-----------
update date for 2.7.2 (never released)
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2018-03-16 13:51:41 UTC (rev 3725)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2018-03-16 15:27:51 UTC (rev 3726)
@@ -2745,7 +2745,7 @@
SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"08/2015\\\"";
+ VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 6;
@@ -2967,7 +2967,7 @@
SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"08/2015\\\"";
+ VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 6;
@@ -3043,7 +3043,7 @@
SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"08/2015\\\"";
+ VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 6;
@@ -3303,7 +3303,7 @@
SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"08/2015\\\"";
+ VERSION_DATE = "\\\"03/2018\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 6;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2018-03-16 13:51:43
|
Revision: 3725
http://sourceforge.net/p/ftm/code/3725
Author: diemo
Date: 2018-03-16 13:51:41 +0000 (Fri, 16 Mar 2018)
Log Message:
-----------
4.1.2017: catch one more condition that could lead to crash with "unresolved scopes", some printing, NOPE
Modified Paths:
--------------
trunk/ftm/ftmlib/max5/maxpat.c
Modified: trunk/ftm/ftmlib/max5/maxpat.c
===================================================================
--- trunk/ftm/ftmlib/max5/maxpat.c 2018-03-16 13:50:27 UTC (rev 3724)
+++ trunk/ftm/ftmlib/max5/maxpat.c 2018-03-16 13:51:41 UTC (rev 3725)
@@ -27,7 +27,7 @@
/* debug scope console printouts */
#ifndef WIN32
#define debug_post(args...)
-//#define debug_post(args...) post(args)
+//#define debug_post(args...) printf(args); puts("\n") //post(args)
#else
static void debug_post(const char *format, ...){}
#endif
@@ -258,11 +258,13 @@
{
fts_atom_t k, v;
+ debug_post("--> register_unresolved_scope %p for maxpat %p", scope, maxpat);
+
fts_set_pointer(&k, scope);
fts_set_pointer(&v, maxpat);
fts_hashtable_put(&unresolved_scope_hash, &k, &v);
- /* trigger defered resolve */
+ /* trigger defered resolve (calls resolve_unresolved_scopes()) */
qelem_set(unresolved_scope_qelem);
}
@@ -414,6 +416,8 @@
filename = p->p_originalname;
else
filename = fts_s_empty_string;
+
+ debug_post("patcher_get_filename from t_jpatcher: '%s'\n", fts_symbol_name(p->p_originalname));
}
return filename;
@@ -425,7 +429,7 @@
t_symbol *filepath = object_attr_getsym(toplevel, gensym("filepath"));
t_symbol *filename = object_attr_getsym(toplevel, gensym("filename"));
- if(filepath == NULL || filepath == fts_s_empty_string || filepath == NULL || filename == fts_s_empty_string || filename == NULL)
+ if(filepath == NULL || filepath == fts_s_empty_string || filename == NULL || filename == fts_s_empty_string)
{
t_jpatcher *p = (t_jpatcher *)toplevel;
@@ -437,6 +441,8 @@
if(path_topathname(p->p_vol, p->p_originalname->s_name, fullpath) == 0)
filepath = fts_new_symbol(fullpath);
+
+ debug_post("patcher_get_filepath from t_jpatcher: '%s' vol %ld full '%s'\n", fts_symbol_name(p->p_originalname), p->p_vol, fts_symbol_name(filepath));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2018-03-16 13:50:31
|
Revision: 3724
http://sourceforge.net/p/ftm/code/3724
Author: diemo
Date: 2018-03-16 13:50:27 +0000 (Fri, 16 Mar 2018)
Log Message:
-----------
21.2.2017: use new patch to libsndfile 1.0.28 to revive marker import
Modified Paths:
--------------
trunk/ftm/ftmlib/audiofile.c
trunk/ftm/ftmlib/ftsconfig.h
Modified: trunk/ftm/ftmlib/audiofile.c
===================================================================
--- trunk/ftm/ftmlib/audiofile.c 2017-02-14 18:26:34 UTC (rev 3723)
+++ trunk/ftm/ftmlib/audiofile.c 2018-03-16 13:50:27 UTC (rev 3724)
@@ -328,35 +328,44 @@
fts_audiofile_marker_info_callback_t getinfo,
void *userdata)
{
- int size, i;
- SF_CUE_INFO *info;
+ int i;
+ uint32_t count = 0;
+ SF_CUES_VAR(0) *info;
- if (sf_command(audiofile->sfhandle, SFC_GET_CUE_SIZE, &size, sizeof (int)) == SF_FALSE)
+ if (sf_command(audiofile->sfhandle, SFC_GET_CUE_COUNT, &count, sizeof(uint32_t)) == SF_FALSE)
{
#if DEBUG
- fts_post("audiofile.c: can't get cue info size for file '%s'\n",
- fts_symbol_name(audiofile->filename));
+ if (sf_error(audiofile->sfhandle) == 0)
+ fts_post("audiofile.c: no cues in file '%s'\n",
+ fts_symbol_name(audiofile->filename));
+ else
+ fts_post("audiofile.c: can't get cue info size for file '%s': error %s\n",
+ fts_symbol_name(audiofile->filename), sf_strerror(audiofile->sfhandle));
#endif
return 0;
}
+ if (getnum)
+ getnum(count, userdata);
+
+ int size = sizeof(*info) + count * sizeof(SF_CUE_POINT);
+
if (!(info = fts_malloc(size)))
return 0;
- if (sf_command(audiofile->sfhandle, SFC_GET_CUE_INFO, info, size) == SF_FALSE)
+ if (sf_command(audiofile->sfhandle, SFC_GET_CUE, info, size) == SF_FALSE)
{
- fts_post("audiofile.c: can't get cue info of size %d for file '%s'\n",
- size, fts_symbol_name(audiofile->filename));
+ fts_post("audiofile.c: can't get info for %d cues of size %d for file '%s'\n",
+ count, sizeof(SF_CUES), fts_symbol_name(audiofile->filename));
return 0;
}
- if (getnum)
- getnum(info->num, userdata);
+ if (getinfo)
+ for (i = 0; i < (int) info->cue_count; i++)
+ getinfo(i, info->cue_points[i].indx, info->cue_points[i].position, info->cue_points[i].name,
+ audiofile->sfinfo.samplerate, userdata);
- if (getinfo)
- for (i = 0; i < info->num; i++)
- getinfo(i, info->cue[i].markerID, info->cue[i].position, info->cue[i].label, audiofile->sfinfo.samplerate, userdata);
-
+ fts_free(info);
return 1;
}
#endif /* #if HAVE_SNDFILE_WITH_MARKER_IMPORT */
Modified: trunk/ftm/ftmlib/ftsconfig.h
===================================================================
--- trunk/ftm/ftmlib/ftsconfig.h 2017-02-14 18:26:34 UTC (rev 3723)
+++ trunk/ftm/ftmlib/ftsconfig.h 2018-03-16 13:50:27 UTC (rev 3724)
@@ -26,10 +26,8 @@
/* defined ONLY BY Debug build configuration to enable debugging and special functions, so DON'T undefine here! */
/* #undef DEBUG */
-/* Use new functions of libsndfile (patch on imtr-libs trac
- repositiory only, not yet in release of libsndfile-1.0.18) */
-/* moved to sndfile.h.in:
- #define HAVE_SNDFILE_WITH_MARKER_IMPORT 1 */
+/* Use new functions of libsndfile 1.0.28 */
+#define HAVE_SNDFILE_WITH_MARKER_IMPORT 1
/* library dependencies */
#ifndef FTS_LIGHT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-02-03 15:51:14
|
Revision: 3719
http://sourceforge.net/p/ftm/code/3719
Author: borghesi
Date: 2017-02-03 15:51:10 +0000 (Fri, 03 Feb 2017)
Log Message:
-----------
replaced max7 with max6.1 in projects
Modified Paths:
--------------
trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj
trunk/ftm/build/max5/winxp-vs/ftmlib.vcxproj
trunk/ftm/ftmlib/max5/ftmversion.h
Modified: trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -127,7 +127,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs.def</ModuleDefinitionFile>
<DelayLoadDLLs>
@@ -161,7 +161,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -186,7 +186,7 @@
<AdditionalDependencies>ftmlib64.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs64bits.def</ModuleDefinitionFile>
<DelayLoadDLLs>
@@ -221,7 +221,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -246,7 +246,7 @@
<AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -280,7 +280,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_MSCVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -305,7 +305,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -127,7 +127,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -157,7 +157,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -182,7 +182,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.buffer64bits.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -213,7 +213,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -238,7 +238,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
<ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
@@ -271,7 +271,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -296,7 +296,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.buffer64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -127,7 +127,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -181,7 +181,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.clone64bits.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -211,7 +211,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -233,7 +233,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
<ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
@@ -266,7 +266,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -288,7 +288,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.clone64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -127,7 +127,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -181,7 +181,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.copy64bits.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -211,7 +211,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -236,7 +236,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -270,7 +270,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -295,7 +295,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.copy64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -110,7 +110,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<MinimalRebuild>true</MinimalRebuild>
@@ -139,7 +139,7 @@
<AdditionalDependencies>ftmlib32.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\ftm.editor.def</ModuleDefinitionFile>
@@ -173,7 +173,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -201,7 +201,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\ftm.editor64bits.def</ModuleDefinitionFile>
@@ -236,7 +236,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -260,7 +260,7 @@
<AdditionalDependencies>ftmlib32.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.editor.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -298,7 +298,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\max-includes\common;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\max-includes\common;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;WIN64;_WIN64;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE=1;DISABLE_JUCE_NAMESPACE=1;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;MTREDITOR_DONT_USE_LOCAL_JUCEINCLUDES=1;JUCER_VS2015_78A5022=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>
</StringPooling>
@@ -326,7 +326,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.editor64bits.def</ModuleDefinitionFile>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -127,7 +127,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.inter.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -160,7 +160,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -185,7 +185,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.inter64bits.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -219,7 +219,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -244,7 +244,7 @@
<AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.inter.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -278,7 +278,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -303,7 +303,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.inter64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -127,7 +127,7 @@
<AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.iter.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -160,7 +160,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -185,7 +185,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.iter64bits.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -219,7 +219,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -244,7 +244,7 @@
<AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.iter.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -278,7 +278,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -303,7 +303,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.iter64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj 2017-02-02 16:35:55 UTC (rev 3718)
+++ trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj 2017-02-03 15:51:10 UTC (rev 3719)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\jit-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\jit-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -127,7 +127,7 @@
<AdditionalDependencies>ftmlib32.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\jit-includes;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max6.1\jit-includes;..\..\..\..\components\maxapi\max6.1\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.jitter.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\jit-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max6.1\max-includes;..\..\..\..\components\maxapi\max6.1\jit-includes;..\..\..\..\components\maxapi\max6.1\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -181,7 +181,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\jit-includes\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max6.1\jit-includes\x64;..\..\..\..\components\maxapi\max6.1\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.jitter64bits.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -211,7 +211,7 @@
...
[truncated message content] |
|
From: <bor...@us...> - 2017-02-02 16:35:58
|
Revision: 3718
http://sourceforge.net/p/ftm/code/3718
Author: borghesi
Date: 2017-02-02 16:35:55 +0000 (Thu, 02 Feb 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
trunk/ftm/distrib/icon.png
Modified: trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2017-02-02 15:27:38 UTC (rev 3717)
+++ trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2017-02-02 16:35:55 UTC (rev 3718)
@@ -128,17 +128,18 @@
3B1CF46D161AE679007A5AE6 /* IndexChooserMarkersContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B1CF46B161AE679007A5AE6 /* IndexChooserMarkersContainer.cpp */; };
3B3E8CB10AB81B2800EE3FAB /* ftm.guilistener.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B3E8CB00AB81B2800EE3FAB /* ftm.guilistener.c */; };
3B46D2A310B566F800C927D9 /* ftm.tween.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B46D2A210B566F800C927D9 /* ftm.tween.c */; };
+ 3B6614F51E363A0E00E5EFCC /* juce_opengl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614F41E363A0E00E5EFCC /* juce_opengl.mm */; };
+ 3B6614F71E363A1E00E5EFCC /* juce_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614F61E363A1E00E5EFCC /* juce_core.mm */; };
+ 3B6614F91E363A2300E5EFCC /* juce_data_structures.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614F81E363A2300E5EFCC /* juce_data_structures.mm */; };
+ 3B6614FB1E363A2800E5EFCC /* juce_events.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614FA1E363A2800E5EFCC /* juce_events.mm */; };
+ 3B6614FD1E363A3000E5EFCC /* juce_graphics.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614FC1E363A3000E5EFCC /* juce_graphics.mm */; };
+ 3B6614FF1E363A3F00E5EFCC /* juce_gui_basics.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614FE1E363A3F00E5EFCC /* juce_gui_basics.mm */; };
+ 3B6615011E363A4400E5EFCC /* juce_gui_extra.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6615001E363A4400E5EFCC /* juce_gui_extra.mm */; };
3B7073BE0713F12300764C51 /* ftm.list.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B7073BD0713F04500764C51 /* ftm.list.c */; };
3BA1E34F0F6E6A4D007B27D1 /* commonsyms.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA1E34D0F6E6A4D007B27D1 /* commonsyms.c */; };
3BA1E3500F6E6A4D007B27D1 /* jpatcher_syms.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA1E34E0F6E6A4D007B27D1 /* jpatcher_syms.c */; };
3BBA7CA1171C05C1008E4C6E /* AppConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBA7CA0171C05C1008E4C6E /* AppConfig.h */; };
3BBA7CA4171C05D1008E4C6E /* juceincludes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBA7CA3171C05D1008E4C6E /* juceincludes.h */; };
- 3BBA7CB3171C0612008E4C6E /* juce_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3BBA7CB2171C0612008E4C6E /* juce_core.mm */; };
- 3BBA7CB5171C062B008E4C6E /* juce_data_structures.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3BBA7CB4171C062B008E4C6E /* juce_data_structures.mm */; };
- 3BBA7CB7171C0642008E4C6E /* juce_events.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3BBA7CB6171C0642008E4C6E /* juce_events.mm */; };
- 3BBA7CB9171C0658008E4C6E /* juce_graphics.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3BBA7CB8171C0658008E4C6E /* juce_graphics.mm */; };
- 3BBA7CBB171C0679008E4C6E /* juce_gui_basics.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3BBA7CBA171C0679008E4C6E /* juce_gui_basics.mm */; };
- 3BBA7CBD171C0696008E4C6E /* juce_gui_extra.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3BBA7CBC171C0696008E4C6E /* juce_gui_extra.mm */; };
3BDD70C01677718700D97963 /* LockTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BDD70BF1677718700D97963 /* LockTool.cpp */; };
3BE10ED4142C9103006E1168 /* BpfEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BE1ACB5136EB1730036CFFC /* BpfEditor.cpp */; };
3BE1AC96136EB14D0036CFFC /* EditorAtom.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BE1AC78136EB14D0036CFFC /* EditorAtom.h */; };
@@ -477,17 +478,18 @@
3B3E8CAE0AB81AB100EE3FAB /* ftm.guilistener.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.guilistener.mxo; sourceTree = BUILT_PRODUCTS_DIR; };
3B3E8CB00AB81B2800EE3FAB /* ftm.guilistener.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ftm.guilistener.c; sourceTree = "<group>"; };
3B46D2A210B566F800C927D9 /* ftm.tween.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftm.tween.c; sourceTree = "<group>"; };
+ 3B6614F41E363A0E00E5EFCC /* juce_opengl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_opengl.mm; path = ../../../components/juce/JuceLibraryCode/juce_opengl.mm; sourceTree = "<group>"; };
+ 3B6614F61E363A1E00E5EFCC /* juce_core.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_core.mm; path = ../../../components/juce/JuceLibraryCode/juce_core.mm; sourceTree = "<group>"; };
+ 3B6614F81E363A2300E5EFCC /* juce_data_structures.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_data_structures.mm; path = ../../../components/juce/JuceLibraryCode/juce_data_structures.mm; sourceTree = "<group>"; };
+ 3B6614FA1E363A2800E5EFCC /* juce_events.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_events.mm; path = ../../../components/juce/JuceLibraryCode/juce_events.mm; sourceTree = "<group>"; };
+ 3B6614FC1E363A3000E5EFCC /* juce_graphics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_graphics.mm; path = ../../../components/juce/JuceLibraryCode/juce_graphics.mm; sourceTree = "<group>"; };
+ 3B6614FE1E363A3F00E5EFCC /* juce_gui_basics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_gui_basics.mm; path = ../../../components/juce/JuceLibraryCode/juce_gui_basics.mm; sourceTree = "<group>"; };
+ 3B6615001E363A4400E5EFCC /* juce_gui_extra.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_gui_extra.mm; path = ../../../components/juce/JuceLibraryCode/juce_gui_extra.mm; sourceTree = "<group>"; };
3B7073BD0713F04500764C51 /* ftm.list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ftm.list.c; sourceTree = "<group>"; };
3BA1E34D0F6E6A4D007B27D1 /* commonsyms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = commonsyms.c; path = "../../../../components/maxapi/max5/max-includes/common/commonsyms.c"; sourceTree = SOURCE_ROOT; };
3BA1E34E0F6E6A4D007B27D1 /* jpatcher_syms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jpatcher_syms.c; path = "../../../../components/maxapi/max5/max-includes/common/jpatcher_syms.c"; sourceTree = SOURCE_ROOT; };
3BBA7CA0171C05C1008E4C6E /* AppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppConfig.h; sourceTree = "<group>"; };
3BBA7CA3171C05D1008E4C6E /* juceincludes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = juceincludes.h; sourceTree = "<group>"; };
- 3BBA7CB2171C0612008E4C6E /* juce_core.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_core.mm; path = ../../../../components/juce/modules/juce_core/juce_core.mm; sourceTree = SOURCE_ROOT; };
- 3BBA7CB4171C062B008E4C6E /* juce_data_structures.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_data_structures.mm; path = ../../../../components/juce/modules/juce_data_structures/juce_data_structures.mm; sourceTree = SOURCE_ROOT; };
- 3BBA7CB6171C0642008E4C6E /* juce_events.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_events.mm; path = ../../../../components/juce/modules/juce_events/juce_events.mm; sourceTree = SOURCE_ROOT; };
- 3BBA7CB8171C0658008E4C6E /* juce_graphics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_graphics.mm; path = ../../../../components/juce/modules/juce_graphics/juce_graphics.mm; sourceTree = SOURCE_ROOT; };
- 3BBA7CBA171C0679008E4C6E /* juce_gui_basics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_gui_basics.mm; path = ../../../../components/juce/modules/juce_gui_basics/juce_gui_basics.mm; sourceTree = SOURCE_ROOT; };
- 3BBA7CBC171C0696008E4C6E /* juce_gui_extra.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_gui_extra.mm; path = ../../../../components/juce/modules/juce_gui_extra/juce_gui_extra.mm; sourceTree = SOURCE_ROOT; };
3BDD70BF1677718700D97963 /* LockTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LockTool.cpp; sourceTree = "<group>"; };
3BE1AC78136EB14D0036CFFC /* EditorAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorAtom.h; sourceTree = "<group>"; };
3BE1AC79136EB14D0036CFFC /* EditorContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorContainer.cpp; sourceTree = "<group>"; };
@@ -821,12 +823,13 @@
3BBA7CA5171C05D9008E4C6E /* juce */ = {
isa = PBXGroup;
children = (
- 3BBA7CBC171C0696008E4C6E /* juce_gui_extra.mm */,
- 3BBA7CBA171C0679008E4C6E /* juce_gui_basics.mm */,
- 3BBA7CB8171C0658008E4C6E /* juce_graphics.mm */,
- 3BBA7CB6171C0642008E4C6E /* juce_events.mm */,
- 3BBA7CB4171C062B008E4C6E /* juce_data_structures.mm */,
- 3BBA7CB2171C0612008E4C6E /* juce_core.mm */,
+ 3B6614F61E363A1E00E5EFCC /* juce_core.mm */,
+ 3B6614F81E363A2300E5EFCC /* juce_data_structures.mm */,
+ 3B6614FA1E363A2800E5EFCC /* juce_events.mm */,
+ 3B6614FC1E363A3000E5EFCC /* juce_graphics.mm */,
+ 3B6614FE1E363A3F00E5EFCC /* juce_gui_basics.mm */,
+ 3B6615001E363A4400E5EFCC /* juce_gui_extra.mm */,
+ 3B6614F41E363A0E00E5EFCC /* juce_opengl.mm */,
);
name = juce;
sourceTree = "<group>";
@@ -2597,10 +2600,13 @@
buildActionMask = 2147483647;
files = (
3B1CA7D40C467B12005F0280 /* ftm.editor.cpp in Sources */,
+ 3B6615011E363A4400E5EFCC /* juce_gui_extra.mm in Sources */,
3BE1AC97136EB14D0036CFFC /* EditorContainer.cpp in Sources */,
3BE1AC9A136EB14D0036CFFC /* EditorDomainRuler.cpp in Sources */,
21DD1AFC1D9B137900476592 /* SplineEditor.cpp in Sources */,
+ 3B6614F91E363A2300E5EFCC /* juce_data_structures.mm in Sources */,
3BE1AC9C136EB14D0036CFFC /* EditorDomainScrollbar.cpp in Sources */,
+ 3B6614F71E363A1E00E5EFCC /* juce_core.mm in Sources */,
3BE1AC9E136EB14D0036CFFC /* EditorInnerBar.cpp in Sources */,
3BE1ACA1136EB14D0036CFFC /* EditorRangeRuler.cpp in Sources */,
3BE1ACA2136EB14D0036CFFC /* EditorResizerBar.cpp in Sources */,
@@ -2609,17 +2615,21 @@
3BE1ACA8136EB14D0036CFFC /* EditorTextField.cpp in Sources */,
3BE1ACAA136EB14D0036CFFC /* EditorToolbar.cpp in Sources */,
3BE1ACAE136EB14D0036CFFC /* IndexChooser.cpp in Sources */,
+ 3B6614FD1E363A3000E5EFCC /* juce_graphics.mm in Sources */,
3BE1ACB2136EB14D0036CFFC /* ViewScrollBar.cpp in Sources */,
3BE1ACC4136EB1730036CFFC /* MarkersEditor.cpp in Sources */,
3BE1ACC5136EB1730036CFFC /* MatrixEditor.cpp in Sources */,
3BE1ACC6136EB1730036CFFC /* MultibpfEditor.cpp in Sources */,
+ 3B6614F51E363A0E00E5EFCC /* juce_opengl.mm in Sources */,
3BE1ACC7136EB1730036CFFC /* MultiwaveEditor.cpp in Sources */,
3BE1ACC8136EB1730036CFFC /* PixelsEditor.cpp in Sources */,
3BE1ACC9136EB1730036CFFC /* ScoreEditor.cpp in Sources */,
3BE1ACCA136EB1730036CFFC /* SonogramEditor.cpp in Sources */,
3BE1ACCB136EB1730036CFFC /* TracesEditor.cpp in Sources */,
3BE1ACCC136EB1730036CFFC /* WaveEditor.cpp in Sources */,
+ 3B6614FB1E363A2800E5EFCC /* juce_events.mm in Sources */,
3BE1ACD2136EB18C0036CFFC /* EditorToolbarImages.cpp in Sources */,
+ 3B6614FF1E363A3F00E5EFCC /* juce_gui_basics.mm in Sources */,
3BE1ACD4136EB18C0036CFFC /* ImtrEditorData.cpp in Sources */,
3BE1ACDE136EB1AF0036CFFC /* CursorTool.cpp in Sources */,
3BE1ACDF136EB1AF0036CFFC /* DrawTool.cpp in Sources */,
@@ -2631,12 +2641,6 @@
3B1CF468161AE66E007A5AE6 /* IndexChooserMarkersEditor.cpp in Sources */,
3B1CF46D161AE679007A5AE6 /* IndexChooserMarkersContainer.cpp in Sources */,
3BDD70C01677718700D97963 /* LockTool.cpp in Sources */,
- 3BBA7CB3171C0612008E4C6E /* juce_core.mm in Sources */,
- 3BBA7CB5171C062B008E4C6E /* juce_data_structures.mm in Sources */,
- 3BBA7CB7171C0642008E4C6E /* juce_events.mm in Sources */,
- 3BBA7CB9171C0658008E4C6E /* juce_graphics.mm in Sources */,
- 3BBA7CBB171C0679008E4C6E /* juce_gui_basics.mm in Sources */,
- 3BBA7CBD171C0696008E4C6E /* juce_gui_extra.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2925,6 +2929,7 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
@@ -3019,10 +3024,13 @@
"DISABLE_JUCE_NAMESPACE=1",
"_DEBUG=1",
"DEBUG=1",
+ "IMTREDITOR_DONT_USE_LOCAL_JUCEINCLUDES=1",
+ "JUCER_XCODE_MAC_F6D2F4CF=1",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
OTHER_LDFLAGS = (
@@ -3035,6 +3043,8 @@
QuartzCore,
"-framework",
WebKit,
+ "-framework",
+ OpenGL,
);
PRODUCT_NAME = ftm.editor;
};
@@ -3287,15 +3297,17 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
- IMTREDITOR_C_GUI_INTERFACE,
- "=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
"DISABLE_JUCE_NAMESPACE=1",
"_DEBUG=1",
"DEBUG=1",
+ "IMTREDITOR_DONT_USE_LOCAL_JUCEINCLUDES=1",
+ "JUCER_XCODE_MAC_F6D2F4CF=1",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
@@ -3309,6 +3321,8 @@
QuartzCore,
"-framework",
WebKit,
+ "-framework",
+ OpenGL,
);
PRODUCT_NAME = ftm.editor;
};
@@ -3617,6 +3631,7 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
@@ -3689,10 +3704,13 @@
"DISABLE_JUCE_NAMESPACE=1",
"_DEBUG=1",
"DEBUG=1",
+ "IMTREDITOR_DONT_USE_LOCAL_JUCEINCLUDES=1",
+ "JUCER_XCODE_MAC_F6D2F4CF=1",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
@@ -3706,6 +3724,8 @@
QuartzCore,
"-framework",
WebKit,
+ "-framework",
+ OpenGL,
);
PRODUCT_NAME = ftm.editor;
};
@@ -3717,15 +3737,17 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
- IMTREDITOR_C_GUI_INTERFACE,
- "=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
"DISABLE_JUCE_NAMESPACE=1",
"_NDEBUG=1",
"NDEBUG=1",
+ "IMTREDITOR_DONT_USE_LOCAL_JUCEINCLUDES=1",
+ "JUCER_XCODE_MAC_F6D2F4CF=1",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
@@ -3739,6 +3761,8 @@
QuartzCore,
"-framework",
WebKit,
+ "-framework",
+ OpenGL,
);
PRODUCT_NAME = ftm.editor;
};
@@ -4088,6 +4112,7 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
@@ -4157,6 +4182,7 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
Modified: trunk/ftm/distrib/icon.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-02-02 15:27:41
|
Revision: 3717
http://sourceforge.net/p/ftm/code/3717
Author: borghesi
Date: 2017-02-02 15:27:38 +0000 (Thu, 02 Feb 2017)
Log Message:
-----------
Added Paths:
-----------
trunk/ftm/build/max5/winxp-vs/ftm.absargs64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.buffer64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.clone64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.copy64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.editor64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.inter64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.iter64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.jitter64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.list64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.mess64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.midiparse64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.midiunparse64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.object64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.play64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.print64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.record64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.schedule64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.sdif.info64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.sdif.write64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.sqlite64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.tween64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.value64bits.def
trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay64bits.def
Added: trunk/ftm/build/max5/winxp-vs/ftm.absargs64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.absargs64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.absargs64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,6 @@
+;ftm.absargs64bits.def
+
+LIBRARY ftm.absargs.mxe64
+EXPORTS
+
+ main
Added: trunk/ftm/build/max5/winxp-vs/ftm.buffer64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.buffer64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.buffer64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.buffer64bits.def
+
+
+
+LIBRARY ftm.buffer.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.clone64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.clone64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.clone64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.clone64bits.def
+
+
+
+LIBRARY ftm.clone.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.copy64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.copy64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.copy64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.copy64bits.def
+
+
+
+LIBRARY ftm.copy.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.editor64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.editor64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.editor64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,7 @@
+;ftm.editor64bits.def
+
+LIBRARY ftm.editor.mxe64
+
+EXPORTS
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.inter64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.inter64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.inter64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.inter64bits.def
+
+
+
+LIBRARY ftm.inter.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.iter64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.iter64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.iter64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.iter64bits.def
+
+
+
+LIBRARY ftm.iter.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.jitter64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.jitter64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.jitter64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.jitter64bits.def
+
+
+
+LIBRARY ftm.jitter.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.list64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.list64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.list64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.list64bits.def
+
+
+
+LIBRARY ftm.list.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.mess64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.mess64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.mess64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.mess64bits.def
+
+
+
+LIBRARY ftm.mess.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.midiparse64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.midiparse64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.midiparse64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.midiparse64bits.def
+
+
+
+LIBRARY ftm.midiparse.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.midiunparse64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.midiunparse64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.midiunparse64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.midiunparse64bits.def
+
+
+
+LIBRARY ftm.midiunparse.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.object64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.object64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.object64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.object64bits.def
+
+
+
+LIBRARY ftm.object.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.play64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.play64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.play64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.play64bits.def
+
+
+
+LIBRARY ftm.play.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.print64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.print64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.print64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.print64bits.def
+
+
+
+LIBRARY ftm.print.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.record64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.record64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.record64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.record64bits.def
+
+
+
+LIBRARY ftm.record.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.schedule64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.schedule64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.schedule64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.schedule64bits.def
+
+
+
+LIBRARY ftm.schedule.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.sdif.info64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sdif.info64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sdif.info64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.sdif.info64bits.def
+
+
+
+LIBRARY ftm.sdif.info.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.sdif.write64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sdif.write64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sdif.write64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.sdif.write64bits.def
+
+
+
+LIBRARY ftm.sdif.write.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.sqlite64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sqlite64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sqlite64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.sqlite64bits.def
+
+
+
+LIBRARY ftm.sqlite.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.tween64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.tween64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.tween64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.tween64bits.def
+
+
+
+LIBRARY ftm.tween.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.value64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.value64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.value64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,12 @@
+;ftm.value64bits.def
+
+
+
+LIBRARY ftm.value.mxe64
+
+
+
+EXPORTS
+
+ main
+
Added: trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay64bits.def
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay64bits.def (rev 0)
+++ trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay64bits.def 2017-02-02 15:27:38 UTC (rev 3717)
@@ -0,0 +1,7 @@
+;ftm.vecdisplay64bits.def
+
+LIBRARY ftm.vecdisplay.mxe64
+
+EXPORTS
+ main
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-02-02 14:13:34
|
Revision: 3716
http://sourceforge.net/p/ftm/code/3716
Author: borghesi
Date: 2017-02-02 14:13:33 +0000 (Thu, 02 Feb 2017)
Log Message:
-----------
Added Paths:
-----------
trunk/ftm/distrib/icon.png
Added: trunk/ftm/distrib/icon.png
===================================================================
(Binary files differ)
Index: trunk/ftm/distrib/icon.png
===================================================================
--- trunk/ftm/distrib/icon.png 2017-02-02 13:56:58 UTC (rev 3715)
+++ trunk/ftm/distrib/icon.png 2017-02-02 14:13:33 UTC (rev 3716)
Property changes on: trunk/ftm/distrib/icon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-02-02 13:57:00
|
Revision: 3715
http://sourceforge.net/p/ftm/code/3715
Author: borghesi
Date: 2017-02-02 13:56:58 +0000 (Thu, 02 Feb 2017)
Log Message:
-----------
Added Paths:
-----------
trunk/ftm/distrib/package-info.json
trunk/ftm/distrib/readme=win.md
Added: trunk/ftm/distrib/package-info.json
===================================================================
--- trunk/ftm/distrib/package-info.json (rev 0)
+++ trunk/ftm/distrib/package-info.json 2017-02-02 13:56:58 UTC (rev 3715)
@@ -0,0 +1,24 @@
+{
+ "name" : "FTM",
+ "author" : "ISMM Team @ Ircam",
+ "description" : "FTM: extended real-time object system for Max/MSP",
+ "homepatcher" : "FTMExamplesOverview.maxpat",
+ "max_version_max" : "none",
+ "max_version_min" : "7.1",
+ "os" : {
+ "macintosh" : {
+ "platform" : [ "ia32", "x64" ],
+ "min_version" : "10.7.x"
+ }
+,
+ "windows" : {
+ "platform" : [ "ia32", "x64" ],
+ "min_version" : "7"
+ }
+
+ }
+,
+ "tags" : [ "data", "analysis", "synthesis", "externals", "gesture", "visualisation" ],
+ "version" : "3.0.0.BETA",
+ "website" : "http://ftm.ircam.fr"
+}
Added: trunk/ftm/distrib/readme=win.md
===================================================================
--- trunk/ftm/distrib/readme=win.md (rev 0)
+++ trunk/ftm/distrib/readme=win.md 2017-02-02 13:56:58 UTC (rev 3715)
@@ -0,0 +1,14 @@
+# FTM
+by ISMM Team @ Ircam - Centre Pompidou (http://www.ircam.fr)
+
+This version requires Max 7.1 or higher.
+
+##### Easy installation (for Max 7.1):
+Select **Show Package Manager** in the **File** menu, and browse to install **FTM**
+
+##### Manual installation:
+Copy the FTM folder to your **~/Documents/Max 7/Packages** folder.
+
+[ISMM Team Pages](http://ismm.ircam.fr)
+
+[FTM Page at IRCAM](http://ftm.ircam.fr/)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-02-02 13:42:21
|
Revision: 3714
http://sourceforge.net/p/ftm/code/3714
Author: borghesi
Date: 2017-02-02 13:42:18 +0000 (Thu, 02 Feb 2017)
Log Message:
-----------
update of ftm overview patch
Added Paths:
-----------
trunk/ftm/patches/max5/FTM-Overview.maxpat
trunk/ftm/patches/max5/FTMObjectsList.maxpat
Removed Paths:
-------------
trunk/ftm/patches/max5/FTMExamplesOverview.maxpat
Added: trunk/ftm/patches/max5/FTM-Overview.maxpat
===================================================================
--- trunk/ftm/patches/max5/FTM-Overview.maxpat (rev 0)
+++ trunk/ftm/patches/max5/FTM-Overview.maxpat 2017-02-02 13:42:18 UTC (rev 3714)
@@ -0,0 +1,1893 @@
+{
+ "patcher" : {
+ "fileversion" : 1,
+ "appversion" : {
+ "major" : 7,
+ "minor" : 3,
+ "revision" : 1,
+ "architecture" : "x64",
+ "modernui" : 1
+ }
+,
+ "rect" : [ 594.0, 232.0, 960.0, 591.0 ],
+ "bglocked" : 0,
+ "openinpresentation" : 0,
+ "default_fontsize" : 10.0,
+ "default_fontface" : 0,
+ "default_fontname" : "Arial",
+ "gridonopen" : 1,
+ "gridsize" : [ 15.0, 15.0 ],
+ "gridsnaponopen" : 1,
+ "objectsnaponopen" : 1,
+ "statusbarvisible" : 2,
+ "toolbarvisible" : 1,
+ "lefttoolbarpinned" : 0,
+ "toptoolbarpinned" : 0,
+ "righttoolbarpinned" : 0,
+ "bottomtoolbarpinned" : 0,
+ "toolbars_unpinned_last_save" : 0,
+ "tallnewobj" : 0,
+ "boxanimatetime" : 200,
+ "enablehscroll" : 1,
+ "enablevscroll" : 1,
+ "devicewidth" : 0.0,
+ "description" : "",
+ "digest" : "",
+ "tags" : "",
+ "style" : "",
+ "subpatcher_template" : "",
+ "boxes" : [ {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.784314, 0.145098, 0.023529, 0.172549 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-66",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 79.5, 138.5, 192.5, 137.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-64",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 82.5, 245.5, 128.0, 18.0 ],
+ "style" : "",
+ "text" : "Overwiev of Mnm objects"
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 1,
+ "id" : "obj-65",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 19.5, 224.5, 101.765617, 19.0 ],
+ "presentation_rect" : [ 19.5, 224.5, 101.765617, 19.0 ],
+ "text" : [ "_MnmObjectsList" ]
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-62",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 82.5, 191.5, 128.0, 18.0 ],
+ "style" : "",
+ "text" : "Overwiev of Gabor objects"
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-63",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 19.5, 170.0, 108.779289, 19.0 ],
+ "presentation_rect" : [ 19.5, 170.0, 108.779289, 19.0 ],
+ "text" : [ "_GaborObjectsList" ]
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-60",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 82.5, 138.5, 121.0, 18.0 ],
+ "style" : "",
+ "text" : "Overwiev of FTM objects"
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-61",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 19.5, 118.5, 96.966789, 19.0 ],
+ "presentation_rect" : [ 19.5, 118.5, 96.966789, 19.0 ],
+ "text" : [ "_FTMObjectsList" ]
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Verdana",
+ "fontsize" : 18.0,
+ "id" : "obj-2",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 27.0, 82.5, 171.0, 28.0 ],
+ "style" : "",
+ "text" : "FTM & Co Objects"
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.937255, 0.937255, 0.937255, 1.0 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-3",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 10.0, 74.0, 223.0, 206.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-91",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 85.0, 464.0, 143.0, 18.0 ],
+ "style" : "",
+ "text" : "about FTM objects references"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-90",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 85.0, 423.0, 187.0, 18.0 ],
+ "style" : "",
+ "text" : "about FTM objects and more messages"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-89",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 85.0, 383.0, 107.0, 18.0 ],
+ "style" : "",
+ "text" : "about FTM messages"
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-88",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 21.0, 499.0, 54.97266, 19.0 ],
+ "presentation_rect" : [ 21.0, 499.0, 54.97266, 19.0 ],
+ "text" : [ "_f00-TOC" ]
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-87",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 84.0, 500.0, 172.0, 18.0 ],
+ "style" : "",
+ "text" : "additional tutorrials by Chris Dobrian"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-81",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 382.0, 110.0, 147.0, 18.0 ],
+ "style" : "",
+ "text" : "extraction of audio descruptors"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-76",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 484.0, 61.0, 18.0 ],
+ "style" : "",
+ "text" : "make it talk"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-75",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 445.0, 138.0, 18.0 ],
+ "style" : "",
+ "text" : "my first analysis/re-synthesis"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-74",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 406.0, 210.0, 18.0 ],
+ "style" : "",
+ "text" : "bits of sounds cut out of recordings of vowels"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-73",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 367.0, 139.0, 18.0 ],
+ "style" : "",
+ "text" : "generating vowels with FOFs"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-72",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 328.0, 260.0, 18.0 ],
+ "style" : "",
+ "text" : "la Fonction d'Onde Formantique (the queen of formants)"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-71",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 289.0, 195.0, 18.0 ],
+ "style" : "",
+ "text" : "watch and listen to different window types"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-70",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 250.0, 250.0, 18.0 ],
+ "style" : "",
+ "text" : "a simple formant generator based on a cosine window"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-69",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 211.0, 209.0, 18.0 ],
+ "style" : "",
+ "text" : "overlapping windows generating a sine wave"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-68",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 673.0, 172.0, 169.0, 18.0 ],
+ "style" : "",
+ "text" : "generating a sine wave: hello world!"
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-59",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 464.0, 133.21875, 19.0 ],
+ "presentation_rect" : [ 620.0, 464.0, 133.21875, 19.0 ],
+ "text" : [ "_'01.09 - your vowels'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-58",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 425.0, 179.337891, 19.0 ],
+ "presentation_rect" : [ 620.0, 425.0, 179.337891, 19.0 ],
+ "text" : [ "_'01.08 - recomposed vowels'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-57",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 386.0, 142.523438, 19.0 ],
+ "presentation_rect" : [ 620.0, 386.0, 142.523438, 19.0 ],
+ "text" : [ "_'01.07 - stolen vowels'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-56",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 347.0, 147.708984, 19.0 ],
+ "presentation_rect" : [ 620.0, 347.0, 147.708984, 19.0 ],
+ "text" : [ "_'01.06 - my 1st vowels'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-54",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 308.0, 99.16993, 19.0 ],
+ "presentation_rect" : [ 620.0, 308.0, 99.16993, 19.0 ],
+ "text" : [ "_'01.05 - la FOF'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-53",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 269.0, 167.917953, 19.0 ],
+ "presentation_rect" : [ 620.0, 269.0, 167.917953, 19.0 ],
+ "text" : [ "_'01.04 - different windows'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-48",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 230.0, 154.740219, 19.0 ],
+ "presentation_rect" : [ 620.0, 230.0, 154.740219, 19.0 ],
+ "text" : [ "_'01.03 - my 1st formant'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-49",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 191.0, 198.990234, 19.0 ],
+ "presentation_rect" : [ 620.0, 191.0, 198.990234, 19.0 ],
+ "text" : [ "_'01.02 - sine wave with overlap'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-50",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 620.0, 153.0, 120.67968, 19.0 ],
+ "presentation_rect" : [ 620.0, 153.0, 120.67968, 19.0 ],
+ "text" : [ "_'01.01 - sine wave'" ]
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Verdana",
+ "fontsize" : 18.0,
+ "id" : "obj-51",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 695.0, 112.0, 150.0, 28.0 ],
+ "style" : "",
+ "text" : "Gabor Tutorials"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-46",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 367.0, 550.0, 216.0, 18.0 ],
+ "style" : "",
+ "text" : "granular synthesis on a real-time audio stream"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 9.0,
+ "id" : "obj-45",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 391.0, 532.0, 98.0, 17.0 ],
+ "style" : "",
+ "text" : "... and f0 and centroid"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-44",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 359.0, 510.0, 137.0, 18.0 ],
+ "style" : "",
+ "text" : "vowel and formant synthesis"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-43",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 373.0, 490.0, 198.0, 18.0 ],
+ "style" : "",
+ "text" : "recording, playing, scrubbing and shuffling"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-42",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 385.0, 470.0, 173.0, 18.0 ],
+ "style" : "",
+ "text" : "PSOLA version of the ststst example"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-40",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 367.0, 450.0, 149.0, 18.0 ],
+ "style" : "",
+ "text" : "simple psola pitch transposition"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-39",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 379.0, 430.0, 141.0, 18.0 ],
+ "style" : "",
+ "text" : "additive analysis/re-synthesis"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-38",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 394.0, 410.0, 177.0, 18.0 ],
+ "style" : "",
+ "text" : "simple mel-based musaicing example"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-37",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 319.0, 390.0, 286.0, 18.0 ],
+ "style" : "",
+ "text" : "compute cepstrum smoothing with logarithmic frequency scale"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-36",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 396.0, 351.0, 141.0, 18.0 ],
+ "style" : "",
+ "text" : "additive analysis/re-synthesis"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-34",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 386.0, 329.0, 123.0, 18.0 ],
+ "style" : "",
+ "text" : "simple granular synthesis"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-35",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 319.0, 310.0, 267.0, 18.0 ],
+ "style" : "",
+ "text" : "sound hybridisation remixing FFT magnitudes and phases"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-33",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 319.0, 271.0, 204.0, 18.0 ],
+ "style" : "",
+ "text" : "suppress sinusoidal components of a signal"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 9.0,
+ "id" : "obj-32",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 401.0, 231.0, 43.0, 17.0 ],
+ "style" : "",
+ "text" : "yin & co"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-30",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 319.0, 211.0, 216.0, 18.0 ],
+ "style" : "",
+ "text" : "filter a sound with the mel spectrum of another"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-41",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 390.0, 171.0, 113.0, 18.0 ],
+ "style" : "",
+ "text" : "... autocorrelation & yin"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Arial",
+ "fontsize" : 10.0,
+ "id" : "obj-29",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 319.0, 151.0, 234.0, 18.0 ],
+ "style" : "",
+ "text" : "filter a sound with the spectral envelope of another"
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-28",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 549.0, 76.171867, 19.0 ],
+ "presentation_rect" : [ 287.0, 549.0, 76.171867, 19.0 ],
+ "text" : [ "_gabor.ststst" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-26",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 529.0, 99.474602, 19.0 ],
+ "presentation_rect" : [ 287.0, 529.0, 99.474602, 19.0 ],
+ "text" : [ "_gabor.spectrum" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-24",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 509.0, 67.845703, 19.0 ],
+ "presentation_rect" : [ 287.0, 509.0, 67.845703, 19.0 ],
+ "text" : [ "_gabor.sing" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-23",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 489.0, 81.632813, 19.0 ],
+ "presentation_rect" : [ 287.0, 489.0, 81.632813, 19.0 ],
+ "text" : [ "_gabor.record" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-22",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 469.0, 95.267563, 19.0 ],
+ "presentation_rect" : [ 287.0, 469.0, 95.267563, 19.0 ],
+ "text" : [ "_gabor.psolastic" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-21",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 449.0, 74.74218, 19.0 ],
+ "presentation_rect" : [ 287.0, 449.0, 74.74218, 19.0 ],
+ "text" : [ "_gabor.psola" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-20",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 429.0, 87.808586, 19.0 ],
+ "presentation_rect" : [ 287.0, 429.0, 87.808586, 19.0 ],
+ "text" : [ "_gabor.partials" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-19",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 409.0, 103.863274, 19.0 ],
+ "presentation_rect" : [ 287.0, 409.0, 103.863274, 19.0 ],
+ "text" : [ "_gabor.musaicing" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-18",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 370.0, 88.412109, 19.0 ],
+ "presentation_rect" : [ 287.0, 370.0, 88.412109, 19.0 ],
+ "text" : [ "_gabor.logceps" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-17",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 350.0, 105.498032, 19.0 ],
+ "presentation_rect" : [ 287.0, 350.0, 105.498032, 19.0 ],
+ "text" : [ "_gabor.harmonics" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-16",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 329.0, 93.632813, 19.0 ],
+ "presentation_rect" : [ 287.0, 329.0, 93.632813, 19.0 ],
+ "text" : [ "_gabor.granular" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-15",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 290.0, 119.167953, 19.0 ],
+ "presentation_rect" : [ 287.0, 290.0, 119.167953, 19.0 ],
+ "text" : [ "_gabor.generalcross" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-14",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 251.0, 88.82811, 19.0 ],
+ "presentation_rect" : [ 287.0, 251.0, 88.82811, 19.0 ],
+ "text" : [ "_gabor.devoice" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-13",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 230.0, 109.63475, 19.0 ],
+ "presentation_rect" : [ 287.0, 230.0, 109.63475, 19.0 ],
+ "text" : [ "_gabor.descriptors" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-12",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 191.0, 96.503899, 19.0 ],
+ "presentation_rect" : [ 287.0, 191.0, 96.503899, 19.0 ],
+ "text" : [ "_gabor.crossmel" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-7",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 170.0, 99.474602, 19.0 ],
+ "presentation_rect" : [ 287.0, 170.0, 99.474602, 19.0 ],
+ "text" : [ "_gabor.cepstrum" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-8",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 131.0, 108.919907, 19.0 ],
+ "presentation_rect" : [ 287.0, 131.0, 108.919907, 19.0 ],
+ "text" : [ "_gabor.cepsmooth" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-9",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 287.0, 109.0, 91.42968, 19.0 ],
+ "presentation_rect" : [ 287.0, 109.0, 91.42968, 19.0 ],
+ "text" : [ "_gabor.analysis" ]
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Verdana",
+ "fontsize" : 18.0,
+ "id" : "obj-10",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 323.0, 67.0, 158.0, 28.0 ],
+ "style" : "",
+ "text" : "Gabor Examples"
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-6",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 22.0, 443.0, 145.710938, 19.0 ],
+ "presentation_rect" : [ 22.0, 443.0, 145.710938, 19.0 ],
+ "text" : [ "_FTM.tutorial.references" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-5",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 22.0, 403.0, 110.894531, 19.0 ],
+ "presentation_rect" : [ 22.0, 403.0, 110.894531, 19.0 ],
+ "text" : [ "_FTM.tutorial.8-14" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 12.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0,
+ "id" : "obj-4",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 22.0, 363.0, 103.265625, 19.0 ],
+ "presentation_rect" : [ 22.0, 363.0, 103.265625, 19.0 ],
+ "text" : [ "_FTM.tutorial.1-7" ]
+ }
+
+ }
+, {
+ "box" : {
+ "#init" : "",
+ "#loadbang" : 0,
+ "#triggerall" : 0,
+ "#untuple" : 0,
+ "fontface" : 0,
+ "fontname" : "Verdana",
+ "fontsize" : 10.0,
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 2,
+ "hidden" : 1,
+ "id" : "obj-25",
+ "maxclass" : "ftm.mess",
+ "numinlets" : 2,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 246.0, 615.0, 43.28027, 17.0 ],
+ "presentation_rect" : [ 246.0, 615.0, 43.28027, 17.0 ],
+ "text" : [ "_load $1" ]
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Verdana",
+ "fontsize" : 10.0,
+ "hidden" : 1,
+ "id" : "obj-27",
+ "maxclass" : "newobj",
+ "numinlets" : 1,
+ "numoutlets" : 1,
+ "outlettype" : [ "" ],
+ "patching_rect" : [ 246.0, 635.0, 49.0, 21.0 ],
+ "style" : "",
+ "text" : "pcontrol"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Verdana",
+ "fontsize" : 18.0,
+ "id" : "obj-1",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 47.0, 322.0, 132.0, 28.0 ],
+ "style" : "",
+ "text" : "FTM Tutorials"
+ }
+
+ }
+, {
+ "box" : {
+ "fontname" : "Verdana",
+ "fontsize" : 24.0,
+ "id" : "obj-31",
+ "maxclass" : "comment",
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 19.5, 18.5, 246.0, 36.0 ],
+ "style" : "",
+ "text" : "FTM & Co Overview"
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.827451, 0.92549, 0.6, 0.25098 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-47",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 315.0, 105.0, 292.0, 470.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.937255, 0.937255, 0.937255, 1.0 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-11",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 275.0, 66.0, 219.0, 511.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.92549, 0.858824, 0.6, 0.25098 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-77",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 671.0, 170.0, 268.0, 336.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.937255, 0.937255, 0.937255, 1.0 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-52",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 615.0, 105.0, 230.0, 412.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.941176, 0.941176, 0.941176, 1.0 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 0.0 ],
+ "id" : "obj-78",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 10.0, 12.0, 263.0, 49.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.133333, 0.721569, 0.976471, 0.172549 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-92",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 85.0, 378.5, 191.0, 148.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+, {
+ "box" : {
+ "angle" : 0.0,
+ "bgcolor" : [ 0.937255, 0.937255, 0.937255, 1.0 ],
+ "border" : 1,
+ "bordercolor" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "id" : "obj-55",
+ "maxclass" : "panel",
+ "mode" : 0,
+ "numinlets" : 1,
+ "numoutlets" : 0,
+ "patching_rect" : [ 11.0, 315.0, 222.0, 211.0 ],
+ "proportion" : 0.39,
+ "rounded" : 25,
+ "style" : ""
+ }
+
+ }
+ ],
+ "lines" : [ {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-12", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.5, 255.5, 592.5 ],
+ "source" : [ "obj-13", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-14", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 594.5, 255.5, 594.5 ],
+ "source" : [ "obj-15", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 590.0, 255.5, 590.0 ],
+ "source" : [ "obj-16", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.5, 255.5, 592.5 ],
+ "source" : [ "obj-17", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.5, 255.5, 592.5 ],
+ "source" : [ "obj-18", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 591.0, 255.5, 591.0 ],
+ "source" : [ "obj-19", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 593.0, 255.5, 593.0 ],
+ "source" : [ "obj-20", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-21", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 590.0, 255.5, 590.0 ],
+ "source" : [ "obj-22", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-23", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-24", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-27", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "source" : [ "obj-25", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 593.0, 255.5, 593.0 ],
+ "source" : [ "obj-26", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 591.0, 255.5, 591.0 ],
+ "source" : [ "obj-28", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 31.5, 565.0, 255.5, 565.0 ],
+ "source" : [ "obj-4", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 591.5, 255.5, 591.5 ],
+ "source" : [ "obj-48", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-49", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 31.5, 566.0, 255.5, 566.0 ],
+ "source" : [ "obj-5", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 593.0, 255.5, 593.0 ],
+ "source" : [ "obj-50", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-53", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 592.5, 255.5, 592.5 ],
+ "source" : [ "obj-54", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 591.0, 255.5, 591.0 ],
+ "source" : [ "obj-56", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 593.5, 255.5, 593.5 ],
+ "source" : [ "obj-57", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 593.0, 255.5, 593.0 ],
+ "source" : [ "obj-58", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 629.5, 591.5, 255.5, 591.5 ],
+ "source" : [ "obj-59", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 31.5, 566.0, 255.5, 566.0 ],
+ "source" : [ "obj-6", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 29.0, 567.75, 255.5, 567.75 ],
+ "source" : [ "obj-61", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 29.0, 567.25, 255.5, 567.25 ],
+ "source" : [ "obj-63", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 29.0, 568.75, 255.5, 568.75 ],
+ "source" : [ "obj-65", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 593.5, 255.5, 593.5 ],
+ "source" : [ "obj-7", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 591.0, 255.5, 591.0 ],
+ "source" : [ "obj-8", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 30.5, 566.0, 255.5, 566.0 ],
+ "source" : [ "obj-88", 0 ]
+ }
+
+ }
+, {
+ "patchline" : {
+ "destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
+ "hidden" : 1,
+ "midpoints" : [ 296.5, 592.0, 255.5, 592.0 ],
+ "source" : [ "obj-9", 0 ]
+ }
+
+ }
+ ],
+ "dependency_cache" : [ {
+ "name" : "ftm.mess.mxe64",
+ "type" : "mx64"
+ }
+ ],
+ "autosave" : 0
+ }
+
+}
Deleted: trunk/ftm/patches/max5/FTMExamplesOverview.maxpat
===================================================================
--- trunk/ftm/patches/max5/FTMExamplesOverview.maxpat 2017-02-01 15:40:58 UTC (rev 3713)
+++ trunk/ftm/patches/max5/FTMExamplesOverview.maxpat 2017-02-02 13:42:18 UTC (rev 3714)
@@ -1,1854 +0,0 @@
-{
- "patcher" : {
- "fileversion" : 1,
- "rect" : [ 628.0, 242.0, 951.0, 629.0 ],
- "bglocked" : 0,
- "defrect" : [ 628.0, 242.0, 951.0, 629.0 ],
- "openrect" : [ 0.0, 0.0, 0.0, 0.0 ],
- "openinpresentation" : 0,
- "default_fontsize" : 10.0,
- "default_fontface" : 0,
- "default_fontname" : "Arial",
- "gridonopen" : 0,
- "gridsize" : [ 15.0, 15.0 ],
- "gridsnaponopen" : 0,
- "toolbarvisible" : 1,
- "boxanimatetime" : 200,
- "imprint" : 0,
- "boxes" : [ {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-91",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 84.0, 227.0, 143.0, 18.0 ],
- "text" : "about FTM objects references"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-90",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 84.0, 186.0, 187.0, 18.0 ],
- "text" : "about FTM objects and more messages"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-89",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 84.0, 146.0, 107.0, 18.0 ],
- "text" : "about FTM messages"
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 1,
- "id" : "obj-88",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 262.0, 59.964848, 19.0 ],
- "presentation_rect" : [ 20.0, 262.0, 59.964848, 19.0 ],
- "text" : [ "_f00-TOC" ]
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-87",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 83.0, 263.0, 172.0, 18.0 ],
- "text" : "additional tutorrials by Chris Dobrian"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-86",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 159.0, 572.0, 99.0, 18.0 ],
- "text" : "using voice analysis"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-85",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 87.0, 552.0, 148.0, 18.0 ],
- "text" : "template: connect any max list"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-84",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 87.0, 514.0, 78.0, 18.0 ],
- "text" : "Using Wiimote "
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-83",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 87.0, 476.0, 149.0, 18.0 ],
- "text" : "using sound analysis (gbr.yin~)"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-82",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 87.0, 438.0, 162.0, 18.0 ],
- "text" : "using drawing with the LCD object"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-81",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 382.0, 110.0, 147.0, 18.0 ],
- "text" : "extraction of audio descruptors"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-79",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 87.0, 401.0, 180.0, 18.0 ],
- "text" : "Recognize between two gestures (1D)"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-67",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 87.0, 363.0, 169.0, 18.0 ],
- "text" : "following a one dimensional gesture"
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-3",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 381.0, 142.675781, 19.0 ],
- "presentation_rect" : [ 20.0, 381.0, 142.675781, 19.0 ],
- "text" : [ "_follower-1D-recognize" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-2",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 343.0, 138.60936, 19.0 ],
- "presentation_rect" : [ 20.0, 343.0, 138.60936, 19.0 ],
- "text" : [ "_follower-1D-following" ]
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-76",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 484.0, 61.0, 18.0 ],
- "text" : "make it talk"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-75",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 445.0, 138.0, 18.0 ],
- "text" : "my first analysis/re-synthesis"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-74",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 406.0, 210.0, 18.0 ],
- "text" : "bits of sounds cut out of recordings of vowels"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-73",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 367.0, 139.0, 18.0 ],
- "text" : "generating vowels with FOFs"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-72",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 328.0, 260.0, 18.0 ],
- "text" : "la Fonction d'Onde Formantique (the queen of formants)"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-71",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 289.0, 195.0, 18.0 ],
- "text" : "watch and listen to different window types"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-70",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 250.0, 250.0, 18.0 ],
- "text" : "a simple formant generator based on a cosine window"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-69",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 211.0, 209.0, 18.0 ],
- "text" : "overlapping windows generating a sine wave"
- }
-
- }
-, {
- "box" : {
- "fontname" : "Arial",
- "fontsize" : 10.0,
- "id" : "obj-68",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 673.0, 172.0, 169.0, 18.0 ],
- "text" : "generating a sine wave: hello world!"
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-66",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 571.0, 136.740234, 19.0 ],
- "presentation_rect" : [ 20.0, 571.0, 136.740234, 19.0 ],
- "text" : [ "_mnm.follower-voice3" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-65",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 533.0, 171.058594, 19.0 ],
- "presentation_rect" : [ 20.0, 533.0, 171.058594, 19.0 ],
- "text" : [ "_mnm.follower-template.03" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-60",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 494.0, 192.603531, 19.0 ],
- "presentation_rect" : [ 20.0, 494.0, 192.603531, 19.0 ],
- "text" : [ "_mnm.follower-example-Wii.03" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-61",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 418.0, 198.457031, 19.0 ],
- "presentation_rect" : [ 20.0, 418.0, 198.457031, 19.0 ],
- "text" : [ "_mnm.follower-example-LCD.03" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-62",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 20.0, 456.0, 158.677734, 19.0 ],
- "presentation_rect" : [ 20.0, 456.0, 158.677734, 19.0 ],
- "text" : [ "_mnm.follower-ex-snd.03" ]
- }
-
- }
-, {
- "box" : {
- "fontname" : "Verdana",
- "fontsize" : 18.0,
- "id" : "obj-63",
- "maxclass" : "comment",
- "numinlets" : 1,
- "numoutlets" : 0,
- "patching_rect" : [ 71.0, 302.0, 145.0, 28.0 ],
- "text" : "MnM Examples"
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-59",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 464.0, 137.25, 19.0 ],
- "presentation_rect" : [ 620.0, 464.0, 137.25, 19.0 ],
- "text" : [ "_'01.09 - your vowels'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-58",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 425.0, 183.263672, 19.0 ],
- "presentation_rect" : [ 620.0, 425.0, 183.263672, 19.0 ],
- "text" : [ "_'01.08 - recomposed vowels'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-57",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 386.0, 146.449219, 19.0 ],
- "presentation_rect" : [ 620.0, 386.0, 146.449219, 19.0 ],
- "text" : [ "_'01.07 - stolen vowels'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-56",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 347.0, 151.751953, 19.0 ],
- "presentation_rect" : [ 620.0, 347.0, 151.751953, 19.0 ],
- "text" : [ "_'01.06 - my 1st vowels'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-54",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 308.0, 102.990242, 19.0 ],
- "presentation_rect" : [ 620.0, 308.0, 102.990242, 19.0 ],
- "text" : [ "_'01.05 - la FOF'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-53",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 269.0, 171.738266, 19.0 ],
- "presentation_rect" : [ 620.0, 269.0, 171.738266, 19.0 ],
- "text" : [ "_'01.04 - different windows'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-48",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 230.0, 158.677719, 19.0 ],
- "presentation_rect" : [ 620.0, 230.0, 158.677719, 19.0 ],
- "text" : [ "_'01.03 - my 1st formant'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "",
- "#loadbang" : 0,
- "#triggerall" : 0,
- "#untuple" : 0,
- "fontname" : "Verdana",
- "fontsize" : 12.0,
- "ftm_scope" : 0,
- "id" : "obj-49",
- "maxclass" : "ftm.mess",
- "numinlets" : 2,
- "numoutlets" : 1,
- "outlettype" : [ "" ],
- "patching_rect" : [ 620.0, 191.0, 203.320312, 19.0 ],
- "presentation_rect" : [ 620.0, 191.0, 203.320312, 19.0 ],
- "text" : [ "_'01.02 - sine wave with overlap'" ]
- }
-
- }
-, {
- "box" : {
- "#init" : "...
[truncated message content] |
|
From: <bor...@us...> - 2017-02-01 15:41:01
|
Revision: 3713
http://sourceforge.net/p/ftm/code/3713
Author: borghesi
Date: 2017-02-01 15:40:58 +0000 (Wed, 01 Feb 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj.filters
trunk/ftm/externals/ftm.sqlite.c
trunk/ftm/externals/ftm.sqlite3.c
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-02-01 12:09:13 UTC (rev 3712)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-02-01 15:40:58 UTC (rev 3713)
@@ -101,7 +101,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite\amalgamation;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
@@ -124,10 +124,10 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sqlite3_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.sqlite.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -157,7 +157,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite\amalgamation;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -179,10 +179,10 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3_64.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;..\..\..\..\components\pthreads\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.sqlite64bits.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -213,7 +213,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite\amalgamation;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -235,10 +235,10 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sqlite3_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.sqlite.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -272,7 +272,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite\amalgamation;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -294,10 +294,10 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3_64.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;..\..\..\..\components\pthreads\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.sqlite64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -316,6 +316,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\components\maxapi\max5\max-includes\common\dllmain_win.c" />
+ <ClCompile Include="..\..\..\..\components\sqlite\amalgamation\sqlite3.c" />
<ClCompile Include="..\..\..\externals\ftm.sqlite.c" />
<ClCompile Include="..\..\..\externals\ftm.sqlite3.c" />
</ItemGroup>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj.filters
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj.filters 2017-02-01 12:09:13 UTC (rev 3712)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj.filters 2017-02-01 15:40:58 UTC (rev 3713)
@@ -23,6 +23,9 @@
<ClCompile Include="..\..\..\..\components\maxapi\max5\max-includes\common\dllmain_win.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\components\sqlite\amalgamation\sqlite3.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="ftm.sqlite.def">
Modified: trunk/ftm/externals/ftm.sqlite.c
===================================================================
--- trunk/ftm/externals/ftm.sqlite.c 2017-02-01 12:09:13 UTC (rev 3712)
+++ trunk/ftm/externals/ftm.sqlite.c 2017-02-01 15:40:58 UTC (rev 3713)
@@ -1,399 +1,399 @@
-/* $Id$
- *
- * ftm.sqlite.c Diemo Schwarz 13.1.2005
- *
- * Max/MSP external using FTMext that allows to access an SQLite database
- */
-
-#include "ftmlib.h"
-#include "ftm.sqlite.h"
-
-
-#if DEBUG
-#define SQLITE_DEBUG 1
-#else
-#define SQLITE_DEBUG 0
-#endif
-
-
-/* max length of query string */
-#define MAX_QUERY 4096
-
-
-typedef struct
-{
- ftmext_t o;
-
- ftm_sqlite_db *sqlite;
- fts_bytestream_t *memstream;
- fts_atom_t nullatom; /* for SQL NULL values */
-} ftm_sqlite_t;
-
-
-static void sqlite_open_callback (ftmext_t *o, fts_symbol_t type, fts_symbol_t name, int ac, const fts_atom_t *at, fts_status_t status)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) o;
- char *namestr;
- char *retPath = NULL;
- char path[MAX_PATH_CHARS];
- const char *errstr;
- int ok = 0, create = 0;
-
- /* search filename in max paths, normalise Mac volume names */
- namestr = fts_symbol_name(name);
- fts_file_find(namestr, path, MAX_PATH_CHARS);
-
- if (ac > 0 && fts_is_int(at) && fts_get_number_int(at) == 1)
- { /* create command: delete db file first by truncating to 0 bytes */
-#if SQLITE_DEBUG
- fts_post("delete file '%s'\n", path);
-#endif
- fts_atomfile_t *killer = fts_atomfile_open_write(fts_new_symbol(path));
- if(killer != NULL)
- {
- fts_atomfile_close(killer);
- create = 1;
- }
- else
- {
- ftmext_error(o, "Can't create the file %s at given location %s\n", namestr, path);
- return;
- }
- }
- else
- {
+/* $Id$
+ *
+ * ftm.sqlite.c Diemo Schwarz 13.1.2005
+ *
+ * Max/MSP external using FTMext that allows to access an SQLite database
+ */
+
+#include "ftmlib.h"
+#include "ftm.sqlite.h"
+
+
+#if DEBUG
+#define SQLITE_DEBUG 1
+#else
+#define SQLITE_DEBUG 0
+#endif
+
+
+/* max length of query string */
+#define MAX_QUERY 4096
+
+
+typedef struct
+{
+ ftmext_t o;
+
+ ftm_sqlite_db *sqlite;
+ fts_bytestream_t *memstream;
+ fts_atom_t nullatom; /* for SQL NULL values */
+} ftm_sqlite_t;
+
+
+static void sqlite_open_callback (ftmext_t *o, fts_symbol_t type, fts_symbol_t name, int ac, const fts_atom_t *at, fts_status_t status)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) o;
+ char *namestr;
+ char *retPath = NULL;
+ char path[MAX_PATH_CHARS];
+ const char *errstr;
+ int ok = 0, create = 0;
+
+ /* search filename in max paths, normalise Mac volume names */
+ namestr = fts_symbol_name(name);
+ fts_file_find(namestr, path, MAX_PATH_CHARS);
+
+ if (ac > 0 && fts_is_int(at) && fts_get_number_int(at) == 1)
+ { /* create command: delete db file first by truncating to 0 bytes */
+#if SQLITE_DEBUG
+ fts_post("delete file '%s'\n", path);
+#endif
+ fts_atomfile_t *killer = fts_atomfile_open_write(fts_new_symbol(path));
+ if(killer != NULL)
+ {
+ fts_atomfile_close(killer);
+ create = 1;
+ }
+ else
+ {
+ ftmext_error(o, "Can't create the file %s at given location %s\n", namestr, path);
+ return;
+ }
+ }
+ else
+ {
FILE *fp = fopen(path, "r");
if (fp != NULL)
fclose(fp);
- else
- {
- ftmext_error(o, "Can't open/create the file %s at given location %s\n", namestr, path);
- return;
- }
- }
-#if SQLITE_DEBUG
- fts_post("%s file '%s'\n path '%s'\n", create ? "create" : "open", namestr, path);
-#endif
-
- ok = ftm_sqlite_set_fname(self->sqlite, path, &errstr);
-
- /* error checking */
- if (!ok)
- ftmext_error(o, "%s '%s' error: %s\n", create ? "create" : "open", namestr, errstr);
-}
-
-
-FTMEXT_METHOD_BOOLEAN(sqlite, echo)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
-
- self->sqlite->echoquery = FTMEXT_GET_BOOLEAN();
-
- FTMEXT_METHOD_RETURN;
-}
-
-
-FTMEXT_METHOD_VARARGS(sqlite, nullatom)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = (int)FTMEXT_GET_COUNT();
- fts_atom_t *at = FTMEXT_GET_ARGS();
-
- if (ac > 0)
- fts_atom_assign(&self->nullatom, at);
- else
- fts_set_symbol(&self->nullatom, fts_new_symbol("NULL"));
-
- FTMEXT_METHOD_RETURN;
-}
-
-
-/** usage: open [<database name>] */
-FTMEXT_METHOD_VARARGS(sqlite, open)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = (int)FTMEXT_GET_COUNT();
- fts_atom_t *at = FTMEXT_GET_ARGS();
- fts_atom_t create;
- fts_set_int(&create, 0);
-
- if (ac == 0)
- {
- fts_symbol_t prompt = fts_new_symbol("Choose sqlite database file to open");
-
- ftmext_file_open_dialog((ftmext_t *) self, 1, &create,
- sqlite_open_callback, prompt,
- fts_new_symbol("db"));
- }
- else if (ac == 1 && fts_is_symbol(at))
- {
- sqlite_open_callback((ftmext_t *) self, NULL, fts_get_symbol(at),
- 1, &create, fts_ok);
- }
- else /* arg error */
- ftmext_error((ftmext_t *) self, "open error: only zero or one symbol argument allowed\n");
-
- FTMEXT_METHOD_RETURN;
-}
-
-/** usage: create [<database name>] */
-FTMEXT_METHOD_VARARGS(sqlite, create)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = (int)FTMEXT_GET_COUNT();
- fts_atom_t *at = FTMEXT_GET_ARGS();
- fts_atom_t create;
- fts_set_int(&create, 1);
-
- if (ac == 0)
- {
- fts_symbol_t prompt = fts_new_symbol("Choose sqlite database file to create");
-
- ftmext_file_save_dialog((ftmext_t *) self, 1, &create,
- sqlite_open_callback, prompt,
- fts_new_symbol("db"), fts_new_symbol("untitled.db"));
- }
- else if (ac == 1 && fts_is_symbol(at))
- {
- sqlite_open_callback((ftmext_t *) self, NULL, fts_get_symbol(at),
- 1, &create, fts_ok);
- }
- else /* arg error */
- ftmext_error((ftmext_t *) self, "create error: only zero or one symbol argument allowed\n");
-
- FTMEXT_METHOD_RETURN;
-}
-
-
-/** usage: close */
-
-FTMEXT_METHOD_VARARGS(sqlite, close)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
-
- ftm_sqlite_close(self->sqlite);
-
- FTMEXT_METHOD_RETURN;
-}
-
-
-/** usage: exec "sql query" args... */
-FTMEXT_METHOD_VARARGS(sqlite, exec)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = (int)FTMEXT_GET_COUNT();
- fts_atom_t *at = FTMEXT_GET_ARGS();
- mat_t *res;
- const char *errstr;
- int ok;
-
- if (ac)
- {
- char *query = fts_symbol_name(fts_get_symbol(at));
- res = (mat_t *) fts_object_create(mat_class, 0, NULL);
- fts_object_refer((fts_object_t *) res);
-
- ok = ftm_sqlite_execute(self->sqlite, query,
- (int)FTMEXT_GET_COUNT() - 1, FTMEXT_GET_ARGS() + 1,
- &self->nullatom, res, &errstr);
- if (ok)
- { /* send result */
- ftmext_outlet_object((ftmext_t *) self, 0, (fts_object_t *) res);
- }
- else
- { /* report error */
- ftmext_error((ftmext_t *) self, "exec query '%s': %s", query, errstr);
- }
-
- fts_object_release((fts_object_t *) res);
- }
-
- FTMEXT_METHOD_RETURN;
-}
-
-
-/** usage: insert <table name> <mat>|<dict> */
-FTMEXT_METHOD_VARARGS(sqlite, insert)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- fts_atom_t *at = FTMEXT_GET_ARGS();
-
- if (FTMEXT_GET_COUNT() >= 2 && fts_is_symbol(at))
- {
- char *table = fts_symbol_name(fts_get_symbol(at));
- char query[MAX_QUERY];
- int qlen;
- int ok = 1;
- const char *errstr;
-
- if (fts_is_a(at + 1, mat_class))
- { /* insert whole mat row by row, all columns */
- mat_t *data = (mat_t *) fts_get_object(at+1);
- int m, n, i, j;
-
- mat_lock(data); /* obtain lock; TODO: copy mat, since db access might take a looong time? */
- m = mat_get_m(data);
- n = mat_get_n(data);
-
- /* construct query for one row with wildcards */
- qlen = snprintf(query, MAX_QUERY, "insert into %s values(", table);
-
- for (j = 0; j < n && qlen < MAX_QUERY - 3; j++)
- {
- query[qlen++] = '?';
- query[qlen++] = j < n - 1 ? ',' : ')';
- }
- query[qlen++] = 0;
-
- /* begin transaction */
- for (i = 0; i < m && ok; i++)
- { /* for each row in input matrix */
- /* execute insert of one row */
- ok = ftm_sqlite_execute(self->sqlite, query,
- n, mat_get_row(data, i),
- &self->nullatom, NULL, &errstr);
- }
- /* end transaction */
-
- mat_unlock(data);
-
- /* error checking */
- if (!ok)
- ftmext_error((ftmext_t *) self, "insert mat(%d, %d) into %s: %s",
- m, n, table, errstr);
-
- FTMEXT_EXIT; /* return ok */
- }
- else if (fts_is_a(at + 1, dict_class))
- { /* insert one row from dict, columns given by keys */
- dict_t *dict = (dict_t *) fts_get_object(at + 1);
- fts_iterator_t key_iterator;
- fts_iterator_t value_iterator;
- fts_atom_t key, *wilda; /* atoms to insert */
- int size, i;
- char wildstr[MAX_QUERY];
-
- /* construct query for one row with wildcards */
- qlen = snprintf(query, MAX_QUERY, "insert into %s (", table);
-
- dict_lock_read(dict);
-
- size = dict_get_size(dict);
- wilda = alloca(size * sizeof(fts_atom_t));
- fts_hashtable_get_keys_shared(&dict->hash, &key_iterator);
- fts_hashtable_get_values_shared(&dict->hash, &value_iterator);
-
- for (i = 0; fts_iterator_has_more(&key_iterator); i++)
- {
- fts_iterator_next(&key_iterator, &key);
- fts_iterator_next(&value_iterator, &wilda[i]);
-
- if (fts_is_symbol(&key))
- qlen += snprintf(query + qlen, MAX_QUERY - qlen, "%s%c",
- fts_symbol_name(fts_get_symbol(&key)),
- i < size - 1 ? ',' : ')');
- else
- {
- ftmext_error((ftmext_t *) self, "insert dict: key must be symbol");
- dict_unlock(dict);
- FTMEXT_EXIT;
- }
-
- wildstr[i * 2] = '?'; /* create list of '?' */
- wildstr[i * 2 + 1] = i < size - 1 ? ',' : 0;
- }
-
- fts_iterator_has_more(&value_iterator); /* free value iterator */
- dict_unlock(dict);
-
- /* finish query */
- qlen += snprintf(query + qlen, MAX_QUERY - qlen, " values (%s)",
- wildstr);
-
- /* begin transaction */
- /* execute insert of one row */
- ok = ftm_sqlite_execute(self->sqlite, query, size, wilda,
- &self->nullatom, NULL, &errstr);
- /* end transaction */
-
- /* error checking */
- if (!ok)
- ftmext_error((ftmext_t *) self, "insert dict (size %d) into %s: %s",
- size, table, errstr);
-
- FTMEXT_EXIT; /* return ok */
- }
- }
-
- ftmext_error((ftmext_t *) self, "insert: invalid args");
-
- FTMEXT_METHOD_RETURN;
-}
-
-
-
-/***************************************************************
- *
- * class
- *
- */
-
-FTMEXT_INIT (sqlite)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
-
- self->sqlite = ftm_sqlite_create();
- self->memstream = ( fts_bytestream_t*)fts_object_create(fts_memorystream_class, 0, NULL);
- fts_object_refer(self->memstream);
- fts_set_symbol(&self->nullatom, fts_new_symbol("NULL"));
-
- if(ac > 0) {
- /* get db name */;
- }
-
- FTMEXT_INIT_RETURN;
-}
-
-
-FTMEXT_DELETE (sqlite)
-{
- ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
-
- ftm_sqlite_destroy(self->sqlite);
- fts_object_release(self->memstream);
-
- FTMEXT_DELETE_RETURN;
-}
-
-
-FTMEXT_CLASS (ftm, sqlite, ftm_sqlite_t)
-{
- FTMEXT_CLASS_ATTRIBUTE_BOOLEAN(sqlite, echo, FTMEXT_ATTRIBUTE_DYNAMIC, "print queries to console before execution");
- FTMEXT_CLASS_ATTRIBUTE_VARARGS(sqlite, nullatom, FTMEXT_ATTRIBUTE_DYNAMIC, "atom to return for SQL NULL values (default \"NULL\")");
-
- FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, open,
- "open [<database name>]: Open database, create if non-existent. If no name is given, open a dialog box.");
- FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, create,
- "create [<database name>]: Create new database, clear file if it existed. If no name is given, open a dialog box.");
- FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, close,
- "close: close current database");
- FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, exec,
- "exec <sql query> args... : execute SQL query with all ? replaced by arguments in turn");
- FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, insert,
- "insert <table name> <mat>: insert all rows of mat into database table");
-
-/* later:
- addmess((method) ftm_sqlite_exec, "select", A_GIMME, 0);
- addmess((method) ftm_sqlite_exec, "update", A_GIMME, 0);
- addmess((method) ftm_sqlite_exec, "insert", A_GIMME, 0);
- addmess((method) ftm_sqlite_exec, "alter", A_GIMME, 0);
-*/
-
- FTMEXT_CLASS_OUTLET_OBJECT(sqlite, mat_class, 0,
- "output result of query in a mat");
- FTMEXT_CLASS_OUTLET (sqlite, 1,
- "output sqlite error message");
-
- FTMEXT_CLASS_RETURN;
-}
+ else
+ {
+ ftmext_error(o, "Can't open/create the file %s at given location %s\n", namestr, path);
+ return;
+ }
+ }
+#if SQLITE_DEBUG
+ fts_post("%s file '%s'\n path '%s'\n", create ? "create" : "open", namestr, path);
+#endif
+
+ ok = ftm_sqlite_set_fname(self->sqlite, path, &errstr);
+
+ /* error checking */
+ if (!ok)
+ ftmext_error(o, "%s '%s' error: %s\n", create ? "create" : "open", namestr, errstr);
+}
+
+
+FTMEXT_METHOD_BOOLEAN(sqlite, echo)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+
+ self->sqlite->echoquery = FTMEXT_GET_BOOLEAN();
+
+ FTMEXT_METHOD_RETURN;
+}
+
+
+FTMEXT_METHOD_VARARGS(sqlite, nullatom)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+ int ac = (int)FTMEXT_GET_COUNT();
+ fts_atom_t *at = FTMEXT_GET_ARGS();
+
+ if (ac > 0)
+ fts_atom_assign(&self->nullatom, at);
+ else
+ fts_set_symbol(&self->nullatom, fts_new_symbol("NULL"));
+
+ FTMEXT_METHOD_RETURN;
+}
+
+
+/** usage: open [<database name>] */
+FTMEXT_METHOD_VARARGS(sqlite, open)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+ int ac = (int)FTMEXT_GET_COUNT();
+ fts_atom_t *at = FTMEXT_GET_ARGS();
+ fts_atom_t create;
+ fts_set_int(&create, 0);
+
+ if (ac == 0)
+ {
+ fts_symbol_t prompt = fts_new_symbol("Choose sqlite database file to open");
+
+ ftmext_file_open_dialog((ftmext_t *) self, 1, &create,
+ sqlite_open_callback, prompt,
+ fts_new_symbol("db"));
+ }
+ else if (ac == 1 && fts_is_symbol(at))
+ {
+ sqlite_open_callback((ftmext_t *) self, NULL, fts_get_symbol(at),
+ 1, &create, fts_ok);
+ }
+ else /* arg error */
+ ftmext_error((ftmext_t *) self, "open error: only zero or one symbol argument allowed\n");
+
+ FTMEXT_METHOD_RETURN;
+}
+
+/** usage: create [<database name>] */
+FTMEXT_METHOD_VARARGS(sqlite, create)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+ int ac = (int)FTMEXT_GET_COUNT();
+ fts_atom_t *at = FTMEXT_GET_ARGS();
+ fts_atom_t create;
+ fts_set_int(&create, 1);
+
+ if (ac == 0)
+ {
+ fts_symbol_t prompt = fts_new_symbol("Choose sqlite database file to create");
+
+ ftmext_file_save_dialog((ftmext_t *) self, 1, &create,
+ sqlite_open_callback, prompt,
+ fts_new_symbol("db"), fts_new_symbol("untitled.db"));
+ }
+ else if (ac == 1 && fts_is_symbol(at))
+ {
+ sqlite_open_callback((ftmext_t *) self, NULL, fts_get_symbol(at),
+ 1, &create, fts_ok);
+ }
+ else /* arg error */
+ ftmext_error((ftmext_t *) self, "create error: only zero or one symbol argument allowed\n");
+
+ FTMEXT_METHOD_RETURN;
+}
+
+
+/** usage: close */
+
+FTMEXT_METHOD_VARARGS(sqlite, close)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+
+ ftm_sqlite_close(self->sqlite);
+
+ FTMEXT_METHOD_RETURN;
+}
+
+
+/** usage: exec "sql query" args... */
+FTMEXT_METHOD_VARARGS(sqlite, exec)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+ int ac = (int)FTMEXT_GET_COUNT();
+ fts_atom_t *at = FTMEXT_GET_ARGS();
+ mat_t *res;
+ const char *errstr;
+ int ok;
+
+ if (ac)
+ {
+ char *query = fts_symbol_name(fts_get_symbol(at));
+ res = (mat_t *) fts_object_create(mat_class, 0, NULL);
+ fts_object_refer((fts_object_t *) res);
+
+ ok = ftm_sqlite_execute(self->sqlite, query,
+ (int)FTMEXT_GET_COUNT() - 1, FTMEXT_GET_ARGS() + 1,
+ &self->nullatom, res, &errstr);
+ if (ok)
+ { /* send result */
+ ftmext_outlet_object((ftmext_t *) self, 0, (fts_object_t *) res);
+ }
+ else
+ { /* report error */
+ ftmext_error((ftmext_t *) self, "exec query '%s': %s", query, errstr);
+ }
+
+ fts_object_release((fts_object_t *) res);
+ }
+
+ FTMEXT_METHOD_RETURN;
+}
+
+
+/** usage: insert <table name> <mat>|<dict> */
+FTMEXT_METHOD_VARARGS(sqlite, insert)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+ fts_atom_t *at = FTMEXT_GET_ARGS();
+
+ if (FTMEXT_GET_COUNT() >= 2 && fts_is_symbol(at))
+ {
+ char *table = fts_symbol_name(fts_get_symbol(at));
+ char query[MAX_QUERY];
+ int qlen;
+ int ok = 1;
+ const char *errstr;
+
+ if (fts_is_a(at + 1, mat_class))
+ { /* insert whole mat row by row, all columns */
+ mat_t *data = (mat_t *) fts_get_object(at+1);
+ int m, n, i, j;
+
+ mat_lock(data); /* obtain lock; TODO: copy mat, since db access might take a looong time? */
+ m = mat_get_m(data);
+ n = mat_get_n(data);
+
+ /* construct query for one row with wildcards */
+ qlen = snprintf(query, MAX_QUERY, "insert into %s values(", table);
+
+ for (j = 0; j < n && qlen < MAX_QUERY - 3; j++)
+ {
+ query[qlen++] = '?';
+ query[qlen++] = j < n - 1 ? ',' : ')';
+ }
+ query[qlen++] = 0;
+
+ /* begin transaction */
+ for (i = 0; i < m && ok; i++)
+ { /* for each row in input matrix */
+ /* execute insert of one row */
+ ok = ftm_sqlite_execute(self->sqlite, query,
+ n, mat_get_row(data, i),
+ &self->nullatom, NULL, &errstr);
+ }
+ /* end transaction */
+
+ mat_unlock(data);
+
+ /* error checking */
+ if (!ok)
+ ftmext_error((ftmext_t *) self, "insert mat(%d, %d) into %s: %s",
+ m, n, table, errstr);
+
+ FTMEXT_EXIT; /* return ok */
+ }
+ else if (fts_is_a(at + 1, dict_class))
+ { /* insert one row from dict, columns given by keys */
+ dict_t *dict = (dict_t *) fts_get_object(at + 1);
+ fts_iterator_t key_iterator;
+ fts_iterator_t value_iterator;
+ fts_atom_t key, *wilda; /* atoms to insert */
+ int size, i;
+ char wildstr[MAX_QUERY];
+
+ /* construct query for one row with wildcards */
+ qlen = snprintf(query, MAX_QUERY, "insert into %s (", table);
+
+ dict_lock_read(dict);
+
+ size = dict_get_size(dict);
+ wilda = alloca(size * sizeof(fts_atom_t));
+ fts_hashtable_get_keys_shared(&dict->hash, &key_iterator);
+ fts_hashtable_get_values_shared(&dict->hash, &value_iterator);
+
+ for (i = 0; fts_iterator_has_more(&key_iterator); i++)
+ {
+ fts_iterator_next(&key_iterator, &key);
+ fts_iterator_next(&value_iterator, &wilda[i]);
+
+ if (fts_is_symbol(&key))
+ qlen += snprintf(query + qlen, MAX_QUERY - qlen, "%s%c",
+ fts_symbol_name(fts_get_symbol(&key)),
+ i < size - 1 ? ',' : ')');
+ else
+ {
+ ftmext_error((ftmext_t *) self, "insert dict: key must be symbol");
+ dict_unlock(dict);
+ FTMEXT_EXIT;
+ }
+
+ wildstr[i * 2] = '?'; /* create list of '?' */
+ wildstr[i * 2 + 1] = i < size - 1 ? ',' : 0;
+ }
+
+ fts_iterator_has_more(&value_iterator); /* free value iterator */
+ dict_unlock(dict);
+
+ /* finish query */
+ qlen += snprintf(query + qlen, MAX_QUERY - qlen, " values (%s)",
+ wildstr);
+
+ /* begin transaction */
+ /* execute insert of one row */
+ ok = ftm_sqlite_execute(self->sqlite, query, size, wilda,
+ &self->nullatom, NULL, &errstr);
+ /* end transaction */
+
+ /* error checking */
+ if (!ok)
+ ftmext_error((ftmext_t *) self, "insert dict (size %d) into %s: %s",
+ size, table, errstr);
+
+ FTMEXT_EXIT; /* return ok */
+ }
+ }
+
+ ftmext_error((ftmext_t *) self, "insert: invalid args");
+
+ FTMEXT_METHOD_RETURN;
+}
+
+
+
+/***************************************************************
+ *
+ * class
+ *
+ */
+
+FTMEXT_INIT (sqlite)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+ int ac = FTMEXT_GET_COUNT();
+
+ self->sqlite = ftm_sqlite_create();
+ self->memstream = ( fts_bytestream_t*)fts_object_create(fts_memorystream_class, 0, NULL);
+ fts_object_refer(self->memstream);
+ fts_set_symbol(&self->nullatom, fts_new_symbol("NULL"));
+
+ if(ac > 0) {
+ /* get db name */;
+ }
+
+ FTMEXT_INIT_RETURN;
+}
+
+
+FTMEXT_DELETE (sqlite)
+{
+ ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
+
+ ftm_sqlite_destroy(self->sqlite);
+ fts_object_release(self->memstream);
+
+ FTMEXT_DELETE_RETURN;
+}
+
+
+FTMEXT_CLASS (ftm, sqlite, ftm_sqlite_t)
+{
+ FTMEXT_CLASS_ATTRIBUTE_BOOLEAN(sqlite, echo, FTMEXT_ATTRIBUTE_DYNAMIC, "print queries to console before execution");
+ FTMEXT_CLASS_ATTRIBUTE_VARARGS(sqlite, nullatom, FTMEXT_ATTRIBUTE_DYNAMIC, "atom to return for SQL NULL values (default \"NULL\")");
+
+ FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, open,
+ "open [<database name>]: Open database, create if non-existent. If no name is given, open a dialog box.");
+ FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, create,
+ "create [<database name>]: Create new database, clear file if it existed. If no name is given, open a dialog box.");
+ FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, close,
+ "close: close current database");
+ FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, exec,
+ "exec <sql query> args... : execute SQL query with all ? replaced by arguments in turn");
+ FTMEXT_CLASS_MESSAGE_VARARGS(sqlite, insert,
+ "insert <table name> <mat>: insert all rows of mat into database table");
+
+/* later:
+ addmess((method) ftm_sqlite_exec, "select", A_GIMME, 0);
+ addmess((method) ftm_sqlite_exec, "update", A_GIMME, 0);
+ addmess((method) ftm_sqlite_exec, "insert", A_GIMME, 0);
+ addmess((method) ftm_sqlite_exec, "alter", A_GIMME, 0);
+*/
+
+ FTMEXT_CLASS_OUTLET_OBJECT(sqlite, mat_class, 0,
+ "output result of query in a mat");
+ FTMEXT_CLASS_OUTLET (sqlite, 1,
+ "output sqlite error message");
+
+ FTMEXT_CLASS_RETURN;
+}
Modified: trunk/ftm/externals/ftm.sqlite3.c
===================================================================
--- trunk/ftm/externals/ftm.sqlite3.c 2017-02-01 12:09:13 UTC (rev 3712)
+++ trunk/ftm/externals/ftm.sqlite3.c 2017-02-01 15:40:58 UTC (rev 3713)
@@ -85,10 +85,11 @@
}
}
-
int ftm_sqlite_set_fname (ftm_sqlite_db* me, const char* fname, const char **err)
{
*err = 0;
+ //TCHAR lpTempPathBuffer[MAX_PATH];
+ //sqlite3_temp_directory = GetTempPath(MAX_PATH, lpTempPathBuffer);
if (!me)
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-02-01 12:09:16
|
Revision: 3712
http://sourceforge.net/p/ftm/code/3712
Author: borghesi
Date: 2017-02-01 12:09:13 +0000 (Wed, 01 Feb 2017)
Log Message:
-----------
sqlite minor fix for windows version
Modified Paths:
--------------
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
trunk/ftm/externals/ftm.sqlite.c
trunk/ftm/ftmlib/max5/maxfile.c
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-02-01 12:09:13 UTC (rev 3712)
@@ -102,7 +102,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@@ -158,7 +158,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -214,7 +214,7 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -273,7 +273,7 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\sqlite;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
Modified: trunk/ftm/externals/ftm.sqlite.c
===================================================================
--- trunk/ftm/externals/ftm.sqlite.c 2017-01-31 13:46:47 UTC (rev 3711)
+++ trunk/ftm/externals/ftm.sqlite.c 2017-02-01 12:09:13 UTC (rev 3712)
@@ -34,23 +34,43 @@
{
ftm_sqlite_t *self = (ftm_sqlite_t *) o;
char *namestr;
- char path[MAX_PATH_CHARS];
+ char *retPath = NULL;
+ char path[MAX_PATH_CHARS];
const char *errstr;
int ok = 0, create = 0;
/* search filename in max paths, normalise Mac volume names */
namestr = fts_symbol_name(name);
- fts_file_find(namestr, path, MAX_PATH_CHARS);
+ fts_file_find(namestr, path, MAX_PATH_CHARS);
- if (ac > 0 && fts_is_int(at) && fts_get_number_int(at) == 1)
+ if (ac > 0 && fts_is_int(at) && fts_get_number_int(at) == 1)
{ /* create command: delete db file first by truncating to 0 bytes */
#if SQLITE_DEBUG
fts_post("delete file '%s'\n", path);
#endif
- fts_atomfile_t *killer = fts_atomfile_open_write(fts_new_symbol(path));
- fts_atomfile_close(killer);
- create = 1;
- }
+ fts_atomfile_t *killer = fts_atomfile_open_write(fts_new_symbol(path));
+ if(killer != NULL)
+ {
+ fts_atomfile_close(killer);
+ create = 1;
+ }
+ else
+ {
+ ftmext_error(o, "Can't create the file %s at given location %s\n", namestr, path);
+ return;
+ }
+ }
+ else
+ {
+ FILE *fp = fopen(path, "r");
+ if (fp != NULL)
+ fclose(fp);
+ else
+ {
+ ftmext_error(o, "Can't open/create the file %s at given location %s\n", namestr, path);
+ return;
+ }
+ }
#if SQLITE_DEBUG
fts_post("%s file '%s'\n path '%s'\n", create ? "create" : "open", namestr, path);
#endif
Modified: trunk/ftm/ftmlib/max5/maxfile.c
===================================================================
--- trunk/ftm/ftmlib/max5/maxfile.c 2017-01-31 13:46:47 UTC (rev 3711)
+++ trunk/ftm/ftmlib/max5/maxfile.c 2017-02-01 12:09:13 UTC (rev 3712)
@@ -144,7 +144,7 @@
if(path_is_absolute(filename))
{
/* absolute path, return it with Mac OSX volume:/names normalised */
- return translate_absolute_path(filename, fullpath, len);
+ return translate_absolute_path(filename, fullpath, len);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-01-31 13:46:50
|
Revision: 3711
http://sourceforge.net/p/ftm/code/3711
Author: borghesi
Date: 2017-01-31 13:46:47 +0000 (Tue, 31 Jan 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj
Modified: trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -81,7 +81,7 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe64</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe64</TargetExt>
</PropertyGroup>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -163,7 +163,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -180,7 +180,7 @@
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -219,7 +219,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -157,7 +157,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -162,7 +162,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -217,7 +217,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -276,7 +276,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -198,7 +198,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -162,7 +162,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -217,7 +217,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -277,7 +277,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2_32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2_32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2_32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -116,7 +116,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -176,7 +176,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -237,7 +237,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -300,7 +300,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -166,7 +166,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -225,7 +225,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -284,7 +284,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sdifd.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdifd.lib;pthreadVC2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -162,7 +162,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -217,7 +217,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -233,7 +233,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sdif.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdif.lib;pthreadVC2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -277,7 +277,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sdifd.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdifd.lib;pthreadVC2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -162,7 +162,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -217,7 +217,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -233,7 +233,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sdif.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdif.lib;pthreadVC2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -277,7 +277,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sqlite3_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86</AdditionalLibraryDirectories>
@@ -163,7 +163,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -179,7 +179,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3_64.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -219,7 +219,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -235,7 +235,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sqlite3_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86</AdditionalLibraryDirectories>
@@ -278,7 +278,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -294,7 +294,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3_64.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -162,7 +162,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -217,7 +217,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -276,7 +276,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -108,7 +108,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
@@ -163,7 +163,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -219,7 +219,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -235,7 +235,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
@@ -279,7 +279,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj 2017-01-31 13:45:57 UTC (rev 3710)
+++ trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj 2017-01-31 13:46:47 UTC (rev 3711)
@@ -112,7 +112,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -171,7 +171,7 @@
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -231,7 +231,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -293,7 +293,7 @@
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-01-31 13:45:59
|
Revision: 3710
http://sourceforge.net/p/ftm/code/3710
Author: borghesi
Date: 2017-01-31 13:45:57 +0000 (Tue, 31 Jan 2017)
Log Message:
-----------
minor fix for windows compilation
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.editor.cpp
trunk/ftm/externals/max5/ftm.mess.c
trunk/ftm/externals/max5/ftm.object.c
trunk/ftm/externals/max5/ftm.vecdisplay.c
Modified: trunk/ftm/externals/max5/ftm.editor.cpp
===================================================================
--- trunk/ftm/externals/max5/ftm.editor.cpp 2017-01-30 14:24:54 UTC (rev 3709)
+++ trunk/ftm/externals/max5/ftm.editor.cpp 2017-01-31 13:45:57 UTC (rev 3710)
@@ -141,7 +141,8 @@
long view_inspector_track;
void *view_dummy_attr[2];
long view_dummy_attr_long;
-
+ long view_dummy_attr_long_array[2];
+
/////////////////////////
void *qelem_init_inspector;
void *qelem_mouse_refresh;
@@ -7696,7 +7697,7 @@
CLASS_ATTR_PAINT(_mc,"view_foremost", 0);
CLASS_ATTR_ORDER(_mc, "view_foremost", 0, "224");
- CLASS_ATTR_LONG_VARSIZE(_mc, "view_visibleindexes", 0, ftmeditor_t, view_dummy_attr, view_dummy_attr, 256);
+ CLASS_ATTR_LONG_VARSIZE(_mc, "view_visibleindexes", 0, ftmeditor_t, view_dummy_attr_long_array, view_dummy_attr_long, 256);
CLASS_ATTR_LABEL(_mc,"view_visibleindexes", 0,"View Visible Indexes");
CLASS_ATTR_ACCESSORS(_mc, "view_visibleindexes", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_PAINT(_mc,"view_visibleindexes", 0);
Modified: trunk/ftm/externals/max5/ftm.mess.c
===================================================================
--- trunk/ftm/externals/max5/ftm.mess.c 2017-01-30 14:24:54 UTC (rev 3709)
+++ trunk/ftm/externals/max5/ftm.mess.c 2017-01-31 13:45:57 UTC (rev 3710)
@@ -2214,7 +2214,7 @@
CLASS_ATTR_DEFAULT(_mc, "patching_rect", 0, "0. 0. 64. 15");
CLASS_ATTR_ACCESSORS(_mc, "patching_size", NULL, ftmmess_set_attribute_patching_size);
- CLASS_ATTR_LONG(_mc, "numins", 0, ftmmess_t, n_inlets_next);
+ CLASS_ATTR_ATOM_LONG(_mc, "numins", 0, ftmmess_t, n_inlets_next);
CLASS_ATTR_INVISIBLE(_mc,"numins", 0);
CLASS_ATTR_DEFAULT_SAVE(_mc,"numins", 0, "2");
Modified: trunk/ftm/externals/max5/ftm.object.c
===================================================================
--- trunk/ftm/externals/max5/ftm.object.c 2017-01-30 14:24:54 UTC (rev 3709)
+++ trunk/ftm/externals/max5/ftm.object.c 2017-01-31 13:45:57 UTC (rev 3710)
@@ -2369,7 +2369,7 @@
FTMEXT_CLASS_MESSAGE_VOID_NAMED(ftmobj, open_editor, "open", "open editor window");
FTMEXT_CLASS_MESSAGE_VARARGS_NAMED(ftmobj, editor_window, "window", "set the bounds of editor window");
- CLASS_ATTR_LONG(_mc, "persistence", 0, ftmobj_t, dummyattr);
+ CLASS_ATTR_ATOM_LONG(_mc, "persistence", 0, ftmobj_t, dummyattr);
CLASS_ATTR_STYLE_LABEL(_mc, "persistence", 0, "onoff", "Save Data With Patcher");
CLASS_ATTR_ACCESSORS(_mc, "persistence", ftmobj_get_attribute_persistence, ftmobj_set_attribute_persistence);
CLASS_ATTR_SAVE(_mc,"persistence", 0);
@@ -2384,7 +2384,7 @@
CLASS_ATTR_LABEL(_mc, "name", 0, "Name");
CLASS_ATTR_SAVE(_mc,"name", 0);
- CLASS_ATTR_LONG(_mc, "scope", 0, ftmobj_t, dummyattr);
+ CLASS_ATTR_ATOM_LONG(_mc, "scope", 0, ftmobj_t, dummyattr);
CLASS_ATTR_ACCESSORS(_mc, "scope", ftmobj_get_attribute_scope, ftmobj_set_attribute_scope);
CLASS_ATTR_LABEL(_mc, "scope", 0, "Name Scope");
CLASS_ATTR_ENUMINDEX(_mc,"scope", 0, "local global");
Modified: trunk/ftm/externals/max5/ftm.vecdisplay.c
===================================================================
--- trunk/ftm/externals/max5/ftm.vecdisplay.c 2017-01-30 14:24:54 UTC (rev 3709)
+++ trunk/ftm/externals/max5/ftm.vecdisplay.c 2017-01-31 13:45:57 UTC (rev 3710)
@@ -2380,17 +2380,17 @@
CLASS_ATTR_STYLE_LABEL(_mc,"bgcolor", 0,"rgba","Background Color");
CLASS_ATTR_DEFAULTNAME_SAVE_PAINT(_mc,"bgcolor", 0, "0.75 0.75 0.75 1.");
- CLASS_ATTR_LONG(_mc,"history", 0, vecdisplay_t, historyMode);
+ CLASS_ATTR_ATOM_LONG(_mc,"history", 0, vecdisplay_t, historyMode);
CLASS_ATTR_LABEL(_mc,"history", 0,"History Color Mode");
CLASS_ATTR_DEFAULT_SAVE_PAINT(_mc,"history", 0, "0");
CLASS_ATTR_ENUMINDEX(_mc,"history", 0, "InletColor AllColors");
- CLASS_ATTR_LONG(_mc,"historyzoom", 0, vecdisplay_t, historyZoom);
+ CLASS_ATTR_ATOM_LONG(_mc,"historyzoom", 0, vecdisplay_t, historyZoom);
CLASS_ATTR_LABEL(_mc,"historyzoom", 0,"History Zoom Factor");
CLASS_ATTR_DEFAULT_SAVE_PAINT(_mc,"historyzoom", 0, "5");
CLASS_ATTR_ACCESSORS(_mc, "historyzoom", NULL, vecdisplay_set_attribute_historyzoom);
- CLASS_ATTR_LONG(_mc,"historyheight", 0, vecdisplay_t, history_height);
+ CLASS_ATTR_ATOM_LONG(_mc,"historyheight", 0, vecdisplay_t, history_height);
CLASS_ATTR_INVISIBLE(_mc,"historyheight", 0);
CLASS_ATTR_DEFAULT_SAVE(_mc,"historyheight", 0, "0");
CLASS_ATTR_ACCESSORS(_mc, "historyheight", NULL, vecdisplay_set_attribute_historyheight);
@@ -2403,7 +2403,7 @@
CLASS_STICKY_ATTR_CLEAR(_mc, "category");
CLASS_STICKY_ATTR(_mc, "category", 0, ".Inlet.1");
- CLASS_ATTR_LONG(_mc,"view1", 0, vecdisplay_t, view[0]);
+ CLASS_ATTR_ATOM_LONG(_mc,"view1", 0, vecdisplay_t, view[0]);
CLASS_ATTR_LABEL(_mc,"view1", 0,"View Mode Inlet 1");
CLASS_ATTR_DEFAULT_SAVE_PAINT(_mc,"view1", 0, "1");
CLASS_ATTR_ENUMINDEX(_mc,"view1", 0, "Points Lines 0-Peeks Peeks");
@@ -2422,7 +2422,7 @@
/* attributes for Inlet 2 */
CLASS_STICKY_ATTR_CLEAR(_mc, "category");
CLASS_STICKY_ATTR(_mc, "category", 0, ".Inlet.2");
- CLASS_ATTR_LONG(_mc,"view2", 0, vecdisplay_t, view[1]);
+ CLASS_ATTR_ATOM_LONG(_mc,"view2", 0, vecdisplay_t, view[1]);
CLASS_ATTR_LABEL(_mc,"view2", 0,"View Mode Inlet 2");
CLASS_ATTR_DEFAULT_SAVE_PAINT(_mc,"view2", 0, "1");
CLASS_ATTR_ENUMINDEX(_mc,"view2", 0, "Points Lines 0-Peeks Peeks");
@@ -2443,7 +2443,7 @@
CLASS_STICKY_ATTR_CLEAR(_mc, "category");
CLASS_STICKY_ATTR(_mc, "category", 0, ".Inlet.3");
- CLASS_ATTR_LONG(_mc,"view3", 0, vecdisplay_t, view[2]);
+ CLASS_ATTR_ATOM_LONG(_mc,"view3", 0, vecdisplay_t, view[2]);
CLASS_ATTR_LABEL(_mc,"view3", 0,"View Mode Inlet 3");
CLASS_ATTR_DEFAULT_SAVE_PAINT(_mc,"view3", 0, "1");
CLASS_ATTR_ENUMINDEX(_mc,"view3", 0, "Points Lines 0-Peeks Peeks");
@@ -2464,7 +2464,7 @@
CLASS_STICKY_ATTR_CLEAR(_mc, "category");
CLASS_STICKY_ATTR(_mc, "category", 0, ".Inlet.4");
- CLASS_ATTR_LONG(_mc,"view4", 0, vecdisplay_t, view[3]);
+ CLASS_ATTR_ATOM_LONG(_mc,"view4", 0, vecdisplay_t, view[3]);
CLASS_ATTR_LABEL(_mc,"view4", 0,"View Mode Inlet 4");
CLASS_ATTR_DEFAULT_SAVE_PAINT(_mc,"view4", 0, "1");
CLASS_ATTR_ENUMINDEX(_mc,"view4", 0, "Points Lines 0-Peeks Peeks");
@@ -2485,7 +2485,7 @@
CLASS_STICKY_ATTR_CLEAR(_mc, "category");
CLASS_STICKY_ATTR(_mc, "category", 0, ".Inlet.5");
- CLASS_ATTR_LONG(_mc,"view5", 0, vecdisplay_t, view[4]);
+ CLASS_ATTR_ATOM_LONG(_mc,"view5", 0, vecdisplay_t, view[4]);
CLASS_ATTR_LABEL(_mc,"view5", 0,"View Mode Inlet 5");
CLASS_ATTR_DEFAULT_SAVE_PAINT(_mc,"view5", 0, "1");
CLASS_ATTR_ENUMINDEX(_mc,"view5", 0, "Points Lines 0-Peeks Peeks");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-01-30 14:24:58
|
Revision: 3709
http://sourceforge.net/p/ftm/code/3709
Author: borghesi
Date: 2017-01-30 14:24:54 +0000 (Mon, 30 Jan 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj
trunk/ftm/build/max5/winxp-vs/ftmlib.vcxproj
Modified: trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -183,7 +183,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib64.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -243,7 +243,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -302,7 +302,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -179,7 +179,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -235,7 +235,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -293,7 +293,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -178,7 +178,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -230,7 +230,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -285,7 +285,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -178,7 +178,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -233,7 +233,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -292,7 +292,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -136,7 +136,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -198,7 +198,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -257,7 +257,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -323,7 +323,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\jit-includes;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -178,7 +178,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\jit-includes\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -233,7 +233,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\jit-includes;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -293,7 +293,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;jitlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\jit-includes\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\pthreads\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;pthreadVC2.lib;</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\pthreads\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\pthreads\win-x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\pthreads\win-x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -133,7 +133,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -193,7 +193,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -253,7 +253,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -316,7 +316,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -182,7 +182,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -300,7 +300,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;sdifd.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdifd.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -178,7 +178,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;sdifd.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sdifd.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\sdif\win-x64;..\..\..\..\components\pthreads\win-x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -233,7 +233,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;sdif.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdif.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -293,7 +293,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;sdif.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sdif.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\sdif\win-x64;..\..\..\..\components\pthreads\win-x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;sdifd.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdifd.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -178,7 +178,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;sdifd.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sdifd.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\sdif\win-x64;..\..\..\..\components\pthreads\win-x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -233,7 +233,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;sdif.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sdif.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\sdif\win-x86;..\..\..\..\components\pthreads\win-x86;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -293,7 +293,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;sdif.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sdif.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\sdif\win-x64;..\..\..\..\components\pthreads\win-x64;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86</AdditionalLibraryDirectories>
@@ -179,7 +179,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;sqlite3.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -235,7 +235,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\sqlite\win-x86</AdditionalLibraryDirectories>
@@ -294,7 +294,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;sqlite3.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;sqlite3.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\sqlite\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -178,7 +178,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
@@ -233,7 +233,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
@@ -292,7 +292,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
Modified: trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
+++ trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj 2017-01-30 14:24:54 UTC (rev 3709)
@@ -124,7 +124,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\pthreads\win-x86</AdditionalLibraryDirectories>
@@ -179,7 +179,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;pthreadVC2.lib</AdditionalDependencies>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib64.lib;pthreadVC2.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64;..\..\..\..\components\pthreads\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -235,7 +235,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ftmlib32.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<Additi...
[truncated message content] |
|
From: <bor...@us...> - 2017-01-25 10:05:57
|
Revision: 3708
http://sourceforge.net/p/ftm/code/3708
Author: borghesi
Date: 2017-01-25 10:05:54 +0000 (Wed, 25 Jan 2017)
Log Message:
-----------
fixed compilation of ftmlib anf ftmexternals on windows 32bits and 64 bits
Modified Paths:
--------------
trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj.user
trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.javascript.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.javascript.vcxproj.user
trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.sln
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj.filters
trunk/ftm/build/max5/winxp-vs/ftmjs.vcxproj
trunk/ftm/build/max5/winxp-vs/ftmlib.vcxproj
trunk/ftm/externals/max5/ftm.buffer.c
trunk/ftm/externals/max5/ftm.editor.cpp
Modified: trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
@@ -186,7 +186,7 @@
<AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs64bits.def</ModuleDefinitionFile>
<DelayLoadDLLs>
@@ -246,7 +246,7 @@
<AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -305,7 +305,7 @@
<AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs64bits.def</ModuleDefinitionFile>
<ForceSymbolReferences>
@@ -328,6 +328,7 @@
</ItemGroup>
<ItemGroup>
<None Include="ftm.absargs.def" />
+ <None Include="ftm.absargs64bits.def" />
</ItemGroup>
<ItemGroup>
<Library Include="..\..\..\..\components\maxapi\max5\max-includes\MaxAPI.lib" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj.filters
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj.filters 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj.filters 2017-01-25 10:05:54 UTC (rev 3708)
@@ -25,6 +25,9 @@
<None Include="ftm.absargs.def">
<Filter>Resource Files</Filter>
</None>
+ <None Include="ftm.absargs64bits.def">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<Library Include="..\..\..\..\components\maxapi\max5\max-includes\MaxAPI.lib">
Modified: trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
@@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{9E0B7BAD-0438-4255-99B5-1A671F8211D3}</ProjectGuid>
<RootNamespace>ftm.buffer</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -80,9 +81,9 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe64</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe64</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -100,8 +101,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@@ -126,7 +127,7 @@
<AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -156,8 +157,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -177,13 +178,13 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\ftm.buffer64bits.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -212,8 +213,8 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -237,7 +238,7 @@
<AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
<ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
@@ -270,13 +271,13 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeader>
@@ -291,14 +292,15 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
- <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <ModuleDefinitionFile>.\ftm.buffer64bits.def</ModuleDefinitionFile>
+ <ForceSymbolReferences>
+ </ForceSymbolReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -317,6 +319,7 @@
</ItemGroup>
<ItemGroup>
<None Include="ftm.buffer.def" />
+ <None Include="ftm.buffer64bits.def" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ftmlib\ftmext.h" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj.filters
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj.filters 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj.filters 2017-01-25 10:05:54 UTC (rev 3708)
@@ -29,6 +29,9 @@
<None Include="ftm.buffer.def">
<Filter>Resource Files</Filter>
</None>
+ <None Include="ftm.buffer64bits.def">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ftmlib\ftmext.h">
Modified: trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
@@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{73069FC3-D989-47DB-B15F-625703EED4DA}</ProjectGuid>
<RootNamespace>ftm.clone</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -80,9 +81,9 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe64</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe64</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -100,14 +101,14 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -126,7 +127,7 @@
<AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -155,13 +156,13 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -176,13 +177,13 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\ftm.clone64bits.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -210,13 +211,13 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -232,7 +233,7 @@
<AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
<ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
@@ -265,13 +266,13 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>false</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -283,14 +284,15 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
- <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <ModuleDefinitionFile>.\ftm.clone64bits.def</ModuleDefinitionFile>
+ <ForceSymbolReferences>
+ </ForceSymbolReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -309,6 +311,7 @@
</ItemGroup>
<ItemGroup>
<None Include="ftm.clone.def" />
+ <None Include="ftm.clone64bits.def" />
</ItemGroup>
<ItemGroup>
<Library Include="..\..\..\..\components\maxapi\max5\max-includes\MaxAPI.lib" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj.filters
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj.filters 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj.filters 2017-01-25 10:05:54 UTC (rev 3708)
@@ -29,6 +29,9 @@
<None Include="ftm.clone.def">
<Filter>Resource Files</Filter>
</None>
+ <None Include="ftm.clone64bits.def">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<Library Include="..\..\..\..\components\maxapi\max5\max-includes\MaxAPI.lib">
Modified: trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
@@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{4579921A-B6DB-4945-B5BE-A8F7853A5CFA}</ProjectGuid>
<RootNamespace>ftm.copy</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -80,9 +81,9 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe64</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe64</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -100,8 +101,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@@ -126,7 +127,7 @@
<AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -155,8 +156,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -176,13 +177,13 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\ftm.copy64bits.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -210,8 +211,8 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -235,10 +236,11 @@
<AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
- <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <ForceSymbolReferences>
+ </ForceSymbolReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -268,8 +270,8 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -289,14 +291,15 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
- <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <ModuleDefinitionFile>.\ftm.copy64bits.def</ModuleDefinitionFile>
+ <ForceSymbolReferences>
+ </ForceSymbolReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -315,6 +318,7 @@
</ItemGroup>
<ItemGroup>
<None Include="ftm.copy.def" />
+ <None Include="ftm.copy64bits.def" />
</ItemGroup>
<ItemGroup>
<Library Include="..\..\..\..\components\maxapi\max5\max-includes\MaxAPI.lib" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj.filters
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj.filters 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj.filters 2017-01-25 10:05:54 UTC (rev 3708)
@@ -29,6 +29,9 @@
<None Include="ftm.copy.def">
<Filter>Resource Files</Filter>
</None>
+ <None Include="ftm.copy64bits.def">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<Library Include="..\..\..\..\components\maxapi\max5\max-includes\MaxAPI.lib">
Modified: trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-13 17:50:53 UTC (rev 3707)
+++ trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-25 10:05:54 UTC (rev 3708)
@@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{B27C4E03-1801-419F-BA32-957CC314F208}</ProjectGuid>
<RootNamespace>ftm.vecdisplay</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -33,7 +34,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>
+ </CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
@@ -78,12 +80,16 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ </LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe64</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
- <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe64</TargetExt>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>
@@ -104,14 +110,14 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@@ -120,8 +126,9 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsCpp</CompileAs>
- <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <CompileAs>Default</CompileAs>
+ <ForcedIncludeFiles>
+ </ForcedIncludeFiles>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -130,9 +137,9 @@
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\ftm.editor.def</ModuleDefinitionFile>
@@ -166,13 +173,13 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@@ -181,22 +188,23 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsCpp</CompileAs>
- <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <CompileAs>Default</CompileAs>
+ <ForcedIncludeFiles>
+ </ForcedIncludeFiles>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5\x64;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>.\ftm.editor.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\ftm.editor64bits.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -228,12 +236,12 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <StructMemberAlignment>Default</StructMemberAlignment>
<FunctionLevelLinking>false</FunctionLevelLinking>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@@ -241,7 +249,7 @@
<PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>CompileAsCpp</CompileAs>
+ <CompileAs>Default</CompileAs>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -250,12 +258,13 @@
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.editor.def</ModuleDefinitionFile>
- <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <ForceSymbolReferences>
+ </ForceSymbolReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -288,49 +297,98 @@
</Midl>
<ClCompile>
<Optimization>Full</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\juce;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE;DISABLE_JUCE_NAMESPACE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>Sync</ExceptionHandling>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\max-includes\common;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\ImtrEditor\src;..\..\..\..\components\ImtrEditor\src\components;..\..\..\..\components\ImtrEditor\src\editors;..\..\..\..\components\ImtrEditor\src\images;..\..\..\..\components\ImtrEditor\src\tools;..\..\..\..\components\juce;..\..\..\..\components\juce\modules;..\..\..\..\components\juce\JuceLibraryCode;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;WIN64;_WIN64;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;IMTREDITOR_C_GUI_INTERFACE=1;DISABLE_JUCE_NAMESPACE=1;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;MTREDITOR_DONT_USE_LOCAL_JUCEINCLUDES=1;JUCER_VS2015_78A5022=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>
+ </StringPooling>
+ <ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <StructMemberAlignment>2Bytes</StructMemberAlignment>
- <FunctionLevelLinking>false</FunctionLevelLinking>
+ <StructMemberAlignment>Default</StructMemberAlignment>
+ <FunctionLevelLinking>
+ </FunctionLevelLinking>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</Suppr...
[truncated message content] |
|
From: <di...@us...> - 2017-01-13 17:50:55
|
Revision: 3707
http://sourceforge.net/p/ftm/code/3707
Author: diemo
Date: 2017-01-13 17:50:53 +0000 (Fri, 13 Jan 2017)
Log Message:
-----------
add dummy attr to avoid C74_STATIC_ASSERT on structmembersize of head (although get/set are given)
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.object.c
Modified: trunk/ftm/externals/max5/ftm.object.c
===================================================================
--- trunk/ftm/externals/max5/ftm.object.c 2017-01-11 11:18:21 UTC (rev 3706)
+++ trunk/ftm/externals/max5/ftm.object.c 2017-01-13 17:50:53 UTC (rev 3707)
@@ -62,6 +62,7 @@
typedef struct
{
ftmext_t head;
+ t_atom_long dummyattr; /* used to make attr_long macro happy */
ftm_context_t context;
fts_object_t *obj; /* cache object */
@@ -2368,7 +2369,7 @@
FTMEXT_CLASS_MESSAGE_VOID_NAMED(ftmobj, open_editor, "open", "open editor window");
FTMEXT_CLASS_MESSAGE_VARARGS_NAMED(ftmobj, editor_window, "window", "set the bounds of editor window");
- CLASS_ATTR_LONG(_mc, "persistence", 0, ftmobj_t, head);
+ CLASS_ATTR_LONG(_mc, "persistence", 0, ftmobj_t, dummyattr);
CLASS_ATTR_STYLE_LABEL(_mc, "persistence", 0, "onoff", "Save Data With Patcher");
CLASS_ATTR_ACCESSORS(_mc, "persistence", ftmobj_get_attribute_persistence, ftmobj_set_attribute_persistence);
CLASS_ATTR_SAVE(_mc,"persistence", 0);
@@ -2383,7 +2384,7 @@
CLASS_ATTR_LABEL(_mc, "name", 0, "Name");
CLASS_ATTR_SAVE(_mc,"name", 0);
- CLASS_ATTR_LONG(_mc, "scope", 0, ftmobj_t, head);
+ CLASS_ATTR_LONG(_mc, "scope", 0, ftmobj_t, dummyattr);
CLASS_ATTR_ACCESSORS(_mc, "scope", ftmobj_get_attribute_scope, ftmobj_set_attribute_scope);
CLASS_ATTR_LABEL(_mc, "scope", 0, "Name Scope");
CLASS_ATTR_ENUMINDEX(_mc,"scope", 0, "local global");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2017-01-11 11:18:25
|
Revision: 3706
http://sourceforge.net/p/ftm/code/3706
Author: borghesi
Date: 2017-01-11 11:18:21 +0000 (Wed, 11 Jan 2017)
Log Message:
-----------
ftm: update of windows projects (adding 64bits compilation)
Modified Paths:
--------------
trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj.user
trunk/ftm/build/max5/winxp-vs/ftm.inter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.iter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.javascript.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.jitter.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.list.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.mess.vcxproj.user
trunk/ftm/build/max5/winxp-vs/ftm.midiparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.midiunparse.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.object.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.play.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.print.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.record.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.schedule.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.info.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sdif.write.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.sln
trunk/ftm/build/max5/winxp-vs/ftm.sqlite.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.tween.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.value.vcxproj
trunk/ftm/build/max5/winxp-vs/ftm.vecdisplay.vcxproj
trunk/ftm/build/max5/winxp-vs/ftmjs.vcxproj
trunk/ftm/build/max5/winxp-vs/ftmlib.vcxproj
trunk/ftm/build/max5/winxp-vs/libftmlight.vcxproj
trunk/ftm/ftmlib/max5/maxext.c
trunk/ftm/ftmlib/parser.y
Modified: trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-09 14:54:54 UTC (rev 3705)
+++ trunk/ftm/build/max5/winxp-vs/ftm.absargs.vcxproj 2017-01-11 11:18:21 UTC (rev 3706)
@@ -1,18 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9A6DCB2A-62FF-493E-93F0-49760F8F60D3}</ProjectGuid>
<RootNamespace>ftm.buffer</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -20,12 +29,27 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +57,33 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe64</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -65,8 +101,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@@ -91,10 +127,11 @@
<AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs.def</ModuleDefinitionFile>
- <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+ <DelayLoadDLLs>
+ </DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -109,6 +146,64 @@
<SuppressStartupBanner>false</SuppressStartupBanner>
</Bscmake>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <StructMemberAlignment>Default</StructMemberAlignment>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>ftmlib.lib;MaxAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes\x64</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.absargs64bits.def</ModuleDefinitionFile>
+ <DelayLoadDLLs>
+ </DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ <Bscmake>
+ <SuppressStartupBanner>false</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -126,8 +221,8 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -151,10 +246,11 @@
<AdditionalDependencies>ftmlib.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\ftm.absargs.def</ModuleDefinitionFile>
- <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <ForceSymbolReferences>
+ </ForceSymbolReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -168,6 +264,64 @@
<Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max7\max-includes;..\..\..\..\components\maxapi\max7\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;HAVE_STRUCT_TIMESPEC=1;MAX611=1;MAXAPI_USE_MSCRT=1;_int64_t=int64_t;__int64_t=int64_t;_MSCVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <StructMemberAlignment>Default</StructMemberAlignment>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:x64 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>MaxAPI.lib;ftmlib.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe64</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max7\max-includes\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.absargs64bits.def</ModuleDefinitionFile>
+ <ForceSymbolReferences>
+ </ForceSymbolReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\components\maxapi\max5\max-includes\common\dllmain_win.c" />
<ClCompile Include="..\..\..\externals\max5\ftm.absargs.c" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-09 14:54:54 UTC (rev 3705)
+++ trunk/ftm/build/max5/winxp-vs/ftm.buffer.vcxproj 2017-01-11 11:18:21 UTC (rev 3706)
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9E0B7BAD-0438-4255-99B5-1A671F8211D3}</ProjectGuid>
@@ -20,12 +28,27 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +56,33 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -106,6 +141,60 @@
<Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
+ <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -165,6 +254,63 @@
<Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.buffer.def</ModuleDefinitionFile>
+ <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\components\maxapi\max5\max-includes\common\dllmain_win.c" />
<ClCompile Include="..\..\..\externals\max5\ftm.buffer.c" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-09 14:54:54 UTC (rev 3705)
+++ trunk/ftm/build/max5/winxp-vs/ftm.clone.vcxproj 2017-01-11 11:18:21 UTC (rev 3706)
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{73069FC3-D989-47DB-B15F-625703EED4DA}</ProjectGuid>
@@ -20,12 +28,27 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +56,33 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -105,6 +140,59 @@
<Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -161,6 +249,60 @@
<Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.clone.def</ModuleDefinitionFile>
+ <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\components\maxapi\max5\max-includes\common\dllmain_win.c" />
<ClCompile Include="..\..\..\externals\ftm.clone.c" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-09 14:54:54 UTC (rev 3705)
+++ trunk/ftm/build/max5/winxp-vs/ftm.copy.vcxproj 2017-01-11 11:18:21 UTC (rev 3706)
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4579921A-B6DB-4945-B5BE-A8F7853A5CFA}</ProjectGuid>
@@ -20,12 +28,27 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +56,33 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.mxe</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -105,6 +140,59 @@
<Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -164,6 +252,63 @@
<Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateTypeLibrary>false</GenerateTypeLibrary>
+ <TypeLibraryName>
+ </TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\ftmlib;..\..\..\ftmlib\classes;..\..\..\ftmlib\max5;..\..\..\..\components\maxapi\max5\max-includes;..\..\..\..\components\maxapi\max5\msp-includes;..\..\..\..\components\sndfile;..\..\..\..\components\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_EXT_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <StructMemberAlignment>2Bytes</StructMemberAlignment>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderFile>ext.h</PrecompiledHeaderFile>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>ftmlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).mxe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\..\..\..\build-max5;..\..\..\..\components\maxapi\max5\max-includes;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\ftm.copy.def</ModuleDefinitionFile>
+ <ForceSymbolReferences>_DllMain%4012;%(ForceSymbolReferences)</ForceSymbolReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" "$(ProjectDir)\..\..\..\..\..\build-max5"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\components\maxapi\max5\max-includes\common\dllmain_win.c" />
<ClCompile Include="..\..\..\externals\ftm.copy.c" />
Modified: trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj
===================================================================
--- trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-09 14:54:54 UTC (rev 3705)
+++ trunk/ftm/build/max5/winxp-vs/ftm.editor.vcxproj 2017-01-11 11:18:21 UTC (rev 3706)
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B27C4E03-1801-419F-BA32-957CC314F208}</ProjectGuid>
@@ -20,12 +28,27 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -33,21 +56,33 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.mxe</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.mxe</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">....
[truncated message content] |
|
From: <bor...@us...> - 2017-01-09 14:54:56
|
Revision: 3705
http://sourceforge.net/p/ftm/code/3705
Author: borghesi
Date: 2017-01-09 14:54:54 +0000 (Mon, 09 Jan 2017)
Log Message:
-----------
update to changed macros IMTREDITOR_C_GUI_INTERFACE and IMTREDITOR_JUCE_NAMESPACE
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
trunk/ftm/externals/max5/ftm.editor.cpp
Modified: trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2017-01-04 14:15:16 UTC (rev 3704)
+++ trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2017-01-09 14:54:54 UTC (rev 3705)
@@ -2907,7 +2907,8 @@
"USE_STDLIB_MALLOC=1",
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ IMTREDITOR_C_GUI_INTERFACE,
+ "=1",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -3014,7 +3015,7 @@
buildSettings = {
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
"DISABLE_JUCE_NAMESPACE=1",
"_DEBUG=1",
"DEBUG=1",
@@ -3286,7 +3287,8 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
- "C_GUI_INTERFACE=1",
+ IMTREDITOR_C_GUI_INTERFACE,
+ "=1",
"DISABLE_JUCE_NAMESPACE=1",
"_DEBUG=1",
"DEBUG=1",
@@ -3683,7 +3685,7 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
"DISABLE_JUCE_NAMESPACE=1",
"_DEBUG=1",
"DEBUG=1",
@@ -3715,7 +3717,8 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
- "C_GUI_INTERFACE=1",
+ IMTREDITOR_C_GUI_INTERFACE,
+ "=1",
"DISABLE_JUCE_NAMESPACE=1",
"_NDEBUG=1",
"NDEBUG=1",
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2017-01-04 14:15:16 UTC (rev 3704)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2017-01-09 14:54:54 UTC (rev 3705)
@@ -2349,7 +2349,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_MACROS)",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
@@ -2390,7 +2390,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_MACROS)",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
@@ -2428,7 +2428,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_MACROS)",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
INFOPLIST_FILE = ftmexternal.plist;
@@ -2465,7 +2465,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_MACROS)",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
@@ -2587,7 +2587,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
@@ -2616,7 +2616,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
@@ -2646,7 +2646,7 @@
"USE_STDLIB_MALLOC=1",
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
@@ -2700,7 +2700,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -2847,7 +2847,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
@@ -2922,7 +2922,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -2997,7 +2997,7 @@
GCC_PREFIX_HEADER = "$(MAXAPI_DIR)/max-includes/macho-prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_UNROLL_LOOPS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -3068,7 +3068,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
@@ -3100,7 +3100,7 @@
"USE_STDLIB_MALLOC=1",
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
@@ -3260,7 +3260,7 @@
"USE_STDLIB_MALLOC=1",
"DEBUG=1",
"$(VERSION_MACROS)",
- "C_GUI_INTERFACE=1",
+ "IMTREDITOR_C_GUI_INTERFACE=1",
);
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
Modified: trunk/ftm/externals/max5/ftm.editor.cpp
===================================================================
--- trunk/ftm/externals/max5/ftm.editor.cpp 2017-01-04 14:15:16 UTC (rev 3704)
+++ trunk/ftm/externals/max5/ftm.editor.cpp 2017-01-09 14:54:54 UTC (rev 3705)
@@ -149,7 +149,7 @@
void *qelem_ftmeditor_refresh;
t_jsurface *ftmeditor_offscreen;
- JUCE_EDITOR_NAMESPACE::Image ftmeditorSnapshot;
+ IMTREDITOR_JUCE_NAMESPACE::Image ftmeditorSnapshot;
t_critical critical_off;
} ftmeditor_t;
@@ -166,21 +166,21 @@
static void ftmeditor_outlet_message_deferred(ftmeditor_t *self, fts_symbol_t s, short ac, t_atom *at);
static void ftmeditor_set_all_objects_changed(ftmeditor_t *self);
//==============================================================================
-class ImtrEditorContainer : public JUCE_EDITOR_NAMESPACE::Component, public ImtrEditorListener
+class ImtrEditorContainer : public IMTREDITOR_JUCE_NAMESPACE::Component, public ImtrEditorListener
{
ftmeditor_t *external;
- JUCE_EDITOR_NAMESPACE::Colour backcolor;
+ IMTREDITOR_JUCE_NAMESPACE::Colour backcolor;
int multieditorMode;
public :
- JUCE_EDITOR_NAMESPACE::ScopedPointer <EditorContainer> editorContainer;
+ IMTREDITOR_JUCE_NAMESPACE::ScopedPointer <EditorContainer> editorContainer;
bool autoupdate;
- JUCE_EDITOR_NAMESPACE::Array <fts_symbol_t> interfaces;
+ IMTREDITOR_JUCE_NAMESPACE::Array <fts_symbol_t> interfaces;
public:
ImtrEditorContainer(ftmeditor_t *external) :external(external)
{
setBufferedToImage(true);
- backcolor = JUCE_EDITOR_NAMESPACE::Colour(227, 227, 227);
+ backcolor = IMTREDITOR_JUCE_NAMESPACE::Colour(227, 227, 227);
addAndMakeVisible(editorContainer = new EditorContainer(this));
editorContainer->setBoundsRelative(0.0f, 0.0f, 1.0f, 1.0f);
@@ -191,28 +191,28 @@
{
}
- JUCE_EDITOR_NAMESPACE::ModifierKeys getModifierKeysFromFlags(long maxModifiers)
+ IMTREDITOR_JUCE_NAMESPACE::ModifierKeys getModifierKeysFromFlags(long maxModifiers)
{
int modifiers = 0;
if(maxModifiers & eCommandKey)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::commandModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::commandModifier;
if(maxModifiers & eShiftKey)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::shiftModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::shiftModifier;
if(maxModifiers & eControlKey)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::ctrlModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::ctrlModifier;
if(maxModifiers & eAltKey)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::altModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::altModifier;
if(maxModifiers & ePopupMenu)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::popupMenuClickModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::popupMenuClickModifier;
if(maxModifiers & eLeftButton)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::leftButtonModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::leftButtonModifier;
if(maxModifiers & eRightButton)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::rightButtonModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::rightButtonModifier;
if(maxModifiers & eMiddleButton)
- modifiers |= JUCE_EDITOR_NAMESPACE::ModifierKeys::middleButtonModifier;
+ modifiers |= IMTREDITOR_JUCE_NAMESPACE::ModifierKeys::middleButtonModifier;
- return JUCE_EDITOR_NAMESPACE::ModifierKeys(modifiers);
+ return IMTREDITOR_JUCE_NAMESPACE::ModifierKeys(modifiers);
}
int getJuceKeyCodeFromMaxKeyCode(t_keycode code)
@@ -220,158 +220,158 @@
switch(code)
{
case JKEY_SPACEBAR:
- return JUCE_EDITOR_NAMESPACE::KeyPress::spaceKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::spaceKey;
case JKEY_ESC:
- return JUCE_EDITOR_NAMESPACE::KeyPress::escapeKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::escapeKey;
case JKEY_RETURN:
- return JUCE_EDITOR_NAMESPACE::KeyPress::returnKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::returnKey;
case JKEY_TAB:
- return JUCE_EDITOR_NAMESPACE::KeyPress::tabKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::tabKey;
case JKEY_DELETE:
- return JUCE_EDITOR_NAMESPACE::KeyPress::deleteKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::deleteKey;
case JKEY_BACKSPACE:
- return JUCE_EDITOR_NAMESPACE::KeyPress::backspaceKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::backspaceKey;
case JKEY_INSERT:
- return JUCE_EDITOR_NAMESPACE::KeyPress::insertKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::insertKey;
case JKEY_UPARROW:
- return JUCE_EDITOR_NAMESPACE::KeyPress::upKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::upKey;
case JKEY_DOWNARROW:
- return JUCE_EDITOR_NAMESPACE::KeyPress::downKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::downKey;
case JKEY_LEFTARROW:
- return JUCE_EDITOR_NAMESPACE::KeyPress::leftKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::leftKey;
case JKEY_RIGHTARROW:
- return JUCE_EDITOR_NAMESPACE::KeyPress::rightKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::rightKey;
case JKEY_PAGEUP:
- return JUCE_EDITOR_NAMESPACE::KeyPress::pageUpKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::pageUpKey;
case JKEY_PAGEDOWN:
- return JUCE_EDITOR_NAMESPACE::KeyPress::pageDownKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::pageDownKey;
case JKEY_HOME:
- return JUCE_EDITOR_NAMESPACE::KeyPress::homeKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::homeKey;
case JKEY_END:
- return JUCE_EDITOR_NAMESPACE::KeyPress::endKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::endKey;
case JKEY_F1:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F1Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F1Key;
case JKEY_F2:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F2Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F2Key;
case JKEY_F3:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F3Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F3Key;
case JKEY_F4:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F4Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F4Key;
case JKEY_F5:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F5Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F5Key;
case JKEY_F6:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F6Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F6Key;
case JKEY_F7:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F7Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F7Key;
case JKEY_F8:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F8Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F8Key;
case JKEY_F9:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F9Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F9Key;
case JKEY_F10:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F10Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F10Key;
case JKEY_F11:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F11Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F11Key;
case JKEY_F12:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F12Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F12Key;
case JKEY_F13:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F13Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F13Key;
case JKEY_F14:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F14Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F14Key;
case JKEY_F15:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F15Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F15Key;
case JKEY_F16:
- return JUCE_EDITOR_NAMESPACE::KeyPress::F16Key;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::F16Key;
case JKEY_NUMPAD0:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad0;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad0;
case JKEY_NUMPAD1:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad1;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad1;
case JKEY_NUMPAD2:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad2;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad2;
case JKEY_NUMPAD3:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad3;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad3;
case JKEY_NUMPAD4:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad4;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad4;
case JKEY_NUMPAD5:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad5;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad5;
case JKEY_NUMPAD6:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad6;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad6;
case JKEY_NUMPAD7:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad7;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad7;
case JKEY_NUMPAD8:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad8;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad8;
case JKEY_NUMPAD9:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPad9;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPad9;
case JKEY_NUMPADADD:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadAdd;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadAdd;
case JKEY_NUMPADSUBTRACT:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadSubtract;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadSubtract;
case JKEY_NUMPADMULTIPLY:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadMultiply;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadMultiply;
case JKEY_NUMPADDIVIDE:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadDivide;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadDivide;
case JKEY_NUMPADSEPARATOR:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadSeparator;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadSeparator;
case JKEY_NUMPADDECIMALPOINT:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadDecimalPoint;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadDecimalPoint;
case JKEY_NUMPADEQUALS:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadEquals;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadEquals;
case JKEY_NUMPADDELETE:
- return JUCE_EDITOR_NAMESPACE::KeyPress::numberPadDelete;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::numberPadDelete;
case JKEY_PLAYPAUSE:
- return JUCE_EDITOR_NAMESPACE::KeyPress::playKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::playKey;
case JKEY_STOP:
- return JUCE_EDITOR_NAMESPACE::KeyPress::stopKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::stopKey;
case JKEY_NEXTTRACK:
- return JUCE_EDITOR_NAMESPACE::KeyPress::fastForwardKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::fastForwardKey;
case JKEY_PREVTRACK:
- return JUCE_EDITOR_NAMESPACE::KeyPress::rewindKey;
+ return IMTREDITOR_JUCE_NAMESPACE::KeyPress::rewindKey;
default:
return code;
}
}
t_jmouse_cursortype
- getCursorType(const JUCE_EDITOR_NAMESPACE::MouseCursor::StandardCursorType type)
+ getCursorType(const IMTREDITOR_JUCE_NAMESPACE::MouseCursor::StandardCursorType type)
{
switch(type)
{
- case JUCE_EDITOR_NAMESPACE::MouseCursor::NoCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::NoCursor:
return JMOUSE_CURSOR_NONE;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::NormalCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::NormalCursor:
return JMOUSE_CURSOR_ARROW;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::WaitCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::WaitCursor:
return JMOUSE_CURSOR_WAIT;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::IBeamCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::IBeamCursor:
return JMOUSE_CURSOR_IBEAM;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::CrosshairCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::CrosshairCursor:
return JMOUSE_CURSOR_CROSSHAIR;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::CopyingCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::CopyingCursor:
return JMOUSE_CURSOR_COPYING;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::PointingHandCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::PointingHandCursor:
return JMOUSE_CURSOR_POINTINGHAND;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::DraggingHandCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::DraggingHandCursor:
return JMOUSE_CURSOR_DRAGGINGHAND;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::LeftRightResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::LeftRightResizeCursor:
return JMOUSE_CURSOR_RESIZE_LEFTRIGHT;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::UpDownResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::UpDownResizeCursor:
return JMOUSE_CURSOR_RESIZE_UPDOWN;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::UpDownLeftRightResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::UpDownLeftRightResizeCursor:
return JMOUSE_CURSOR_RESIZE_FOURWAY;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::TopEdgeResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::TopEdgeResizeCursor:
return JMOUSE_CURSOR_RESIZE_TOPEDGE;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::BottomEdgeResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::BottomEdgeResizeCursor:
return JMOUSE_CURSOR_RESIZE_BOTTOMEDGE;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::LeftEdgeResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::LeftEdgeResizeCursor:
return JMOUSE_CURSOR_RESIZE_LEFTEDGE;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::RightEdgeResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::RightEdgeResizeCursor:
return JMOUSE_CURSOR_RESIZE_RIGHTEDGE;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::TopLeftCornerResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::TopLeftCornerResizeCursor:
return JMOUSE_CURSOR_RESIZE_TOPLEFTCORNER;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::TopRightCornerResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::TopRightCornerResizeCursor:
return JMOUSE_CURSOR_RESIZE_TOPRIGHTCORNER;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::BottomLeftCornerResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::BottomLeftCornerResizeCursor:
return JMOUSE_CURSOR_RESIZE_BOTTOMLEFTCORNER;
- case JUCE_EDITOR_NAMESPACE::MouseCursor::BottomRightCornerResizeCursor:
+ case IMTREDITOR_JUCE_NAMESPACE::MouseCursor::BottomRightCornerResizeCursor:
return JMOUSE_CURSOR_RESIZE_BOTTOMRIGHTCORNER;
default:
return JMOUSE_CURSOR_ARROW;
@@ -380,7 +380,7 @@
void createMultiEditor(int ac, fts_atom_t *at)
{
- JUCE_EDITOR_NAMESPACE::Array <ImtrEditor *> ftmeditors;
+ IMTREDITOR_JUCE_NAMESPACE::Array <ImtrEditor *> ftmeditors;
int i;
interfaces.clear();
@@ -390,9 +390,9 @@
fts_object_t *obj = fts_get_object(at + i);
fts_symbol_t interface_name = fts_get_symbol(at + i + 1);
imtr_guiInterface *guiInterface = (imtr_guiInterface *)fts_object_get_gui_interface(obj, interface_name);
- JUCE_EDITOR_NAMESPACE::Component *c = editorContainer->createEditor((void *)obj, (void *)external, (imtr_guiInterface *)(guiInterface));
+ IMTREDITOR_JUCE_NAMESPACE::Component *c = editorContainer->createEditor((void *)obj, (void *)external, (imtr_guiInterface *)(guiInterface));
fts_symbol_t identifier = fts_object_get_name(obj);
- JUCE_EDITOR_NAMESPACE::String description;
+ IMTREDITOR_JUCE_NAMESPACE::String description;
fts_object_add_listener(obj, external, editor_callback);
@@ -401,7 +401,7 @@
ftmeditors.add(dynamic_cast<ImtrEditor *>(c));
- description = JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+ JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(identifier));
+ description = IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+ IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(identifier));
(dynamic_cast<ImtrEditor *>(c))->setDescription(description);
(dynamic_cast<ImtrEditor *>(c))->setViewName(description);
interfaces.add(interface_name);
@@ -427,33 +427,33 @@
if(identifier == NULL)
identifier = fts_object_get_id(obj);
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->getEditor(index)->replaceObject((void *)obj, guiInterface);
editorContainer->getEditor(index)->updateReplacements((void *)obj);
if(editorContainer->getEditor(index)->getViewName() == editorContainer->getEditor(index)->getDescription())
- editorContainer->changeViewName(index, JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+
- JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(identifier)));
+ editorContainer->changeViewName(index, IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+
+ IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(identifier)));
}
}
void appendEditor(fts_object_t *obj, fts_symbol_t interface_name)
{
imtr_guiInterface *guiInterface = (imtr_guiInterface *)fts_object_get_gui_interface(obj, interface_name);
- JUCE_EDITOR_NAMESPACE::Component *c = editorContainer->createEditor((void *)obj, (void *)external, (imtr_guiInterface *)(guiInterface));
+ IMTREDITOR_JUCE_NAMESPACE::Component *c = editorContainer->createEditor((void *)obj, (void *)external, (imtr_guiInterface *)(guiInterface));
fts_symbol_t identifier = fts_object_get_name(obj);
if(identifier == NULL)
identifier = fts_object_get_id(obj);
- (dynamic_cast<ImtrEditor *>(c))->setDescription(JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+
- JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(identifier)));
+ (dynamic_cast<ImtrEditor *>(c))->setDescription(IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+
+ IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(identifier)));
interfaces.add(interface_name);
if(editorContainer->getEditorsSize() == 0)
{
- JUCE_EDITOR_NAMESPACE::Array <ImtrEditor *> ftmeditors;
+ IMTREDITOR_JUCE_NAMESPACE::Array <ImtrEditor *> ftmeditors;
ftmeditors.add(dynamic_cast<ImtrEditor *>(c));
editorContainer->createMultiEditor(ftmeditors);
}
@@ -461,20 +461,20 @@
editorContainer->appendEditor(dynamic_cast<ImtrEditor *>(c), true);
}
- void insertEditor(fts_object_t *obj, int index, fts_symbol_t interface_name, JUCE_EDITOR_NAMESPACE::Component *c)
+ void insertEditor(fts_object_t *obj, int index, fts_symbol_t interface_name, IMTREDITOR_JUCE_NAMESPACE::Component *c)
{
fts_symbol_t identifier = fts_object_get_name(obj);
if(identifier == NULL)
identifier = fts_object_get_id(obj);
- (dynamic_cast<ImtrEditor *>(c))->setDescription(JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+
- JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(identifier)));
+ (dynamic_cast<ImtrEditor *>(c))->setDescription(IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+
+ IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(identifier)));
interfaces.insert(index, interface_name);
if(editorContainer->getEditorsSize() == 0)
{
- JUCE_EDITOR_NAMESPACE::Array <ImtrEditor *> ftmeditors;
+ IMTREDITOR_JUCE_NAMESPACE::Array <ImtrEditor *> ftmeditors;
ftmeditors.add(dynamic_cast<ImtrEditor *>(c));
editorContainer->createMultiEditor(ftmeditors);
}
@@ -482,18 +482,18 @@
editorContainer->insertEditor(index, dynamic_cast<ImtrEditor *>(c));
}
- void changeEditorInterfaceDelayed(JUCE_EDITOR_NAMESPACE::Component *editor, void *obj, void *context, JUCE_EDITOR_NAMESPACE::String newInterfaceName, JUCE_EDITOR_NAMESPACE::String oldInterfaceName)
+ void changeEditorInterfaceDelayed(IMTREDITOR_JUCE_NAMESPACE::Component *editor, void *obj, void *context, IMTREDITOR_JUCE_NAMESPACE::String newInterfaceName, IMTREDITOR_JUCE_NAMESPACE::String oldInterfaceName)
{
ImtrEditor *imtred = dynamic_cast<ImtrEditor *>(editor);
int index = editorContainer->getIndexOfView(imtred);
- JUCE_EDITOR_NAMESPACE::String name = imtred->getViewName();
- JUCE_EDITOR_NAMESPACE::Component *replacement = NULL;
+ IMTREDITOR_JUCE_NAMESPACE::String name = imtred->getViewName();
+ IMTREDITOR_JUCE_NAMESPACE::Component *replacement = NULL;
replacement = imtred->getReplacement(newInterfaceName);
if(replacement == NULL)
{
- JUCE_EDITOR_NAMESPACE::StringArray replacedNames;
+ IMTREDITOR_JUCE_NAMESPACE::StringArray replacedNames;
int i;
imtr_guiInterface *guiInterface = (imtr_guiInterface *)fts_object_get_gui_interface((fts_object_t *)obj, getSymbolFromString(newInterfaceName));
@@ -513,15 +513,15 @@
{
fts_symbol_t identifier = fts_object_get_name((fts_object_t *)obj);
if(identifier == NULL) identifier = fts_object_get_id((fts_object_t *)obj);
- (dynamic_cast<ImtrEditor *>(replacement))->setDescription(JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name((fts_object_t *)obj))) +":"+
- JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(identifier)));
+ (dynamic_cast<ImtrEditor *>(replacement))->setDescription(IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name((fts_object_t *)obj))) +":"+
+ IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(identifier)));
interfaces.remove(index);
interfaces.insert(index, getSymbolFromString(newInterfaceName));
editorContainer->replaceEditor(index, imtred, (dynamic_cast<ImtrEditor *>(replacement)));
- if(name != JUCE_EDITOR_NAMESPACE::String::empty)
+ if(name != IMTREDITOR_JUCE_NAMESPACE::String::empty)
editorContainer->setViewName(index, name);
editorContainer->setViewForegroundColor(index, imtred->getForegroundColor());
@@ -555,13 +555,13 @@
{
if(fts_is_float(a)) ea->setFloat(fts_get_float(a));
else if(fts_is_int(a)) ea->setInt((int)fts_get_int(a));
- else if(fts_is_symbol(a)) ea->setString( JUCE_EDITOR_NAMESPACE::String(fts_get_symbol(a)->s_name));
+ else if(fts_is_symbol(a)) ea->setString( IMTREDITOR_JUCE_NAMESPACE::String(fts_get_symbol(a)->s_name));
else if(fts_is_pointer(a)) ea->setPointer(fts_get_pointer(a));
}
#pragma mark ImtrEditorListener interface
// ImtrEditorListener interface
- void changeEditorInterface(JUCE_EDITOR_NAMESPACE::Component *editor, void *obj, void *context, JUCE_EDITOR_NAMESPACE::String newInterfaceName, JUCE_EDITOR_NAMESPACE::String oldInterfaceName)
+ void changeEditorInterface(IMTREDITOR_JUCE_NAMESPACE::Component *editor, void *obj, void *context, IMTREDITOR_JUCE_NAMESPACE::String newInterfaceName, IMTREDITOR_JUCE_NAMESPACE::String oldInterfaceName)
{
fts_atom_t at[5];
fts_set_pointer(at, editor);
@@ -575,7 +575,7 @@
void updateContainer(bool resizeAll)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->updateContainer(resizeAll, false);
}
@@ -584,7 +584,7 @@
if(viewIndex < editorContainer->getEditorsSize())
{
interfaces.remove(viewIndex);
- editorContainer->removeEditor((dynamic_cast<JUCE_EDITOR_NAMESPACE::Component *>(editorContainer->getEditors()[viewIndex])), true);
+ editorContainer->removeEditor((dynamic_cast<IMTREDITOR_JUCE_NAMESPACE::Component *>(editorContainer->getEditors()[viewIndex])), true);
}
}
@@ -615,7 +615,7 @@
outputAtoms(fts_s_cursor, 2, &a);
}
- void outputProperty(int viewIndex, JUCE_EDITOR_NAMESPACE::String propname)
+ void outputProperty(int viewIndex, IMTREDITOR_JUCE_NAMESPACE::String propname)
{
if(viewIndex >= 0)
{
@@ -628,13 +628,13 @@
outputProperty(getSymbolFromString(propname), 0, NULL);
}
- void outputEditorSelection(JUCE_EDITOR_NAMESPACE::Component *edt, JUCE_EDITOR_NAMESPACE::Rectangle<double>selectionBounds, JUCE_EDITOR_NAMESPACE::String arg)
+ void outputEditorSelection(IMTREDITOR_JUCE_NAMESPACE::Component *edt, IMTREDITOR_JUCE_NAMESPACE::Rectangle<double>selectionBounds, IMTREDITOR_JUCE_NAMESPACE::String arg)
{
if(external->outputselection > 0)
{
ImtrEditor *editor = (dynamic_cast<ImtrEditor *>(edt));
int editorIndex = editorContainer->getIndexOfView(editor);
- JUCE_EDITOR_NAMESPACE::Array <int> selection = (arg != JUCE_EDITOR_NAMESPACE::String::empty) ? editor->getSelection(arg) : editor->getSelection();
+ IMTREDITOR_JUCE_NAMESPACE::Array <int> selection = (arg != IMTREDITOR_JUCE_NAMESPACE::String::empty) ? editor->getSelection(arg) : editor->getSelection();
bool selectionAsRange = editor->selectionAsRange();
fts_atom_t a[1024];
int i;
@@ -642,7 +642,7 @@
fts_set_int(a, editorIndex);
fts_set_symbol(a+1, fts_s_selection);
- if(arg != JUCE_EDITOR_NAMESPACE::String::empty)
+ if(arg != IMTREDITOR_JUCE_NAMESPACE::String::empty)
{
fts_set_symbol(a+2, getSymbolFromString(arg));
ac++;
@@ -716,30 +716,30 @@
{
EditorAtom atoms[4];
- atoms[0].setString(JUCE_EDITOR_NAMESPACE::String("mouse"));
+ atoms[0].setString(IMTREDITOR_JUCE_NAMESPACE::String("mouse"));
switch(mouse)
{
case ImtrTypes::mouse_down:
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("down"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("down"));
break;
case ImtrTypes::mouse_up:
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("up"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("up"));
break;
case ImtrTypes::mouse_drag:
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("drag"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("drag"));
break;
case ImtrTypes::mouse_enter:
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("enter"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("enter"));
break;
case ImtrTypes::mouse_exit:
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("exit"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("exit"));
break;
case ImtrTypes::mouse_double_click:
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("doubleclick"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("doubleclick"));
break;
default:
case ImtrTypes::mouse_move:
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("move"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("move"));
break;
}
@@ -755,24 +755,24 @@
{
EditorAtom atoms[4];
- atoms[0].setString(JUCE_EDITOR_NAMESPACE::String("domain"));
- atoms[1].setString(JUCE_EDITOR_NAMESPACE::String("bounds"));
+ atoms[0].setString(IMTREDITOR_JUCE_NAMESPACE::String("domain"));
+ atoms[1].setString(IMTREDITOR_JUCE_NAMESPACE::String("bounds"));
atoms[2].setFloat(editorContainer->getVisibleMin());
atoms[3].setFloat(editorContainer->getVisibleMax());
outputAtoms(4, atoms);
}
}
- void postError(JUCE_EDITOR_NAMESPACE::String error)
+ void postError(IMTREDITOR_JUCE_NAMESPACE::String error)
{
post(fts_symbol_name(getSymbolFromString(error)));
}
- void doAction(JUCE_EDITOR_NAMESPACE::String action)
+ void doAction(IMTREDITOR_JUCE_NAMESPACE::String action)
{
static t_object *pcontrol = NULL;
- if(action == JUCE_EDITOR_NAMESPACE::String("help"))
+ if(action == IMTREDITOR_JUCE_NAMESPACE::String("help"))
{
fts_atom_t a;
@@ -783,15 +783,15 @@
typedmess(pcontrol, gensym("help"), 1, &a);
}
else
- if(action == JUCE_EDITOR_NAMESPACE::String("refresh"))
+ if(action == IMTREDITOR_JUCE_NAMESPACE::String("refresh"))
qelem_set(external->qelem_ftmeditor_repaint);
- else if(action == JUCE_EDITOR_NAMESPACE::String("unboundMouseDrag"))
+ else if(action == IMTREDITOR_JUCE_NAMESPACE::String("unboundMouseDrag"))
jbox_set_mousedragdelta((t_box *)external, 1);
- else if(action == JUCE_EDITOR_NAMESPACE::String("infiniteMouseDrag"))
+ else if(action == IMTREDITOR_JUCE_NAMESPACE::String("infiniteMouseDrag"))
jbox_set_mousedragdelta((t_box *)external, 0);
}
- void cursorChanged(const JUCE_EDITOR_NAMESPACE::MouseCursor::StandardCursorType type)
+ void cursorChanged(const IMTREDITOR_JUCE_NAMESPACE::MouseCursor::StandardCursorType type)
{
long i;
for(i = 0; i < linklist_getsize(external->attachedviews); i++)
@@ -1213,7 +1213,7 @@
else if(pname == fts_s_colormode)
{
int i;
- JUCE_EDITOR_NAMESPACE::StringArray modes = editorContainer->getEditor(idx)->getColorMode();
+ IMTREDITOR_JUCE_NAMESPACE::StringArray modes = editorContainer->getEditor(idx)->getColorMode();
*ac = modes.size() + 2;
fts_set_symbol(at+1, pname);
for(i = 0; i < modes.size(); i++)
@@ -1225,7 +1225,7 @@
else if(pname == fts_s_colorpattern)
{
int i;
- JUCE_EDITOR_NAMESPACE::StringArray colors = editorContainer->getEditor(index)->getColorPatternNames();
+ IMTREDITOR_JUCE_NAMESPACE::StringArray colors = editorContainer->getEditor(index)->getColorPatternNames();
*ac = colors.size() + 2;
fts_set_int(at, idx);
fts_set_symbol(at+1, pname);
@@ -1265,7 +1265,7 @@
else if(pname == fts_s_visibleindexes)
{
int i;
- JUCE_EDITOR_NAMESPACE::Array <int> indexes = editorContainer->getEditor(idx)->getVisibleIndexes();
+ IMTREDITOR_JUCE_NAMESPACE::Array <int> indexes = editorContainer->getEditor(idx)->getVisibleIndexes();
*ac = indexes.size() + 2;
fts_set_int(at, idx);
fts_set_symbol(at+1, pname);
@@ -1275,14 +1275,14 @@
else if(pname == fts_s_paramcols)
{
int i;
- JUCE_EDITOR_NAMESPACE::StringArray columnNames = editorContainer->getEditor(idx)->getParameterColumnNames();
- JUCE_EDITOR_NAMESPACE::Array <int> columnIndexes = editorContainer->getEditor(idx)->getParameterColumnIndexes();
+ IMTREDITOR_JUCE_NAMESPACE::StringArray columnNames = editorContainer->getEditor(idx)->getParameterColumnNames();
+ IMTREDITOR_JUCE_NAMESPACE::Array <int> columnIndexes = editorContainer->getEditor(idx)->getParameterColumnIndexes();
*ac = columnNames.size() + 2;
fts_set_int(at, idx);
fts_set_symbol(at+1, pname);
for(i = 0; i < columnNames.size(); i++)
{
- if(columnNames[i] != JUCE_EDITOR_NAMESPACE::String("-") || columnIndexes[i] == -1)
+ if(columnNames[i] != IMTREDITOR_JUCE_NAMESPACE::String("-") || columnIndexes[i] == -1)
fts_set_symbol(at+2 + i, gensym(columnNames[i].toUTF8()));
else
fts_set_int(at+2 + i, columnIndexes[i]);
@@ -1297,7 +1297,7 @@
}
else if(pname == fts_s_fgcolor)
{
- JUCE_EDITOR_NAMESPACE::Colour fg = editorContainer->getEditor(index)->getForegroundColor();
+ IMTREDITOR_JUCE_NAMESPACE::Colour fg = editorContainer->getEditor(index)->getForegroundColor();
*ac = 5;
fts_set_int(at, idx);
@@ -1317,7 +1317,7 @@
}
else if(pname == fts_s_depth)
{
- JUCE_EDITOR_NAMESPACE::Array <double> depths = editorContainer->getEditor(index)->getDepth();
+ IMTREDITOR_JUCE_NAMESPACE::Array <double> depths = editorContainer->getEditor(index)->getDepth();
*ac = 2+depths.size();
fts_set_symbol(at+1, pname);
@@ -1363,7 +1363,7 @@
}
else if(arg == fts_s_bgcolor)
{
- JUCE_EDITOR_NAMESPACE::Colour hbg = editorContainer->getEditor(idx)->getHeaderBackgroundColor();
+ IMTREDITOR_JUCE_NAMESPACE::Colour hbg = editorContainer->getEditor(idx)->getHeaderBackgroundColor();
*ac = 7;
fts_set_int(at+3, hbg.getRed());
@@ -1373,7 +1373,7 @@
}
else if(arg == fts_s_fgcolor)
{
- JUCE_EDITOR_NAMESPACE::Colour hfg = editorContainer->getEditor(idx)->getHeaderForegroundColor();
+ IMTREDITOR_JUCE_NAMESPACE::Colour hfg = editorContainer->getEditor(idx)->getHeaderForegroundColor();
*ac = 7;
fts_set_int(at+3, hfg.getRed());
@@ -1383,7 +1383,7 @@
}
else if(arg == fts_s_bordercolor)
{
- JUCE_EDITOR_NAMESPACE::Colour hbc = editorContainer->getEditor(idx)->getHeaderBorderColor();
+ IMTREDITOR_JUCE_NAMESPACE::Colour hbc = editorContainer->getEditor(idx)->getHeaderBorderColor();
*ac = 7;
fts_set_int(at+3, hbc.getRed());
@@ -1408,7 +1408,7 @@
}
else if(arg == fts_s_color)
{
- JUCE_EDITOR_NAMESPACE::Colour grcol = editorContainer->getEditor(idx)->getGridColor();
+ IMTREDITOR_JUCE_NAMESPACE::Colour grcol = editorContainer->getEditor(idx)->getGridColor();
*ac = 7;
fts_set_int(at+3, grcol.getRed());
@@ -1429,7 +1429,7 @@
if(arg == fts_s_color)
{
- JUCE_EDITOR_NAMESPACE::Colour hcol = editorContainer->getEditor(idx)->getHighlightColor();
+ IMTREDITOR_JUCE_NAMESPACE::Colour hcol = editorContainer->getEditor(idx)->getHighlightColor();
*ac = 7;
fts_set_int(at+3, hcol.getRed());
@@ -1441,20 +1441,20 @@
}
else if(pname == fts_s_selection)
{
- JUCE_EDITOR_NAMESPACE::String arg = JUCE_EDITOR_NAMESPACE::String::empty;
+ IMTREDITOR_JUCE_NAMESPACE::String arg = IMTREDITOR_JUCE_NAMESPACE::String::empty;
if(nargs == 1 && fts_is_symbol(args))
- arg = JUCE_EDITOR_NAMESPACE::String(fts_get_symbol(args)->s_name);
+ arg = IMTREDITOR_JUCE_NAMESPACE::String(fts_get_symbol(args)->s_name);
ImtrEditor *editor = editorContainer->getEditor(idx);
bool selectionAsRange = editor->selectionAsRange();
- JUCE_EDITOR_NAMESPACE::Array <int> selection = (arg == JUCE_EDITOR_NAMESPACE::String::empty) ? editor->getSelection() : editor->getSelection(arg);
+ IMTREDITOR_JUCE_NAMESPACE::Array <int> selection = (arg == IMTREDITOR_JUCE_NAMESPACE::String::empty) ? editor->getSelection() : editor->getSelection(arg);
int i, size;
size = 2;
fts_set_int(at, idx);
fts_set_symbol(at+1, fts_s_selection);
- if(arg != JUCE_EDITOR_NAMESPACE::String::empty)
+ if(arg != IMTREDITOR_JUCE_NAMESPACE::String::empty)
{
fts_set_symbol(at+2, getSymbolFromString(arg));
size++;
@@ -1544,7 +1544,7 @@
void resized()
{
- JUCE_EDITOR_NAMESPACE::Rectangle <int>rect = getBounds();
+ IMTREDITOR_JUCE_NAMESPACE::Rectangle <int>rect = getBounds();
if(editorContainer != NULL)
editorContainer->setBounds(0, 0, rect.getWidth(), rect.getHeight());
}
@@ -1569,7 +1569,7 @@
void clear()
{
clearEditors();
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->removeDomainScrollbar();
}
@@ -1585,7 +1585,7 @@
{
int i;
ImtrTypes::change_type changeType;
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
for(i = 0; i < editorContainer->getEditorsSize(); i++)
{
changeType = external->objectsChangeType[i];
@@ -1605,7 +1605,7 @@
{
if(editorContainer != NULL)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->objectChanged(-1, changeType);
}
}
@@ -1642,13 +1642,13 @@
void setLayout(FtmEditorLayoutE layout, int ac, fts_atom_t *at)
{
- JUCE_EDITOR_NAMESPACE::Array <float> juxtSizes;
+ IMTREDITOR_JUCE_NAMESPACE::Array <float> juxtSizes;
switch(layout)
{
case FtmEditorLayoutSuperposed:
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setLayout(ImtrTypes::superposed, juxtSizes);
break;
}
@@ -1666,7 +1666,7 @@
juxtSizes.add(size);
}
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setLayout(ImtrTypes::juxtaposed, juxtSizes);
break;
}
@@ -1684,7 +1684,7 @@
juxtSizes.add(size);
}
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setLayout(ImtrTypes::mixedjuxtaposed, juxtSizes);
break;
}
@@ -1702,7 +1702,7 @@
juxtSizes.add(size);
}
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setLayout(ImtrTypes::mixedsuperposed, juxtSizes);
break;
}
@@ -1714,27 +1714,27 @@
void setOrientation(fts_symbol_t orientation)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(orientation == fts_s_horizontal)
editorContainer->setOrientation(ImtrTypes::horizontal);
else if(orientation == fts_s_vertical)
editorContainer->setOrientation(ImtrTypes::vertical);
}
- void setColorShades(JUCE_EDITOR_NAMESPACE::Colour color)
+ void setColorShades(IMTREDITOR_JUCE_NAMESPACE::Colour color)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setColorShades(color);
}
void setForemost(int index)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setForemost(index);
}
void setOpacity(float alpha)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setOpacity(alpha);
}
void setTool(fts_symbol_t tool)
@@ -1754,11 +1754,11 @@
}
void setCursor(fts_symbol_t prop, int ac, fts_atom_t *at)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(prop == fts_s_color)
{
if(ac == 3 && fts_is_number(at) && fts_is_number(at+1) && fts_is_number(at+2))
- editorContainer->setCursorColor(JUCE_EDITOR_NAMESPACE::Colour(fts_get_number_int(at), fts_get_number_int(at+1), fts_get_number_int(at+2)));
+ editorContainer->setCursorColor(IMTREDITOR_JUCE_NAMESPACE::Colour(fts_get_number_int(at), fts_get_number_int(at+1), fts_get_number_int(at+2)));
}
else if(prop == fts_s_size)
{
@@ -1773,19 +1773,19 @@
}
void moveCursor(float time)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->moveCursor(time);
}
void setRegion(float start, float end)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setRegionSelectionBounds(start, end);
}
void setRegionProperty(fts_symbol_t prop, int ac, fts_atom_t *at)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(prop == fts_s_color)
{
if(ac == 1 && fts_is_symbol(at))
@@ -1795,7 +1795,7 @@
editorContainer->setRegionSelectionColor(true, editorContainer->getBackgroundColor().brighter());
}
else if(ac == 3 && fts_is_number(at) && fts_is_number(at+1) && fts_is_number(at+2))
- editorContainer->setRegionSelectionColor(false, JUCE_EDITOR_NAMESPACE::Colour(fts_get_number_int(at), fts_get_number_int(at+1), fts_get_number_int(at+2)));
+ editorContainer->setRegionSelectionColor(false, IMTREDITOR_JUCE_NAMESPACE::Colour(fts_get_number_int(at), fts_get_number_int(at+1), fts_get_number_int(at+2)));
}
else if(prop == fts_s_visible)
{
@@ -1806,9 +1806,9 @@
void setDomainScrollbarProperty(fts_symbol_t prop, int ac, fts_atom_t *at)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(prop == fts_s_color)
- editorContainer->setDomainScrollbarColor(false, JUCE_EDITOR_NAMESPACE::Colour((int)(external->domainScrollbar_color.red * 255), (int)(external->domainScrollbar_color.green * 255),
+ editorContainer->setDomainScrollbarColor(false, IMTREDITOR_JUCE_NAMESPACE::Colour((int)(external->domainScrollbar_color.red * 255), (int)(external->domainScrollbar_color.green * 255),
(int)(external->domainScrollbar_color.blue * 255)).withAlpha((float)external->domainScrollbar_color.alpha));
else if(prop == fts_s_visible)
editorContainer->setDomainScrollbarVisible((external->domainScrollbar_visible == 1));
@@ -1818,7 +1818,7 @@
void setRangeRulerProperty(fts_symbol_t prop)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(prop == fts_s_visible)
editorContainer->setRangeRulerVisible((external->rangeruler_visible == 1));
else if(prop == fts_s_size)
@@ -1829,7 +1829,7 @@
void setDomainRulerProperty(fts_symbol_t prop)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(prop == fts_s_visible)
editorContainer->setDomainRulerVisible((external->domainruler_visible == 1));
else if(prop == fts_s_position)
@@ -1841,16 +1841,16 @@
else if(prop == fts_s_grid)
editorContainer->setDomainRulerGridVisible((external->domainruler_grid == 1));
else if(prop == fts_s_fgcolor)
- editorContainer->setDomainRulerForegroundColor(JUCE_EDITOR_NAMESPACE::Colour((int)(external->domainruler_fgcolor.red * 255), (int)(external->domainruler_fgcolor.green * 255),
+ editorContainer->setDomainRulerForegroundColor(IMTREDITOR_JUCE_NAMESPACE::Colour((int)(external->domainruler_fgcolor.red * 255), (int)(external->domainruler_fgcolor.green * 255),
(int)(external->domainruler_fgcolor.blue * 255)).withAlpha((float)external->domainruler_fgcolor.alpha));
else if(prop == fts_s_bgcolor)
- editorContainer->setDomainRulerBackgroundColor(JUCE_EDITOR_NAMESPACE::Colour((int)(external->domainruler_bgcolor.red * 255), (int)(external->domainruler_bgcolor.green * 255),
+ editorContainer->setDomainRulerBackgroundColor(IMTREDITOR_JUCE_NAMESPACE::Colour((int)(external->domainruler_bgcolor.red * 255), (int)(external->domainruler_bgcolor.green * 255),
(int)(external->domainruler_bgcolor.blue * 255)).withAlpha((float)external->domainruler_bgcolor.alpha));
}
int setToolbarProperty(fts_symbol_t prop)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(prop == fts_s_visible)
editorContainer->setToolbarVisible((ImtrTypes::toolbar_visibility) external->toolbar_visible);
else if(prop == fts_s_position)
@@ -1858,7 +1858,7 @@
else if(prop == fts_s_size)
editorContainer->setToolbarSize((int)external->toolbar_size);
else if(prop == fts_s_bgcolor)
- editorContainer->setToolbarBackgroundColor(JUCE_EDITOR_NAMESPACE::Colour((int)(external->toolbar_bgcolor.red * 255), (int)(external->toolbar_bgcolor.green * 255),
+ editorContainer->setToolbarBackgroundColor(IMTREDITOR_JUCE_NAMESPACE::Colour((int)(external->toolbar_bgcolor.red * 255), (int)(external->toolbar_bgcolor.green * 255),
(int)(external->toolbar_bgcolor.blue * 255)).withAlpha((float)external->toolbar_bgcolor.alpha));
else
return 0;
@@ -1908,7 +1908,7 @@
if(ret > 0)
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
if(max > min)
editorContainer->setDomainBounds(min, max);
else if(min > max)
@@ -1927,7 +1927,7 @@
if((ac > 0) && fts_is_number(at + 1))
range = fts_get_number_float(at + 1);
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setDomainCenter(center, range);
}
else
@@ -1937,7 +1937,7 @@
{
if(ac > 0 && fts_is_number(at))
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setDomainCenter(-1.0, fts_get_number_float(at));
}
else
@@ -1947,7 +1947,7 @@
{
external->domain[0] = 0.0;
external->domain[1] = 0.0;
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->alignEditors(false);
editorContainer->setDefaultZoom(false);
editorContainer->refreshDomainScrollbar();
@@ -1966,8 +1966,8 @@
{
if(ac == 1 && fts_is_symbol(at))
{
- const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
- editorContainer->setViewName(index, JUCE_EDITOR_NAMESPACE::String( fts_symbol_name(fts_get_symbol(at))));
+ const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
+ editorContainer->setViewName(index, IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(fts_get_symbol(at))));
qelem_set(external->qelem_init_inspector);
}
}
@@ -1975,7 +1975,7 @@
{
if(ac >= 3 && fts_is_number(at) && fts_is_number(at+1) && fts_is_number(at+2))
{
- JUCE_EDITOR_NAMESPACE::Colour color;
+ IMTREDITOR_JUCE_NAMESPACE::Colour color;
int r, g, b;
if(fts_is_int(at))
{
@@ -1989,18 +1989,18 @@
g = (int)(fts_get_number_float(at + 1) * 255.0);
b = (int)(fts_get_number_float(at + 2) * 255.0);
}
- color = JUCE_EDITOR_NAMESPACE::Colour(r, g, b);
+ color = IMTREDITOR_JUCE_NAMESPACE::Colour(r, g, b);
if(ac > 3 && fts_is_number(at+3))
color = color.withAlpha((float)fts_get_number_float(at+3));
- //const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ //const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setViewForegroundColor(index, color);
}
else if(ac == 1 && fts_is_symbol(at))
{
- JUCE_EDITOR_NAMESPACE::String name = JUCE_EDITOR_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at)));
- JUCE_EDITOR_NAMESPACE::Colour color = JUCE_EDITOR_NAMESPACE::Colours::findColourForName( name, JUCE_EDITOR_NAMESPACE::Colours::black);
+ IMTREDITOR_JUCE_NAMESPACE::String name = IMTREDITOR_JUCE_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at)));
+ IMTREDITOR_JUCE_NAMESPACE::Colour color = IMTREDITOR_JUCE_NAMESPACE::Colours::findColourForName( name, IMTREDITOR_JUCE_NAMESPACE::Colours::black);
editorContainer->setViewForegroundColor(index, color);
}
}
@@ -2008,7 +2008,7 @@
{
if(ac >= 3 && fts_is_number(at) && fts_is_number(at+1) && fts_is_number(at+2))
{
- JUCE_EDITOR_NAMESPACE::Colour color;
+ IMTREDITOR_JUCE_NAMESPACE::Colour color;
int r, g, b;
if(fts_is_int(at))
{
@@ -2022,18 +2022,18 @@
g = (int)(fts_get_number_float(at + 1) * 255.0);
b = (int)(fts_get_number_float(at + 2) * 255.0);
}
- color = JUCE_EDITOR_NAMESPACE::Colour(r, g, b);
+ color = IMTREDITOR_JUCE_NAMESPACE::Colour(r, g, b);
if(ac > 3 && fts_is_number(at+3))
color = color.withAlpha((float)fts_get_number_float(at+3));
- //const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ //const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setViewBackgroundColor(index, color);
}
else if(ac == 1 && fts_is_symbol(at))
{
- JUCE_EDITOR_NAMESPACE::String name = JUCE_EDITOR_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at)));
- JUCE_EDITOR_NAMESPACE::Colour color = JUCE_EDITOR_NAMESPACE::Colours::findColourForName( name, JUCE_EDITOR_NAMESPACE::Colours::white);
+ IMTREDITOR_JUCE_NAMESPACE::String name = IMTREDITOR_JUCE_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at)));
+ IMTREDITOR_JUCE_NAMESPACE::Colour color = IMTREDITOR_JUCE_NAMESPACE::Colours::findColourForName( name, IMTREDITOR_JUCE_NAMESPACE::Colours::white);
editorContainer->setViewBackgroundColor(index, color);
}
}
@@ -2041,7 +2041,7 @@
{
if(ac >= 3 && fts_is_number(at) && fts_is_number(at+1) && fts_is_number(at+2))
{
- JUCE_EDITOR_NAMESPACE::Colour color;
+ IMTREDITOR_JUCE_NAMESPACE::Colour color;
int r, g, b;
if(fts_is_int(at))
{
@@ -2055,36 +2055,36 @@
g = (int)(fts_get_number_float(at + 1) * 255.0);
b = (int)(fts_get_number_float(at + 2) * 255.0);
}
- color = JUCE_EDITOR_NAMESPACE::Colour(r, g, b);
+ color = IMTREDITOR_JUCE_NAMESPACE::Colour(r, g, b);
if(ac > 3 && fts_is_number(at+3))
color = color.withAlpha((float)fts_get_number_float(at+3));
- //const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
+ //const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setViewStaveColor(index, color);
}
else if(ac == 1 && fts_is_symbol(at))
{
- JUCE_EDITOR_NAMESPACE::String name = JUCE_EDITOR_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at)));
- JUCE_EDITOR_NAMESPACE::Colour color = JUCE_EDITOR_NAMESPACE::Colours::findColourForName( name, JUCE_EDITOR_NAMESPACE::Colours::white);
+ IMTREDITOR_JUCE_NAMESPACE::String name = IMTREDITOR_JUCE_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at)));
+ IMTREDITOR_JUCE_NAMESPACE::Colour color = IMTREDITOR_JUCE_NAMESPACE::Colours::findColourForName( name, IMTREDITOR_JUCE_NAMESPACE::Colours::white);
editorContainer->setViewStaveColor(index, color);
}
}
else if(prop == fts_s_colormode)
{
- JUCE_EDITOR_NAMESPACE::StringArray modes;
+ IMTREDITOR_JUCE_NAMESPACE::StringArray modes;
if(ac > 0 && fts_is_symbol(at))
{
for(int i = 0; i< ac; i++)
- modes.add(JUCE_EDITOR_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at+i))));
+ modes.add(IMTREDITOR_JUCE_NAMESPACE::String(fts_symbol_name(fts_get_symbol(at+i))));
editorContainer->setViewColorMode(index, modes);
}
}
else if(prop == fts_s_colorpattern)
{
- JUCE_EDITOR_NAMESPACE::Array <JUCE_EDITOR_NAMESPACE::Colour> colors;
- JUCE_EDITOR_NAMESPACE::StringArray names;
- JUCE_EDITOR_NAMESPACE::Colour defaultColor = (index >= 0) ? editorContainer->getEditor(index)->getForegroundColor() : JUCE_EDITOR_NAMESPACE::Colours::black;
+ IMTREDITOR_JUCE_NAMESPACE::Array <IMTREDITOR_JUCE_NAMESPACE::Colour> colors;
+ IMTREDITOR_JUCE_NAMESPACE::StringArray names;
+ IMTREDITOR_JUCE_NAMESPACE::Colour defaultColor = (index >= 0) ? editorContainer->getEditor(index)->getForegroundColor() : IMTREDITOR_JUCE_NAMESP...
[truncated message content] |
|
From: <bor...@us...> - 2017-01-04 14:15:18
|
Revision: 3704
http://sourceforge.net/p/ftm/code/3704
Author: borghesi
Date: 2017-01-04 14:15:16 +0000 (Wed, 04 Jan 2017)
Log Message:
-----------
removed warnings
Modified Paths:
--------------
trunk/ftm/externals/ftm.sdif.write.c
trunk/ftm/ftmlib/audiofile.c
trunk/ftm/ftmlib/class.c
trunk/ftm/ftmlib/classes/bpf.c
trunk/ftm/ftmlib/classes/datafiles.c
trunk/ftm/ftmlib/classes/fmat.c
trunk/ftm/ftmlib/classes/fring.c
trunk/ftm/ftmlib/classes/fvec.c
trunk/ftm/ftmlib/classes/llist.c
trunk/ftm/ftmlib/classes/marker.c
trunk/ftm/ftmlib/classes/mat.c
trunk/ftm/ftmlib/classes/propobj.c
trunk/ftm/ftmlib/classes/scoob.c
trunk/ftm/ftmlib/classes/seqmidi.c
trunk/ftm/ftmlib/classes/seqtxt.c
trunk/ftm/ftmlib/classes/sequence.c
trunk/ftm/ftmlib/classes/track.c
trunk/ftm/ftmlib/dumper.c
trunk/ftm/ftmlib/expression.c
trunk/ftm/ftmlib/ftmdump.c
trunk/ftm/ftmlib/ftmext.c
trunk/ftm/ftmlib/ftmlib.c
trunk/ftm/ftmlib/ftmsdif.c
trunk/ftm/ftmlib/functions.c
trunk/ftm/ftmlib/max5/maxext.c
trunk/ftm/ftmlib/max5/maxpat.c
trunk/ftm/ftmlib/midievent.c
trunk/ftm/ftmlib/midifile.c
trunk/ftm/ftmlib/predefsymbols.h
trunk/ftm/ftmlib/random.c
trunk/ftm/ftmlib/seqsdif.c
trunk/ftm/ftmlib/tuple.c
Modified: trunk/ftm/externals/ftm.sdif.write.c
===================================================================
--- trunk/ftm/externals/ftm.sdif.write.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/externals/ftm.sdif.write.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -170,7 +170,7 @@
static int writesdif_writeframe(writesdif_t *self, double now, framespec_t* f)
{
ftmsdif_t *base = &self->base;
- SdifUInt4 fsz = SdifSizeOfFrameHeader();
+ SdifUInt4 fsz = (SdifUInt4)SdifSizeOfFrameHeader();
int nmatrix = 0; /* num. matrices actually present */
int m;
Modified: trunk/ftm/ftmlib/audiofile.c
===================================================================
--- trunk/ftm/ftmlib/audiofile.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/audiofile.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -253,7 +253,7 @@
float *buffer = (float *)alloca(sizeof(float) * size * n_channels);
long n, i, j, k;
- n = sf_read_float(audiofile->sfhandle, buffer, size * n_channels);
+ n = (long)sf_read_float(audiofile->sfhandle, buffer, size * n_channels);
/* un-interleave samples */
for(i=0, k=0; k<n; i++, k+=n_channels)
@@ -262,14 +262,14 @@
buf[j][i] = buffer[k + j];
}
- return n / n_channels;
+ return (int)(n / n_channels);
}
int
fts_audiofile_read_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, long size)
{
if(n_channels == audiofile->sfinfo.channels)
- return sf_read_float(audiofile->sfhandle, buf, size * n_channels) / n_channels;
+ return (int)sf_read_float(audiofile->sfhandle, buf, size * n_channels) / n_channels;
else
return 0;
}
@@ -294,16 +294,16 @@
buffer[k + j] = 0.0;
}
- n = sf_write_float(audiofile->sfhandle, buffer, size * n_channels);
+ n = (long)sf_write_float(audiofile->sfhandle, buffer, size * n_channels);
- return n / n_channels;
+ return (int)(n / n_channels);
}
int
fts_audiofile_write_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, long size)
{
if(n_channels == audiofile->sfinfo.channels)
- return sf_write_float(audiofile->sfhandle, buf, size * n_channels) / n_channels;
+ return (int)sf_write_float(audiofile->sfhandle, buf, size * n_channels) / n_channels;
else
return 0;
}
@@ -313,7 +313,7 @@
int
fts_audiofile_seek(fts_audiofile_t *audiofile, long offset)
{
- int status = sf_seek(audiofile->sfhandle, offset, SEEK_SET);
+ int status = (int)sf_seek(audiofile->sfhandle, offset, SEEK_SET);
return status != -1;
}
Modified: trunk/ftm/ftmlib/class.c
===================================================================
--- trunk/ftm/ftmlib/class.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/class.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -794,7 +794,7 @@
fts_set_symbol(&k, name);
if(fts_hashtable_get(&schema->hash, &k, &a))
- return fts_get_int(&a);
+ return (int)fts_get_int(&a);
return -1;
}
@@ -830,7 +830,7 @@
fts_schema_t *self = (fts_schema_t *) o;
if (ac > 0 && fts_is_number(at))
- fts_atom_assign(ret, fts_schema_get_key(self, fts_get_number_int(at)));
+ fts_atom_assign(ret, fts_schema_get_key(self, (int)fts_get_number_int(at)));
}
Modified: trunk/ftm/ftmlib/classes/bpf.c
===================================================================
--- trunk/ftm/ftmlib/classes/bpf.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/bpf.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -1011,7 +1011,7 @@
{
bpf_t *self = (bpf_t *)o;
int size = self->func.size;
- int n = fts_get_number_int(at);
+ int n = (int)fts_get_number_int(at);
bpf_lock_capacity(self, n);
Modified: trunk/ftm/ftmlib/classes/datafiles.c
===================================================================
--- trunk/ftm/ftmlib/classes/datafiles.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/datafiles.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -208,7 +208,7 @@
if(sf != NULL)
{
- long m = fts_audiofile_get_num_frames(sf);
+ long m = (long)fts_audiofile_get_num_frames(sf);
long n = fts_audiofile_get_num_channels(sf);
long wanted = 0; /* number of sample frames to load */
long offset = 0;
@@ -258,22 +258,22 @@
if(resample_sr == 0)
{
- float *ptr = fmat_lock_reshape(self, m, n);
+ float *ptr = fmat_lock_reshape(self, (int)m, (int)n);
- m = fts_audiofile_read_interleaved(sf, ptr, n, m);
+ m = fts_audiofile_read_interleaved(sf, ptr, (int)n, m);
fts_audiofile_close(sf);
- fmat_set_m_nogrow(self, m);
+ fmat_set_m_nogrow(self, (int)m);
fmat_unlock(self);
}
else
{
- fmat_t *read_fmat = fmat_create(m + 2, n); /* temp buffer to be resampled */
+ fmat_t *read_fmat = fmat_create((int)(m + 2), (int)n); /* temp buffer to be resampled */
float *ptr = fmat_get_ptr_unlocked(read_fmat);
fts_object_refer((fts_object_t *)read_fmat);
- m = fts_audiofile_read_interleaved(sf, ptr, n, m);
+ m = fts_audiofile_read_interleaved(sf, ptr, (int)n, m);
fts_audiofile_close(sf);
if(m > 0)
Modified: trunk/ftm/ftmlib/classes/fmat.c
===================================================================
--- trunk/ftm/ftmlib/classes/fmat.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/fmat.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -119,7 +119,7 @@
if(values != NULL)
{
self->values = values + HEAD_POINTS;
- self->alloc = size;
+ self->alloc = (int)size;
}
else
{
@@ -1253,10 +1253,10 @@
if (m > 0 && n > 0)
{
if(ac > 0 && fts_is_number(at))
- i = fts_get_number_int(at);
+ i = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- j = fts_get_number_int(at + 1);
+ j = (int)fts_get_number_int(at + 1);
/* index clipping and wraparound */
if (i >= m)
@@ -1301,10 +1301,10 @@
else
{
if(ac > 0 && fts_is_number(at))
- i = fts_get_number_int(at);
+ i = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- j = fts_get_number_int(at + 1);
+ j = (int)fts_get_number_int(at + 1);
/* index clipping and wraparound */
if (i >= m)
@@ -1702,7 +1702,7 @@
if(fts_is_number(&key))
{
- i = fts_get_number_int(&key);
+ i = (int)fts_get_number_int(&key);
j = 0;
}
else if(fts_is_a(&key, fts_tuple_class))
@@ -1712,10 +1712,10 @@
fts_atom_t *atoms = fts_tuple_get_atoms(tuple);
if(size > 0 && fts_is_number(atoms))
- i = fts_get_number_int(atoms);
+ i = (int)fts_get_number_int(atoms);
if(size > 1 && fts_is_number(atoms + 1))
- j = fts_get_number_int(atoms + 1);
+ j = (int)fts_get_number_int(atoms + 1);
}
if(i >= m)
@@ -1742,7 +1742,7 @@
if(fts_is_number(&key))
{
- i = fts_get_number_int(&key);
+ i = (int)fts_get_number_int(&key);
j = 0;
}
else if(fts_is_a(&key, fts_tuple_class))
@@ -1752,10 +1752,10 @@
fts_atom_t *atoms = fts_tuple_get_atoms(tuple);
if(size > 0 && fts_is_number(atoms))
- i = fts_get_number_int(atoms);
+ i = (int)fts_get_number_int(atoms);
if(size > 1 && fts_is_number(atoms + 1))
- j = fts_get_number_int(atoms + 1);
+ j = (int)fts_get_number_int(atoms + 1);
}
if(i >= 0 && j >= 0)
@@ -1787,8 +1787,8 @@
if (size > 0 && ac > 2 && fts_is_number(at) && fts_is_number(at + 1))
{
- int i = fts_get_number_int(at);
- int j = fts_get_number_int(at + 1);
+ int i = (int)fts_get_number_int(at);
+ int j = (int)fts_get_number_int(at + 1);
int onset;
ac -= 2;
@@ -1837,7 +1837,7 @@
if(ac > 1 && fts_is_number(at))
{
- int row = fts_get_number_int(at);
+ int row = (int)fts_get_number_int(at);
int m = self->m;
int n = self->n;
@@ -1872,7 +1872,7 @@
if(ac > 1 && fts_is_number(at))
{
- int col = fts_get_number_int(at);
+ int col = (int)fts_get_number_int(at);
int m = self->m;
int n = self->n;
int old_n = n;
@@ -2024,10 +2024,10 @@
int i;
if(ac > 0 && fts_is_number(at))
- onset = fts_get_number_int(at);
+ onset = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- range = fts_get_number_int(at + 1);
+ range = (int)fts_get_number_int(at + 1);
if(onset + range > m)
range = m - onset;
@@ -2196,10 +2196,10 @@
if(ac > 0 && fts_is_number(at))
{
- m = fts_get_number_int(at);
+ m = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- n = fts_get_number_int(at + 1);
+ n = (int)fts_get_number_int(at + 1);
if(m >= 0 && n >= 0)
{
@@ -2219,7 +2219,7 @@
_fmat_set_m(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fmat_t *self = (fmat_t *)o;
- int m = fts_get_number_int(at);
+ int m = (int)fts_get_number_int(at);
if(m >= 0)
{
@@ -2240,7 +2240,7 @@
_fmat_set_n(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fmat_t *self = (fmat_t *)o;
- int n = fts_get_number_int(at);
+ int n = (int)fts_get_number_int(at);
if(n >= 0)
{
@@ -2301,7 +2301,7 @@
if(fts_is_int(at))
{
- i = fts_get_int(at);
+ i = (int)fts_get_int(at);
if(i < 0)
i = 0;
@@ -2327,7 +2327,7 @@
{
if(fts_is_int(at + 1))
{
- j = fts_get_int(at + 1);
+ j = (int)fts_get_int(at + 1);
if(j < 0)
j = 0;
@@ -2386,14 +2386,14 @@
{
int m = self->m;
int n = self->n;
- int i = fts_get_number_int(at);
+ int i = (int)fts_get_number_int(at);
int offset = 0;
int size = n;
int j; /* column */
if (ac > 1 && fts_is_number(at+1))
{
- offset = fts_get_number_int(at+1);
+ offset = (int)fts_get_number_int(at+1);
if (offset < 0)
offset = 0;
if (offset > n)
@@ -2402,7 +2402,7 @@
if (ac > 2 && fts_is_number(at+2))
{
- size = fts_get_number_int(at+2);
+ size = (int)fts_get_number_int(at+2);
if (size < 0)
size = 0;
@@ -2450,14 +2450,14 @@
{
int m = self->m;
int n = self->n;
- int j = fts_get_number_int(at);
+ int j = (int)fts_get_number_int(at);
int offset = 0;
int size = m;
int i; /* row */
if (ac > 1 && fts_is_number(at+1))
{
- offset = fts_get_number_int(at+1);
+ offset = (int)fts_get_number_int(at+1);
if (offset < 0)
offset = 0;
if (offset > m)
@@ -2466,7 +2466,7 @@
if (ac > 2 && fts_is_number(at+2))
{
- size = fts_get_number_int(at+2);
+ size = (int)fts_get_number_int(at+2);
if (size < 0)
size = 0;
@@ -2517,7 +2517,7 @@
int order = 3;
if(ac > 1 && fts_is_number(at + 1))
- order = fts_get_number_int(at + 1);
+ order = (int)fts_get_number_int(at + 1);
if(order > 1)
{
@@ -2778,7 +2778,7 @@
fts_set_object(ret, o);
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
if (pos < 0)
pos = 0;
@@ -2786,7 +2786,7 @@
pos = m;
if (ac > 1 && fts_is_number(at + 1))
- numrows = fts_get_number_int(at + 1);
+ numrows = (int)fts_get_number_int(at + 1);
if (numrows > 0)
{
@@ -2827,7 +2827,7 @@
fts_set_object(ret, o);
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
if(pos < 0)
pos = 0;
@@ -2835,7 +2835,7 @@
pos = n;
if (ac > 1 && fts_is_number(at + 1))
- num = fts_get_number_int(at + 1) ;
+ num = (int)fts_get_number_int(at + 1) ;
if(num > 0)
{
@@ -2862,10 +2862,10 @@
fts_set_object(ret, o);
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
if (ac > 1 && fts_is_number(at+1))
- num = fts_get_number_int(at+1) ;
+ num = (int)fts_get_number_int(at+1) ;
fmat_lock(self);
fmat_delete_columns(self, pos, num);
@@ -2893,10 +2893,10 @@
fts_set_object(ret, o);
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
if (ac > 1 && fts_is_number(at+1))
- numrows = fts_get_number_int(at+1);
+ numrows = (int)fts_get_number_int(at+1);
fmat_lock(self);
fmat_delete_rows(self, pos, numrows);
@@ -3104,8 +3104,8 @@
float *ptr = fmat_lock(self);
int m = self->m;
int n = self->n;
- int i = fts_get_number_int(at);
- int j = fts_get_number_int(at + 1);
+ int i = (int)fts_get_number_int(at);
+ int j = (int)fts_get_number_int(at + 1);
float op = fts_get_number_float(at + 2);
ac -= 2;
@@ -4847,7 +4847,7 @@
int i, j;
if(ac > 0 && fts_is_number(at))
- fade = fts_get_number_int(at);
+ fade = (int)fts_get_number_int(at);
n_fade = fade;
incr = (float)(1.0 / (float)fade);
@@ -5207,7 +5207,7 @@
int shift = n; /* default: one row up */
if (ac > 0 && fts_is_number(at))
- shift = fts_get_number_int(at) * n;
+ shift = (int)fts_get_number_int(at) * n;
/* rotate rows */
if (shift == 1)
@@ -5228,7 +5228,7 @@
{
int i;
- shift = fts_get_number_int(at + 1); /* column shift */
+ shift = (int)fts_get_number_int(at + 1); /* column shift */
/* rotate columns for each row */
if (shift == 1)
@@ -5332,10 +5332,10 @@
int n = self->n;
if(ac > 0 && fts_is_number(at))
- m = fts_get_number_int(at);
+ m = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- n = fts_get_number_int(at + 1);
+ n = (int)fts_get_number_int(at + 1);
fm_grow_locked(self, m * n);
self->m = m;
@@ -5355,7 +5355,7 @@
int col = 0;
if (ac > 0)
- col = fts_get_number_int(at);
+ col = (int)fts_get_number_int(at);
fmat_lock(self);
fmat_sort_ascending(self, col);
@@ -5374,7 +5374,7 @@
int col = 0;
if (ac > 0)
- col = fts_get_number_int(at);
+ col = (int)fts_get_number_int(at);
fmat_lock(self);
fmat_sort_descending(self, col);
@@ -5395,7 +5395,7 @@
int i, j;
if (ac > 0)
- col = fts_get_number_int(at);
+ col = (int)fts_get_number_int(at);
if (col < n)
{
@@ -5573,10 +5573,10 @@
fm_initialize(self);
if(ac > 0 && fts_is_number(at))
- m = fts_get_number_int(at);
+ m = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- n = fts_get_number_int(at + 1);
+ n = (int)fts_get_number_int(at + 1);
if(n < 0)
n = 0;
Modified: trunk/ftm/ftmlib/classes/fring.c
===================================================================
--- trunk/ftm/ftmlib/classes/fring.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/fring.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -440,7 +440,7 @@
if(ac > 0 && fts_is_number(at))
{
- idx = fts_get_number_int(at);
+ idx = (int)fts_get_number_int(at);
while(idx < 0)
idx += size;
@@ -472,13 +472,13 @@
else
{
if(ac > 0 && fts_is_number(at))
- i = fts_get_number_int(at);
+ i = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- j = fts_get_number_int(at + 1);
+ j = (int)fts_get_number_int(at + 1);
if(ac > 2 && fts_is_number(at + 2))
- k = fts_get_number_int(at + 2);
+ k = (int)fts_get_number_int(at + 2);
while (i < 0)
i += m;
@@ -575,7 +575,7 @@
_fring_set_size(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fring_t *self = (fring_t *)o;
- int size = fts_get_number_int(at);
+ int size = (int)fts_get_number_int(at);
if(size < 0)
size = 0;
@@ -602,16 +602,16 @@
default:
case 4:
if(fts_is_number(at + 3))
- has_times = fts_get_number_int(at + 3);
+ has_times = (int)fts_get_number_int(at + 3);
case 3:
if(fts_is_number(at + 2))
- n = fts_get_number_int(at + 2);
+ n = (int)fts_get_number_int(at + 2);
case 2:
if(fts_is_number(at + 2))
- m = fts_get_number_int(at + 2);
+ m = (int)fts_get_number_int(at + 2);
case 1:
if(fts_is_number(at + 2))
- size = fts_get_number_int(at + 2);
+ size = (int)fts_get_number_int(at + 2);
case 0:
break;
}
@@ -1114,7 +1114,7 @@
if(ac > 0 && fts_is_number(at))
{
- size = fts_get_number_int(at);
+ size = (int)fts_get_number_int(at);
if(size < 0)
size = 0;
@@ -1122,7 +1122,7 @@
if(ac > 1 && fts_is_number(at + 1))
{
- self->m = fts_get_number_int(at + 1);
+ self->m = (int)fts_get_number_int(at + 1);
if(self->m < 1)
self->m = 1;
@@ -1130,7 +1130,7 @@
if(ac > 2 && fts_is_number(at + 2))
{
- self->n = fts_get_number_int(at + 2);
+ self->n = (int)fts_get_number_int(at + 2);
if(self->n < 1)
self->n = 1;
Modified: trunk/ftm/ftmlib/classes/fvec.c
===================================================================
--- trunk/ftm/ftmlib/classes/fvec.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/fvec.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -426,7 +426,7 @@
case 3:
if(fts_is_number(at + 2))
{
- int size = fts_get_number_int(at + 2);
+ int size = (int)fts_get_number_int(at + 2);
if(size > 0)
fvec->size = size;
@@ -436,7 +436,7 @@
case 2:
if(fts_is_number(at + 1))
{
- int onset = fts_get_number_int(at + 1);
+ int onset = (int)fts_get_number_int(at + 1);
if(onset > 0)
fvec->onset = onset;
@@ -445,7 +445,7 @@
}
case 1:
if(fts_is_number(at))
- fvec->index = fts_get_number_int(at);
+ fvec->index = (int)fts_get_number_int(at);
case 0:
break;
}
@@ -565,7 +565,7 @@
if (ptr != NULL && size > 0)
{
if(ac > 0 && fts_is_number(at))
- i = fts_get_number_int(at);
+ i = (int)fts_get_number_int(at);
/* index clipping and wraparound */
if (i >= size)
@@ -606,7 +606,7 @@
else
{
if(ac > 0 && fts_is_number(at))
- i = fts_get_number_int(at);
+ i = (int)fts_get_number_int(at);
if(i >= size)
i = size - 1;
@@ -937,7 +937,7 @@
if (ac > 1 && fts_is_number(at))
{
- int onset = fts_get_number_int(at);
+ int onset = (int)fts_get_number_int(at);
float *ptr;
int size;
int stride;
@@ -1188,7 +1188,7 @@
if(fts_is_number(&key))
{
- int i = fts_get_number_int(&key);
+ int i = (int)fts_get_number_int(&key);
if(i < size)
{
@@ -1334,7 +1334,7 @@
int size = 0;
if(ac > 0 && fts_is_number(at))
- size = fts_get_number_int(at);
+ size = (int)fts_get_number_int(at);
if(size < 0)
size = 0;
@@ -1365,7 +1365,7 @@
_fvec_set_onset(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fvec_t *self = (fvec_t *) o;
- int onset = fts_get_number_int(at);
+ int onset = (int)fts_get_number_int(at);
if (onset < 0)
onset = 0;
@@ -1393,7 +1393,7 @@
_fvec_set_index(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fvec_t *self = (fvec_t *) o;
- int index = fts_get_number_int(at);
+ int index = (int)fts_get_number_int(at);
if(index < 0)
index = 0;
@@ -1421,7 +1421,7 @@
_fvec_set_size(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fvec_t *self = (fvec_t *)o;
- int size = fts_get_number_int(at);
+ int size = (int)fts_get_number_int(at);
if(size > 0 && fvec_get_type(self) == fvec_type_vector)
{
@@ -2803,7 +2803,7 @@
else if(fts_is_number(at))
{
/* create fvec with own matrix of given size */
- int size = fts_get_number_int(at);
+ int size = (int)fts_get_number_int(at);
fmat = fmat_create(size, 1);
self->type = fvec_type_vector;
Modified: trunk/ftm/ftmlib/classes/llist.c
===================================================================
--- trunk/ftm/ftmlib/classes/llist.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/llist.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -451,7 +451,7 @@
if(ac > 0 && fts_is_number(at))
{
- int index = fts_get_number_int(at);
+ int index = (int)fts_get_number_int(at);
fts_atom_t *a = fts_llist_get_element(self, index);
if(a != NULL)
@@ -466,7 +466,7 @@
if(ac > 0 && fts_is_number(at))
{
- int index = fts_get_number_int(at);
+ int index = (int)fts_get_number_int(at);
fts_llist_set_element(self, index, value);
}
@@ -601,7 +601,7 @@
_llist_set_size(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fts_llist_t *self = (fts_llist_t *) o;
- int size = fts_get_number_int(at);
+ int size = (int)fts_get_number_int(at);
fts_llist_set_size(self, size);
fts_set_object(ret, (fts_object_t *)self);
@@ -649,7 +649,7 @@
if(ac > 1 && fts_is_number(at))
{
- int index = fts_get_number_int(at);
+ int index = (int)fts_get_number_int(at);
fts_llist_insert_from_atoms(self, index, ac - 1, at + 1);
}
Modified: trunk/ftm/ftmlib/classes/marker.c
===================================================================
--- trunk/ftm/ftmlib/classes/marker.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/marker.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -231,7 +231,7 @@
if(ac > 0 && fts_is_symbol(at))
metric_set_meter(self, fts_get_symbol(at));
else if(ac > 1 && fts_is_number(at) && fts_is_number(at + 1))
- metric_set_meter_quotient(self, fts_get_number_int(at), fts_get_number_int(at + 1));
+ metric_set_meter_quotient(self, (int)fts_get_number_int(at), (int)fts_get_number_int(at + 1));
return fts_ok;
}
@@ -253,7 +253,7 @@
metric_t *self = (metric_t *) o;
if (ac > 0 && fts_is_number(at))
- self->bar_num = fts_get_number_int(at);
+ self->bar_num = (int)fts_get_number_int(at);
return fts_ok;
}
@@ -353,7 +353,7 @@
metric_set_meter(self, meter);
}
else if(fts_get_symbol(at) == fts_s_num && fts_is_number(at + 1))
- self->bar_num = fts_get_number_int(at + 1);
+ self->bar_num = (int)fts_get_number_int(at + 1);
ac -= 2;
at += 2;
@@ -361,7 +361,7 @@
if(ac > 0 && fts_is_number(at))
{
- self->bar_num = fts_get_number_int(at);
+ self->bar_num = (int)fts_get_number_int(at);
ac--;
at++;
@@ -374,7 +374,7 @@
}
else if(ac > 1 && fts_is_number(at) && fts_is_number(at + 1))
{
- metric_set_meter_quotient(self, fts_get_int(at), fts_get_int(at + 1));
+ metric_set_meter_quotient(self, (int)fts_get_int(at), (int)fts_get_int(at + 1));
ac -= 2;
at += 2;
}
@@ -464,13 +464,13 @@
if(sym == fts_s_label && fts_is_symbol(at + i + 1))
self->label = fts_get_symbol(at + i + 1);
else if(sym == fts_s_cue && fts_is_number(at + i + 1))
- self->cue = fts_get_number_int(at + i + 1);
+ self->cue = (int)fts_get_number_int(at + i + 1);
else if(sym == fts_s_tempo && fts_is_number(at + i + 1))
self->tempo = fts_get_number_float(at + i + 1);
else if(sym == fts_s_meter && fts_is_symbol(at + i + 1))
self->meter = fts_get_symbol(at + i + 1);
else if(((sym == fts_s_bar_num) || (sym == fts_s_num)) && fts_is_number(at + i + 1))
- self->bar_num = fts_get_number_int(at + i + 1);
+ self->bar_num = (int)fts_get_number_int(at + i + 1);
}
}
}
Modified: trunk/ftm/ftmlib/classes/mat.c
===================================================================
--- trunk/ftm/ftmlib/classes/mat.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/mat.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -82,7 +82,7 @@
data = (fts_atom_t *)fts_realloc(data, size * sizeof(fts_atom_t));
self->data = data;
- self->alloc = size;
+ self->alloc = (int)size;
return data;
}
@@ -916,8 +916,8 @@
if(ac > 2 && fts_is_number(at) && fts_is_number(at + 1))
{
- int i = fts_get_number_int(at);
- int j = fts_get_number_int(at + 1);
+ int i = (int)fts_get_number_int(at);
+ int j = (int)fts_get_number_int(at + 1);
int m = mat_get_m(self);
int n = mat_get_n(self);
@@ -968,7 +968,7 @@
{
int m = mat_get_m(self);
int n = mat_get_n(self);
- int i = fts_get_number_int(at);
+ int i = (int)fts_get_number_int(at);
mat_lock(self);
@@ -1000,7 +1000,7 @@
if (ac > 1 && fts_is_number(at))
{
- int row = fts_get_number_int(at);
+ int row = (int)fts_get_number_int(at);
int m = self->m;
int n = self->n;
@@ -1036,7 +1036,7 @@
if (ac > 1 && fts_is_number(at))
{
- int col = fts_get_number_int(at);
+ int col = (int)fts_get_number_int(at);
int m = self->m;
int n = self->n;
int old_n = n;
@@ -1124,7 +1124,7 @@
/* check and test args */
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
if (pos < 0)
pos = 0;
@@ -1132,7 +1132,7 @@
pos = m;
if (ac > 1 && fts_is_number(at + 1))
- numrows = fts_get_number_int(at + 1) ;
+ numrows = (int)fts_get_number_int(at + 1) ;
if (numrows > 0)
{
@@ -1172,7 +1172,7 @@
/* check and test args */
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
if (pos < 0)
pos = 0;
@@ -1180,7 +1180,7 @@
pos = n;
if (ac > 1 && fts_is_number(at+1))
- numcols = fts_get_number_int(at+1) ;
+ numcols = (int)fts_get_number_int(at+1) ;
fts_set_object(ret, o); /* return ourself in any case */
@@ -1214,7 +1214,7 @@
/* get and check args */
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
fts_set_object(ret, o); /* return ourself in any case */
@@ -1224,7 +1224,7 @@
return fts_ok;
if (ac > 1 && fts_is_number(at+1))
- numrows = fts_get_number_int(at+1);
+ numrows = (int)fts_get_number_int(at+1);
if (numrows <= 0)
return fts_ok;
@@ -1250,10 +1250,10 @@
/* check and test args */
if (ac > 0 && fts_is_number(at))
- pos = fts_get_number_int(at);
+ pos = (int)fts_get_number_int(at);
if (ac > 1 && fts_is_number(at+1))
- numcols = fts_get_number_int(at+1) ;
+ numcols = (int)fts_get_number_int(at+1) ;
mat_lock(self);
mat_delete_columns(self, pos, numcols);
@@ -1308,13 +1308,13 @@
if (ac == 1 && fts_is_number(at))
{
/* only change # of rows */
- m = fts_get_number_int(at);
+ m = (int)fts_get_number_int(at);
n = mat_get_n(self);
}
else if (ac == 2 && fts_is_number(at) && fts_is_number(at + 1))
{
- m = fts_get_number_int(at);
- n = fts_get_number_int(at + 1);
+ m = (int)fts_get_number_int(at);
+ n = (int)fts_get_number_int(at + 1);
}
if(m >= 0 && n >= 0)
@@ -1335,7 +1335,7 @@
_mat_change_rows(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
mat_t *self = (mat_t *) o;
- int m = fts_get_number_int(at);
+ int m = (int)fts_get_number_int(at);
int n = mat_get_n(self);
if(m >= 0)
@@ -1357,7 +1357,7 @@
{
mat_t *self = (mat_t *)o;
int m = mat_get_m(self);
- int n = fts_get_number_int(at);
+ int n = (int)fts_get_number_int(at);
if(n >= 0)
{
@@ -1477,7 +1477,7 @@
if(fts_is_number(&key))
{
- i = fts_get_number_int(&key);
+ i = (int)fts_get_number_int(&key);
j = 0;
}
else if(fts_is_a(&key, fts_tuple_class))
@@ -1487,10 +1487,10 @@
fts_atom_t *atoms = fts_tuple_get_atoms(tuple);
if(size > 0 && fts_is_number(atoms))
- i = fts_get_number_int(atoms);
+ i = (int)fts_get_number_int(atoms);
if(size > 1 && fts_is_number(atoms + 1))
- j = fts_get_number_int(atoms + 1);
+ j = (int)fts_get_number_int(atoms + 1);
}
if(i >= m)
@@ -1518,7 +1518,7 @@
if(fts_is_number(&key))
{
- i = fts_get_number_int(&key);
+ i = (int)fts_get_number_int(&key);
j = 0;
}
else if(fts_is_a(&key, fts_tuple_class))
@@ -1528,10 +1528,10 @@
fts_atom_t *atoms = fts_tuple_get_atoms(tuple);
if(size > 0 && fts_is_number(atoms))
- i = fts_get_number_int(atoms);
+ i = (int)fts_get_number_int(atoms);
if(size > 1 && fts_is_number(atoms + 1))
- j = fts_get_number_int(atoms + 1);
+ j = (int)fts_get_number_int(atoms + 1);
}
if(i >= 0 && j >= 0)
@@ -1749,7 +1749,7 @@
compare = ma_element_compare_descending;
if (ac > 0)
- col = fts_get_number_int(at);
+ col = (int)fts_get_number_int(at);
#if HAVE_QSORT_R
qsort_r((void *) ptr, m, n * sizeof(fts_atom_t), (void *) col, compare);
@@ -1799,7 +1799,7 @@
int i, j;
if (ac > 0)
- col = fts_get_number_int(at);
+ col = (int)fts_get_number_int(at);
/* don't mat_sort(o, s, ac, at, fts_nix); */
@@ -1960,10 +1960,10 @@
mat_lock(self);
if (ac > 0 && fts_is_number(at))
- i = fts_get_number_int(at);
+ i = (int)fts_get_number_int(at);
if (ac > 1 && fts_is_number(at + 1))
- j = fts_get_number_int(at + 1);
+ j = (int)fts_get_number_int(at + 1);
/* index clipping and wraparound */
if (i >= m)
@@ -2007,10 +2007,10 @@
else
{
if (ac > 0 && fts_is_number(at))
- i = fts_get_number_int(at);
+ i = (int)fts_get_number_int(at);
if (ac > 1 && fts_is_number(at + 1))
- j = fts_get_number_int(at + 1);
+ j = (int)fts_get_number_int(at + 1);
/* index clipping and wraparound */
if (i >= m)
@@ -2137,14 +2137,14 @@
if (m > 0 && ac > 0 && fts_is_number(at))
{
- int i = fts_get_number_int(at);
+ int i = (int)fts_get_number_int(at);
int n = mat_get_n(self);
int offset = 0;
int size = n;
if(ac > 1 && fts_is_number(at + 1))
{
- offset = fts_get_number_int(at + 1);
+ offset = (int)fts_get_number_int(at + 1);
if (offset < 0)
offset = 0;
@@ -2154,7 +2154,7 @@
if (ac > 2 && fts_is_number(at + 2))
{
- size = fts_get_number_int(at + 2);
+ size = (int)fts_get_number_int(at + 2);
if (size < 0)
size = 0;
@@ -2193,7 +2193,7 @@
if (n > 0 && ac > 0 && fts_is_number(at))
{
- int j = fts_get_number_int(at);
+ int j = (int)fts_get_number_int(at);
int m = mat_get_m(self);
int offset = 0;
int size = m;
@@ -2201,7 +2201,7 @@
if (ac > 1 && fts_is_number(at+1))
{
- offset = fts_get_number_int(at+1);
+ offset = (int)fts_get_number_int(at+1);
if (offset < 0)
offset = 0;
if (offset > m)
@@ -2210,7 +2210,7 @@
if (ac > 2 && fts_is_number(at+2))
{
- size = fts_get_number_int(at+2);
+ size = (int)fts_get_number_int(at+2);
if (size < 0)
size = 0;
@@ -2280,10 +2280,10 @@
return fts_ok;
if(ac > 0 && fts_is_number(at))
- m = fts_get_number_int(at);
+ m = (int)fts_get_number_int(at);
if(ac > 1 && fts_is_number(at + 1))
- n = fts_get_number_int(at + 1);
+ n = (int)fts_get_number_int(at + 1);
if(n < 1)
n = 1;
Modified: trunk/ftm/ftmlib/classes/propobj.c
===================================================================
--- trunk/ftm/ftmlib/classes/propobj.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/propobj.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -116,7 +116,7 @@
if(propobj_get_property(self, prop, &a) && fts_is_number(&a))
{
- *i = fts_get_number_int(&a);
+ *i = (int)fts_get_number_int(&a);
return 1;
}
Modified: trunk/ftm/ftmlib/classes/scoob.c
===================================================================
--- trunk/ftm/ftmlib/classes/scoob.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/scoob.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -117,7 +117,7 @@
propobj_get_property((propobj_t *)self, fts_s_channel, &a);
if(fts_is_number(&a))
- return fts_get_number_int(&a);
+ return (int)fts_get_number_int(&a);
else
return -1;
}
@@ -141,7 +141,7 @@
}
else if(fts_is_number(at))
{
- fts_atom_t *key = fts_schema_get_key(scoob_type_schema, fts_get_number_int(at));
+ fts_atom_t *key = fts_schema_get_key(scoob_type_schema, (int)fts_get_number_int(at));
if(key != NULL)
self->type = fts_get_symbol(key);
Modified: trunk/ftm/ftmlib/classes/seqmidi.c
===================================================================
--- trunk/ftm/ftmlib/classes/seqmidi.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/seqmidi.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -433,8 +433,8 @@
while(off && event_get_time(off) <= until)
{
- int off_pitch = event_get_int(off) >> 8;
- int off_channel = event_get_int(off) & 0xff;
+ int off_pitch = (int)event_get_int(off) >> 8;
+ int off_channel = (int)event_get_int(off) & 0xff;
/* write note off */
fts_midifile_write_channel_message(file, event_get_time(off), midi_note, off_channel, off_pitch, 0);
@@ -676,14 +676,14 @@
if(sym == fts_s_track)
{
- int n = fts_get_number_int(at + i + 1);
+ int n = (int)fts_get_number_int(at + i + 1);
if(n >= 0)
fts_midifile_select_track(file, n);
}
else if(sym == fts_s_channel)
{
- int n = fts_get_number_int(at + i + 1);
+ int n = (int)fts_get_number_int(at + i + 1);
if(n > 0)
fts_midifile_select_channel(file, n);
Modified: trunk/ftm/ftmlib/classes/seqtxt.c
===================================================================
--- trunk/ftm/ftmlib/classes/seqtxt.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/seqtxt.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -307,7 +307,7 @@
if(ac > 2)
{
- if (! (fts_is_number(at+2) && (*time_index = fts_get_number_int(at+2)) >= 0))
+ if (! (fts_is_number(at+2) && (*time_index = (int)fts_get_number_int(at+2)) >= 0))
{
fts_post("bad time index (import argument number(2))\n");
fts_set_object(ret, o);
@@ -317,7 +317,7 @@
if(ac > 1)
{
- if(!(fts_is_number(at+1) && (*m_max_index = fts_get_number_int(at+1)) >= 0))
+ if(!(fts_is_number(at+1) && (*m_max_index = (int)fts_get_number_int(at+1)) >= 0))
{
fts_post("bad number of rows index (import argument number(1))\n");
fts_set_object(ret, o);
@@ -347,7 +347,7 @@
{
if(*n == *m_max_index)
{
- *m_max = fts_get_number_int(a);
+ *m_max = (int)fts_get_number_int(a);
}
else if(*n == *time_index)
{
@@ -383,7 +383,7 @@
{
if(*n == *m_max_index)
{
- *m_max = fts_get_number_int(a);
+ *m_max = (int)fts_get_number_int(a);
}
else if(*n == *time_index)
{
Modified: trunk/ftm/ftmlib/classes/sequence.c
===================================================================
--- trunk/ftm/ftmlib/classes/sequence.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/sequence.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -1684,7 +1684,7 @@
_sequence_set_size(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
sequence_t *self = (sequence_t *)o;
- int n = fts_get_number_int(at);
+ int n = (int)fts_get_number_int(at);
event_t *event;
int size;
@@ -1874,7 +1874,7 @@
dequeue (sequence_t *queue)
{
event_t *qev = sequence_get_first(queue);
- int i = event_get_int(qev);
+ int i = (int)event_get_int(qev);
seq_cutout_event(queue, qev);
Modified: trunk/ftm/ftmlib/classes/track.c
===================================================================
--- trunk/ftm/ftmlib/classes/track.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/classes/track.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -421,7 +421,7 @@
if(prop == fts_s_cue)
{
if(fts_is_number(value))
- propobj_set_property_int(marker_or_metric, fts_s_cue, fts_get_number_int(value));
+ propobj_set_property_int(marker_or_metric, fts_s_cue, (int)fts_get_number_int(value));
}
else if(prop == fts_s_label)
{
@@ -431,7 +431,7 @@
else if(prop == fts_s_bar_num)
{
if(fts_is_number(value))
- propobj_set_property_int(marker_or_metric, fts_s_num, fts_get_number_int(value));
+ propobj_set_property_int(marker_or_metric, fts_s_num, (int)fts_get_number_int(value));
}
else if(prop == fts_s_meter)
{
Modified: trunk/ftm/ftmlib/dumper.c
===================================================================
--- trunk/ftm/ftmlib/dumper.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/dumper.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -210,7 +210,7 @@
fts_set_object(&a_obj, obj);
if(fts_hashtable_get(&dumper->hash, &a_obj, &a_id))
- return fts_get_int(&a_id);
+ return (int)fts_get_int(&a_id);
else
return 0;
}
@@ -438,7 +438,7 @@
if(ac > 0 && fts_is_int(at))
{
- int id = fts_get_int(at);
+ int id = (int)fts_get_int(at);
if(ac > 1 && fts_is_symbol(at + 1))
{
@@ -502,7 +502,7 @@
if(ac > 0 && fts_is_int(at))
{
- int id = fts_get_int(at);
+ int id = (int)fts_get_int(at);
if(ac > 1 && fts_is_symbol(at + 1))
{
Modified: trunk/ftm/ftmlib/expression.c
===================================================================
--- trunk/ftm/ftmlib/expression.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/expression.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -145,7 +145,7 @@
if ( i == fp - FRAME_OFFSET)
{
fprintf( stderr, "%-7s %d\n", "FP", (int)fts_get_int( p+i));
- fp = fts_get_int( p+i);
+ fp = (int)fts_get_int( p+i);
}
else if (fts_is_float( p+i))
fprintf( stderr, "%-7s %g\n", "FLOAT", fts_get_float(p+i));
@@ -189,7 +189,7 @@
fts_atom_release( at);
old_fp = exp->fp;
- exp->fp = fts_get_int( (fts_atom_t *)fts_stack_base(&exp->stack) + exp->fp - FRAME_OFFSET);
+ exp->fp = (int)fts_get_int( (fts_atom_t *)fts_stack_base(&exp->stack) + exp->fp - FRAME_OFFSET);
expression_stack_pop( exp, fts_stack_top( &exp->stack) - old_fp + 1 + FRAME_OFFSET);
}
@@ -843,7 +843,7 @@
}
else if(fts_is_int(right))
{
- int divisor = fts_get_int(right);
+ int divisor = (int)fts_get_int(right);
if (divisor == 0)
fts_set_int(ret, 0);
else
@@ -1080,7 +1080,7 @@
if(fts_is_int( &tree->value))
{
/****** $<int>: argument lookup ******/
- int index = fts_get_int( &tree->value) - 1;
+ int index = (int)fts_get_int( &tree->value) - 1;
if (index < 0 || index >= exp->env_ac)
return exp_error_return(exp, fts_status_format("invalid reference: '$%d'", index + 1), return_args);
Modified: trunk/ftm/ftmlib/ftmdump.c
===================================================================
--- trunk/ftm/ftmlib/ftmdump.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/ftmdump.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -155,7 +155,7 @@
fts_set_pointer(&a_obj, (void *)obj);
if(fts_hashtable_get(&dumper->hash, &a_obj, &a_id))
- return fts_get_int(&a_id);
+ return (int)fts_get_int(&a_id);
else
return 0;
}
Modified: trunk/ftm/ftmlib/ftmext.c
===================================================================
--- trunk/ftm/ftmlib/ftmext.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/ftmext.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -324,7 +324,7 @@
char *p;
if(doc != NULL && (p = strchr(doc, '-')) != NULL)
- post_string_len(doc, p - doc);
+ post_string_len(doc, (int)(p - doc));
else
fts_post("<%s> ", get_type_string(cl->arguments[i].type));
}
@@ -341,7 +341,7 @@
char *p;
if(doc != NULL && (p = strchr(doc, '-')) != NULL)
- post_string_len(doc, p - doc);
+ post_string_len(doc, (int)(p - doc));
fts_post(get_newline(html));
}
@@ -362,7 +362,7 @@
if(q != NULL)
{
fts_post(indent);
- post_string_len(p, q - p);
+ post_string_len(p, (int)(q - p));
fts_post(get_newline(html));
q++;
}
@@ -1049,7 +1049,7 @@
}
else if(fts_is_number(a))
{
- int n = fts_get_number_int(a);
+ int n = (int)fts_get_number_int(a);
(*munion->boolean)(ext, (n != 0));
return 1;
}
Modified: trunk/ftm/ftmlib/ftmlib.c
===================================================================
--- trunk/ftm/ftmlib/ftmlib.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/ftmlib.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -738,13 +738,13 @@
int release = 0;
if (ac > 0 && fts_is_number(at))
- major = fts_get_number_int(at);
+ major = (int)fts_get_number_int(at);
if (ac > 1 && fts_is_number(at + 1))
- minor = fts_get_number_int(at + 1);
+ minor = (int)fts_get_number_int(at + 1);
if (ac > 2 && fts_is_number(at + 2))
- release = fts_get_number_int(at + 2);
+ release = (int)fts_get_number_int(at + 2);
/* check version */
fts_set_int(ret, FTM_VERSION_MAJOR >= major && FTM_VERSION_MINOR >= minor && FTM_VERSION_RELEASE >= release);
@@ -789,7 +789,7 @@
{
if(fts_is_number(at))
{
- int level = fts_get_number_int(at);
+ int level = (int)fts_get_number_int(at);
fts_expression_set_error_ckecking_level(level);
return fts_ok;
}
Modified: trunk/ftm/ftmlib/ftmsdif.c
===================================================================
--- trunk/ftm/ftmlib/ftmsdif.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/ftmsdif.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -577,7 +577,7 @@
if (ac > 1 && fts_is_number(at + 1))
{
- f->streamid = fts_get_number_int(at + 1);
+ f->streamid = (int)fts_get_number_int(at + 1);
consumed++;
}
else
Modified: trunk/ftm/ftmlib/functions.c
===================================================================
--- trunk/ftm/ftmlib/functions.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/functions.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -441,7 +441,7 @@
{
if(ac > 1 && fts_is_number(at))
{
- int idx = fts_get_number_int(at);
+ int idx = (int)fts_get_number_int(at);
/* skip index */
ac--;
@@ -464,7 +464,7 @@
{
if(ac > 1 && fts_is_number(at))
{
- int idx = fts_get_number_int(at);
+ int idx = (int)fts_get_number_int(at);
/* skip index */
ac--;
@@ -485,8 +485,8 @@
{
if(ac > 1 && fts_is_number(at) && fts_is_number(at + 1))
{
- int idx = fts_get_number_int(at);
- int len = fts_get_number_int(at + 1);
+ int idx = (int)fts_get_number_int(at);
+ int len = (int)fts_get_number_int(at + 1);
/* skip index and length */
ac -= 2;
@@ -691,7 +691,7 @@
gettimeofday(&tv, NULL);
seed = tv.tv_usec;
#else
- seed = time( NULL);
+ seed = (int)time( NULL);
#endif
}
@@ -703,8 +703,8 @@
unsigned int hi;
- hi = RA * (long)((unsigned int)seed >> 16);
- seed = RA * (long)(seed & 0xFFFF);
+ hi = (unsigned int) (RA * (long)((unsigned int)seed >> 16));
+ seed = (unsigned int) (RA * (long)(seed & 0xFFFF));
seed += (hi & 0x7FFF) << 16;
@@ -951,7 +951,7 @@
int cond = 0; /* default: no output */
if (fts_is_number(at))
- cond = fts_get_number_int(at);
+ cond = (int)fts_get_number_int(at);
if (0 < cond && cond < ac)
*ret = at[cond];
Modified: trunk/ftm/ftmlib/max5/maxext.c
===================================================================
--- trunk/ftm/ftmlib/max5/maxext.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/max5/maxext.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -114,7 +114,7 @@
}
if(print != 0)
- fts_post_atoms(ac, at);
+ fts_post_atoms((int)ac, at);
else
fts_post("<oops!>");
@@ -448,7 +448,7 @@
else if(fts_is_float(at + idx))
snprint_float(buf + j, len - j, fts_get_float(at + idx));
else if(fts_is_symbol(at + idx))
- snprintf(buf + j, len - j, fts_symbol_name(fts_get_symbol(at + idx)));
+ snprintf(buf + j, len - j, "%s", fts_symbol_name(fts_get_symbol(at + idx)));
j += strlen(buf + j);
}
@@ -509,7 +509,7 @@
long textsize = 1024;
atom_gettext(ac, at, &textsize, &ptmpstr, 0);
- ftmext_loader_set_scope_data(loader, ac, at); /* associate absargs to current loader scope */
+ ftmext_loader_set_scope_data(loader, (int)ac, at); /* associate absargs to current loader scope */
if(at) sysmem_freeptr(at);
}
}
@@ -1302,8 +1302,8 @@
{
if(msg == ASSIST_INLET)
{
- int n_class_ins = ftmext_class_get_inlets(cl);
- int i_doc = arg;
+ int n_class_ins = (int)ftmext_class_get_inlets(cl);
+ int i_doc = (int)arg;
const char *doc = NULL;
if(i_doc >= n_class_ins)
@@ -1316,14 +1316,14 @@
sprintf(dst, "%s", doc);
else
{
- int inlet = arg + 1;
+ int inlet = (int)(arg + 1);
sprintf(dst, "%d%s inlet", inlet, get_numbering_suffix(inlet));
}
}
else if(msg == ASSIST_OUTLET)
{
int n_class_outs = ftmext_class_get_outlets(cl);
- int i_doc = arg;
+ int i_doc = (int)arg;
const char *doc = NULL;
if(i_doc >= n_class_outs)
@@ -1336,7 +1336,7 @@
sprintf(dst, "%s", doc);
else
{
- int outlet = arg + 1;
+ int outlet = (int)(arg + 1);
sprintf(dst, "%d%s outlet", outlet, get_numbering_suffix(outlet));
}
}
@@ -1409,7 +1409,7 @@
{
fts_symbol_t sym = fts_get_symbol(at + i);
char *str = fts_symbol_name(sym);
- int len = strlen(str);
+ int len = (int)strlen(str);
char *buf = alloca(len + 1);
strcpy(buf, str);
@@ -1424,7 +1424,7 @@
aa[i] = at[i];
}
- ftmext_loader_set_scope_data(loader, ac, aa); /* associate absargs to current loader scope */
+ ftmext_loader_set_scope_data(loader, (int)ac, aa); /* associate absargs to current loader scope */
}
else if(selector == maxext_sym_restore_aa)
{
Modified: trunk/ftm/ftmlib/max5/maxpat.c
===================================================================
--- trunk/ftm/ftmlib/max5/maxpat.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/max5/maxpat.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -479,7 +479,7 @@
// patcher in a box
if (object_classname(box) == gensym("bpatcher"))
{
- int embedded = object_attr_getlong((t_object *)box, gensym("embed"));
+ int embedded = (int)object_attr_getlong((t_object *)box, gensym("embed"));
if(embedded != 0)
return 0; /* embedded bpatcher */
Modified: trunk/ftm/ftmlib/midievent.c
===================================================================
--- trunk/ftm/ftmlib/midievent.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/midievent.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -47,20 +47,20 @@
fts_set_symbol(&k, name);
fts_hashtable_get(&midi_type_hash, &k, &a);
- return fts_get_int(&a);
+ return (int)fts_get_int(&a);
}
enum midi_type
fts_midi_get_type(const fts_atom_t *at)
{
if(fts_is_int(at))
- return fts_get_int(at);
+ return (int)fts_get_int(at);
else if(fts_is_symbol(at))
{
fts_atom_t a;
if(fts_hashtable_get(&midi_type_hash, at, &a))
- return fts_get_int(&a);
+ return (int)fts_get_int(&a);
}
return midi_type_any;
@@ -265,13 +265,13 @@
default:
case 3:
if(fts_is_number(at + 3))
- fts_midievent_channel_message_set_channel(this, fts_get_number_int(at + 3));
+ fts_midievent_channel_message_set_channel(this, (int)fts_get_number_int(at + 3));
case 2:
if(fts_is_number(at + 2))
- fts_midievent_channel_message_set_second(this, fts_get_number_int(at + 2));
+ fts_midievent_channel_message_set_second(this, (int)fts_get_number_int(at + 2));
case 1:
if(fts_is_number(at + 1))
- fts_midievent_channel_message_set_first(this, fts_get_number_int(at + 1));
+ fts_midievent_channel_message_set_first(this, (int)fts_get_number_int(at + 1));
case 0:
break;
}
@@ -286,10 +286,10 @@
default:
case 2:
if(fts_is_number(at + 2))
- fts_midievent_channel_message_set_channel(this, fts_get_number_int(at + 2));
+ fts_midievent_channel_message_set_channel(this, (int)fts_get_number_int(at + 2));
case 1:
if(fts_is_number(at + 1))
- fts_midievent_channel_message_set_first(this, fts_get_number_int(at + 1));
+ fts_midievent_channel_message_set_first(this, (int)fts_get_number_int(at + 1));
case 0:
break;
}
@@ -305,19 +305,19 @@
default:
case 5:
if(fts_is_number(at + 5))
- fts_midievent_time_code_set_frame(this, fts_get_number_int(at + 5));
+ fts_midievent_time_code_set_frame(this, (int)fts_get_number_int(at + 5));
case 4:
if(fts_is_number(at + 4))
- fts_midievent_time_code_set_second(this, fts_get_number_int(at + 4));
+ fts_midievent_time_code_set_second(this, (int)fts_get_number_int(at + 4));
case 3:
if(fts_is_number(at + 3))
- fts_midievent_time_code_set_minute(this, fts_get_number_int(at + 3));
+ fts_midievent_time_code_set_minute(this, (int)fts_get_number_int(at + 3));
case 2:
if(fts_is_number(at + 2))
- fts_midievent_time_code_set_hour(this, fts_get_number_int(at + 2));
+ fts_midievent_time_code_set_hour(this, (int)fts_get_number_int(at + 2));
case 1:
if(fts_is_number(at + 1))
- fts_midievent_time_code_set_type(this, fts_get_number_int(at + 1));
+ fts_midievent_time_code_set_type(this, (int)fts_get_number_int(at + 1));
case 0:
break;
}
@@ -330,7 +330,7 @@
case 2:
fts_midievent_song_position_pointer_set_second(this, fts_get_number_int(at + 2));
case 1:
- fts_midievent_song_position_pointer_set_first(this, fts_get_number_int(at + 1));
+ fts_midievent_song_position_pointer_set_first(this, (int)fts_get_number_int(at + 1));
case 0:
break;
}
@@ -338,12 +338,12 @@
case midi_song_select:
if(fts_is_number(at + 1))
- fts_midievent_song_select_set(this, fts_get_number_int(at + 1));
+ fts_midievent_song_select_set(this, (int)fts_get_number_int(at + 1));
break;
case midi_real_time:
if(fts_is_number(at + 1))
- fts_midievent_real_time_set(this, fts_get_number_int(at + 1));
+ fts_midievent_real_time_set(this, (int)fts_get_number_int(at + 1));
break;
}
}
@@ -432,7 +432,7 @@
if(fts_midievent_is_channel_message(this))
{
- int byte = fts_get_number_int(at);
+ int byte = (int)fts_get_number_int(at);
if(byte < 0)
fts_midievent_channel_message_set_first(this, 0);
@@ -442,7 +442,7 @@
fts_midievent_channel_message_set_first(this, byte);
}
else if(fts_midievent_is_song_position_pointer(this)){
- int byte = fts_get_number_int(at);
+ int byte = (int)fts_get_number_int(at);
if(byte < 0)
fts_midievent_song_position_pointer_set_first(this, 0);
@@ -452,7 +452,7 @@
fts_midievent_song_position_pointer_set_first(this, byte);
}
else if(fts_midievent_is_song_select(this)){
- int byte = fts_get_number_int(at);
+ int byte = (int)fts_get_number_int(at);
if(byte < 0)
fts_midievent_song_select_set(this, 0);
@@ -489,7 +489,7 @@
if(fts_midievent_is_channel_message(this) && fts_midievent_channel_message_has_second_byte(this))
{
- int byte = fts_get_number_int(at);
+ int byte = (int)fts_get_number_int(at);
if(byte < 0)
fts_midievent_channel_message_set_second(this, 0);
@@ -500,7 +500,7 @@
}
else if(fts_midievent_is_song_position_pointer(this))
{
- int byte = fts_get_number_int(at);
+ int byte = (int)fts_get_number_int(at);
if(byte < 0)
fts_midievent_song_position_pointer_set_second(this, 0);
@@ -534,7 +534,7 @@
if(fts_midievent_is_channel_message(this))
{
- int channel = fts_get_number_int(at);
+ int channel = (int)fts_get_number_int(at);
if(channel < 1)
fts_midievent_channel_message_set_second(this, 0);
Modified: trunk/ftm/ftmlib/midifile.c
===================================================================
--- trunk/ftm/ftmlib/midifile.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/midifile.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -839,7 +839,7 @@
/* rememeber position to rewrite size later */
writeblock(midifile);
- midifile->bytes = ftell(midifile->file);
+ midifile->bytes = (int)ftell(midifile->file);
/* write the track chunk header */
write32bit(midifile, trkhdr);
Modified: trunk/ftm/ftmlib/predefsymbols.h
===================================================================
--- trunk/ftm/ftmlib/predefsymbols.h 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/predefsymbols.h 2017-01-04 14:15:16 UTC (rev 3704)
@@ -144,7 +144,7 @@
PREDEF_SYMBOL( fts_s_quote, "'")
PREDEF_SYMBOL( fts_s_dollar, "$")
PREDEF_SYMBOL( fts_s_sect, "\xA4")
-PREDEF_SYMBOL( fts_s_euro, "\xA4")
+PREDEF_SYMBOL( fts_s_euro, "\xDB")
PREDEF_SYMBOL( fts_s_at, "@")
PREDEF_SYMBOL( fts_s_semi, ";")
PREDEF_SYMBOL( fts_s_arrow_left, "<--")
Modified: trunk/ftm/ftmlib/random.c
===================================================================
--- trunk/ftm/ftmlib/random.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/random.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -65,8 +65,8 @@
{
unsigned int hi;
- hi = RA * (long)((unsigned int)seed >> 16);
- seed = RA * (long)(seed & 0xFFFF);
+ hi = (unsigned int) (RA * (long)((unsigned int)seed >> 16));
+ seed = (unsigned int) (RA * (long)(seed & 0xFFFF));
seed += (hi & 0x7FFF) << 16;
@@ -138,8 +138,8 @@
{
unsigned int hi;
- hi = RA * (long)((unsigned int)seed >> 16);
- seed = RA * (long)(seed & 0xFFFF);
+ hi = (unsigned int) (RA * (long)((unsigned int)seed >> 16));
+ seed = (unsigned int) (RA * (long)(seed & 0xFFFF));
seed += (hi & 0x7FFF) << 16;
@@ -169,6 +169,6 @@
gettimeofday(&tv, NULL);
seed = tv.tv_usec;
#else
- seed = time( NULL);
+ seed = (unsigned int)time( NULL);
#endif
}
Modified: trunk/ftm/ftmlib/seqsdif.c
===================================================================
--- trunk/ftm/ftmlib/seqsdif.c 2017-01-03 16:49:32 UTC (rev 3703)
+++ trunk/ftm/ftmlib/seqsdif.c 2017-01-04 14:15:16 UTC (rev 3704)
@@ -627,7 +627,7 @@
/* write frame header */
SdifFSetCurrFrameHeader(base->file, fsig,
- SdifSizeOfFrameHeader() + SdifSizeOfMatrix(eFloat4, m, n),
+ (SdifUInt4) (SdifSizeOfFrameHeader() + SdifSizeOfMatrix(eFloat4, m, n)),
1, frm->streamid, event_get_time(ev) / 1000.0);
SdifFWriteFrameHeader(base->file);
@@ -664,7 +664,7 @@
/* write frame header */
SdifFSetCurrFrameHeader(base->file, fsig,
- SdifSizeOfFrameHeader() + SdifSizeOfMatrix(eFloat4, size, 1),
+ (SdifUInt4) (SdifSizeOfFrameHeader() + SdifSizeOfMatrix(eFloat4, size, 1)),
1, frm->streamid, event_get_time(ev) / 1000.0);
SdifFWriteFrameHeader(base->file);
@@ -713,8 +713,7 @@
float val = fts_get_number_float(event_get_value(ev));
/* write frame header */
- SdifFSetCurrFrameHeader(base->file, fsig,
- SdifSizeOfFrameHeader() + SdifSizeOfMatrix(eFloat4, 1, 1),
+ SdifFSetCurrFrameHeader(base->file, fsig, (SdifUInt4) (SdifSizeOfFrameHeader() + SdifSizeOfMatrix(eFloat4, 1, 1)),
1, frm->streamid, event_get_time(ev) / 1000.0);
SdifFWriteFrameHeader(base->file);
@@ -807,7 +806,7 @@
/* write frame header */
SdifFSetCurrFrameHeader(base->file, framesig,
- SdifSizeOfFrameHeader() + framesize,
+ (SdifUInt4)(SdifSizeOfFrameHeader() + framesize),
nummatrix, framespec->streamid,
event_get_time(ev) / 1000.0);
SdifFWriteFrameHeader(base->file);
@@ -852,9 +851,9 @@
# define num_mid 3
# define num_sco 7
- int headsize = SdifSizeOfFrameHeader()
+ int headsize = (int) (SdifSizeOfFrameHeader()
+ SdifSizeOfMatrix(eFloat4, 1, num_mid)
- + SdifSizeOfMatrix(eFloat4, 1, num_sco);
+ + SdifSizeOfMatrix(eFloat4, 1, num_sco));
while (ev)
{
@@ -917,7 +916,7 @@
double time = event_get_time(ev);
int numbeg = 0;
int numend = 0;
- int headsize = SdifSizeOfFrameHeader();
+ int headsize = (int)SdifSizeOfFrameHeader();
int nummatrix = 0;
fts_atom_t a;
event_t *endev;
@@ -967,7 +966,7 @@
{
/* end marker, build matrix and remove ugly event */
event_t *next = event_get_next(ev);
- end[numend++] = event_get_int(ev);
+ end[numend++] = (int)event_get_int(ev);
sequence_remove_event(events, ev); /* clears and releases ev */
ev = next;
}
@@ -1028,14 +1027,14 @@
fts_object_t *marker = fts_get_object(event_get_value(ev));
fts_symbol_t label = fts_s_empty_string;
char *str = NULL;
- int headsize = SdifSizeOfFrameHeader();
+ int headsize = (int)SdifSizeOfFrameHeader();
propobj_get_property_symbol((propobj_t *)marker, fts_s_label, &label);
if (label != fts_s_empty_string)
{
str = fts_symbol_name(label);
- headsize += SdifSizeOfMatrix(eChar, 1, strlen(str));
+ headsize += SdifSizeOfMatrix(eChar, 1, (SdifUInt4)strlen(str));
}
/* write frame heade...
[truncated message content] |
1 message has been excluded from this view by a project administrator.
