updates
This commit is contained in:
@@ -14,7 +14,7 @@ depdir = "./dependencies/linux64" #local pre-compiled dependency libraries and t
|
|||||||
installdir = "../../linux64" #directory to install to when finished
|
installdir = "../../linux64" #directory to install to when finished
|
||||||
builddir = "./build_linux64"
|
builddir = "./build_linux64"
|
||||||
|
|
||||||
doinstall = False #copies the build_output to the install dir when finished
|
doinstall = True #copies the build_output to the install dir when finished
|
||||||
cc = "g++" #compiler
|
cc = "g++" #compiler
|
||||||
cflags = "-fPIC"
|
cflags = "-fPIC"
|
||||||
libraries = "-l{}".format(libname)
|
libraries = "-l{}".format(libname)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ depdir = "./dependencies/linux64" #local pre-compiled dependency libraries and t
|
|||||||
installdir = "../../linux64" #directory to install to when finished
|
installdir = "../../linux64" #directory to install to when finished
|
||||||
builddir = "./build_linux64"
|
builddir = "./build_linux64"
|
||||||
|
|
||||||
doinstall = False #copies the build_output to the install dir when finished
|
doinstall = True #copies the build_output to the install dir when finished
|
||||||
cc = "g++" #compiler
|
cc = "g++" #compiler
|
||||||
cflags = "-fPIC"
|
cflags = "-fPIC"
|
||||||
libraries = "-l{}".format(libname)
|
libraries = "-l{}".format(libname)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ depdir = "./dependencies/winx64" #local pre-compiled dependency libraries and th
|
|||||||
installdir = "../../winx64" #directory to install to when finished
|
installdir = "../../winx64" #directory to install to when finished
|
||||||
builddir = "./build_mingw64"
|
builddir = "./build_mingw64"
|
||||||
|
|
||||||
doinstall = False #copies the build_output to the install dir when finished
|
doinstall = True #copies the build_output to the install dir when finished
|
||||||
cc = "x86_64-w64-mingw32-g++" #compiler
|
cc = "x86_64-w64-mingw32-g++" #compiler
|
||||||
cflags = "-fPIC -O3"
|
cflags = "-fPIC -O3"
|
||||||
libraries = "-l{}".format(libname)
|
libraries = "-l{}".format(libname)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ depdir = "./dependencies/winx64" #local pre-compiled dependency libraries and th
|
|||||||
installdir = "../../winx64" #directory to install to when finished
|
installdir = "../../winx64" #directory to install to when finished
|
||||||
builddir = "./build_mingw64"
|
builddir = "./build_mingw64"
|
||||||
|
|
||||||
doinstall = False #copies the build_output to the install dir when finished
|
doinstall = True #copies the build_output to the install dir when finished
|
||||||
cc = "x86_64-w64-mingw32-g++" #compiler
|
cc = "x86_64-w64-mingw32-g++" #compiler
|
||||||
cflags = "-fPIC -O3"
|
cflags = "-fPIC -O3"
|
||||||
libraries = "-l{}".format(libname)
|
libraries = "-l{}".format(libname)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ depdir = "./dependencies/winx64" #local pre-compiled dependency libraries and th
|
|||||||
installdir = "../../winx64" #directory to install to when finished
|
installdir = "../../winx64" #directory to install to when finished
|
||||||
builddir = "./build_msvc64"
|
builddir = "./build_msvc64"
|
||||||
|
|
||||||
doinstall = False #copies the build_output to the install dir when finished
|
doinstall = True #copies the build_output to the install dir when finished
|
||||||
cc = "cl" #compiler
|
cc = "cl" #compiler
|
||||||
cflags = "/O2"
|
cflags = "/O2"
|
||||||
libraries = "lib{}.lib".format(libname)
|
libraries = "lib{}.lib".format(libname)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ depdir = "./dependencies/winx64" #local pre-compiled dependency libraries and th
|
|||||||
installdir = "../../winx64" #directory to install to when finished
|
installdir = "../../winx64" #directory to install to when finished
|
||||||
builddir = "./build_msvc64"
|
builddir = "./build_msvc64"
|
||||||
|
|
||||||
doinstall = False #copies the build_output to the install dir when finished
|
doinstall = True #copies the build_output to the install dir when finished
|
||||||
cc = "cl" #compiler
|
cc = "cl" #compiler
|
||||||
cflags = "/O2"
|
cflags = "/O2"
|
||||||
libraries = "lib{}.lib".format(libname)
|
libraries = "lib{}.lib".format(libname)
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+27
-27
@@ -1,28 +1,28 @@
|
|||||||
|
|
||||||
use <threads1.scad>
|
use <threads1.scad>
|
||||||
|
|
||||||
|
|
||||||
module acmehexbolt_0p375(L)
|
module acmehexbolt_0p375(L)
|
||||||
{
|
{
|
||||||
|
|
||||||
Lh = 0.25;
|
Lh = 0.25;
|
||||||
Dh = 0.75;
|
Dh = 0.75;
|
||||||
Dth = 0.375;
|
Dth = 0.375;
|
||||||
Lth = L-Lh-0.125;
|
Lth = L-Lh-0.125;
|
||||||
|
|
||||||
union()
|
union()
|
||||||
{
|
{
|
||||||
translate([0,0,0])
|
translate([0,0,0])
|
||||||
{
|
{
|
||||||
cylinder(d=Dh,h=Lh,$fn=6);
|
cylinder(d=Dh,h=Lh,$fn=6);
|
||||||
}
|
}
|
||||||
translate([0,0,Lh-0.125])
|
translate([0,0,Lh-0.125])
|
||||||
{
|
{
|
||||||
thread_10tpi(Dth,Lth);
|
thread_10tpi(Dth,Lth);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
acmehexbolt_0p375(4);
|
acmehexbolt_0p375(4);
|
||||||
@@ -141,6 +141,7 @@ namespace ams
|
|||||||
if(newcstring==NULL)
|
if(newcstring==NULL)
|
||||||
{
|
{
|
||||||
ret = amsstring_failure;
|
ret = amsstring_failure;
|
||||||
|
printf("debug: amsstring::resize() - failed to allocate.\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,7 +152,7 @@ namespace ams
|
|||||||
newcstring[I] = cstring[I];
|
newcstring[I] = cstring[I];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(I=length;I<_newlen+1;I++)
|
for(I=length;I<(_newlen+1);I++)
|
||||||
{
|
{
|
||||||
newcstring[I] = (ams_chartype) '\0';
|
newcstring[I] = (ams_chartype) '\0';
|
||||||
}
|
}
|
||||||
@@ -242,6 +243,9 @@ namespace ams
|
|||||||
|
|
||||||
if(this!=&other)
|
if(this!=&other)
|
||||||
{
|
{
|
||||||
|
if(this->cstring!=NULL) {delete[] this->cstring; this->cstring=NULL;}
|
||||||
|
this->length = 0;
|
||||||
|
|
||||||
this->length = other.length;
|
this->length = other.length;
|
||||||
this->blank = other.blank;
|
this->blank = other.blank;
|
||||||
this->cstring = other.cstring;
|
this->cstring = other.cstring;
|
||||||
|
|||||||
@@ -122,11 +122,24 @@ int amssprintf_s(char *s, int n, const char *format, ...)
|
|||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
|
if(s==NULL) {ret = -1; return ret;}
|
||||||
|
if(format==NULL)
|
||||||
|
{
|
||||||
|
ret = -2;
|
||||||
|
if(s!=NULL && n>0)
|
||||||
|
{
|
||||||
|
s[0] = '\0';
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
va_start(args, format);
|
va_start(args, format);
|
||||||
//exampleV(b, args);
|
//exampleV(b, args);
|
||||||
//va_arg(val,datatype)
|
//va_arg(val,datatype)
|
||||||
if(s!=NULL)
|
// if(s!=NULL)
|
||||||
{
|
// {
|
||||||
#if defined(LINUX) || defined(linux) || defined(__linux__) || defined(__GNUC__)
|
#if defined(LINUX) || defined(linux) || defined(__linux__) || defined(__GNUC__)
|
||||||
//use snprintf
|
//use snprintf
|
||||||
ret = (int)vsnprintf(s,n,format,args);
|
ret = (int)vsnprintf(s,n,format,args);
|
||||||
@@ -138,7 +151,7 @@ int amssprintf_s(char *s, int n, const char *format, ...)
|
|||||||
#else
|
#else
|
||||||
#pragma message("amssprintf_s: Unsupported architecture - neither linux nor mingw64 nor msvc")
|
#pragma message("amssprintf_s: Unsupported architecture - neither linux nor mingw64 nor msvc")
|
||||||
#endif
|
#endif
|
||||||
}
|
//}
|
||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
return ret;
|
return ret;
|
||||||
@@ -151,6 +164,9 @@ double amsstrtonum(const char *str)
|
|||||||
{
|
{
|
||||||
int q;
|
int q;
|
||||||
double ret = std::numeric_limits<double>::quiet_NaN();
|
double ret = std::numeric_limits<double>::quiet_NaN();
|
||||||
|
|
||||||
|
if(str==NULL) return ret;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//sscanf(s.cstring,"%lf",&ret);
|
//sscanf(s.cstring,"%lf",&ret);
|
||||||
|
|||||||
Reference in New Issue
Block a user