Skip to content

Commit 9e9c05b

Browse files
ikws4BeanCheeseBurrito
authored andcommitted
fix: revert library-type
1 parent e6727d0 commit 9e9c05b

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

src/Flecs.NET.Native/Flecs.NET.Native.csproj

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,102 +58,86 @@
5858
<When Condition="$(RuntimeIdentifier) == 'win-x64'">
5959
<PropertyGroup>
6060
<ZigIdentifier>x86_64-windows-gnu</ZigIdentifier>
61-
<ZigLibraryType>Shared</ZigLibraryType>
6261
</PropertyGroup>
6362
</When>
6463
<When Condition="$(RuntimeIdentifier) == 'win-x86'">
6564
<PropertyGroup>
6665
<ZigIdentifier>x86-windows-gnu</ZigIdentifier>
67-
<ZigLibraryType>Shared</ZigLibraryType>
6866
</PropertyGroup>
6967
</When>
7068
<When Condition="$(RuntimeIdentifier) == 'win-arm'">
7169
<PropertyGroup>
7270
<ZigIdentifier>arm-windows-gnu</ZigIdentifier>
73-
<ZigLibraryType>Shared</ZigLibraryType>
7471
</PropertyGroup>
7572
</When>
7673
<When Condition="$(RuntimeIdentifier) == 'win-arm64'">
7774
<PropertyGroup>
7875
<ZigIdentifier>aarch64-windows-gnu</ZigIdentifier>
79-
<ZigLibraryType>Shared</ZigLibraryType>
8076
</PropertyGroup>
8177
</When>
8278
<When Condition="$(RuntimeIdentifier) == 'linux-x64'">
8379
<PropertyGroup>
8480
<ZigIdentifier>x86_64-linux-gnu</ZigIdentifier>
85-
<ZigLibraryType>Shared</ZigLibraryType>
8681
</PropertyGroup>
8782
</When>
8883
<When Condition="$(RuntimeIdentifier) == 'linux-x86'">
8984
<PropertyGroup>
9085
<ZigIdentifier>x86-linux-gnu</ZigIdentifier>
91-
<ZigLibraryType>Shared</ZigLibraryType>
9286
</PropertyGroup>
9387
</When>
9488
<When Condition="$(RuntimeIdentifier) == 'linux-arm'">
9589
<PropertyGroup>
9690
<ZigIdentifier>arm-linux-gnueabihf</ZigIdentifier>
97-
<ZigLibraryType>Shared</ZigLibraryType>
9891
</PropertyGroup>
9992
</When>
10093
<When Condition="$(RuntimeIdentifier) == 'linux-arm64'">
10194
<PropertyGroup>
10295
<ZigIdentifier>aarch64-linux-gnu</ZigIdentifier>
103-
<ZigLibraryType>Shared</ZigLibraryType>
10496
</PropertyGroup>
10597
</When>
10698
<When Condition="$(RuntimeIdentifier) == 'osx-x64'">
10799
<PropertyGroup>
108100
<ZigIdentifier>x86_64-macos</ZigIdentifier>
109-
<ZigLibraryType>Shared</ZigLibraryType>
110101
</PropertyGroup>
111102
</When>
112103
<When Condition="$(RuntimeIdentifier) == 'osx-arm64'">
113104
<PropertyGroup>
114105
<ZigIdentifier>aarch64-macos</ZigIdentifier>
115-
<ZigLibraryType>Shared</ZigLibraryType>
116106
</PropertyGroup>
117107
</When>
118108
<When Condition="$(RuntimeIdentifier) == 'iossimulator-x64'">
119109
<PropertyGroup>
120110
<ZigIdentifier>x86_64-ios-simulator</ZigIdentifier>
121-
<ZigLibraryType>Shared</ZigLibraryType>
122111
<ZigArgs>--sysroot $(IOS_SIMULATOR_SDK)</ZigArgs>
123112
</PropertyGroup>
124113
</When>
125114
<When Condition="$(RuntimeIdentifier) == 'iossimulator-arm64'">
126115
<PropertyGroup>
127116
<ZigIdentifier>aarch64-ios-simulator</ZigIdentifier>
128-
<ZigLibraryType>Shared</ZigLibraryType>
129117
<ZigArgs>--sysroot $(IOS_SIMULATOR_SDK)</ZigArgs>
130118
</PropertyGroup>
131119
</When>
132120
<When Condition="$(RuntimeIdentifier) == 'ios-arm64'">
133121
<PropertyGroup>
134122
<ZigIdentifier>aarch64-ios</ZigIdentifier>
135-
<ZigLibraryType>Shared</ZigLibraryType>
136123
<ZigArgs>--sysroot $(IOS_SDK)</ZigArgs>
137124
</PropertyGroup>
138125
</When>
139126
<When Condition="$(RuntimeIdentifier) == 'browser-wasm'">
140127
<PropertyGroup>
141128
<ZigIdentifier>wasm32-emscripten</ZigIdentifier>
142-
<ZigLibraryType>Static</ZigLibraryType>
143129
<ZigArgs>--sysroot "$(EMSDK)/upstream/emscripten"</ZigArgs>
144130
</PropertyGroup>
145131
</When>
146132
<When Condition="$(RuntimeIdentifier) == 'android-arm64'">
147133
<PropertyGroup>
148134
<ZigIdentifier>aarch64-linux-android</ZigIdentifier>
149-
<ZigLibraryType>Shared</ZigLibraryType>
150135
<ZigArgs>--sysroot $(ANDROID_NDK_HOME)</ZigArgs>
151136
</PropertyGroup>
152137
</When>
153138
<When Condition="$(RuntimeIdentifier) == 'android-x64'">
154139
<PropertyGroup>
155140
<ZigIdentifier>x86_64-linux-android</ZigIdentifier>
156-
<ZigLibraryType>Shared</ZigLibraryType>
157141
<ZigArgs>--sysroot $(ANDROID_NDK_HOME)</ZigArgs>
158142
</PropertyGroup>
159143
</When>
@@ -185,6 +169,7 @@
185169
<Message Importance="High" Text="Build Target: $(RuntimeIdentifier) $(Configuration)"/>
186170
<Message Importance="High" Text="Build Zig Target: $(ZigIdentifier) $(ZigConfiguration)"/>
187171
<Message Importance="High" Text="Build Zig Args: $(ZigArgs)"/>
188-
<Exec Command="$(BuildCommand) -Dlibrary-type=$(ZigLibraryType)"/>
172+
<Exec Command="$(BuildCommand) -Dlibrary-type=Shared" Condition="'$(RuntimeIdentifier)' != 'browser-wasm'"/>
173+
<Exec Command="$(BuildCommand) -Dlibrary-type=Static"/>
189174
</Target>
190175
</Project>

0 commit comments

Comments
 (0)