[CF-Devel] Compiling crossfire under win32

[phil]

Mark Wedel <
     
     mwedel at sonic.net
     
     > wrote:

>
     
     phil wrote:
     
     
<snip>

>>
     
      I had to add image.c and weather.c to the project.
     
     >
     
     
     >
     
     
     >
     
       If you can get a diff of that, I'll apply it to the server.
     
     
<snip>

Thanks for the quick response.  Checked out CVS and recompiled just now.  I made some other changes, like using Python 2.2.1, and changing the documentation to reflect that.  Plus, Visual Studio automatically translated some things to English.

Anyway, the diffs are attached.  (One diff?  Multiple diffs?  I dunno.  I'm new at this, be gentle.)

-Philip
-------------- next part --------------
Index: crossfire/run_win32.bat
===================================================================
RCS file: /cvsroot/crossfire/crossfire/run_win32.bat,v
retrieving revision 1.5
diff -r1.5 run_win32.bat
0a1
>
     
      @echo off
     
     Index: crossfire/make_win32/INSTALL_WIN32.txt
===================================================================
RCS file: /cvsroot/crossfire/crossfire/make_win32/INSTALL_WIN32.txt,v
retrieving revision 1.2
diff -r1.2 INSTALL_WIN32.txt
9c9
<   The current Crossfire server use Python 2.1.1 .
---
>
     
        The current Crossfire server use Python 2.2.1 .
     
     12c12
<   d:\python21 . You can install the package of course on a different
---
>
     
        c:\python22 . You can install the package of course on a different
     
     Index: crossfire/make_win32/crossfire32.dsp
===================================================================
RCS file: /cvsroot/crossfire/crossfire/make_win32/crossfire32.dsp,v
retrieving revision 1.9
diff -r1.9 crossfire32.dsp
3c3
< # ** NICHT BEARBEITEN **
---
>
     
      # ** DO NOT EDIT **
     
     8,9c8,9
< !MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
< !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
---
>
     
      !MESSAGE This is not a valid makefile. To build this project using NMAKE,
     
     >
     
      !MESSAGE use the Export Makefile command and run
     
     13,14c13,14
< !MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
< !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
---
>
     
      !MESSAGE You can specify a configuration when running NMAKE
     
     >
     
      !MESSAGE by defining the macro CFG on the command line. For example:
     
     18c18
< !MESSAGE Für die Konfiguration stehen zur Auswahl:
---
>
     
      !MESSAGE Possible choices for configuration are:
     
     20,22c20,22
< !MESSAGE "crossfire32 - Win32 FullDebug" (basierend auf  "Win32 (x86) Console Application")
< !MESSAGE "crossfire32 - Win32 ReleaseQuit" (basierend auf  "Win32 (x86) Console Application")
< !MESSAGE "crossfire32 - Win32 ReleaseLog" (basierend auf  "Win32 (x86) Console Application")
---
>
     
      !MESSAGE "crossfire32 - Win32 FullDebug" (based on "Win32 (x86) Console Application")
     
     >
     
      !MESSAGE "crossfire32 - Win32 ReleaseQuit" (based on "Win32 (x86) Console Application")
     
     >
     
      !MESSAGE "crossfire32 - Win32 ReleaseLog" (based on "Win32 (x86) Console Application")
     
     107c107
< # ADD CPP /nologo /MT /W3 /Gi /GX /O2 /Ob2 /I "..\include" /I "..\random_maps" /I "..\\" /I "..\plugin\include" /I "d:\Python21\include" /D "_CONSOLE" /D "DEBUG" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "DEBUG_MOVEATTACK" /YX"preheader.pch" /FD /c
---
>
     
      # ADD CPP /nologo /MT /w /W0 /Gi /GX /O2 /Ob2 /I "..\include" /I "..\random_maps" /I "..\\" /I "..\plugin\include" /I "d:\Python21\include" /D "_CONSOLE" /D "DEBUG" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "DEBUG_MOVEATTACK" /YX"preheader.pch" /FD /c
     
     2097a2098,2105
>
     
      # Begin Source File
     
     >
     
     
     >
     
      SOURCE=..\socket\image.c
     
     >
     
      # End Source File
     
     >
     
      # Begin Source File
     
     >
     
     
     >
     
      SOURCE=..\server\weather.c
     
     >
     
      # End Source File
     
     Index: crossfire/make_win32/installwin32.bat
===================================================================
RCS file: /cvsroot/crossfire/crossfire/make_win32/installwin32.bat,v
retrieving revision 1.7
diff -r1.7 installwin32.bat
23c23
< echo ** unpack maps in \share before you run the server! **
---
>
     
      echo ** unpack maps and archs in \share before you run the server! **
     
     Index: crossfire/server/c_object.c
===================================================================
RCS file: /cvsroot/crossfire/crossfire/server/c_object.c,v
retrieving revision 1.35
diff -r1.35 c_object.c
615a616,619
>
     
           }
     
     >
     
      #else
     
     >
     
      	save_player(op,1); /* To avoid cheating */
     
     >
     
              };