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 Side-by-Side Diffs Ignore Whitespace Patch

Changes to customfont/configure.

  5115   5115   #
  5116   5116   # Windows creates a few extra files that need to be cleaned up.
  5117   5117   # You can add more files to clean if your extension creates any extra
  5118   5118   # files.
  5119   5119   #
  5120   5120   # TEA_ADD_* any platform specific compiler/build info here.
  5121   5121   #--------------------------------------------------------------------
  5122         -if test "${TEA_PLATFORM}" = "windows" ; then
         5122  +if test "${TEA_WINDOWINGSYSTEM}" = "win32" ; then
  5123   5123   
  5124   5124       ac_ext=cpp
  5125   5125   ac_cpp='$CXXCPP $CPPFLAGS'
  5126   5126   ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  5127   5127   ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  5128   5128   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  5129   5129   if test -z "$CXX"; then

Changes to customfont/configure.in.

    81     81   #
    82     82   # Windows creates a few extra files that need to be cleaned up.
    83     83   # You can add more files to clean if your extension creates any extra
    84     84   # files.
    85     85   #
    86     86   # TEA_ADD_* any platform specific compiler/build info here.
    87     87   #--------------------------------------------------------------------
    88         -if test "${TEA_PLATFORM}" = "windows" ; then
           88  +if test "${TEA_WINDOWINGSYSTEM}" = "win32" ; then  
    89     89   
    90     90       AC_PROG_CXX
    91     91       CC=$CXX
    92     92       TEA_ADD_CFLAGS([-DUNICODE -D_UNICODE])
    93     93       TEA_ADD_SOURCES([win/customfont_win.c])
    94     94       TEA_ADD_LIBS([gdiplus.lib gdi32.lib])
    95     95       #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
................................................................................
    97     97       ## Check if the compiler accepts -static-libstdc++ (i.e. mingw)...
    98     98       AC_CACHE_CHECK([if the compiler understands -static-libstdc++],
    99     99           tcl_cv_cc_staticlib, [
   100    100           hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -static-libstdc++"
   101    101           AC_TRY_COMPILE(,, tcl_cv_cc_staticlib=yes, tcl_cv_cc_staticlib=no)
   102    102           CFLAGS=$hold_cflags])
   103    103   
   104         -      AC_DEFINE(BUILD_customfont, 1, [Build windows export dll])
          104  +     AC_DEFINE(BUILD_customfont, 1, [Build windows export dll])
   105    105   
   106    106       CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"
   107    107       #TEA_ADD_SOURCES([win/winFile.c])
   108    108       #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
   109    109   else
   110    110       CLEANFILES="pkgIndex.tcl"
   111    111       #TEA_ADD_SOURCES([unix/unixFile.c])