diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-05-24 18:31:07 -0700 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-05-24 18:31:07 -0700 |
| commit | 3622e91a1d50508cf527b40bde1ee5e3b3742d31 (patch) | |
| tree | 70cdc8bd0b4a5777aec42f6b1c30f6a9acca3b78 | |
| parent | df4d257ad292a5d43706078c54bc11c20c733371 (diff) | |
Enabling libucl depending on the environment.
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.mingw32 | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -23,6 +23,10 @@ ifeq ($(MACHINE),x86_64) ifeq ($(DISTRIB),Debian) #LDFLAGS_READLINE=/usr/lib32/libreadline.a /usr/lib32/libncurses.a endif +ifeq ($(DISTRIB),Debian) +HAVES = -DHAVE_UCL +LDFLAGS = -lucl +else endif SHARED_FLAGS=-shared SHARED_EXT=so @@ -47,7 +51,7 @@ INCLUDES = \ -I /usr/include/oracle/11.1.0.1/client/ \ -I ../PSX-Bundle/includes -HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H +HAVES += -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H LIBS += -lz -ldl -lpthread diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 9071aa5..7777bf2 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -21,12 +21,12 @@ INCLUDES = \ -I../pthreads-w32-2-8-0-release/ \ -I../gnuwin32/include -HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H +HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H -DHAVE_UCL CPPFLAGS += $(INCLUDES) -g -fexceptions -DLUATASK_OMIT_COMMAND -DSTDC_HEADERS -DLIBICONV_PLUG -DREADLINE_STATIC -fexceptions -DWORDS_LITTLEENDIAN -march=i686 $(HAVES) -DUSE_MPQLIB LDFLAGS += -L../gnuwin32/lib -g -fexceptions -Wl,--enable-auto-image-base -Wl,--export-dynamic --export-all-symbols -Wl,--enable-auto-import -fexceptions \ - ../libreadline-static.a -lz.dll -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a --enable-stdcall-fixup + ../libreadline-static.a -lz.dll -lucl.dll -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a --enable-stdcall-fixup vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex |