From 5dfbc426f79b3ace241ba380b70d621849392806 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 4 Feb 2002 23:38:23 +0000 Subject: [PATCH] Cleaned up the Microsoft Visual C++ Makefiles. It was about time. --- src/askalon/askalon-5.dsp | 270 ------ src/askalon/{askalon-6.dsp => askalon.dsp} | 0 src/common/attributes/attributes-5.dsp | 158 ---- .../{attributes-6.dsp => attributes.dsp} | 0 src/common/gamecode/gamecode-5.dsp | 303 ------- .../gamecode/{gamecode-6.dsp => gamecode.dsp} | 0 src/common/items/items-5.dsp | 100 --- src/common/items/{items-6.dsp => items.dsp} | 0 src/common/kernel/kernel-5.dsp | 368 -------- .../kernel/{kernel-6.dsp => kernel.dsp} | 0 src/common/kernel/ugroup.h | 1 - src/common/modules/modules-5.dsp | 141 --- .../modules/{modules-6.dsp => modules.dsp} | 22 +- src/common/races/races-5.dsp | 108 --- src/common/races/{races-6.dsp => races.dsp} | 0 src/common/spells/spells-5.dsp | 100 --- .../spells/{spells-6.dsp => spells.dsp} | 0 src/common/triggers/triggers-5.dsp | 173 ---- .../triggers/{triggers-6.dsp => triggers.dsp} | 0 src/common/util/util-5.dsp | 200 ----- src/common/util/{util-6.dsp => util.dsp} | 0 src/eressea/eressea-5.dsp | 850 ------------------ src/eressea/{eressea-6.dsp => eressea.dsp} | 30 +- src/mapper/mapper-5.dsp | 136 --- src/mapper/{mapper-6.dsp => mapper.dsp} | 0 src/tools/reduce-6.dsp | 101 --- src/tools/{reduce-5.dsp => reduce.dsp} | 0 27 files changed, 6 insertions(+), 3055 deletions(-) delete mode 100644 src/askalon/askalon-5.dsp rename src/askalon/{askalon-6.dsp => askalon.dsp} (100%) delete mode 100644 src/common/attributes/attributes-5.dsp rename src/common/attributes/{attributes-6.dsp => attributes.dsp} (100%) delete mode 100644 src/common/gamecode/gamecode-5.dsp rename src/common/gamecode/{gamecode-6.dsp => gamecode.dsp} (100%) delete mode 100644 src/common/items/items-5.dsp rename src/common/items/{items-6.dsp => items.dsp} (100%) delete mode 100644 src/common/kernel/kernel-5.dsp rename src/common/kernel/{kernel-6.dsp => kernel.dsp} (100%) delete mode 100644 src/common/modules/modules-5.dsp rename src/common/modules/{modules-6.dsp => modules.dsp} (90%) delete mode 100644 src/common/races/races-5.dsp rename src/common/races/{races-6.dsp => races.dsp} (100%) delete mode 100644 src/common/spells/spells-5.dsp rename src/common/spells/{spells-6.dsp => spells.dsp} (100%) delete mode 100644 src/common/triggers/triggers-5.dsp rename src/common/triggers/{triggers-6.dsp => triggers.dsp} (100%) delete mode 100644 src/common/util/util-5.dsp rename src/common/util/{util-6.dsp => util.dsp} (100%) delete mode 100644 src/eressea/eressea-5.dsp rename src/eressea/{eressea-6.dsp => eressea.dsp} (90%) delete mode 100644 src/mapper/mapper-5.dsp rename src/mapper/{mapper-6.dsp => mapper.dsp} (100%) delete mode 100644 src/tools/reduce-6.dsp rename src/tools/{reduce-5.dsp => reduce.dsp} (100%) diff --git a/src/askalon/askalon-5.dsp b/src/askalon/askalon-5.dsp deleted file mode 100644 index b31ca59c4..000000000 --- a/src/askalon/askalon-5.dsp +++ /dev/null @@ -1,270 +0,0 @@ -# Microsoft Developer Studio Project File - Name="askalon" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=askalon - Win32 Debug -!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 -!MESSAGE NMAKE /f "askalon-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "askalon-5.mak" CFG="askalon - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "askalon - Win32 Release" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE "askalon - Win32 Debug" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "askalon - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "askalon_" -# PROP BASE Intermediate_Dir "askalon_" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "askalon - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "askalon0" -# PROP BASE Intermediate_Dir "askalon0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Gm /GX- /Zi /Od /I ".." /I "../util" /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX"stdafx.h" /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "askalon - Win32 Release" -# Name "askalon - Win32 Debug" -# Name "askalon - Win32 Conversion" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=..\modules\arena.h -# End Source File -# Begin Source File - -SOURCE=..\modules\museum.h -# End Source File -# Begin Source File - -SOURCE=..\modules\score.h -# End Source File -# Begin Source File - -SOURCE=.\weapons.h -# End Source File -# Begin Source File - -SOURCE=..\modules\xmas2000.h -# End Source File -# End Group -# Begin Group "Conversion" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\old\pointertags.c - -!IF "$(CFG)" == "askalon - Win32 Release" - -!ELSEIF "$(CFG)" == "askalon - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\old\relation.c - -!IF "$(CFG)" == "askalon - Win32 Release" - -!ELSEIF "$(CFG)" == "askalon - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\old\trigger.c - -!IF "$(CFG)" == "askalon - Win32 Release" - -!ELSEIF "$(CFG)" == "askalon - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "askalon - Win32 Conversion" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Attributes" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\attributes\attributes.c -# End Source File -# Begin Source File - -SOURCE=..\attributes\attributes.h -# End Source File -# Begin Source File - -SOURCE=..\attributes\follow.c -# End Source File -# Begin Source File - -SOURCE=..\attributes\follow.h -# End Source File -# Begin Source File - -SOURCE=..\attributes\hate.c -# End Source File -# Begin Source File - -SOURCE=..\attributes\iceberg.c -# End Source File -# Begin Source File - -SOURCE=..\attributes\iceberg.h -# End Source File -# Begin Source File - -SOURCE=..\attributes\key.c -# End Source File -# Begin Source File - -SOURCE=..\attributes\key.h -# End Source File -# Begin Source File - -SOURCE=..\attributes\matmod.c -# End Source File -# Begin Source File - -SOURCE=..\attributes\matmod.h -# End Source File -# Begin Source File - -SOURCE=..\attributes\reduceproduction.c -# End Source File -# Begin Source File - -SOURCE=..\attributes\reduceproduction.h -# End Source File -# Begin Source File - -SOURCE=..\attributes\targetregion.c -# End Source File -# End Group -# Begin Group "Races" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\races\dragons.c -# End Source File -# Begin Source File - -SOURCE=..\races\dragons.h -# End Source File -# Begin Source File - -SOURCE=..\races\illusion.c -# End Source File -# Begin Source File - -SOURCE=..\races\illusion.h -# End Source File -# Begin Source File - -SOURCE=..\races\zombies.c -# End Source File -# Begin Source File - -SOURCE=..\races\zombies.h -# End Source File -# End Group -# Begin Group "Items" - -# PROP Default_Filter "" -# End Group -# Begin Source File - -SOURCE=.\korrektur.c -# End Source File -# Begin Source File - -SOURCE=.\main.c -# End Source File -# Begin Source File - -SOURCE=..\modules\score.c -# End Source File -# Begin Source File - -SOURCE=.\triggers.c -# End Source File -# Begin Source File - -SOURCE=.\weapons.c -# End Source File -# End Target -# End Project diff --git a/src/askalon/askalon-6.dsp b/src/askalon/askalon.dsp similarity index 100% rename from src/askalon/askalon-6.dsp rename to src/askalon/askalon.dsp diff --git a/src/common/attributes/attributes-5.dsp b/src/common/attributes/attributes-5.dsp deleted file mode 100644 index 05860e89e..000000000 --- a/src/common/attributes/attributes-5.dsp +++ /dev/null @@ -1,158 +0,0 @@ -# Microsoft Developer Studio Project File - Name="attributes" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=attributes - Win32 Debug -!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 -!MESSAGE NMAKE /f "attributes.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "attributes.mak" CFG="attributes - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "attributes - Win32 Release" (basierend auf\ - "Win32 (x86) Static Library") -!MESSAGE "attributes - Win32 Debug" (basierend auf\ - "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "attributes - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "attributes - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /GX- /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "attributes - Win32 Release" -# Name "attributes - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\attributes.h -# End Source File -# Begin Source File - -SOURCE=.\follow.h -# End Source File -# Begin Source File - -SOURCE=.\giveitem.h -# End Source File -# Begin Source File - -SOURCE=.\hate.h -# End Source File -# Begin Source File - -SOURCE=.\iceberg.h -# End Source File -# Begin Source File - -SOURCE=.\key.h -# End Source File -# Begin Source File - -SOURCE=.\matmod.h -# End Source File -# Begin Source File - -SOURCE=.\reduceproduction.h -# End Source File -# Begin Source File - -SOURCE=.\targetregion.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\attributes.c -# End Source File -# Begin Source File - -SOURCE=.\follow.c -# End Source File -# Begin Source File - -SOURCE=.\giveitem.c -# End Source File -# Begin Source File - -SOURCE=.\hate.c -# End Source File -# Begin Source File - -SOURCE=.\iceberg.c -# End Source File -# Begin Source File - -SOURCE=.\key.c -# End Source File -# Begin Source File - -SOURCE=.\matmod.c -# End Source File -# Begin Source File - -SOURCE=.\reduceproduction.c -# End Source File -# Begin Source File - -SOURCE=.\targetregion.c -# End Source File -# End Target -# End Project diff --git a/src/common/attributes/attributes-6.dsp b/src/common/attributes/attributes.dsp similarity index 100% rename from src/common/attributes/attributes-6.dsp rename to src/common/attributes/attributes.dsp diff --git a/src/common/gamecode/gamecode-5.dsp b/src/common/gamecode/gamecode-5.dsp deleted file mode 100644 index 5f6fe8364..000000000 --- a/src/common/gamecode/gamecode-5.dsp +++ /dev/null @@ -1,303 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gamecode" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=gamecode - Win32 Conversion -!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 -!MESSAGE NMAKE /f "gamecode-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "gamecode-5.mak" CFG="gamecode - Win32 Conversion" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "gamecode - Win32 Release" (basierend auf\ - "Win32 (x86) Static Library") -!MESSAGE "gamecode - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE "gamecode - Win32 Conversion" (basierend auf\ - "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "gamecode - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "gamecode - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\gamecode.lib" - -!ELSEIF "$(CFG)" == "gamecode - Win32 Conversion" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "gamecode__" -# PROP BASE Intermediate_Dir "gamecode__" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "gamecode__" -# PROP Intermediate_Dir "gamecode__" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /Za /W4 /Z7 /Od /I ".." /I "../util" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I ".." /I "../util" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "CONVERT_TRIGGER" /FR /FD /c -# SUBTRACT CPP /YX -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "gamecode - Win32 Release" -# Name "gamecode - Win32 Debug" -# Name "gamecode - Win32 Conversion" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\alchemy.h -# End Source File -# Begin Source File - -SOURCE=.\battle.h -# End Source File -# Begin Source File - -SOURCE=.\border.h -# End Source File -# Begin Source File - -SOURCE=.\build.h -# End Source File -# Begin Source File - -SOURCE=.\building.h -# End Source File -# Begin Source File - -SOURCE=.\creation.h -# End Source File -# Begin Source File - -SOURCE=.\economy.h -# End Source File -# Begin Source File - -SOURCE=.\eressea.h -# End Source File -# Begin Source File - -SOURCE=.\group.h -# End Source File -# Begin Source File - -SOURCE=.\item.h -# End Source File -# Begin Source File - -SOURCE=.\karma.h -# End Source File -# Begin Source File - -SOURCE=.\laws.h -# End Source File -# Begin Source File - -SOURCE=.\magic.h -# End Source File -# Begin Source File - -SOURCE=.\message.h -# End Source File -# Begin Source File - -SOURCE=.\monster.h -# End Source File -# Begin Source File - -SOURCE=.\movement.h -# End Source File -# Begin Source File - -SOURCE=.\names.h -# End Source File -# Begin Source File - -SOURCE=.\objtypes.h -# End Source File -# Begin Source File - -SOURCE=.\orders.h -# End Source File -# Begin Source File - -SOURCE=.\pathfinder.h -# End Source File -# Begin Source File - -SOURCE=.\plane.h -# End Source File -# Begin Source File - -SOURCE=.\pool.h -# End Source File -# Begin Source File - -SOURCE=.\race.h -# End Source File -# Begin Source File - -SOURCE=.\randenc.h -# End Source File -# Begin Source File - -SOURCE=.\region.h -# End Source File -# Begin Source File - -SOURCE=.\render.h -# End Source File -# Begin Source File - -SOURCE=.\reports.h -# End Source File -# Begin Source File - -SOURCE=.\save.h -# End Source File -# Begin Source File - -SOURCE=.\ship.h -# End Source File -# Begin Source File - -SOURCE=.\skill.h -# End Source File -# Begin Source File - -SOURCE=.\spell.h -# End Source File -# Begin Source File - -SOURCE=.\spells.h -# End Source File -# Begin Source File - -SOURCE=.\spy.h -# End Source File -# Begin Source File - -SOURCE=.\study.h -# End Source File -# Begin Source File - -SOURCE=.\teleport.h -# End Source File -# Begin Source File - -SOURCE=.\terrain.h -# End Source File -# Begin Source File - -SOURCE=.\unit.h -# End Source File -# End Group -# Begin Group "Spells" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\spells\alp.c -# End Source File -# End Group -# Begin Source File - -SOURCE=.\creation.c -# End Source File -# Begin Source File - -SOURCE=.\creport.c -# End Source File -# Begin Source File - -SOURCE=.\economy.c -# End Source File -# Begin Source File - -SOURCE=.\laws.c -# End Source File -# Begin Source File - -SOURCE=.\monster.c -# End Source File -# Begin Source File - -SOURCE=.\randenc.c -# End Source File -# Begin Source File - -SOURCE=.\report.c -# End Source File -# Begin Source File - -SOURCE=.\spy.c -# End Source File -# Begin Source File - -SOURCE=.\study.c -# End Source File -# End Target -# End Project diff --git a/src/common/gamecode/gamecode-6.dsp b/src/common/gamecode/gamecode.dsp similarity index 100% rename from src/common/gamecode/gamecode-6.dsp rename to src/common/gamecode/gamecode.dsp diff --git a/src/common/items/items-5.dsp b/src/common/items/items-5.dsp deleted file mode 100644 index 84ea30af4..000000000 --- a/src/common/items/items-5.dsp +++ /dev/null @@ -1,100 +0,0 @@ -# Microsoft Developer Studio Project File - Name="items" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=items - Win32 Debug -!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 -!MESSAGE NMAKE /f "items-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "items-5.mak" CFG="items - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "items - Win32 Release" (basierend auf "Win32 (x86) Static Library") -!MESSAGE "items - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "items - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "items - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "items - Win32 Release" -# Name "items - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\demonseye.h -# End Source File -# Begin Source File - -SOURCE=.\weapons.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\demonseye.c -# End Source File -# Begin Source File - -SOURCE=.\weapons.c -# End Source File -# End Target -# End Project diff --git a/src/common/items/items-6.dsp b/src/common/items/items.dsp similarity index 100% rename from src/common/items/items-6.dsp rename to src/common/items/items.dsp diff --git a/src/common/kernel/kernel-5.dsp b/src/common/kernel/kernel-5.dsp deleted file mode 100644 index 5597de537..000000000 --- a/src/common/kernel/kernel-5.dsp +++ /dev/null @@ -1,368 +0,0 @@ -# Microsoft Developer Studio Project File - Name="kernel" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=kernel - Win32 Debug -!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 -!MESSAGE NMAKE /f "kernel-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "kernel-5.mak" CFG="kernel - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "kernel - Win32 Release" (basierend auf "Win32 (x86) Static Library") -!MESSAGE "kernel - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "kernel - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "kernel - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "kernel___W" -# PROP BASE Intermediate_Dir "kernel___W" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../util" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\kernel.lib" - -!ENDIF - -# Begin Target - -# Name "kernel - Win32 Release" -# Name "kernel - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\alchemy.h -# End Source File -# Begin Source File - -SOURCE=.\battle.h -# End Source File -# Begin Source File - -SOURCE=.\border.h -# End Source File -# Begin Source File - -SOURCE=.\build.h -# End Source File -# Begin Source File - -SOURCE=.\building.h -# End Source File -# Begin Source File - -SOURCE=.\creation.h -# End Source File -# Begin Source File - -SOURCE=.\curse.h -# End Source File -# Begin Source File - -SOURCE=.\economy.h -# End Source File -# Begin Source File - -SOURCE=.\eressea.h -# End Source File -# Begin Source File - -SOURCE=.\faction.h -# End Source File -# Begin Source File - -SOURCE=.\group.h -# End Source File -# Begin Source File - -SOURCE=.\item.h -# End Source File -# Begin Source File - -SOURCE=.\karma.h -# End Source File -# Begin Source File - -SOURCE=.\laws.h -# End Source File -# Begin Source File - -SOURCE=.\magic.h -# End Source File -# Begin Source File - -SOURCE=.\message.h -# End Source File -# Begin Source File - -SOURCE=.\monster.h -# End Source File -# Begin Source File - -SOURCE=.\movement.h -# End Source File -# Begin Source File - -SOURCE=.\names.h -# End Source File -# Begin Source File - -SOURCE=.\objtypes.h -# End Source File -# Begin Source File - -SOURCE=.\orders.h -# End Source File -# Begin Source File - -SOURCE=.\pathfinder.h -# End Source File -# Begin Source File - -SOURCE=.\plane.h -# End Source File -# Begin Source File - -SOURCE=.\pool.h -# End Source File -# Begin Source File - -SOURCE=.\race.h -# End Source File -# Begin Source File - -SOURCE=.\randenc.h -# End Source File -# Begin Source File - -SOURCE=.\region.h -# End Source File -# Begin Source File - -SOURCE=.\render.h -# End Source File -# Begin Source File - -SOURCE=.\reports.h -# End Source File -# Begin Source File - -SOURCE=.\save.h -# End Source File -# Begin Source File - -SOURCE=.\ship.h -# End Source File -# Begin Source File - -SOURCE=.\skill.h -# End Source File -# Begin Source File - -SOURCE=.\spell.h -# End Source File -# Begin Source File - -SOURCE=.\spells.h -# End Source File -# Begin Source File - -SOURCE=.\spy.h -# End Source File -# Begin Source File - -SOURCE=.\study.h -# End Source File -# Begin Source File - -SOURCE=.\teleport.h -# End Source File -# Begin Source File - -SOURCE=.\terrain.h -# End Source File -# Begin Source File - -SOURCE=.\unit.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\alchemy.c -# End Source File -# Begin Source File - -SOURCE=.\battle.c -# End Source File -# Begin Source File - -SOURCE=.\border.c -# End Source File -# Begin Source File - -SOURCE=.\build.c -# End Source File -# Begin Source File - -SOURCE=.\building.c -# End Source File -# Begin Source File - -SOURCE=.\combatspells.c -# End Source File -# Begin Source File - -SOURCE=.\curse.c -# End Source File -# Begin Source File - -SOURCE=.\eressea.c -# End Source File -# Begin Source File - -SOURCE=.\faction.c -# End Source File -# Begin Source File - -SOURCE=.\group.c -# End Source File -# Begin Source File - -SOURCE=.\item.c -# End Source File -# Begin Source File - -SOURCE=.\karma.c -# End Source File -# Begin Source File - -SOURCE=.\magic.c -# End Source File -# Begin Source File - -SOURCE=.\message.c -# End Source File -# Begin Source File - -SOURCE=.\movement.c -# End Source File -# Begin Source File - -SOURCE=.\names.c -# End Source File -# Begin Source File - -SOURCE=.\objtypes.c -# End Source File -# Begin Source File - -SOURCE=.\orders.c -# End Source File -# Begin Source File - -SOURCE=.\pathfinder.c -# End Source File -# Begin Source File - -SOURCE=.\plane.c -# End Source File -# Begin Source File - -SOURCE=.\pool.c -# End Source File -# Begin Source File - -SOURCE=.\race.c -# End Source File -# Begin Source File - -SOURCE=.\region.c -# End Source File -# Begin Source File - -SOURCE=.\render.c -# End Source File -# Begin Source File - -SOURCE=.\reports.c -# End Source File -# Begin Source File - -SOURCE=.\save.c -# End Source File -# Begin Source File - -SOURCE=.\ship.c -# End Source File -# Begin Source File - -SOURCE=.\skill.c -# End Source File -# Begin Source File - -SOURCE=.\spell.c -# End Source File -# Begin Source File - -SOURCE=.\teleport.c -# End Source File -# Begin Source File - -SOURCE=.\terrain.c -# End Source File -# Begin Source File - -SOURCE=.\unit.c -# End Source File -# End Target -# End Project diff --git a/src/common/kernel/kernel-6.dsp b/src/common/kernel/kernel.dsp similarity index 100% rename from src/common/kernel/kernel-6.dsp rename to src/common/kernel/kernel.dsp diff --git a/src/common/kernel/ugroup.h b/src/common/kernel/ugroup.h index 0534f936d..b57544719 100644 --- a/src/common/kernel/ugroup.h +++ b/src/common/kernel/ugroup.h @@ -8,7 +8,6 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. - $Id: ugroup.h,v 1.4 2001/12/10 00:13:30 enno Exp $ */ #ifndef UGROUP_H diff --git a/src/common/modules/modules-5.dsp b/src/common/modules/modules-5.dsp deleted file mode 100644 index 4f0b79320..000000000 --- a/src/common/modules/modules-5.dsp +++ /dev/null @@ -1,141 +0,0 @@ -# Microsoft Developer Studio Project File - Name="modules" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=modules - Win32 Debug -!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 -!MESSAGE NMAKE /f "modules-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "modules-5.mak" CFG="modules - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "modules - Win32 Release" (basierend auf\ - "Win32 (x86) Static Library") -!MESSAGE "modules - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "modules - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "modules - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "modules" -# PROP BASE Intermediate_Dir "modules" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\modules.lib" - -!ENDIF - -# Begin Target - -# Name "modules - Win32 Release" -# Name "modules - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\arena.h -# End Source File -# Begin Source File - -SOURCE=.\gmcmd.h -# End Source File -# Begin Source File - -SOURCE=.\museum.h -# End Source File -# Begin Source File - -SOURCE=.\oceannames.h -# End Source File -# Begin Source File - -SOURCE=.\score.h -# End Source File -# Begin Source File - -SOURCE=.\weather.h -# End Source File -# Begin Source File - -SOURCE=.\xmas2000.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\arena.c -# End Source File -# Begin Source File - -SOURCE=.\gmcmd.c -# End Source File -# Begin Source File - -SOURCE=.\museum.c -# End Source File -# Begin Source File - -SOURCE=.\oceannames.c -# End Source File -# Begin Source File - -SOURCE=.\score.c -# End Source File -# Begin Source File - -SOURCE=.\weather.c -# End Source File -# Begin Source File - -SOURCE=.\xmas2000.c -# End Source File -# End Target -# End Project diff --git a/src/common/modules/modules-6.dsp b/src/common/modules/modules.dsp similarity index 90% rename from src/common/modules/modules-6.dsp rename to src/common/modules/modules.dsp index cbd82d139..9f8cfe12d 100644 --- a/src/common/modules/modules-6.dsp +++ b/src/common/modules/modules.dsp @@ -8,12 +8,12 @@ CFG=modules - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "modules-6.mak". +!MESSAGE NMAKE /f "modules.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "modules-6.mak" CFG="modules - Win32 Debug" +!MESSAGE NMAKE /f "modules.mak" CFG="modules - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\modules.lib" +# ADD LIB32 /nologo !ENDIF @@ -89,10 +89,6 @@ SOURCE=.\arena.h # End Source File # Begin Source File -SOURCE=.\command.h -# End Source File -# Begin Source File - SOURCE=.\dungeon.h # End Source File # Begin Source File @@ -105,10 +101,6 @@ SOURCE=.\infocmd.h # End Source File # Begin Source File -SOURCE=.\knowledge.h -# End Source File -# Begin Source File - SOURCE=.\museum.h # End Source File # Begin Source File @@ -142,10 +134,6 @@ SOURCE=.\arena.c # End Source File # Begin Source File -SOURCE=.\command.c -# End Source File -# Begin Source File - SOURCE=.\dungeon.c # End Source File # Begin Source File @@ -158,10 +146,6 @@ SOURCE=.\infocmd.c # End Source File # Begin Source File -SOURCE=.\knowledge.c -# End Source File -# Begin Source File - SOURCE=.\museum.c # End Source File # Begin Source File diff --git a/src/common/races/races-5.dsp b/src/common/races/races-5.dsp deleted file mode 100644 index 42ecaef00..000000000 --- a/src/common/races/races-5.dsp +++ /dev/null @@ -1,108 +0,0 @@ -# Microsoft Developer Studio Project File - Name="races" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=races - Win32 Debug -!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 -!MESSAGE NMAKE /f "races-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "races-5.mak" CFG="races - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "races - Win32 Release" (basierend auf "Win32 (x86) Static Library") -!MESSAGE "races - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "races - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "races - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "races" -# PROP BASE Intermediate_Dir "races" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\races.lib" - -!ENDIF - -# Begin Target - -# Name "races - Win32 Release" -# Name "races - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\dragons.h -# End Source File -# Begin Source File - -SOURCE=.\illusion.h -# End Source File -# Begin Source File - -SOURCE=.\zombies.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\dragons.c -# End Source File -# Begin Source File - -SOURCE=.\illusion.c -# End Source File -# Begin Source File - -SOURCE=.\zombies.c -# End Source File -# End Target -# End Project diff --git a/src/common/races/races-6.dsp b/src/common/races/races.dsp similarity index 100% rename from src/common/races/races-6.dsp rename to src/common/races/races.dsp diff --git a/src/common/spells/spells-5.dsp b/src/common/spells/spells-5.dsp deleted file mode 100644 index 05d731c30..000000000 --- a/src/common/spells/spells-5.dsp +++ /dev/null @@ -1,100 +0,0 @@ -# Microsoft Developer Studio Project File - Name="spells" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=spells - Win32 Debug -!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 -!MESSAGE NMAKE /f "spells-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "spells-5.mak" CFG="spells - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "spells - Win32 Release" (basierend auf "Win32 (x86) Static Library") -!MESSAGE "spells - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "spells - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "spells - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "spells" -# PROP BASE Intermediate_Dir "spells" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\spells.lib" - -!ENDIF - -# Begin Target - -# Name "spells - Win32 Release" -# Name "spells - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\alp.h -# End Source File -# Begin Source File - -SOURCE=.\spells.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\alp.c -# End Source File -# Begin Source File - -SOURCE=.\spells.c -# End Source File -# End Target -# End Project diff --git a/src/common/spells/spells-6.dsp b/src/common/spells/spells.dsp similarity index 100% rename from src/common/spells/spells-6.dsp rename to src/common/spells/spells.dsp diff --git a/src/common/triggers/triggers-5.dsp b/src/common/triggers/triggers-5.dsp deleted file mode 100644 index 56b9de710..000000000 --- a/src/common/triggers/triggers-5.dsp +++ /dev/null @@ -1,173 +0,0 @@ -# Microsoft Developer Studio Project File - Name="triggers" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=triggers - Win32 Debug -!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 -!MESSAGE NMAKE /f "triggers-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "triggers-5.mak" CFG="triggers - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "triggers - Win32 Release" (basierend auf\ - "Win32 (x86) Static Library") -!MESSAGE "triggers - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "triggers - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "triggers - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "triggers" -# PROP BASE Intermediate_Dir "triggers" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\triggers.lib" - -!ENDIF - -# Begin Target - -# Name "triggers - Win32 Release" -# Name "triggers - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\changefaction.h -# End Source File -# Begin Source File - -SOURCE=.\changerace.h -# End Source File -# Begin Source File - -SOURCE=.\createcurse.h -# End Source File -# Begin Source File - -SOURCE=.\createunit.h -# End Source File -# Begin Source File - -SOURCE=.\giveitem.h -# End Source File -# Begin Source File - -SOURCE=.\killunit.h -# End Source File -# Begin Source File - -SOURCE=.\removecurse.h -# End Source File -# Begin Source File - -SOURCE=.\shock.h -# End Source File -# Begin Source File - -SOURCE=.\timeout.h -# End Source File -# Begin Source File - -SOURCE=.\triggers.h -# End Source File -# Begin Source File - -SOURCE=.\unitmessage.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\changefaction.c -# End Source File -# Begin Source File - -SOURCE=.\changerace.c -# End Source File -# Begin Source File - -SOURCE=.\createcurse.c -# End Source File -# Begin Source File - -SOURCE=.\createunit.c -# End Source File -# Begin Source File - -SOURCE=.\giveitem.c -# End Source File -# Begin Source File - -SOURCE=.\killunit.c -# End Source File -# Begin Source File - -SOURCE=.\removecurse.c -# End Source File -# Begin Source File - -SOURCE=.\shock.c -# End Source File -# Begin Source File - -SOURCE=.\timeout.c -# End Source File -# Begin Source File - -SOURCE=.\triggers.c -# End Source File -# Begin Source File - -SOURCE=.\unitmessage.c -# End Source File -# End Target -# End Project diff --git a/src/common/triggers/triggers-6.dsp b/src/common/triggers/triggers.dsp similarity index 100% rename from src/common/triggers/triggers-6.dsp rename to src/common/triggers/triggers.dsp diff --git a/src/common/util/util-5.dsp b/src/common/util/util-5.dsp deleted file mode 100644 index aede291c1..000000000 --- a/src/common/util/util-5.dsp +++ /dev/null @@ -1,200 +0,0 @@ -# Microsoft Developer Studio Project File - Name="util" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=util - Win32 Debug -!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 -!MESSAGE NMAKE /f "util-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "util-5.mak" CFG="util - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "util - Win32 Release" (basierend auf "Win32 (x86) Static Library") -!MESSAGE "util - Win32 Debug" (basierend auf "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "util - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "util - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\util.lib" - -!ENDIF - -# Begin Target - -# Name "util - Win32 Release" -# Name "util - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\attrib.h -# End Source File -# Begin Source File - -SOURCE=.\base36.h -# End Source File -# Begin Source File - -SOURCE=.\cvector.h -# End Source File -# Begin Source File - -SOURCE=.\event.h -# End Source File -# Begin Source File - -SOURCE=.\functions.h -# End Source File -# Begin Source File - -SOURCE=.\goodies.h -# End Source File -# Begin Source File - -SOURCE=.\language.h -# End Source File -# Begin Source File - -SOURCE=.\lists.h -# End Source File -# Begin Source File - -SOURCE=.\rand.h -# End Source File -# Begin Source File - -SOURCE=.\resolve.h -# End Source File -# Begin Source File - -SOURCE=.\umlaut.h -# End Source File -# Begin Source File - -SOURCE=.\vmap.h -# End Source File -# Begin Source File - -SOURCE=.\vset.h -# End Source File -# Begin Source File - -SOURCE=.\windir.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\attrib.c -# End Source File -# Begin Source File - -SOURCE=.\base36.c -# End Source File -# Begin Source File - -SOURCE=.\cvector.c -# End Source File -# Begin Source File - -SOURCE=.\dice.c -# End Source File -# Begin Source File - -SOURCE=.\event.c -# End Source File -# Begin Source File - -SOURCE=.\functions.c -# End Source File -# Begin Source File - -SOURCE=.\goodies.c -# End Source File -# Begin Source File - -SOURCE=.\language.c -# End Source File -# Begin Source File - -SOURCE=.\lists.c -# End Source File -# Begin Source File - -SOURCE=.\rand.c -# End Source File -# Begin Source File - -SOURCE=.\resolve.c -# End Source File -# Begin Source File - -SOURCE=.\umlaut.c -# End Source File -# Begin Source File - -SOURCE=.\vmap.c -# End Source File -# Begin Source File - -SOURCE=.\vset.c -# End Source File -# Begin Source File - -SOURCE=.\windir.c -# End Source File -# End Target -# End Project diff --git a/src/common/util/util-6.dsp b/src/common/util/util.dsp similarity index 100% rename from src/common/util/util-6.dsp rename to src/common/util/util.dsp diff --git a/src/eressea/eressea-5.dsp b/src/eressea/eressea-5.dsp deleted file mode 100644 index 3f97daec7..000000000 --- a/src/eressea/eressea-5.dsp +++ /dev/null @@ -1,850 +0,0 @@ -# Microsoft Developer Studio Project File - Name="eressea" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=eressea - Win32 Conversion -!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 -!MESSAGE NMAKE /f "eressea-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "eressea-5.mak" CFG="eressea - Win32 Conversion" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "eressea - Win32 Release" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE "eressea - Win32 Debug" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE "eressea - Win32 Conversion" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "eressea - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "eressea_" -# PROP BASE Intermediate_Dir "eressea_" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "eressea0" -# PROP BASE Intermediate_Dir "eressea0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Gm /Zi /Od /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX"stdafx.h" /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /S (*.h ../*.h ../kernel/eressea.h ../util/*.h ../triggers/*.h) ../kernel/Debug/*.sbr ../triggers/Debug/*.sbr ../util/Debug/*.sbr -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/eressea.exe" /pdbtype:sept - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "eressea_" -# PROP BASE Intermediate_Dir "eressea_" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "eressea_" -# PROP Intermediate_Dir "eressea_" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /Za /W4 /Gm /Zi /Od /I ".." /I "../util" /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /Za /W4 /Gm /Zi /Od /I ".." /I "../util" /I "../common" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "CONVERT_TRIGGER" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "eressea - Win32 Release" -# Name "eressea - Win32 Debug" -# Name "eressea - Win32 Conversion" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=..\common\modules\arena.h -# End Source File -# Begin Source File - -SOURCE=.\attributes.h -# End Source File -# Begin Source File - -SOURCE=..\common\modules\museum.h -# End Source File -# Begin Source File - -SOURCE=..\common\modules\score.h -# End Source File -# Begin Source File - -SOURCE=.\weapons.h -# End Source File -# Begin Source File - -SOURCE=..\common\modules\xmas2000.h -# End Source File -# End Group -# Begin Group "Conversion" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\old\pointertags.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\old\relation.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\old\trigger.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Races" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\common\races\dragons.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\races\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\races\dragons.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\races\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\races\illusion.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\races\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\races\illusion.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\races\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\races\zombies.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\races\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\races\zombies.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\races\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Items" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\common\items\demonseye.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\items\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\items\demonseye.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\items\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\items\weapons.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\items\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\items\weapons.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\items\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Modules" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\common\modules\arena.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\modules\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\modules\museum.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\modules\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\modules\oceannames.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\modules\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\modules\score.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\modules\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\modules\xmas2000.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\modules\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Attributes" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\common\attributes\follow.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\follow.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\giveitem.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\giveitem.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\hate.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\hate.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\iceberg.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\iceberg.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\key.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\key.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\matmod.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\matmod.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\reduceproduction.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\reduceproduction.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\targetregion.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\attributes\targetregion.h - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\attributes\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Triggers" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\common\triggers\changefaction.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\changerace.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\createcurse.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\createunit.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\giveitem.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\killunit.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\removecurse.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\shock.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\timeout.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\unitmessage.c - -!IF "$(CFG)" == "eressea - Win32 Release" - -!ELSEIF "$(CFG)" == "eressea - Win32 Debug" - -# PROP Intermediate_Dir "..\common\triggers\Debug" - -!ELSEIF "$(CFG)" == "eressea - Win32 Conversion" - -!ENDIF - -# End Source File -# End Group -# Begin Source File - -SOURCE=.\attributes.c -# End Source File -# Begin Source File - -SOURCE=..\common\modules\gmcmd.c -# End Source File -# Begin Source File - -SOURCE=.\korrektur.c -# End Source File -# Begin Source File - -SOURCE=.\main.c -# End Source File -# Begin Source File - -SOURCE=.\triggers.c -# End Source File -# End Target -# End Project diff --git a/src/eressea/eressea-6.dsp b/src/eressea/eressea.dsp similarity index 90% rename from src/eressea/eressea-6.dsp rename to src/eressea/eressea.dsp index 352a7eb47..74c4dc3c4 100644 --- a/src/eressea/eressea-6.dsp +++ b/src/eressea/eressea.dsp @@ -8,12 +8,12 @@ CFG=ERESSEA - WIN32 DEBUG !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "eressea-6.mak". +!MESSAGE NMAKE /f "eressea.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "eressea-6.mak" CFG="ERESSEA - WIN32 DEBUG" +!MESSAGE NMAKE /f "eressea.mak" CFG="ERESSEA - WIN32 DEBUG" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo /S (*.h ../*.h ../common/kernel/eressea.h ../common/gamecode/*.h ../common/util/*.h ../common/triggers/*.h) ../common/gamecode/Debug/*.sbr ../common/kernel/Debug/*.sbr ../common/triggers/Debug/*.sbr ../common/util/Debug/*.sbr LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/eressea.exe" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "eressea - Win32 Profile" @@ -110,18 +110,6 @@ LINK32=link.exe # Name "eressea - Win32 Profile" # Begin Source File -SOURCE=.\attributes.c -# End Source File -# Begin Source File - -SOURCE=.\attributes.h -# End Source File -# Begin Source File - -SOURCE=.\items.c -# End Source File -# Begin Source File - SOURCE=.\korrektur.c # End Source File # Begin Source File @@ -132,17 +120,5 @@ SOURCE=.\korrektur.h SOURCE=.\main.c # End Source File -# Begin Source File - -SOURCE=.\spells.c -# End Source File -# Begin Source File - -SOURCE=.\triggers.c -# End Source File -# Begin Source File - -SOURCE=.\triggers.h -# End Source File # End Target # End Project diff --git a/src/mapper/mapper-5.dsp b/src/mapper/mapper-5.dsp deleted file mode 100644 index 26df1e89b..000000000 --- a/src/mapper/mapper-5.dsp +++ /dev/null @@ -1,136 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mapper" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=mapper - Win32 Debug -!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 -!MESSAGE NMAKE /f "mapper-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "mapper-5.mak" CFG="mapper - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "mapper - Win32 Release" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE "mapper - Win32 Debug" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mapper - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "mapper - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /Za /W4 /Gm /Zi /Od /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX"stdafx.h" /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /S (*.h ../*.h ../kernel/eressea.h ../util/*.h ../triggers/*.h) ../kernel/Debug/*.sbr ../triggers/Debug/*.sbr ../util/Debug/*.sbr -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 curses.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/mapper.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "mapper - Win32 Release" -# Name "mapper - Win32 Debug" -# Begin Group "Header" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=.\mapper.h -# End Source File -# Begin Source File - -SOURCE=..\modules\oceannames.h -# End Source File -# Begin Source File - -SOURCE=..\modules\score.h -# End Source File -# Begin Source File - -SOURCE=..\common\triggers\triggers.h -# End Source File -# Begin Source File - -SOURCE=..\modules\weather.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\map_modify.c -# End Source File -# Begin Source File - -SOURCE=.\map_partei.c -# End Source File -# Begin Source File - -SOURCE=.\map_region.c -# End Source File -# Begin Source File - -SOURCE=.\map_tools.c -# End Source File -# Begin Source File - -SOURCE=.\map_units.c -# End Source File -# Begin Source File - -SOURCE=.\mapper.c -# End Source File -# End Target -# End Project diff --git a/src/mapper/mapper-6.dsp b/src/mapper/mapper.dsp similarity index 100% rename from src/mapper/mapper-6.dsp rename to src/mapper/mapper.dsp diff --git a/src/tools/reduce-6.dsp b/src/tools/reduce-6.dsp deleted file mode 100644 index 91c7defcd..000000000 --- a/src/tools/reduce-6.dsp +++ /dev/null @@ -1,101 +0,0 @@ -# Microsoft Developer Studio Project File - Name="reduce" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=reduce - Win32 Debug -!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 -!MESSAGE NMAKE /f "reduce-5.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "reduce-5.mak" CFG="reduce - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "reduce - Win32 Release" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE "reduce - Win32 Debug" (basierend auf\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "reduce - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "reduce - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G5 /Zp1 /MDd /Za /W4 /Gm /Gi /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "reduce - Win32 Release" -# Name "reduce - Win32 Debug" -# Begin Source File - -SOURCE=..\museum.c -# End Source File -# Begin Source File - -SOURCE=.\reduce.c -# End Source File -# Begin Source File - -SOURCE=..\weapons.c -# End Source File -# End Target -# End Project diff --git a/src/tools/reduce-5.dsp b/src/tools/reduce.dsp similarity index 100% rename from src/tools/reduce-5.dsp rename to src/tools/reduce.dsp