Changed name to RTFX due to a naming conflict

4 files changed, 20 insertions, 18 deletions

diff --git a/win32/.cvsignore b/win32/.cvsignore
index 57336c0..fdc9a0c 100644
--- a/win32/.cvsignore
+++ b/win32/.cvsignore
@@ -1,6 +1,8 @@
-rtfm.ncb
-rtfm.plg
-rtfm.opt
-rtfm.ncb
+rtfx.ncb
+rtfx.plg
+rtfx.opt
+rtfx.ncb
 debug
-release
\ No newline at end of file
+release
+Makefile
+Makefile.in
diff --git a/win32/Makefile.am b/win32/Makefile.am
index e46d9af..1ab9118 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -37,5 +37,5 @@
 #
 
 
-EXTRA_DIST=rtfm.dsp rtfm.dsw sablot
+EXTRA_DIST=rtfx.dsp rtfx.dsw sablot
 
diff --git a/win32/rtfx.dsp b/win32/rtfx.dsp
index 9879faf..fabaf9d 100644
--- a/win32/rtfx.dsp
+++ b/win32/rtfx.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="rtfm" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="rtfx" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=rtfm - Win32 Debug
+CFG=rtfx - 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 "rtfm.mak".
+!MESSAGE NMAKE /f "rtfx.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 "rtfm.mak" CFG="rtfm - Win32 Debug"
+!MESSAGE NMAKE /f "rtfx.mak" CFG="rtfx - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "rtfm - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rtfm - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "rtfx - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rtfx - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=rtfm - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "rtfm - Win32 Release"
+!IF  "$(CFG)" == "rtfx - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,7 +54,7 @@ LINK32=link.exe
 # ADD LINK32 sablot.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"sablot/lib" /opt:nowin98
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "rtfm - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rtfx - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -83,8 +83,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "rtfm - Win32 Release"
-# Name "rtfm - Win32 Debug"
+# Name "rtfx - Win32 Release"
+# Name "rtfx - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -102,7 +102,7 @@ SOURCE=..\src\rtfanalyser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfm.cpp
+SOURCE=..\src\rtfx.cpp
 # End Source File
 # Begin Source File
 
diff --git a/win32/rtfx.dsw b/win32/rtfx.dsw
index c65a996..050295c 100644
--- a/win32/rtfx.dsw
+++ b/win32/rtfx.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "rtfm"=.\rtfm.dsp - Package Owner=<4>
+Project: "rtfx"=.\rtfx.dsp - Package Owner=<4>
 
 Package=<5>
 {{{