From c827cb6dfc1ee7acaf82f369ae2c3be0900f6e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 19 Feb 2010 12:37:51 +0100 Subject: [PATCH] Reduce chaos in precompiled SHM libs --- {shmserver => precompiled/linux}/df-hacked | 3 +-- precompiled/{ => linux}/libdfconnect.so | Bin precompiled/{ => windows}/SDL.dll | Bin shmserver/dfconnect.so | Bin 12100 -> 0 bytes 4 files changed, 1 insertion(+), 2 deletions(-) rename {shmserver => precompiled/linux}/df-hacked (89%) rename precompiled/{ => linux}/libdfconnect.so (100%) rename precompiled/{ => windows}/SDL.dll (100%) delete mode 100755 shmserver/dfconnect.so diff --git a/shmserver/df-hacked b/precompiled/linux/df-hacked similarity index 89% rename from shmserver/df-hacked rename to precompiled/linux/df-hacked index bf56b33e2..f9c3a3351 100755 --- a/shmserver/df-hacked +++ b/precompiled/linux/df-hacked @@ -9,6 +9,5 @@ if [ $? -eq 0 ]; then mv libs/libSDL* unused_libs/ fi export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./libs" # Update library search path. -export LD_PRELOAD="./libs/dfconnect.so" # Hack DF! +export LD_PRELOAD="./libs/libdfconnect.so" # Hack DF! ./dwarfort.exe $* # Go, go, go! :) - diff --git a/precompiled/libdfconnect.so b/precompiled/linux/libdfconnect.so similarity index 100% rename from precompiled/libdfconnect.so rename to precompiled/linux/libdfconnect.so diff --git a/precompiled/SDL.dll b/precompiled/windows/SDL.dll similarity index 100% rename from precompiled/SDL.dll rename to precompiled/windows/SDL.dll diff --git a/shmserver/dfconnect.so b/shmserver/dfconnect.so deleted file mode 100755 index ee1579718e289fc9840a34cebd427f5df61230f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12100 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