diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/.cvsignore | 2 | ||||
| -rw-r--r-- | win32/build.bat | 3 | ||||
| -rw-r--r-- | win32/domc.dsp | 97 | ||||
| -rw-r--r-- | win32/libmba.dsp | 97 | ||||
| -rw-r--r-- | win32/rtfx.dsp | 23 | ||||
| -rw-r--r-- | win32/rtfx.dsw | 30 |
6 files changed, 242 insertions, 10 deletions
diff --git a/win32/.cvsignore b/win32/.cvsignore index fdc9a0c..9701b9e 100644 --- a/win32/.cvsignore +++ b/win32/.cvsignore @@ -6,3 +6,5 @@ debug release Makefile Makefile.in +domc.plg +libmba.plg
\ No newline at end of file diff --git a/win32/build.bat b/win32/build.bat new file mode 100644 index 0000000..8bb6185 --- /dev/null +++ b/win32/build.bat @@ -0,0 +1,3 @@ +@echo off +cd ../libs/%1/ +nmake /f Makefile.msvc %2 diff --git a/win32/domc.dsp b/win32/domc.dsp new file mode 100644 index 0000000..ef24010 --- /dev/null +++ b/win32/domc.dsp @@ -0,0 +1,97 @@ +# Microsoft Developer Studio Project File - Name="domc" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=domc - 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 "domc.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 "domc.mak" CFG="domc - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "domc - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "domc - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "domc - 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 Cmd_Line "NMAKE /f domc.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "domc.exe" +# PROP BASE Bsc_Name "domc.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "build.bat domc" +# PROP Rebuild_Opt "/a" +# PROP Target_File "../libs/domc/domc.lib" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "domc - 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 Cmd_Line "NMAKE /f domc.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "domc.exe" +# PROP BASE Bsc_Name "domc.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "build.bat domc" +# PROP Rebuild_Opt "/a" +# PROP Target_File "../libs/domc/domc.lib" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "domc - Win32 Release" +# Name "domc - Win32 Debug" + +!IF "$(CFG)" == "domc - Win32 Release" + +!ELSEIF "$(CFG)" == "domc - Win32 Debug" + +!ENDIF + +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/win32/libmba.dsp b/win32/libmba.dsp new file mode 100644 index 0000000..08546a8 --- /dev/null +++ b/win32/libmba.dsp @@ -0,0 +1,97 @@ +# Microsoft Developer Studio Project File - Name="libmba" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=libmba - 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 "libmba.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 "libmba.mak" CFG="libmba - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libmba - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "libmba - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "libmba - Win32 Release" + +# PROP BASE Use_MFC +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f libmba.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "libmba.exe" +# PROP BASE Bsc_Name "libmba.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "build.bat libmba" +# PROP Rebuild_Opt "/a" +# PROP Target_File "../libs/libmba/libmba.lib" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "libmba - Win32 Debug" + +# PROP BASE Use_MFC +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Cmd_Line "NMAKE /f libmba.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "libmba.exe" +# PROP BASE Bsc_Name "libmba.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "build.bat libmba" +# PROP Rebuild_Opt "/a" +# PROP Target_File "../libs/libmba/libmba.lib" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "libmba - Win32 Release" +# Name "libmba - Win32 Debug" + +!IF "$(CFG)" == "libmba - Win32 Release" + +!ELSEIF "$(CFG)" == "libmba - Win32 Debug" + +!ENDIF + +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/win32/rtfx.dsp b/win32/rtfx.dsp index f89ca96..c4a97c7 100644 --- a/win32/rtfx.dsp +++ b/win32/rtfx.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" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "sablot/include" /I "../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../" /I "../libs/domc/src/" /I "../libs/libmba/src/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -51,7 +51,7 @@ BSC32=bscmake.exe # 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 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 -# 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 +# ADD LINK32 libmba.lib domc.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:"../libs/domc/" /libpath:"../libs/libmba" /opt:nowin98 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "rtfx - Win32 Debug" @@ -68,7 +68,7 @@ LINK32=link.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" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "sablot/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../libs/domc/src/" /I "../libs/libmba/src/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -77,7 +77,7 @@ BSC32=bscmake.exe # 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 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 /debug /machine:I386 /pdbtype:sept -# 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 /debug /machine:I386 /pdbtype:sept /libpath:"sablot/lib" +# ADD LINK32 libmba.lib domc.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 /debug /machine:I386 /pdbtype:sept /libpath:"../libs/domc/" /libpath:"../libs/libmba" !ENDIF @@ -106,8 +106,7 @@ SOURCE=..\src\rtfx.cpp # End Source File # Begin Source File -SOURCE=..\src\sablotr.cpp -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\src\utf8.cpp # End Source File # Begin Source File @@ -127,10 +126,18 @@ SOURCE=..\src\xmlfixups.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File +SOURCE=..\src\domcxx.h +# End Source File +# Begin Source File + SOURCE=..\src\domhelpers.h # End Source File # Begin Source File +SOURCE=..\src\internal.h +# End Source File +# Begin Source File + SOURCE=..\src\levelhandler.h # End Source File # Begin Source File @@ -147,10 +154,6 @@ SOURCE=..\src\rtfparser.h # End Source File # Begin Source File -SOURCE=..\src\sablo.h -# End Source File -# Begin Source File - SOURCE=..\src\tags.h # End Source File # Begin Source File diff --git a/win32/rtfx.dsw b/win32/rtfx.dsw index 050295c..0f90bda 100644 --- a/win32/rtfx.dsw +++ b/win32/rtfx.dsw @@ -3,6 +3,33 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### +Project: "domc"=.\domc.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmba + End Project Dependency +}}} + +############################################################################### + +Project: "libmba"=.\libmba\libmba.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "rtfx"=.\rtfx.dsp - Package Owner=<4> Package=<5> @@ -11,6 +38,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name domc + End Project Dependency }}} ############################################################################### |