Fri Aug 29 10:50:46 2008 Google Inc. <opensource@google.com>

	* cmockery: version 0.11
	* Made it possible to specify executable, library and object output
	  directories.

git-svn-id: http://cmockery.googlecode.com/svn/trunk@10 40f4469a-5155-0410-be90-2de3f0bae501

diff --git a/windows/makefile b/windows/makefile
index 8cb7bb2b1be9a8b8bec7bafe86435a5e04835076..e7a2482e420c2354036eaa998aa8b2da3f1485d3 100644 (file)
--- a/windows/makefile
+++ b/windows/makefile
@@ -35,6 +35,15 @@ LIBRARY_DIR=.
 OBJECT_DIR=.
 !ENDIF # OBJECT_DIR
 
 OBJECT_DIR=.
 !ENDIF # OBJECT_DIR
 

+# Tools
+!IFNDEF LIBTOOL
+LIBTOOL=lib.exe
+!ENDIF # LIBTOOL
+
+!IFNDEF LINK
+LINK=link.exe
+!ENDIF # LINK
+

 # Source directories.
 LIBRARY_SOURCE_DIRECTORY=..\src
 EXAMPLE_SOURCE_DIRECTORY=..\src\example
 # Source directories.
 LIBRARY_SOURCE_DIRECTORY=..\src
 EXAMPLE_SOURCE_DIRECTORY=..\src\example


@@ -48,12 +57,10 @@ CC_COMMAND_UNIT_TEST=$(CC_COMMAND) /DUNIT_TESTING=1
 LIBLINKFLAGS=/NOLOGO /MACHINE:x86 /SUBSYSTEM:console
 
 # Library archiver flags and command.
 LIBLINKFLAGS=/NOLOGO /MACHINE:x86 /SUBSYSTEM:console
 
 # Library archiver flags and command.

-LIBRARY_ARCHIVER=lib.exe

 LIBFLAGS=$(LIBLINKFLAGS)
 LIBFLAGS=$(LIBLINKFLAGS)

-LIB_COMMAND=$(LIBRARY_ARCHIVER) $(LIBFLAGS) $(**) /OUT:$(@)
+LIB_COMMAND=$(LIBTOOL) $(LIBFLAGS) $(**) /OUT:$(@)

 
 # Linker flags and command. 
 
 # Linker flags and command. 

-LINK=link.exe

 LFLAGS=$(LIBLINKFLAGS) libcmt.lib kernel32.lib /NODEFAULTLIB:libc.lib
 LINK_COMMAND=$(LINK) $(LFLAGS) $(**) /OUT:$(@)
 
 LFLAGS=$(LIBLINKFLAGS) libcmt.lib kernel32.lib /NODEFAULTLIB:libc.lib
 LINK_COMMAND=$(LINK) $(LFLAGS) $(**) /OUT:$(@)