PennMUSH Community

Changeset 1215

Show
Ignore:
Timestamp:
01/28/08 23:24:26 (7 months ago)
Author:
shawnw
Message:

Various compilation fixes and cross-compile hints

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/CHANGES.183

    r1208 r1215  
    4646 * Potential infinite loop in error logging fixed. Reported by Yuriko. 
    4747 * Fixes from 1.8.2p9 
    48  
    49  
     48 * Compilation fixes on various platforms. [SW] 
    5049 
    5150Version 1.8.3 patchlevel 6                      Jan 01, 2008 

  • 1.8.3/branches/devel/src/game.c

    r1211 r1215  
    20022002unix_uptime(dbref player __attribute__ ((__unused__))) 
    20032003{ 
     2004#ifndef WIN32 
    20042005#ifdef HAVE_UPTIME 
    20052006  FILE *fp; 
    …… 
    20102011  struct rusage usage; 
    20112012#endif 
    2012 #ifndef WIN32 
    20132013  char tbuf1[BUFFER_LEN]; 
    2014 #endif 
    20152014  pid_t pid; 
    20162015  int psize; 
    …… 
    20682067  notify_format(player, "Signals:     %10ld", usage.ru_nsignals); 
    20692068#endif                          /* HAS_GETRUSAGE */ 
    2070  
     2069#endif 
    20712070} 
    20722071 

  • 1.8.3/branches/devel/src/mysocket.c

    r1138 r1215  
    1515#include <string.h> 
    1616 
     17#ifdef WIN32 
     18#include <windows.h> 
     19#include <winsock.h> 
     20#endif 
     21 
    1722#ifdef I_SYS_TYPES 
    1823#include <sys/types.h> 
    …… 
    6671#endif 
    6772 
    68 #ifndef HAVE_H_ERRNO 
     73#if !defined(HAVE_H_ERRNO) && !defined(WIN32) 
    6974extern int h_errno; 
    7075#endif 
    …… 
    9196#ifdef HAVE_POLL_H 
    9297#include <poll.h> 
     98#endif 
     99 
     100#ifdef I_SYS_SELECT 
     101#include <sys/select.h> 
    93102#endif 
    94103 
    …… 
    500509  } 
    501510#else 
    502   fdset_t wrs; 
     511  fd_set wrs; 
    503512  struct timeval timeout, *to; 
    504513 
    505514  FD_ZERO(&wrs); 
    506515  FD_SET(s, &wrs); 
    507   timeout.tv_secs = secs; 
    508   timeout.tv_usecs = 0; 
     516  timeout.tv_sec = secs; 
     517  timeout.tv_usec = 0; 
    509518  if (secs >= 0) 
    510519    to = &timeout; 

  • 1.8.3/branches/devel/win32/README.mingw

    r958 r1215  
    33by Ervin Hearn III <noltar@korongil.net> 
    44 
    5 Last update: Sunday, 27 June 2004 
     5Last update: Monday, 28 January 2008 
    66 
    77A note on install locations: 
    …… 
    7070 
    7171 
     72 
     73Raevnos has had some success cross-compiling a win32 pennmush on linux 
     74using mingw32. Briefly: 
     75 
     76 * Install the mingw32 cross compilation tools using your package 
     77   manager. 
     78 * Configure like so (The name of the cross-compiler might vary): 
     79   % CC=i486-mingw32-gcc ./configure --host --without-ssl --without-mysql \ 
     80                 --without-sqlite3 --without-postgresql --without-pcre 
     81 * Add -lwsock32 to the LIBS= line in Makefile 
     82 * make update; make netmud 
     83 * cp src/netmud netmush.exe 
     84 * Use netmush.exe and the game/ directory on a Windows computer like usual.