dusk/godot_boids
dusk/godot_boids
1
0
Fork 0
Code Issues Pull Requests Actions Releases 1 Activity

fix: remove conflict

Browse Source
This commit is contained in:
dusk 2024-09-22 02:56:10 +03:00
parent 92dd18cd56
commit 5474c073f5
Signed by: dusk
SSH Key Fingerprint: SHA256:Abmvag+juovVufZTxyWY8KcVgrznxvBjQpJesv071Aw
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/boids/boids.gdextension
View File

@ -4,16 +4,10 @@ compatibility_minimum = 4.3
reloadable = true reloadable = true
[libraries] [libraries]
<<<<<<< HEAD
linux.debug.x86_64 = "res://rust/target/debug/libboids.so"
windows.debug.x86_64 = "res://rust/target/debug/boids.dll"
linux.release.x86_64 = "res://addons/boids/lib/libboids.x86.so"
=======
linux.debug.x86_64 = "res://addons/boids/lib/boids.x86.so" linux.debug.x86_64 = "res://addons/boids/lib/boids.x86.so"
windows.debug.x86_64 = "res://addons/boids/lib/boids.x86.dll" windows.debug.x86_64 = "res://addons/boids/lib/boids.x86.dll"
web.debug.wasm32 = "res://addons/boids/lib/boids.wasm" web.debug.wasm32 = "res://addons/boids/lib/boids.wasm"
linux.release.x86_64 = "res://addons/boids/lib/boids.x86.so" linux.release.x86_64 = "res://addons/boids/lib/boids.x86.so"
>>>>>>> ca5733d (fix: rebuild libraries, fix paths again)
windows.release.x86_64 = "res://addons/boids/lib/boids.x86.dll" windows.release.x86_64 = "res://addons/boids/lib/boids.x86.dll"
macos.release = "res://addons/boids/lib/libboids.x86.dylib" macos.release = "res://addons/boids/lib/libboids.x86.dylib"
macos.release.arm64 = "res://addons/boids/lib/libboids.arm64.dylib" macos.release.arm64 = "res://addons/boids/lib/libboids.arm64.dylib"