Changeset 13412 in project for chicken


Ignore:
Timestamp:
02/26/09 04:04:03 (11 years ago)
Author:
elf
Message:

mingw works again. finally.
chicken-setup needs some major work to make it work correctly on windows, as
whenever it got changed recently, all the defaults and orderings are
unfriendly, to say the least, with windows. thers also some naming issues
that cause conflicts in vista.

Location:
chicken/branches/chicken-3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • chicken/branches/chicken-3/Makefile.mingw

    r13410 r13412  
    2626
    2727
    28 SRCDIR = ./
     28SRCDIR := $(subst /,\\,$(CURDIR)\\)
    2929
    3030# platform configuration
     
    8484
    8585chicken-config.h:
    86         echo "#define HAVE_DIRENT_H 1" >$@
    87         echo "#define HAVE_INTTYPES_H 1" >>$@
    88         echo "#define HAVE_LIMITS_H 1" >>$@
    89         echo "#define HAVE_LONG_LONG 1" >>$@
    90         echo "#define HAVE_MEMMOVE 1" >>$@
    91         echo "#define HAVE_MEMORY_H 1" >>$@
    92         echo "#define HAVE_STDINT_H 1" >>$@
    93         echo "#define HAVE_STDLIB_H 1" >>$@
    94         echo "#define HAVE_STRERROR 1" >>$@
    95         echo "#define HAVE_STRINGS_H 1" >>$@
    96         echo "#define HAVE_STRING_H 1" >>$@
    97         echo "#define HAVE_STRTOLL 1" >>$@
    98         echo "#define HAVE_SYS_STAT_H 1" >>$@
    99         echo "#define HAVE_SYS_TYPES_H 1" >>$@
    100         echo "#define HAVE_UNISTD_H 1" >>$@
    101         echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@
    102         echo "#define HAVE_WINDOWS_H 1" >>$@
    103         echo "#define HAVE__STRTOI64 1" >>$@
    104         echo "#define STDC_HEADERS 1" >>$@
    105         echo "#define HAVE_ALLOCA_H 1" >>$@
    106         echo "#define HAVE_DIRECT_H 1" >>$@
    107         echo "#define HAVE_ERRNO_H 1" >>$@
    108         echo "#define HAVE_GCVT 1" >>$@
    109         echo "#define HAVE_LOADLIBRARY 1" >>$@
    110         echo "#define HAVE_GETPROCADDRESS 1" >>$@
    111         echo "#define HAVE_WINSOCK2_H 1" >>$@
    112         echo "#define HAVE_WS2TCPIP_H 1" >>$@
    113         echo "#define C_STACK_GROWS_DOWNWARD 1" >>$@
     86        echo #define HAVE_DIRENT_H 1 >$@
     87        echo #define HAVE_INTTYPES_H 1 >>$@
     88        echo #define HAVE_LIMITS_H 1 >>$@
     89        echo #define HAVE_LONG_LONG 1 >>$@
     90        echo #define HAVE_MEMMOVE 1 >>$@
     91        echo #define HAVE_MEMORY_H 1 >>$@
     92        echo #define HAVE_STDINT_H 1 >>$@
     93        echo #define HAVE_STDLIB_H 1 >>$@
     94        echo #define HAVE_STRERROR 1 >>$@
     95        echo #define HAVE_STRINGS_H 1 >>$@
     96        echo #define HAVE_STRING_H 1 >>$@
     97        echo #define HAVE_STRTOLL 1 >>$@
     98        echo #define HAVE_SYS_STAT_H 1 >>$@
     99        echo #define HAVE_SYS_TYPES_H 1 >>$@
     100        echo #define HAVE_UNISTD_H 1 >>$@
     101        echo #define HAVE_UNSIGNED_LONG_LONG 1 >>$@
     102        echo #define HAVE_WINDOWS_H 1 >>$@
     103        echo #define HAVE__STRTOI64 1 >>$@
     104        echo #define STDC_HEADERS 1 >>$@
     105        echo #define HAVE_ALLOCA_H 1 >>$@
     106        echo #define HAVE_DIRECT_H 1 >>$@
     107        echo #define HAVE_ERRNO_H 1 >>$@
     108        echo #define HAVE_GCVT 1 >>$@
     109        echo #define HAVE_LOADLIBRARY 1 >>$@
     110        echo #define HAVE_GETPROCADDRESS 1 >>$@
     111        echo #define HAVE_WINSOCK2_H 1 >>$@
     112        echo #define HAVE_WS2TCPIP_H 1 >>$@
     113        echo #define C_STACK_GROWS_DOWNWARD 1 >>$@
    114114ifdef GCHOOKS
    115         echo "#define C_GC_HOOKS" >>$@
     115        echo #define C_GC_HOOKS >>$@
    116116endif
    117117ifdef SYMBOLGC
    118         echo "#define C_COLLECT_ALL_SYMBOLS" >>$@
     118        echo #define C_COLLECT_ALL_SYMBOLS >>$@
    119119endif
    120120ifdef NOAPPLYHOOK
    121         echo "#define C_NO_APPLY_HOOK" >>$@
    122 endif
    123         echo "#define C_HACKED_APPLY" >>$@
    124         #cat chicken-defaults.h >>$@
    125         echo "#define C_BUILD_TAG \"$(BUILD_TAG)\"" >>$@
    126         echo "#ifndef C_INSTALL_CC" >>$@
    127         echo "# define C_INSTALL_CC \"$(C_COMPILER)\"" >>$@
    128         echo "#endif" >>$@
    129         echo "#ifndef C_INSTALL_CXX" >>$@
    130         echo "# define C_INSTALL_CXX \"$(CXX_COMPILER)\"" >>$@
    131         echo "#endif" >>$@
    132         echo "#ifndef C_INSTALL_CFLAGS" >>$@
    133         echo "# define C_INSTALL_CFLAGS \"$(C_COMPILER_OPTIONS) $(C_COMPILER_OPTIMIZATION_OPTIONS)\"" >>$@
    134         echo "#endif" >>$@
    135         echo "#ifndef C_INSTALL_LDFLAGS" >>$@
    136         echo "# define C_INSTALL_LDFLAGS \"$(LINKER_OPTIONS) $(LINKER_OPTIMIZATION_OPTIONS)\"" >>$@
    137         echo "#endif" >>$@
    138         echo "#ifndef C_INSTALL_SHARE_HOME" >>$@
    139         echo "# define C_INSTALL_SHARE_HOME \"$(IDATADIR)\"" >>$@
    140         echo "#endif" >>$@
    141         echo "#ifndef C_INSTALL_BIN_HOME" >>$@
    142         echo "# define C_INSTALL_BIN_HOME \"$(IBINDIR)\"" >>$@
    143         echo "#endif" >>$@
    144         echo "#ifndef C_INSTALL_EGG_HOME" >>$@
    145         echo "# define C_INSTALL_EGG_HOME \"$(IEGGDIR)\"" >>$@
    146         echo "#endif" >>$@
    147         echo "#ifndef C_INSTALL_LIB_HOME" >>$@
    148         echo "# define C_INSTALL_LIB_HOME \"$(IBINDIR)\"" >>$@
    149         echo "#endif" >>$@
    150         echo "#ifndef C_INSTALL_STATIC_LIB_HOME" >>$@
    151         echo "# define C_INSTALL_STATIC_LIB_HOME \"$(ILIBDIR)\"" >>$@
    152         echo "#endif" >>$@
    153         echo "#ifndef C_INSTALL_INCLUDE_HOME" >>$@
    154         echo "# define C_INSTALL_INCLUDE_HOME \"$(IINCDIR)\"" >>$@
    155         echo "#endif" >>$@
    156         echo "#ifndef C_INSTALL_MORE_LIBS" >>$@
    157         echo "# define C_INSTALL_MORE_LIBS \"$(LIBRARIES)\"" >>$@
    158         echo "#endif" >>$@
    159         echo "#ifndef C_INSTALL_MORE_STATIC_LIBS" >>$@
    160         echo "# define C_INSTALL_MORE_STATIC_LIBS \"$(LIBRARIES)\"" >>$@
    161         echo "#endif" >>$@
    162         echo "#ifndef C_DEFAULT_TARGET_STACK_SIZE" >>$@
    163         echo "# define C_DEFAULT_TARGET_STACK_SIZE $(NURSERY)" >>$@
    164         echo "#endif" >>$@
    165         echo "#ifndef C_STACK_GROWS_DOWNWARD" >>$@
    166         echo "# define C_STACK_GROWS_DOWNWARD $(STACKDIRECTION)" >>$@
    167         echo "#endif" >>$@
    168         echo "#ifndef C_TARGET_MORE_LIBS" >>$@
    169         echo "# define C_TARGET_MORE_LIBS \"$(TARGET_LIBRARIES)\"" >>$@
    170         echo "#endif" >>$@
    171         echo "#ifndef C_TARGET_MORE_STATIC_LIBS" >>$@
    172         echo "# define C_TARGET_MORE_STATIC_LIBS \"$(TARGET_LIBRARIES)\"" >>$@
    173         echo "#endif" >>$@
    174         echo "#ifndef C_TARGET_CC" >>$@
    175         echo "# define C_TARGET_CC \"$(TARGET_C_COMPILER)\"" >>$@
    176         echo "#endif" >>$@
    177         echo "#ifndef C_TARGET_CXX" >>$@
    178         echo "# define C_TARGET_CXX \"$(TARGET_CXX_COMPILER)\"" >>$@
    179         echo "#endif" >>$@
    180         echo "#ifndef C_TARGET_CFLAGS" >>$@
    181         echo "# define C_TARGET_CFLAGS \"$(TARGET_C_COMPILER_OPTIONS) $(TARGET_C_COMPILER_OPTIMIZATION_OPTIONS)\"" >>$@
    182         echo "#endif" >>$@
    183         echo "#ifndef C_TARGET_LDFLAGS" >>$@
    184         echo "# define C_TARGET_LDFLAGS \"$(TARGET_LINKER_OPTIONS) $(TARGET_LINKER_OPTIMIZATION_OPTIONS)\"" >>$@
    185         echo "#endif" >>$@
    186         echo "#ifndef C_CROSS_CHICKEN" >>$@
    187         echo "# define C_CROSS_CHICKEN $(CROSS_CHICKEN)" >>$@
    188         echo "#endif" >>$@
    189         echo "#ifndef C_TARGET_LIB_HOME" >>$@
    190         echo "# define C_TARGET_LIB_HOME \"$(TARGET_PREFIX)\\\\bin\"" >>$@
    191         echo "#endif" >>$@
    192         echo "#ifndef C_TARGET_RUN_LIB_HOME" >>$@
    193         echo "# define C_TARGET_RUN_LIB_HOME \"$(TARGET_PREFIX)\\\\bin\"" >>$@
    194         echo "#endif" >>$@
    195         echo "#ifndef C_TARGET_SHARE_HOME" >>$@
    196         echo "# define C_TARGET_SHARE_HOME \"$(TARGET_PREFIX)\\\\share\\\\chicken\"" >>$@
    197         echo "#endif" >>$@
    198         echo "#ifndef C_TARGET_INCLUDE_HOME" >>$@
    199         echo "# define C_TARGET_INCLUDE_HOME \"$(TARGET_PREFIX)\\\\include\"" >>$@
    200         echo "#endif" >>$@
    201         echo "#ifndef C_TARGET_STATIC_LIB_HOME" >>$@
    202         echo "# define C_TARGET_STATIC_LIB_HOME \"$(TARGET_PREFIX)\\\\lib\"" >>$@
    203         echo "#endif" >>$@
    204         echo "#ifndef C_BINARY_VERSION" >>$@
    205         echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
    206         echo "#endif" >>$@
     121        echo #define C_NO_APPLY_HOOK >>$@
     122endif
     123        echo #define C_HACKED_APPLY >>$@
     124#   cat chicken-defaults.h >>$@
     125        echo #define C_BUILD_TAG "$(BUILD_TAG)" >>$@
     126        echo #ifndef C_INSTALL_CC >>$@
     127        echo # define C_INSTALL_CC "$(C_COMPILER)" >>$@
     128        echo #endif >>$@
     129        echo #ifndef C_INSTALL_CXX >>$@
     130        echo # define C_INSTALL_CXX "$(CXX_COMPILER)" >>$@
     131        echo #endif >>$@
     132        echo #ifndef C_INSTALL_CFLAGS >>$@
     133        echo # define C_INSTALL_CFLAGS "$(C_COMPILER_OPTIONS) $(C_COMPILER_OPTIMIZATION_OPTIONS)" >>$@
     134        echo #endif >>$@
     135        echo #ifndef C_INSTALL_LDFLAGS >>$@
     136        echo # define C_INSTALL_LDFLAGS "$(LINKER_OPTIONS) $(LINKER_OPTIMIZATION_OPTIONS)" >>$@
     137        echo #endif >>$@
     138        echo #ifndef C_INSTALL_SHARE_HOME >>$@
     139        echo # define C_INSTALL_SHARE_HOME "$(IDATADIR)" >>$@
     140        echo #endif >>$@
     141        echo #ifndef C_INSTALL_BIN_HOME >>$@
     142        echo # define C_INSTALL_BIN_HOME "$(IBINDIR)" >>$@
     143        echo #endif >>$@
     144        echo #ifndef C_INSTALL_EGG_HOME >>$@
     145        echo # define C_INSTALL_EGG_HOME "$(IEGGDIR)" >>$@
     146        echo #endif >>$@
     147        echo #ifndef C_INSTALL_LIB_HOME >>$@
     148        echo # define C_INSTALL_LIB_HOME "$(IBINDIR)" >>$@
     149        echo #endif >>$@
     150        echo #ifndef C_INSTALL_STATIC_LIB_HOME >>$@
     151        echo # define C_INSTALL_STATIC_LIB_HOME "$(ILIBDIR)" >>$@
     152        echo #endif >>$@
     153        echo #ifndef C_INSTALL_INCLUDE_HOME >>$@
     154        echo # define C_INSTALL_INCLUDE_HOME "$(IINCDIR)" >>$@
     155        echo #endif >>$@
     156        echo #ifndef C_INSTALL_MORE_LIBS >>$@
     157        echo # define C_INSTALL_MORE_LIBS "$(LIBRARIES)" >>$@
     158        echo #endif >>$@
     159        echo #ifndef C_INSTALL_MORE_STATIC_LIBS >>$@
     160        echo # define C_INSTALL_MORE_STATIC_LIBS "$(LIBRARIES)" >>$@
     161        echo #endif >>$@
     162        echo #ifndef C_DEFAULT_TARGET_STACK_SIZE >>$@
     163        echo # define C_DEFAULT_TARGET_STACK_SIZE $(NURSERY) >>$@
     164        echo #endif >>$@
     165        echo #ifndef C_STACK_GROWS_DOWNWARD >>$@
     166        echo # define C_STACK_GROWS_DOWNWARD $(STACKDIRECTION) >>$@
     167        echo #endif >>$@
     168        echo #ifndef C_TARGET_MORE_LIBS >>$@
     169        echo # define C_TARGET_MORE_LIBS "$(TARGET_LIBRARIES)" >>$@
     170        echo #endif >>$@
     171        echo #ifndef C_TARGET_MORE_STATIC_LIBS >>$@
     172        echo # define C_TARGET_MORE_STATIC_LIBS "$(TARGET_LIBRARIES)" >>$@
     173        echo #endif >>$@
     174        echo #ifndef C_TARGET_CC >>$@
     175        echo # define C_TARGET_CC "$(TARGET_C_COMPILER)" >>$@
     176        echo #endif >>$@
     177        echo #ifndef C_TARGET_CXX >>$@
     178        echo # define C_TARGET_CXX "$(TARGET_CXX_COMPILER)" >>$@
     179        echo #endif >>$@
     180        echo #ifndef C_TARGET_CFLAGS >>$@
     181        echo # define C_TARGET_CFLAGS "$(TARGET_C_COMPILER_OPTIONS) $(TARGET_C_COMPILER_OPTIMIZATION_OPTIONS)" >>$@
     182        echo #endif >>$@
     183        echo #ifndef C_TARGET_LDFLAGS >>$@
     184        echo # define C_TARGET_LDFLAGS "$(TARGET_LINKER_OPTIONS) $(TARGET_LINKER_OPTIMIZATION_OPTIONS)" >>$@
     185        echo #endif >>$@
     186        echo #ifndef C_CROSS_CHICKEN >>$@
     187        echo # define C_CROSS_CHICKEN $(CROSS_CHICKEN) >>$@
     188        echo #endif >>$@
     189        echo #ifndef C_TARGET_LIB_HOME >>$@
     190        echo # define C_TARGET_LIB_HOME "$(TARGET_PREFIX)\\bin" >>$@
     191        echo #endif >>$@
     192        echo #ifndef C_TARGET_RUN_LIB_HOME >>$@
     193        echo # define C_TARGET_RUN_LIB_HOME "$(TARGET_PREFIX)\\bin" >>$@
     194        echo #endif >>$@
     195        echo #ifndef C_TARGET_SHARE_HOME >>$@
     196        echo # define C_TARGET_SHARE_HOME "$(TARGET_PREFIX)\\share\\chicken" >>$@
     197        echo #endif >>$@
     198        echo #ifndef C_TARGET_INCLUDE_HOME >>$@
     199        echo # define C_TARGET_INCLUDE_HOME "$(TARGET_PREFIX)\\include" >>$@
     200        echo #endif >>$@
     201        echo #ifndef C_TARGET_STATIC_LIB_HOME >>$@
     202        echo # define C_TARGET_STATIC_LIB_HOME "$(TARGET_PREFIX)\\lib" >>$@
     203        echo #endif >>$@
     204        echo #ifndef C_BINARY_VERSION >>$@
     205        echo # define C_BINARY_VERSION $(BINARYVERSION) >>$@
     206        echo #endif >>$@
    207207
    208208include $(SRCDIR)rules.make
  • chicken/branches/chicken-3/defaults.make

    r13410 r13412  
    6767
    6868ifeq ($(PLATFORM),mingw)
     69BINDIR = "$(PREFIX)\\bin"
     70LIBDIR = $(PREFIX)\\lib
     71SHAREDIR = $(PREFIX)\\share
     72DATADIR = $(SHAREDIR)\\chicken
     73TOPMANDIR = $(SHAREDIR)\\man
     74MANDIR = "$(TOPMANDIR)\\man1"
     75INFODIR = "$(SHAREDIR)\\info"
     76INCDIR = "$(PREFIX)\\include"
     77DOCDIR = "$(DATADIR)\\doc"
     78CHICKENLIBDIR = $(LIBDIR)\\chicken
     79EGGDIR = "$(CHICKENLIBDIR)\\$(BINARYVERSION)"
    6980IBINDIR = $(PREFIX)\\bin
    7081ILIBDIR = $(PREFIX)\\lib
     
    135146TARGET_C_COMPILER_OPTIONS ?= $(C_COMPILER_OPTIONS)
    136147TARGET_C_COMPILER_OPTIMIZATION_OPTIONS ?= $(C_COMPILER_OPTIMIZATION_OPTIONS)
     148ifeq ($(PLATFORM),mingw)
    137149TARGET_PREFIX ?= $(PREFIX)
    138150TARGET_RUN_PREFIX ?= $(TARGET_PREFIX)
     151else
     152TARGET_PREFIX ?= $(PREFIX)
     153TARGET_RUN_PREFIX ?= $(TARGET_PREFIX)
     154endif
    139155TARGET_LIBRARIES ?= $(LIBRARIES)
    140156TARGET_LINKER_OPTIONS ?= $(LINKER_OPTIONS)
     
    152168C_COMPILER_PTABLES_OPTIONS ?= -DC_ENABLE_PTABLES
    153169endif
     170ifeq ($(PLATFORM),mingw)
    154171INCLUDES ?= -I. -I$(SRCDIR)
     172else
     173INCLUDES ?= -I. -I$(SRCDIR)
     174endif
    155175C_COMPILER_COMPILE_OPTION ?= -c
    156176C_COMPILER_OUTPUT_OPTION ?= -o
Note: See TracChangeset for help on using the changeset viewer.