Tk-Components

Check-in [000cda35a5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:more updates for windows
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 000cda35a5579592128a6bd55a9c04483eccf497
User & Date: kevin 2015-09-12 22:18:04
Context
2015-09-13
12:08
Fix Windows naming conflicts check-in: 697de03bc7 user: kevin tags: trunk
2015-09-12
22:18
more updates for windows check-in: 000cda35a5 user: kevin tags: trunk
22:11
More update for Windows check-in: 056c1e8a73 user: kevin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to customfont/configure.

5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
#
# Windows creates a few extra files that need to be cleaned up.
# You can add more files to clean if your extension creates any extra
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------
if test "${TEA_PLATFORM}" = "windows" ; then

    ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test -z "$CXX"; then







|







5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
#
# Windows creates a few extra files that need to be cleaned up.
# You can add more files to clean if your extension creates any extra
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------
if test "${TEA_WINDOWINGSYSTEM}" = "win32" ; then

    ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test -z "$CXX"; then

Changes to customfont/configure.in.

81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
#
# Windows creates a few extra files that need to be cleaned up.
# You can add more files to clean if your extension creates any extra
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------
if test "${TEA_PLATFORM}" = "windows" ; then

    AC_PROG_CXX
    CC=$CXX
    TEA_ADD_CFLAGS([-DUNICODE -D_UNICODE])
    TEA_ADD_SOURCES([win/customfont_win.c])
    TEA_ADD_LIBS([gdiplus.lib gdi32.lib])
    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])

    ## Check if the compiler accepts -static-libstdc++ (i.e. mingw)...
    AC_CACHE_CHECK([if the compiler understands -static-libstdc++],
        tcl_cv_cc_staticlib, [
        hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -static-libstdc++"
        AC_TRY_COMPILE(,, tcl_cv_cc_staticlib=yes, tcl_cv_cc_staticlib=no)
        CFLAGS=$hold_cflags])

      AC_DEFINE(BUILD_customfont, 1, [Build windows export dll])

    CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"
    #TEA_ADD_SOURCES([win/winFile.c])
    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
else
    CLEANFILES="pkgIndex.tcl"
    #TEA_ADD_SOURCES([unix/unixFile.c])







|















|







81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
#
# Windows creates a few extra files that need to be cleaned up.
# You can add more files to clean if your extension creates any extra
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------
if test "${TEA_WINDOWINGSYSTEM}" = "win32" ; then  

    AC_PROG_CXX
    CC=$CXX
    TEA_ADD_CFLAGS([-DUNICODE -D_UNICODE])
    TEA_ADD_SOURCES([win/customfont_win.c])
    TEA_ADD_LIBS([gdiplus.lib gdi32.lib])
    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])

    ## Check if the compiler accepts -static-libstdc++ (i.e. mingw)...
    AC_CACHE_CHECK([if the compiler understands -static-libstdc++],
        tcl_cv_cc_staticlib, [
        hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -static-libstdc++"
        AC_TRY_COMPILE(,, tcl_cv_cc_staticlib=yes, tcl_cv_cc_staticlib=no)
        CFLAGS=$hold_cflags])

     AC_DEFINE(BUILD_customfont, 1, [Build windows export dll])

    CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"
    #TEA_ADD_SOURCES([win/winFile.c])
    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
else
    CLEANFILES="pkgIndex.tcl"
    #TEA_ADD_SOURCES([unix/unixFile.c])