-
-
Notifications
You must be signed in to change notification settings - Fork 483
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bump janet version to 1.29.1 #2244
Conversation
that android build failure looks like a docker pull timeout I havent been able to parse out why the windows XP builds is actually failing |
Not sure how to parse things either, but isn't the Android one something about running out of space? For Windows XP, I noticed this. I think that might be referring to this part of Janet's source. |
for the android docker thing, ya I just missread 😞.. though to me running out of space is an odd error in a CI/CD pipeline. This SO discussion seems possibly related.. though I dont really like any of the solutions 😅 |
actually this blog suggests profileapi.h is not present in windows XP wp.xin.at/archives/5484 wp.xin.at/archives/5484 |
It's strange because I found this in Janet's sources #if !defined(JANET_REDUCED_OS) || !defined(JANET_SINGLE_THREADED)
#include <time.h>
#define JANET_GETTIME
#endif and we have defined |
Puzzling. I compared some of the output from
to
The compiler versions seem different. Don't know if they are, and even if so, perhaps it makes no difference? |
As @AlecTroemel mentioned the problem is with |
I looked into things a bit more. Using info from here and here, I set things up to replicate the build process locally for the Note that I changed:
to:
in the hopes that the output might be less confusing (seems to have helped) [1]. I had some success in replicating the issue mentioned above about After the build stopped, I took a look at A subsequent execution of So about this comment:
May be it is defined because a different IIUC, the build process for janet has more than one stage. A bootstrap janet binary is produced initially which is used subsequently to build "the real bits". Perhaps the I think the GitHub CI workflow build output is of a Below is a section of what seemed like relevant output. C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Microsoft\VC\v150\Platforms\Win32\PlatformToolsets\v141_xp\Toolset.targets(39,5): warning MSB8051: Support for targeting Windows XP is deprecated and will not be present in future releases of Visual Studio. Please see https://go.microsoft.com/fwlink/?linkid=2023588 for more information. [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] Generating C:/Users/user/Desktop/TIC-80.alect/vendor/janet/build/c/janet.c abstract.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' array.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' asm.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' buffer.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' bytecode.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' capi.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' cfuns.c compile.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' corelib.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' debug.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' emit.c ev.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' ffi.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' fiber.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' gc.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' inttypes.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' io.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' marsh.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' math.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' net.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' src\core\net.c(679): warning C4090: 'function': different 'const' qualifiers [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] src\core\net.c(687): warning C4090: 'function': different 'const' qualifiers [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] os.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' parse.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' peg.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' pp.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' regalloc.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' run.c specials.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' state.c string.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' strtod.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' struct.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' symcache.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' table.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' tuple.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' util.c c:\program files (x86)\microsoft sdks\windows\v7.1a\include\sal_supp.h(57): warning C4005: '__useHeader': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2866): note: see previous definition of '__useHeader' c:\program files (x86)\microsoft sdks\windows\v7.1a\include\specstrings_supp.h(77): warning C4005: '__on_failure': macro redefinition [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.16.27023\include\sal.h(2876): note: see previous definition of '__on_failure' src\core\util.c(878): fatal error C1083: Cannot open include file: 'profileapi.h': No such file or directory [C:\Users\user\Desktop\TIC-80.alect\build\janet.vcxproj] [1] I also changed the cmake generator info, using |
It's not pretty, but making the following changes and creating 1 file seems to work here. First, a diff: diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72e00446..caf1ef92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -476,6 +476,8 @@ message("BUILD_WITH_JANET: ${BUILD_WITH_JANET}")
if(BUILD_WITH_JANET)
+ add_library(janet ${THIRDPARTY_DIR}/janet/build/c/janet.c)
+
if(MINGW)
find_program(GIT git)
get_filename_component(GIT_DIR ${GIT} DIRECTORY)
@@ -491,6 +493,12 @@ if(BUILD_WITH_JANET)
WORKING_DIRECTORY ${THIRDPARTY_DIR}/janet/
)
elseif(WIN32)
+ add_custom_command(TARGET janet
+ PRE_BUILD
+ COMMAND ./copy_janetconf_h.bat
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/build/janet
+ )
+
add_custom_command(
OUTPUT ${THIRDPARTY_DIR}/janet/build/c/janet.c
COMMAND ./build_win.bat
@@ -504,7 +512,6 @@ if(BUILD_WITH_JANET)
)
endif()
- add_library(janet ${THIRDPARTY_DIR}/janet/build/c/janet.c)
target_include_directories(janet PUBLIC ${THIRDPARTY_DIR}/janet/src/include)
target_include_directories(janet PUBLIC ${CMAKE_SOURCE_DIR}/build/janet/)
endif() Also, create
The basic idea is to copy I tried a variety of ways to accomplish this but my cmake fu is virtually nonexistent and this seemed to work (^^; |
so, I update Janet module separately here cd05d0a |
@nesbox and @AlecTroemel thanks for your efforts! |
closes #2241