[Python-checkins] r43188 - external/tix-8.4.0/win/makefile.vc

[martin.v.loewis]

Author: martin.v.loewis
Date: Tue Mar 21 14:18:51 2006
New Revision: 43188

Modified:
   external/tix-8.4.0/win/makefile.vc
Log:
Fix bugs in the build process: use rd/md for directories,
do link with the CRT, install tix84.dll into the bin directory.

Modified: external/tix-8.4.0/win/makefile.vc
==============================================================================
--- external/tix-8.4.0/win/makefile.vc	(original)
+++ external/tix-8.4.0/win/makefile.vc	Tue Mar 21 14:18:51 2006
@@ -117,8 +117,8 @@
 link32 		= "$(TOOLS32)\bin\link.exe"
 include32 	= -I"$(TOOLS32)\include"
 
-RMDIR		= $(TCL_DIR)\win\rmd.bat
-MKDIR		= $(TCL_DIR)\win\mkd.bat
+RMDIR		= rd
+MKDIR		= md
 RM		= del
 
 #
@@ -132,17 +132,16 @@
 !ENDIF
 
 # declarations common to all linker options
-lcommon 	= /NODEFAULTLIB /RELEASE /NOLOGO
+lcommon 	= /RELEASE /NOLOGO
 
 # declarations for use on Intel i386, i486, and Pentium systems
 !IF "$(MACHINE)" == "IX86"
-DLLENTRY 	= @12
 lflags	 	= $(lcommon) /MACHINE:$(MACHINE)
 !ELSE
 lflags	 	= $(lcommon) /MACHINE:$(MACHINE)
 !ENDIF
 
-dlllflags 	= $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
+dlllflags 	= $(lflags) -dll
 
 baselibs   	= kernel32.lib $(optlibs) advapi32.lib user32.lib
 winlibs    	= $(baselibs) gdi32.lib comdlg32.lib
@@ -416,11 +415,12 @@
 
 LIB_INSTALL_DIR		= $(INSTALL_DIR)\lib\tix$(DOTVERSION)
 INCLUDE_INSTALL_DIR	= $(INSTALL_DIR)\include
+BIN_INSTALL_DIR         = $(INSTALL_DIR)\bin
 
 install: all
 	-@$(MKDIR) "$(LIB_INSTALL_DIR)"
 	@echo installing $(TIX_DLL)
-	@copy "$(TIX_DLL)" "$(LIB_INSTALL_DIR)"
+	@copy "$(TIX_DLL)" "$(BIN_INSTALL_DIR)"
 	@echo installing $(TIX_LIB)
 	@copy "$(TIX_LIB)" "$(LIB_INSTALL_DIR)"
 	@echo installing library files