[cutter-commit 03415] SF.net SVN: cutter:[3421] cutter/trunk

[<kt...@us...>]

Revision: 3421
          http://cutter.svn.sourceforge.net/cutter/?rev=3421&view=rev
Author:   ktou
Date:     2009-11-15 14:39:42 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
* **/Makefile.win32: fix build problems.

Modified Paths:
--------------
    cutter/trunk/cppcutter/Makefile.win32
    cutter/trunk/cutter/Makefile.win32
    cutter/trunk/vcc/Makefile.build

Modified: cutter/trunk/cppcutter/Makefile.win32
===================================================================
--- cutter/trunk/cppcutter/Makefile.win32	2009-11-15 14:25:28 UTC (rev 3420)
+++ cutter/trunk/cppcutter/Makefile.win32	2009-11-15 14:39:42 UTC (rev 3421)
@@ -6,6 +6,8 @@
 !INCLUDE $(top_srcdir)/vcc/Makefile.build
 !INCLUDE $(top_srcdir)/vcc/Makefile.objects.cppcutter
 
+NODEFAULTLIB =
+
 LOCAL_CPPFLAGS =		\
 	$(CPPCUTTER_CFLAGS)
 
@@ -30,5 +32,5 @@
 	@del $(OBJS) cppcutter.dll
 
 cppcutter.dll: $(OBJS)
-	$(CC) $(CFLAGS) -LD -Fe$@ $(OBJS) $(LIBS) $(LDFLAGS) \
+	$(CC) $(CPPFLAGS) -LD -Fe$@ $(OBJS) $(LIBS) $(CPP_LDFLAGS) \
 	  /implib:cppcutter.lib

Modified: cutter/trunk/cutter/Makefile.win32
===================================================================
--- cutter/trunk/cutter/Makefile.win32	2009-11-15 14:25:28 UTC (rev 3420)
+++ cutter/trunk/cutter/Makefile.win32	2009-11-15 14:39:42 UTC (rev 3421)
@@ -29,4 +29,5 @@
 	  /implib:cutter.lib /def:$(def)
 
 cutter.exe: main.obj cutter.dll
-	$(CC) $(CFLAGS) -Fe$@ main.obj cutter.lib $(CRUNTIME)
+	$(CC) $(CFLAGS) -Fe$@ main.obj cutter.lib \
+	  /link $(NODEFAULTLIB) $(CRUNTIME)

Modified: cutter/trunk/vcc/Makefile.build
===================================================================
--- cutter/trunk/vcc/Makefile.build	2009-11-15 14:25:28 UTC (rev 3420)
+++ cutter/trunk/vcc/Makefile.build	2009-11-15 14:39:42 UTC (rev 3421)
@@ -1,8 +1,8 @@
 # -*- makefile -*-
 
-DEBUG = yes
-WDK_DIR = "C:\WinDDK\7600.16385.0"
-WDK_LIB_DIR = "$(WDK_DIR)\lib\crt\i386"
+# DEBUG = yes
+WDK_DIR = C:\WinDDK\7600.16385.0
+WDK_LIB_DIR = $(WDK_DIR)\lib\crt\i386
 
 CFLAGS =					\
 	/nologo					\
@@ -37,14 +37,26 @@
 DEFS =						\
 	-DHAVE_CONFIG_H
 
-LDFLAGS =					\
+COMMON_LDFLAGS =				\
 	/link					\
 	/machine:ix86				\
-	$(CRUNTIME)				\
 	$(LIBPATHS)				\
 	$(DEBUG_LDFLAGS)			\
 	$(LOCAL_LDFLAGS)
 
+LDFLAGS =					\
+	$(COMMON_LDFLAGS)			\
+	$(NODEFAULTLIB)				\
+	$(CRUNTIME)
+
+CPP_LDFLAGS =					\
+	$(COMMON_LDFLAGS)
+
+NODEFAULTLIB =					\
+	/nodefaultlib:libcmt			\
+	/nodefaultlib:libcmtd			\
+	/nodefaultlib:msvcrt
+
 CUTTER_CFLAGS =					\
 	$(GLIB_CFLAGS)				\
 	-I $(top_srcdir)			\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.