aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorCalvin Rose <calsrose@gmail.com>2023-09-23 08:50:44 -0700
committerCalvin Rose <calsrose@gmail.com>2023-09-23 08:53:37 -0700
commit2f4a6214a27d0eac040b9f6e23c4086e1588950a (patch)
treed7fdf493dc11ec58c5f867b2d5116273642ec08b /tools
parentAdd optional buffer-size to file/open. (diff)
Make meson build work on windows.
By default, use more traditional linking pattern with meson. The janet.exe will now link to janet-x.x.dll on windows (and similar for linux/posix) when built with meson. This is slightly less efficient and means that janet.exe built this way is no longer standalone (you would need to move the dll along with the exe), but plays better with most build systems.
Diffstat (limited to 'tools')
-rw-r--r--tools/msi/janet.wxs6
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/msi/janet.wxs b/tools/msi/janet.wxs
index 9cddd5a4..9ea2038d 100644
--- a/tools/msi/janet.wxs
+++ b/tools/msi/janet.wxs
@@ -132,12 +132,6 @@
<Component Directory="CDir">
<File Source="dist\libjanet.lib"/>
</Component>
- <Component Directory="CDir">
- <File Source="dist\dlljanet.dll"/>
- </Component>
- <Component Directory="CDir">
- <File Source="dist\dlljanet.lib"/>
- </Component>
<Component Id="LibraryComponent" Directory="LibraryDir" Guid="3860e981-5f94-4002-b5d5-2d9ec0d2792d" KeyPath="yes">
<RemoveFolder Id="RemoveLibraryDir" On="uninstall" />