Removed OS/2 support.

icculus · Mar 9, 2012 · 9e2acfd · 9e2acfd
1 parent 4d46d42
commit 9e2acfd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 723 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,11 +21,6 @@ IF(APPLE AND NOT MACOSX)
     SET(MACOSX TRUE)
 ENDIF(APPLE AND NOT MACOSX)
 
-# And this might be wrong...
-IF (CMAKE_SYSTEM MATCHES OS2)
-    SET(OS2 TRUE)
-ENDIF (CMAKE_SYSTEM MATCHES OS2)
-
 # For now, Haiku and BeOS are the same, as far as the build system cares.
 IF(HAIKU AND NOT BEOS)
     SET(BEOS TRUE)
@@ -73,9 +68,9 @@ IF(CMAKE_COMPILER_IS_GNUCC)
 
     IF(PHYSFS_IS_GCC4)
         # Not supported on several operating systems at this time.
-        IF(NOT OS2 AND NOT SOLARIS AND NOT WINDOWS) 
+        IF(NOT SOLARIS AND NOT WINDOWS)
             ADD_DEFINITIONS(-fvisibility=hidden)
-        ENDIF(NOT OS2 AND NOT SOLARIS AND NOT WINDOWS)
+        ENDIF(NOT SOLARIS AND NOT WINDOWS)
     ENDIF(PHYSFS_IS_GCC4)
 
     # Don't use -rpath.
