From 16357ed9f35f5d094445beda43225c3474ada9eb Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Sun, 7 May 2006 23:35:14 +0000 Subject: [PATCH] moved around some platform specific files --- Cxbe.dsp | 4 ++-- Cxbx.dsp | 4 ++-- CxbxKrnl.dsp | 4 ++-- Makefile | 2 +- Source/{ => Common}/Linux/AlignPosfix1.h | 0 Source/{ => Common}/Linux/AlignPrefix1.h | 0 Source/{ => Common}/Win32/AlignPosfix1.h | 0 Source/{ => Common}/Win32/AlignPrefix1.h | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename Source/{ => Common}/Linux/AlignPosfix1.h (100%) rename Source/{ => Common}/Linux/AlignPrefix1.h (100%) rename Source/{ => Common}/Win32/AlignPosfix1.h (100%) rename Source/{ => Common}/Win32/AlignPrefix1.h (100%) diff --git a/Cxbe.dsp b/Cxbe.dsp index a5a4986d7..2f33177d5 100644 --- a/Cxbe.dsp +++ b/Cxbe.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "Source" /I "Source\Win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Source" /I "Source\Common\Win32" /I "Source\Win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=xilink6.exe # 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 /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Source" /I "Source\Win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Source" /I "Source\Common\Win32" /I "Source\Win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" diff --git a/Cxbx.dsp b/Cxbx.dsp index f6bbe959e..624eb357f 100644 --- a/Cxbx.dsp +++ b/Cxbx.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "Source" /I "Source\Win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fr /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "Source" /I "Source\Common\Win32" /I "Source\Win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fr /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=xilink6.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Source" /I "Source\Win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fr /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Source" /I "Source\Common\Win32" /I "Source\Win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fr /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/CxbxKrnl.dsp b/CxbxKrnl.dsp index 591e46fb3..afbddf408 100644 --- a/CxbxKrnl.dsp +++ b/CxbxKrnl.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "Import\OpenXDK" /I "Source" /I "Source\Win32" /I "Import\OpenXDK\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Import\OpenXDK" /I "Source" /I "Source\Common\Win32" /I "Source\Win32" /I "Import\OpenXDK\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=xilink6.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Source" /I "Source\Win32" /I "Import\OpenXDK\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Source" /I "Source\Common\Win32" /I "Source\Win32" /I "Import\OpenXDK\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /GZ /c # SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 diff --git a/Makefile b/Makefile index e6fa67bd9..e2041e501 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ # * File Authors: Aaron Robinson, Edgar Hucek # ****************************************************************** CC = g++ -CFLAGS = -g -O2 -ISource -ISource/Linux +CFLAGS = -g -O2 -ISource -ISource/Common/Linux -ISource/Linux OBJCOPY = objcopy GCC295 = cpp0-2.95 #LDFLAGS = -s -S -T ldscript.ld diff --git a/Source/Linux/AlignPosfix1.h b/Source/Common/Linux/AlignPosfix1.h similarity index 100% rename from Source/Linux/AlignPosfix1.h rename to Source/Common/Linux/AlignPosfix1.h diff --git a/Source/Linux/AlignPrefix1.h b/Source/Common/Linux/AlignPrefix1.h similarity index 100% rename from Source/Linux/AlignPrefix1.h rename to Source/Common/Linux/AlignPrefix1.h diff --git a/Source/Win32/AlignPosfix1.h b/Source/Common/Win32/AlignPosfix1.h similarity index 100% rename from Source/Win32/AlignPosfix1.h rename to Source/Common/Win32/AlignPosfix1.h diff --git a/Source/Win32/AlignPrefix1.h b/Source/Common/Win32/AlignPrefix1.h similarity index 100% rename from Source/Win32/AlignPrefix1.h rename to Source/Common/Win32/AlignPrefix1.h