diff --git a/build/make.linux64.lib.py b/build/make.linux64.lib.py index 1f915db..0dd96ab 100644 --- a/build/make.linux64.lib.py +++ b/build/make.linux64.lib.py @@ -14,7 +14,7 @@ depdir = "./dependencies/linux64" #local pre-compiled dependency libraries and t installdir = "../../linux64" #directory to install to when finished 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 cflags = "-O3 -fPIC" libraries = "-l{}".format(libname) @@ -48,10 +48,11 @@ objlist = flist(kwargs['objstore'],exts='.o',recurse=True) ar_list(objlist,'{}/lib{}.a'.format(builddir,libname)) if(doinstall): - #Copy a binary to the common bin folder - #Push any libraries to the common lib folder - shutil.copy('{}/lib/lib{}.a'.format(builddir,libname),commondir) + shutil.copy( + '{}/lib{}.a'.format(builddir,libname), + "{}/lib".format(installdir) + ) #Copy include files to the common include folder - copytree('./include/',commondir+'/include/',dirs_exist_ok=True) + copytree('./include/',installdir+'/include/',dirs_exist_ok=True) diff --git a/build/make.mingw64.lib.py b/build/make.mingw64.lib.py index e482f5b..f386449 100644 --- a/build/make.mingw64.lib.py +++ b/build/make.mingw64.lib.py @@ -14,9 +14,9 @@ depdir = "./dependencies/winx64" #local pre-compiled dependency libraries and th installdir = "../../winx64" #directory to install to when finished 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 -cflags = "-fPIC -O3" +cflags = "-fPIC -O3 -std=c++17" libraries = "-l{}".format(libname) libdirs = "-L{} -L{}/lib -L{}/lib".format(builddir,commondir,depdir) linkerflags = "-static -static-libgcc -Wl,-rpath=." @@ -49,10 +49,11 @@ objlist = flist(kwargs['objstore'],exts='.o',recurse=True) ar_list(objlist,'{}/lib{}.a'.format(builddir,libname)) if(doinstall): - #Copy a binary to the common bin folder - #Push any libraries to the common lib folder - shutil.copy('{}/lib/lib{}.a'.format(builddir,libname),commondir) + shutil.copy( + '{}/lib{}.a'.format(builddir,libname), + "{}/lib".format(installdir) + ) #Copy include files to the common include folder - copytree('./include/',commondir+'/include/',dirs_exist_ok=True) + copytree('./include/',installdir+'/include/',dirs_exist_ok=True) diff --git a/build/make.mingw64.test.py b/build/make.mingw64.test.py index 5c26f03..bcdd319 100644 --- a/build/make.mingw64.test.py +++ b/build/make.mingw64.test.py @@ -8,7 +8,7 @@ from shutil import copytree from amsbuildlib4 import * libname = "amsmathutil25.mingw64" #static library name to generate -binname = "tests" #create this executable when compiling main.c or main.cpp +binname = "tests.exe" #create this executable when compiling main.c or main.cpp commondir = "../../winx64" #common directory to pul libraries and includes from depdir = "./dependencies/winx64" #local pre-compiled dependency libraries and their includes installdir = "../../winx64" #directory to install to when finished @@ -16,7 +16,7 @@ builddir = "./build_mingw64" doinstall = False #copies the build_output to the install dir when finished cc = "x86_64-w64-mingw32-g++" #compiler -cflags = "-fPIC -O3" +cflags = "-fPIC -O3 -std=c++17" libraries = "-l{}".format(libname) libdirs = "-L{} -L{}/lib -L{}/lib".format(builddir,commondir,depdir) linkerflags = "-static -static-libgcc -Wl,-rpath=." diff --git a/build/make.msvc64.lib.py b/build/make.msvc64.lib.py index 77c21fb..dc43467 100644 --- a/build/make.msvc64.lib.py +++ b/build/make.msvc64.lib.py @@ -51,10 +51,11 @@ objlist = flist(kwargs['objstore'],exts='.obj',recurse=True) msvc_lib_list(objlist,'{}/lib{}.lib'.format(builddir,libname)) if(doinstall): - #Copy a binary to the common bin folder - #Push any libraries to the common lib folder - shutil.copy('{}/lib/lib{}.lib'.format(builddir,libname),commondir) + shutil.copy( + '{}/lib{}.lib'.format(builddir,libname), + "{}/lib".format(installdir) + ) #Copy include files to the common include folder - copytree('./include/',commondir+'/include/',dirs_exist_ok=True) + copytree('./include/',installdir+'/include/',dirs_exist_ok=True) diff --git a/build_linux64/libamsmathutil25.linux64.a b/build_linux64/libamsmathutil25.linux64.a index ddeb585..abc5ab4 100644 Binary files a/build_linux64/libamsmathutil25.linux64.a and b/build_linux64/libamsmathutil25.linux64.a differ diff --git a/build_linux64/objstore/amscpptemplate25a_src2.o b/build_linux64/objstore/amscpptemplate25a_src2.o index 03a41ce..96254c6 100644 Binary files a/build_linux64/objstore/amscpptemplate25a_src2.o and b/build_linux64/objstore/amscpptemplate25a_src2.o differ diff --git a/build_linux64/objstore/amscpptemplate25a_template.o b/build_linux64/objstore/amscpptemplate25a_template.o index 1fc5d71..06d6ac8 100644 Binary files a/build_linux64/objstore/amscpptemplate25a_template.o and b/build_linux64/objstore/amscpptemplate25a_template.o differ diff --git a/build_linux64/objstore/amsmathtuil25_test1.o b/build_linux64/objstore/amsmathtuil25_test1.o index fff9d60..1b3dc46 100644 Binary files a/build_linux64/objstore/amsmathtuil25_test1.o and b/build_linux64/objstore/amsmathtuil25_test1.o differ diff --git a/build_linux64/objstore/amsmathutiil25_random.o b/build_linux64/objstore/amsmathutiil25_random.o index ddb5f35..3a4887f 100644 Binary files a/build_linux64/objstore/amsmathutiil25_random.o and b/build_linux64/objstore/amsmathutiil25_random.o differ diff --git a/build_linux64/objstore/amsmathutil25_amsarray.o b/build_linux64/objstore/amsmathutil25_amsarray.o index 3d4d64a..511af14 100644 Binary files a/build_linux64/objstore/amsmathutil25_amsarray.o and b/build_linux64/objstore/amsmathutil25_amsarray.o differ diff --git a/build_linux64/objstore/amsmathutil25_amsarray_sort.o b/build_linux64/objstore/amsmathutil25_amsarray_sort.o index 69c66ef..f1167cf 100644 Binary files a/build_linux64/objstore/amsmathutil25_amsarray_sort.o and b/build_linux64/objstore/amsmathutil25_amsarray_sort.o differ diff --git a/build_linux64/objstore/amsmathutil25_mathfns1.o b/build_linux64/objstore/amsmathutil25_mathfns1.o index 7def272..0e62279 100644 Binary files a/build_linux64/objstore/amsmathutil25_mathfns1.o and b/build_linux64/objstore/amsmathutil25_mathfns1.o differ diff --git a/build_linux64/objstore/amsmathutil25_utils1.o b/build_linux64/objstore/amsmathutil25_utils1.o index 9232ac3..3f6b99e 100644 Binary files a/build_linux64/objstore/amsmathutil25_utils1.o and b/build_linux64/objstore/amsmathutil25_utils1.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec2.o b/build_linux64/objstore/amsmathutil25_vec2.o index 93f1c86..f6a6e54 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec2.o and b/build_linux64/objstore/amsmathutil25_vec2.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec2f.o b/build_linux64/objstore/amsmathutil25_vec2f.o index 57543d2..43b9398 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec2f.o and b/build_linux64/objstore/amsmathutil25_vec2f.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec3.o b/build_linux64/objstore/amsmathutil25_vec3.o index 6cbc0a1..903d5f2 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec3.o and b/build_linux64/objstore/amsmathutil25_vec3.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec3f.o b/build_linux64/objstore/amsmathutil25_vec3f.o index 3ca6459..6ae367b 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec3f.o and b/build_linux64/objstore/amsmathutil25_vec3f.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec4.o b/build_linux64/objstore/amsmathutil25_vec4.o index 65910fc..191a211 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec4.o and b/build_linux64/objstore/amsmathutil25_vec4.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec4f.o b/build_linux64/objstore/amsmathutil25_vec4f.o index 6eb0c53..dc12f7c 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec4f.o and b/build_linux64/objstore/amsmathutil25_vec4f.o differ diff --git a/build_linux64/objstore/amsmathutil2t_complex128.o b/build_linux64/objstore/amsmathutil2t_complex128.o index be57f9f..fdae151 100644 Binary files a/build_linux64/objstore/amsmathutil2t_complex128.o and b/build_linux64/objstore/amsmathutil2t_complex128.o differ diff --git a/build_linux64/objstore/amsmathutil2t_complex64.o b/build_linux64/objstore/amsmathutil2t_complex64.o index e2bbf48..866300f 100644 Binary files a/build_linux64/objstore/amsmathutil2t_complex64.o and b/build_linux64/objstore/amsmathutil2t_complex64.o differ diff --git a/build_linux64/tests b/build_linux64/tests index 5db147b..489b03b 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/build_mingw64/libamsmathutil25.mingw64.a b/build_mingw64/libamsmathutil25.mingw64.a new file mode 100644 index 0000000..555acd2 Binary files /dev/null and b/build_mingw64/libamsmathutil25.mingw64.a differ diff --git a/build_mingw64/objstore/amscpptemplate25a_src2.o b/build_mingw64/objstore/amscpptemplate25a_src2.o new file mode 100644 index 0000000..6150531 Binary files /dev/null and b/build_mingw64/objstore/amscpptemplate25a_src2.o differ diff --git a/build_mingw64/objstore/amscpptemplate25a_template.o b/build_mingw64/objstore/amscpptemplate25a_template.o new file mode 100644 index 0000000..4fc396d Binary files /dev/null and b/build_mingw64/objstore/amscpptemplate25a_template.o differ diff --git a/build_mingw64/objstore/amsmathtuil25_test1.o b/build_mingw64/objstore/amsmathtuil25_test1.o new file mode 100644 index 0000000..7f47e54 Binary files /dev/null and b/build_mingw64/objstore/amsmathtuil25_test1.o differ diff --git a/build_mingw64/objstore/amsmathutiil25_random.o b/build_mingw64/objstore/amsmathutiil25_random.o new file mode 100644 index 0000000..4af5c95 Binary files /dev/null and b/build_mingw64/objstore/amsmathutiil25_random.o differ diff --git a/build_mingw64/objstore/amsmathutil25_amsarray.o b/build_mingw64/objstore/amsmathutil25_amsarray.o new file mode 100644 index 0000000..8263dd9 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_amsarray.o differ diff --git a/build_mingw64/objstore/amsmathutil25_amsarray_sort.o b/build_mingw64/objstore/amsmathutil25_amsarray_sort.o new file mode 100644 index 0000000..e394ceb Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_amsarray_sort.o differ diff --git a/build_mingw64/objstore/amsmathutil25_mathfns1.o b/build_mingw64/objstore/amsmathutil25_mathfns1.o new file mode 100644 index 0000000..27dc603 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_mathfns1.o differ diff --git a/build_mingw64/objstore/amsmathutil25_utils1.o b/build_mingw64/objstore/amsmathutil25_utils1.o new file mode 100644 index 0000000..cbf7a14 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_utils1.o differ diff --git a/build_mingw64/objstore/amsmathutil25_vec2.o b/build_mingw64/objstore/amsmathutil25_vec2.o new file mode 100644 index 0000000..c707303 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_vec2.o differ diff --git a/build_mingw64/objstore/amsmathutil25_vec2f.o b/build_mingw64/objstore/amsmathutil25_vec2f.o new file mode 100644 index 0000000..18bcfce Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_vec2f.o differ diff --git a/build_mingw64/objstore/amsmathutil25_vec3.o b/build_mingw64/objstore/amsmathutil25_vec3.o new file mode 100644 index 0000000..10391b7 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_vec3.o differ diff --git a/build_mingw64/objstore/amsmathutil25_vec3f.o b/build_mingw64/objstore/amsmathutil25_vec3f.o new file mode 100644 index 0000000..e268348 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_vec3f.o differ diff --git a/build_mingw64/objstore/amsmathutil25_vec4.o b/build_mingw64/objstore/amsmathutil25_vec4.o new file mode 100644 index 0000000..dad355c Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_vec4.o differ diff --git a/build_mingw64/objstore/amsmathutil25_vec4f.o b/build_mingw64/objstore/amsmathutil25_vec4f.o new file mode 100644 index 0000000..d0959b6 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil25_vec4f.o differ diff --git a/build_mingw64/objstore/amsmathutil2t_complex128.o b/build_mingw64/objstore/amsmathutil2t_complex128.o new file mode 100644 index 0000000..4db4a6b Binary files /dev/null and b/build_mingw64/objstore/amsmathutil2t_complex128.o differ diff --git a/build_mingw64/objstore/amsmathutil2t_complex64.o b/build_mingw64/objstore/amsmathutil2t_complex64.o new file mode 100644 index 0000000..2f26e27 Binary files /dev/null and b/build_mingw64/objstore/amsmathutil2t_complex64.o differ diff --git a/build_mingw64/tests.exe b/build_mingw64/tests.exe new file mode 100644 index 0000000..1fbc977 Binary files /dev/null and b/build_mingw64/tests.exe differ diff --git a/make_mingw.py b/make_mingw.py index 7557e18..b7d5fd6 100644 --- a/make_mingw.py +++ b/make_mingw.py @@ -20,7 +20,7 @@ for o in obj_list: if(sys.platform!="win32"): os.chdir('./build_mingw64') - callproc('wine ./tests.exe') + callproc('wine tests.exe') os.chdir('..') else: os.chdir('./build_mingw64')