summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-11-15 15:41:30 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-11-15 15:41:30 +0000
commit2d7084e4f07cd56021ca47dc6124ed587883acc2 (patch)
tree70c0358e5a54e5445b9174569e95b22f970453c6
parent4db90eeb9186cf601cc86baead42c9e37475e147 (diff)
downloadmana-2d7084e4f07cd56021ca47dc6124ed587883acc2.tar.gz
mana-2d7084e4f07cd56021ca47dc6124ed587883acc2.tar.bz2
mana-2d7084e4f07cd56021ca47dc6124ed587883acc2.tar.xz
mana-2d7084e4f07cd56021ca47dc6124ed587883acc2.zip
Fixed dynamic linking of libcurl
-rw-r--r--ChangeLog1
-rw-r--r--The Mana World.dev2
-rw-r--r--tmw.cbp37
3 files changed, 18 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a0718c4..9835f6a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2006-11-15 Eugenio Favalli <elvenprogrammer@gmail.com>
* The Mana World.dev, tmw.cbp: Updated project files.
+ * The Mana World.dev, tmw.cbp: Fixed dynamic linking of libcurl.
2006-11-14 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/The Mana World.dev b/The Mana World.dev
index cbe27d17..ac65f8ef 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -12,7 +12,7 @@ ResourceIncludes=
MakeIncludes=
Compiler=
CppCompiler=-DUSE_OPENGL_@@_-Wall_@@_
-Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image.dll_@@_-lSDL_mixer.dll_@@_-lSDL_net.dll_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL.dll_@@_-lxml2.dll_@@_-lopengl32_@@_-lpng12.dll_@@_-lz.dll_@@_-lphysfs_@@_-lcurl_@@_
+Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image.dll_@@_-lSDL_mixer.dll_@@_-lSDL_net.dll_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL.dll_@@_-lxml2.dll_@@_-lopengl32_@@_-lpng12.dll_@@_-lz.dll_@@_-lphysfs_@@_-lcurl.dll_@@_
IsCpp=1
Icon=
ExeOutput=
diff --git a/tmw.cbp b/tmw.cbp
index f799e387..a232788e 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -21,30 +21,25 @@
<Add option="-DUSE_OPENGL"/>
</Compiler>
<Linker>
- <Add option="-lguichan"/>
- <Add option="-lguichan_sdl"/>
- <Add option="-lguichan_opengl"/>
- <Add option="-lwsock32"/>
- <Add option="-lSDL_image.dll"/>
- <Add option="-lSDL_mixer.dll"/>
- <Add option="-lSDL_net.dll"/>
- <Add option="-lmingw32"/>
- <Add option="-lSDLmain"/>
- <Add option="-lSDL.dll"/>
- <Add option="-lxml2.dll"/>
- <Add option="-lopengl32"/>
- <Add option="-lpng12.dll"/>
- <Add option="-lz.dll"/>
- <Add option="-lphysfs"/>
- <Add option="-lcurl"/>
+ <Add library="guichan"/>
+ <Add library="guichan_sdl"/>
+ <Add library="guichan_opengl"/>
+ <Add library="wsock32"/>
+ <Add library="SDL_image"/>
+ <Add library="SDL_mixer"/>
+ <Add library="SDL_net"/>
+ <Add library="mingw32"/>
+ <Add library="SDLmain"/>
+ <Add library="SDL.dll"/>
+ <Add library="xml2.dll"/>
+ <Add library="opengl32"/>
+ <Add library="png12.dll"/>
+ <Add library="z.dll"/>
+ <Add library="physfs"/>
+ <Add library="curl.dll"/>
</Linker>
</Target>
</Build>
- <Linker>
- <Add library="mingw32"/>
- <Add library="SDLmain"/>
- <Add library="SDL"/>
- </Linker>
<Unit filename="src\action.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>