diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-19 11:36:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-19 11:36:21 (GMT) |
| commit | 91258f5572940a5aafee471b91d0ca866d37ee64 (patch) | |
| tree | 6f5f8cc6e61a9235ed0710a6077a2f552cbe6ffc /win/makefile.vc | |
| parent | ddd29dbbd30d295df6a6f87ded3fd8b618d957e2 (diff) | |
| download | tcl-91258f5572940a5aafee471b91d0ca866d37ee64.zip tcl-91258f5572940a5aafee471b91d0ca866d37ee64.tar.gz tcl-91258f5572940a5aafee471b91d0ca866d37ee64.tar.bz2 | |
Don't build the Tcl library in Unicode mode any more. Just tclAppInit.c (and cat32 on Windows)
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 8f74e79..fa4cd2b 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -547,7 +547,8 @@ clean-pkgs: )
$(CAT32): $(WIN_DIR)\cat.c
- $(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?
+ $(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE \
+ -DUNICODE -D_UNICODE -Fo$(TMP_DIR)\ $?
$(CONEXECMD) -stack:16384 $(TMP_DIR)\cat.obj
$(_VC_MANIFEST_EMBED_EXE)
@@ -646,7 +647,6 @@ CORE_MACHINE = $(MACHINE) CORE_DEBUG = $(DEBUG)
CORE_TCL_THREADS = $(TCL_THREADS)
CORE_USE_THREAD_ALLOC = $(USE_THREAD_ALLOC)
-CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)
<<
#---------------------------------------------------------------------
@@ -733,7 +733,7 @@ gendate: #---------------------------------------------------------------------
$(TMP_DIR)\testMain.obj: $(WIN_DIR)\tclAppInit.c
- $(cc32) $(appcflags) -DTCL_TEST \
+ $(cc32) $(appcflags) -DTCL_TEST -DUNICODE -D_UNICODE \
-DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-Fo$@ $?
@@ -768,7 +768,7 @@ $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c -Fo$@ $?
$(TMP_DIR)\tclAppInit.obj: $(WIN_DIR)\tclAppInit.c
- $(cc32) $(appcflags) \
+ $(cc32) $(appcflags) -DUNICODE -D_UNICODE \
-DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-Fo$@ $?
@@ -776,19 +776,11 @@ $(TMP_DIR)\tclAppInit.obj: $(WIN_DIR)\tclAppInit.c ### *ALL* extensions need to built with -DTCL_THREADS=1
$(TMP_DIR)\tclWinReg.obj: $(WIN_DIR)\tclWinReg.c
-!if $(STATIC_BUILD)
- $(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
-!else
$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
-!endif
$(TMP_DIR)\tclWinDde.obj: $(WIN_DIR)\tclWinDde.c
-!if $(STATIC_BUILD)
- $(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
-!else
$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
-!endif
### The following objects are part of the stub library and should not
|