You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/11/12 08:21:19 UTC
svn commit: r835278 -
/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
Author: mturk
Date: Thu Nov 12 07:21:19 2009
New Revision: 835278
URL: http://svn.apache.org/viewvc?rev=835278&view=rev
Log:
Fix win makefile
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=835278&r1=835277&r2=835278&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Thu Nov 12 07:21:19 2009
@@ -242,7 +242,7 @@
{$(SRCDIR)\modules\network\ssl}.c{$(SRCDIR)\modules\network\ssl}.$(OBJ):
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(SSLNAME)-src $<
-{$(SRCDIR)\modules\sqlite}.c{$(SRCDIR)\srclib\modules}.$(OBJ):
+{$(SRCDIR)\modules\sqlite}.c{$(SRCDIR)\modules\sqlite}.$(OBJ):
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -D_HAVE_SQLITE_CONFIG_H $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
@@ -255,7 +255,7 @@
mt -nologo -manifest $@.manifest -outputresource:$@;2
$(SSLMODLIB): $(SHAREDLIB) $(OPENSSL_OBJS)
- $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="Apache Commons Runtime SSL Module" /d STR_INTNAME="$(SSLNAME)" /i "$(SRCDIR)\include" /fo $@.res $(SRCDIR)/os/win32/main.rc
+ $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime SSL Module\"" /d STR_INTNAME="\"$(SSLNAME)\"" /i "$(SRCDIR)\include" /fo $@.res $(SRCDIR)/os/win32/main.rc
$(LINK) $(SHFLAGS) /DLL /SUBSYSTEM:WINDOWS $(LDFLAGS) $(SSLFLAGS) /libpath:"." $(LIBNAME).lib /pdb:$(SSLNAME).pdb /out:$@ @<<
$(OPENSSL_OBJS) $@.res
<<
@@ -263,7 +263,7 @@
mt -nologo -manifest $@.manifest -outputresource:$@;2
$(SQLMODLIB): $(SHAREDLIB) $(SQLITE_OBJS) @sqliteobjs@
- $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="Apache Commons Runtime SQL Module" /d STR_INTNAME="$(SQLNAME)" /i "$(SRCDIR)\include" /fo $@.res $(SRCDIR)/os/win32/main.rc
+ $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime SQL Module\"" /d STR_INTNAME="\"$(SQLNAME)\"" /i "$(SRCDIR)\include" /fo $@.res $(SRCDIR)/os/win32/main.rc
$(LINK) $(SHFLAGS) /DLL /SUBSYSTEM:WINDOWS $(LDFLAGS) $(SQLFLAGS) /libpath:"." $(LIBNAME).lib /pdb:$(SQLNAME).pdb /out:$@ @<<
$(SQLITE_OBJS) @sqliteobjs@ $@.res
<<