diff options
Diffstat (limited to 'berkeleydb/makefile.mk')
-rw-r--r-- | berkeleydb/makefile.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 5c8f5905248e..fd9f4d7f1b64 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -129,7 +129,7 @@ OUT2INC= \ CONFIGURE_DIR=out #relative to CONFIGURE_DIR # TODO needs clean up -CPPFLAGS+=-nostdinc -D_MT +CFLAGS+=-nostdinc -D_MT db_CC=$(CC) db_CXX=$(CXX) .IF "$(MINGW_SHARED_GCCLIB)"=="YES" @@ -140,10 +140,7 @@ db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin .IF "$(USE_MINGW)"=="cygwin" db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api .ENDIF -db_LDFLAGS+=-L$(COMPATH)/lib -.IF "$(MINGW_CLIB_DIR)"!="" -db_LDFLAGS+=-L$(MINGW_CLIB_DIR) -.ENDIF +db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LIBS=-lmingwthrd .IF "$(MINGW_SHARED_GXXLIB)"=="YES" db_LIBS+=-lstdc++_s @@ -153,8 +150,7 @@ db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) db_LIBXSO_LIBS+=-lgcc_s .ENDIF CONFIGURE_ACTION=..$/dist$/configure -#CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)" -CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) $(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" +CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) |