@@ -141,7 +136,6 @@ SET(PHYSFS_SRCS
     src/physfs.c
     src/physfs_byteorder.c
     src/physfs_unicode.c
-    src/platform_os2.c
     src/platform_posix.c
     src/platform_unix.c
     src/platform_macosx.c
@@ -203,10 +197,10 @@ IF(UNIX)
     ENDIF(BEOS)
 ENDIF(UNIX)
 
-IF(WINDOWS OR OS2)
+IF(WINDOWS)
     SET(PHYSFS_HAVE_CDROM_SUPPORT TRUE)
     SET(PHYSFS_HAVE_THREAD_SUPPORT TRUE)
-ENDIF(WINDOWS OR OS2)
+ENDIF(WINDOWS)
 
 IF(NOT PHYSFS_HAVE_CDROM_SUPPORT)
     ADD_DEFINITIONS(-DPHYSFS_NO_CDROM_SUPPORT=1)

diff --git a/docs/TODO.txt b/docs/TODO.txt
@@ -3,11 +3,6 @@ Stuff that needs to be done and wishlist:
 These are in no particular order.
 Some might be dupes, some might be done already.
 
-UNICODE:
-- OS/2: Codepages. No full Unicode in the filesystem, but we can probably make
-        a conversion effort.
-
-
 Stuff:
 - Other archivers: perhaps tar(.gz|.bz2), RPM, ARJ, etc. These are less
   important, since streaming archives aren't of much value to games (which
@@ -39,7 +34,6 @@ Stuff:
 - Write up a simple HOWTO on embedding physicsfs in another project.
 - Archivers need abstracted i/o to read from memory or files (archives in archives?)
 - Probably other stuff. Requests and recommendations are welcome.
-- Dump OS/2?
 
 // end of TODO.txt ...
 
diff --git a/src/physfs.h b/src/physfs.h
@@ -190,13 +190,13 @@
  * PhysicsFS offers basic encoding conversion support, but not a whole string
  *  library. Get your stuff into whatever format you can work with.
  *
- * Some platforms and archivers don't offer full Unicode support behind the
- *  scenes. For example, OS/2 only offers "codepages" and the filesystem
- *  itself doesn't support multibyte encodings. We make an earnest effort to
- *  convert to/from the current locale here, but all bets are off if
- *  you want to hand an arbitrary Japanese character through to these systems.
- *  Modern OSes (Mac OS X, Linux, Windows, etc) should all be fine.
- *  Many game-specific archivers are seriously unprepared for Unicode (the
+ * All platforms supported by PhysicsFS 2.1 and later fully support Unicode.
+ *  We have dropped platforms that don't (OS/2, Mac OS 9, Windows 95, etc), as
+ *  even an OS that's over a decade old should be expected to handle this well.
+ *  If you absolutely must support one of these platforms, you should use an
+ *  older release of PhysicsFS.
+ *
+ * Many game-specific archivers are seriously unprepared for Unicode (the
  *  Descent HOG/MVL and Build Engine GRP archivers, for example, only offer a
  *  DOS 8.3 filename, for example). Nothing can be done for these, but they
  *  tend to be legacy formats for existing content that was all ASCII (and
@@ -254,8 +254,6 @@ extern "C" {
 /* do nothing. */
 #elif defined(__WIN32__) && !defined(__GNUC__)
 #define PHYSFS_CALL __cdecl
-#elif defined(__OS2__)  /* use _System, so it works across all compilers. */
-#define PHYSFS_CALL _System
 #else
 #define PHYSFS_CALL
 #endif

diff --git a/src/physfs_internal.h b/src/physfs_internal.h
@@ -163,7 +163,6 @@ void __PHYSFS_smallFree(void *ptr);
  #define ERR_DISK_FULL            "Disk is full"
  #define ERR_DIRECTORY_FULL       "Directory full"
  #define ERR_MACOS_GENERIC        "MacOS reported error (%d)"
- #define ERR_OS2_GENERIC          "OS/2 reported error (%d)"
  #define ERR_VOL_LOCKED_HW        "Volume is locked through hardware"
  #define ERR_VOL_LOCKED_SW        "Volume is locked through software"
  #define ERR_FILE_LOCKED          "File is locked"
@@ -262,7 +261,6 @@ void __PHYSFS_smallFree(void *ptr);
  #define ERR_DISK_FULL            "Laufwerk ist voll"
  #define ERR_DIRECTORY_FULL       "Verzeichnis ist voll"
  #define ERR_MACOS_GENERIC        "MacOS meldete Fehler (%d)"
- #define ERR_OS2_GENERIC          "OS/2 meldete Fehler (%d)"
  #define ERR_VOL_LOCKED_HW        "Datencontainer ist durch Hardware gesperrt"
  #define ERR_VOL_LOCKED_SW        "Datencontainer ist durch Software gesperrt"
  #define ERR_FILE_LOCKED          "Datei ist gesperrt"
@@ -360,7 +358,6 @@ void __PHYSFS_smallFree(void *ptr);
  #define ERR_DISK_FULL            "Диск полон"
  #define ERR_DIRECTORY_FULL       "Каталог полон"
  #define ERR_MACOS_GENERIC        "MacOS сообщила ошибку (%d)"
- #define ERR_OS2_GENERIC          "OS/2 сообщила ошибку (%d)"
  #define ERR_VOL_LOCKED_HW        "Том блокирован аппаратно"
  #define ERR_VOL_LOCKED_SW        "Том блокирован программно"
  #define ERR_FILE_LOCKED          "Файл заблокирован"
@@ -460,7 +457,6 @@ void __PHYSFS_smallFree(void *ptr);
  #define ERR_DISK_FULL            "Disque plein"
  #define ERR_DIRECTORY_FULL       "Répertoire plein"
  #define ERR_MACOS_GENERIC        "Erreur rapportée par MacOS (%d)"
- #define ERR_OS2_GENERIC          "Erreur rapportée par OS/2 (%d)"
  #define ERR_VOL_LOCKED_HW        "Le volume est verrouillé matériellement"
  #define ERR_VOL_LOCKED_SW        "Le volume est verrouillé par logiciel"
  #define ERR_FILE_LOCKED          "Fichier verrouillé"
@@ -560,7 +556,6 @@ void __PHYSFS_smallFree(void *ptr);
  #define ERR_DISK_FULL            "Disco cheio"
  #define ERR_DIRECTORY_FULL       "Diretório cheio"
  #define ERR_MACOS_GENERIC        "MacOS reportou um erro (%d)"
- #define ERR_OS2_GENERIC          "OS/2 reportou um erro (%d)"
  #define ERR_VOL_LOCKED_HW        "Volume travado por hardware"
  #define ERR_VOL_LOCKED_SW        "Volume travado por software"
  #define ERR_FILE_LOCKED          "Arquivo travado"
@@ -659,7 +654,6 @@ void __PHYSFS_smallFree(void *ptr);
  #define ERR_DISK_FULL            "El disco está lleno"
  #define ERR_DIRECTORY_FULL       "El directorio está lleno"
  #define ERR_MACOS_GENERIC        "MacOS ha devuelto un error (%d)"
- #define ERR_OS2_GENERIC          "OS/2 ha devuelto un error (%d)"
  #define ERR_VOL_LOCKED_HW        "El volumen está bloqueado por el hardware"
  #define ERR_VOL_LOCKED_SW        "El volumen está bloqueado por el software"
  #define ERR_FILE_LOCKED          "El archivo está bloqueado"

diff --git a/src/physfs_platforms.h b/src/physfs_platforms.h
@@ -24,7 +24,7 @@
 #elif (((defined _WIN32) || (defined _WIN64)) && (!defined __CYGWIN__))
 #  define PHYSFS_PLATFORM_WINDOWS
 #elif (defined OS2)
-#  define PHYSFS_PLATFORM_OS2
+#  error OS/2 support was dropped from PhysicsFS 2.1. Sorry.
 #elif ((defined __MACH__) && (defined __APPLE__))
 /* To check if iphone or not, we need to include this file */
 # include <TargetConditionals.h>