summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstanton <stanton>1998-04-29 17:10:32 (GMT)
committerstanton <stanton>1998-04-29 17:10:32 (GMT)
commitfcbdafcc79f77bf9d1dd024cd13860ff1493f0ca (patch)
treedfb83af2164d6806b0a8504402d71ccccac839ab
parent2557e212d61dbfbf850ba77d225db9aefb718c95 (diff)
downloadtcl-fcbdafcc79f77bf9d1dd024cd13860ff1493f0ca.zip
tcl-fcbdafcc79f77bf9d1dd024cd13860ff1493f0ca.tar.gz
tcl-fcbdafcc79f77bf9d1dd024cd13860ff1493f0ca.tar.bz2
*** empty log message ***
-rw-r--r--win/makefile.vc7
-rw-r--r--win/tclWinInt.h3
2 files changed, 6 insertions, 4 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 12eda6f..6b2c93d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -34,7 +34,8 @@
ROOT = ..
TMPDIR = .
-TOOLS32 = c:\msdev
+TOOLS32 = c:\progra~1\devstudio\vc
+TOOLS32_rc = c:\progra~1\devstudio\sharedide
TOOLS16 = c:\msvc
# Set this to the appropriate value of /MACHINE: for your platform
@@ -141,7 +142,7 @@ TCLOBJS = \
cc32 = $(TOOLS32)\bin\cl.exe
link32 = $(TOOLS32)\bin\link.exe
-rc32 = $(TOOLS32)\bin\rc.exe
+rc32 = $(TOOLS32_rc)\bin\rc.exe
include32 = -I$(TOOLS32)\include
cc16 = $(TOOLS16)\bin\cl.exe
@@ -177,7 +178,7 @@ lcommon = /NODEFAULTLIB /RELEASE /NOLOGO
# declarations for use on Intel i386, i486, and Pentium systems
!IF "$(MACHINE)" == "IX86"
DLLENTRY = @12
-lflags = $(lcommon) -align:0x1000 /MACHINE:$(MACHINE)
+lflags = $(lcommon) /MACHINE:$(MACHINE)
!ELSE
lflags = $(lcommon) /MACHINE:$(MACHINE)
!ENDIF
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 04e84d6..a9d7a60 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -30,9 +30,10 @@
#define VER_PLATFORM_WIN32_WINDOWS 1
#endif
+EXTERN int TclWinGetPlatformId(void);
+EXTERN void TclWinInit(HINSTANCE hInst);
EXTERN int TclWinSynchSpawn(void *args, int type, void **trans,
Tcl_Pid *pidPtr);
-EXTERN int TclWinGetPlatformId(void);
#endif /* _TCLWININT */