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/04/09 19:03:41 UTC
svn commit: r763735 -
/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
Author: mturk
Date: Thu Apr 9 17:03:41 2009
New Revision: 763735
URL: http://svn.apache.org/viewvc?rev=763735&view=rev
Log:
Use rc rule instead direct target command
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=763735&r1=763734&r2=763735&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Thu Apr 9 17:03:41 2009
@@ -62,6 +62,7 @@
$(SRCDIR)/shared/error.$(OBJ)
WINDOWS_OBJS= \
+ $(SRCDIR)/os/win32/main.res \
$(SRCDIR)/os/win32/main.$(OBJ) \
$(SRCDIR)/os/win32/os.$(OBJ) \
$(SRCDIR)/os/win32/syslog.$(OBJ)
@@ -74,9 +75,11 @@
.cpp.$(OBJ):
$(CXX) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(BLDDIR)\$(LIBNAME)-src $<
+.rc.res:
+ $(RC) /l 0x409 /d "NDEBUG" /i "$(SRCDIR)\include" /fo $@ $<
+
$(SHAREDLIB): $(COMMON_OBJS) $(@platform@_OBJS)
- $(RC) /l 0x409 /d "NDEBUG" /i "$(SRCDIR)\include" /fo $(BLDDIR)\$(LIBNAME).res $(SRCDIR)/os/win32/main.rc
- $(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS $(COMMON_OBJS) $(WINDOWS_OBJS) $(BLDDIR)\$(LIBNAME).res /pdb:$(BLDDIR)\$(LIBNAME).pdb /out:$(BLDDIR)\$@
+ $(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS $(COMMON_OBJS) $(WINDOWS_OBJS) /pdb:$(BLDDIR)\$(LIBNAME).pdb /out:$(BLDDIR)\$@
IF EXIST $(BLDDIR)\$(SHAREDLIB).manifest \
mt -nologo -manifest $(BLDDIR)\$(SHAREDLIB).manifest -outputresource:$(BLDDIR)\$(SHAREDLIB);2
@copy /Y $(BLDDIR)\$(SHAREDLIB) $(BLDDIR)\$(SONAME)