diff options
| author | Kostas Nakos | 2007-12-02 12:11:59 +0000 |
|---|---|---|
| committer | Kostas Nakos | 2007-12-02 12:11:59 +0000 |
| commit | 9bda6cdefcb352001d1d774d6e817bd92a3135c8 (patch) | |
| tree | c33b33804dbea61148e23b8f83af7be94fa6388e | |
| parent | 1cf6278fb1a93c22197c814981fb2a0f9e9a2d48 (diff) | |
| download | scummvm-rg350-9bda6cdefcb352001d1d774d6e817bd92a3135c8.tar.gz scummvm-rg350-9bda6cdefcb352001d1d774d6e817bd92a3135c8.tar.bz2 scummvm-rg350-9bda6cdefcb352001d1d774d6e817bd92a3135c8.zip | |
fixes for cygwin build. In particular: move the _mak_plugins environment after LDFLAGS has been defined in config.mk, to allow building in case of non-standard lib paths (thru LDFLAGS). Also, silenced a nasm warning.
svn-id: r29701
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -308,7 +308,7 @@ CheckNASM() else case $_host_os in mingw* | cygwin*) - NASMFLAGS="-f win32" + NASMFLAGS="-f win32 -w-orphan-labels" ;; darwin*) NASMFLAGS="-f macho" @@ -1220,7 +1220,7 @@ POST_OBJS_FLAGS := LIBS += -ldl ' ;; - *mingw32*) + *mingw32* | cygwin*) _def_plugin=' #define PLUGIN_PREFIX "" #define PLUGIN_SUFFIX ".dll" @@ -1231,7 +1231,7 @@ PLUGIN_PREFIX := PLUGIN_SUFFIX := .dll PLUGIN_EXTRA_DEPS = $(EXECUTABLE) CXXFLAGS += -DDYNAMIC_MODULES -PLUGIN_LDFLAGS := -shared ./libscummvm.a $(LIBS) +PLUGIN_LDFLAGS := -shared ./libscummvm.a $(LIBS) $(LDFLAGS) PRE_OBJS_FLAGS := -Wl,--whole-archive POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a ' @@ -1645,8 +1645,6 @@ BINDIR := $_bindir MANDIR := $_mandir DATADIR := $_datadir -$_mak_plugins - $_config_mk_data INCLUDES += $INCLUDES @@ -1654,6 +1652,8 @@ OBJS += $OBJS DEFINES += $DEFINES LDFLAGS += $LDFLAGS +$_mak_plugins + SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS SAVED_LDFLAGS := $SAVED_LDFLAGS SAVED_CXX := $SAVED_CXX |