Last minute changes, fixes, and build system updates for 1.0.

Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.2.16
+# Doxyfile 1.3.4
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -11,7 +11,7 @@
 # Values that contain spaces should be placed between quotes (" ")
 
 #---------------------------------------------------------------------------
-# General configuration options
+# Project related configuration options
 #---------------------------------------------------------------------------
 
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
@@ -23,7 +23,7 @@ PROJECT_NAME           = physfs
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.1.9
+PROJECT_NUMBER         = 1.0.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -36,50 +36,22 @@ OUTPUT_DIRECTORY       = docs
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Korean, 
-# Norwegian, Polish, Portuguese, Romanian, Russian, Slovak, Slovene, 
-# Spanish, Swedish and Ukrainian.
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
+# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, 
+# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
 
-EXTRACT_LOCAL_CLASSES  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these class will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
+USE_WINDOWS_ENCODING   = NO
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
@@ -115,65 +87,34 @@ INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user defined part of the path. Stripping is 
+# can be used to strip a user-defined part of the path. Stripping is 
 # only done if one of the specified strings matches the left-hand part of 
 # the path. It is allowed to use relative paths in the argument list.
 
 STRIP_FROM_PATH        = 
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower case letters. If set to YES upper case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# users are adviced to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments  will behave just like the Qt-style comments (thus requiring an 
+# comments will behave just like the Qt-style comments (thus requiring an 
 # explict @brief command for a brief description.
 
 JAVADOC_AUTOBRIEF      = NO
 
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
 # If the DETAILS_AT_TOP tag is set to YES then Doxygen 
 # will output the detailed description near the top, like JavaDoc.
 # If set to NO, the detailed description appears after the member 
@@ -187,18 +128,6 @@ DETAILS_AT_TOP         = NO
 
 INHERIT_DOCS           = YES
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
 # tag is set to YES, then doxygen will reuse the documentation of the first 
 # member in the group (if any) for the other members of the group. By default 
@@ -211,6 +140,132 @@ DISTRIBUTE_GROUP_DOC   = NO
 
 TAB_SIZE               = 4
 
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
+# only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
+# only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
 # commands in the documentation.
@@ -229,14 +284,11 @@ GENERATE_TESTLIST      = YES
 
 GENERATE_BUGLIST       = YES
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
 
-ALIASES                = 
+GENERATE_DEPRECATEDLIST= YES
 
 # The ENABLED_SECTIONS tag can be used to enable conditional 
 # documentation sections, marked by \if sectionname ... \endif.
@@ -244,7 +296,7 @@ ALIASES                =
 ENABLED_SECTIONS       = 
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consist of for it to appear in 
+# the initial value of a variable or define consists of for it to appear in 
 # the documentation. If the initializer consists of more lines than specified 
 # here it will be hidden. Use a value of 0 to hide initializers completely. 
 # The appearance of the initializer of individual variables and defines in the 
@@ -253,20 +305,6 @@ ENABLED_SECTIONS       =
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
 # at the bottom of the documentation of classes and structs. If set to YES the 
 # list will mention the files that were used to generate the documentation.
@@ -294,6 +332,13 @@ WARNINGS               = YES
 
 WARN_IF_UNDOCUMENTED   = YES
 
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
 # The WARN_FORMAT tag determines the format of the warning messages that 
 # doxygen can produce. The string should contain the $file, $line, and $text 
 # tags, which will be replaced by the file and line number from which the 
@@ -323,7 +368,7 @@ INPUT                  = physfs.h
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl
+# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
 
 FILE_PATTERNS          = 
 
@@ -387,7 +432,7 @@ INPUT_FILTER           =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
 # INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse.
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
 
@@ -405,6 +450,12 @@ SOURCE_BROWSER         = NO
 
 INLINE_SOURCES         = NO
 
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
 # If the REFERENCED_BY_RELATION tag is set to YES (the default) 
 # then for each documented function all documented 
 # functions referencing it will be listed.
@@ -417,6 +468,12 @@ REFERENCED_BY_RELATION = YES
 
 REFERENCES_RELATION    = YES
 
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -438,7 +495,7 @@ COLS_IN_ALPHA_INDEX    = 5
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
 # should be ignored while generating the index headers.
 
-IGNORE_PREFIX          =
+IGNORE_PREFIX          = 
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
@@ -473,7 +530,7 @@ HTML_HEADER            =
 
 HTML_FOOTER            = 
 
-# The HTML_STYLESHEET tag can be used to specify a user defined cascading 
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet
@@ -493,6 +550,20 @@ HTML_ALIGN_MEMBERS     = YES
 
 GENERATE_HTMLHELP      = NO
 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output dir.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
 # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
 # controls if a separate .chi index file is generated (YES) or that 
 # it should be included in the master .chm file (NO).
@@ -506,7 +577,7 @@ GENERATE_CHI           = NO
 BINARY_TOC             = NO
 
 # The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the Html help documentation and to the tree view.
+# to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
@@ -524,10 +595,9 @@ ENUM_VALUES_PER_LINE   = 4
 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
 # generated containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
-# JavaScript and frames is required (for instance Mozilla, Netscape 4.0+, 
-# or Internet explorer 4.0+). Note that for large projects the tree generation 
-# can take a very long time. In such cases it is better to disable this feature. 
-# Windows users are probably better off using the HTML help feature.
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
 
 GENERATE_TREEVIEW      = NO
 
@@ -552,7 +622,8 @@ GENERATE_LATEX         = YES
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be invoked. If left blank `latex' will be used as the default command name.
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
 
 LATEX_CMD_NAME         = latex
 
@@ -606,6 +677,12 @@ USE_PDFLATEX           = NO
 
 LATEX_BATCHMODE        = NO
 
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -688,6 +765,24 @@ MAN_LINKS              = YES
 
 GENERATE_XML           = NO
 
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -700,6 +795,39 @@ GENERATE_XML           = NO
 
 GENERATE_AUTOGEN_DEF   = NO
 
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
@@ -747,9 +875,10 @@ INCLUDE_FILE_PATTERNS  =
 # or name=definition (no spaces). If the definition and the = are 
 # omitted =1 is assumed.
 
-PREDEFINED             = DOXYGEN_SHOULD_IGNORE_THIS=1 __EXPORT__=
+PREDEFINED             = DOXYGEN_SHOULD_IGNORE_THIS=1 \
+                         __EXPORT__=
 
-# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
 # The macro definition that is found in the sources will be used. 
 # Use the PREDEFINED tag if you want to use a different macro definition.
@@ -758,8 +887,9 @@ EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line and do not end with a semicolon. Such function macros are typically 
-# used for boiler-plate code, and will confuse the parser if not removed.
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse the 
+# parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
@@ -767,7 +897,20 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
 
-# The TAGFILES tag can be used to specify one or more tagfiles.
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
 
 TAGFILES               = 
 
@@ -798,7 +941,7 @@ PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in Html, RTF and LaTeX) for classes with base or 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
 # super classes. Setting the tag to NO turns the diagrams off. Note that this 
 # option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
 # recommended to install and use dot, since it yields more powerful graphs.
@@ -832,6 +975,12 @@ CLASS_GRAPH            = NO
 
 COLLABORATION_GRAPH    = NO
 
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similiar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
 # If set to YES, the inheritance and collaboration graphs will show the 
 # relations between templates and their instances.
 
@@ -851,6 +1000,14 @@ INCLUDE_GRAPH          = NO
 
 INCLUDED_BY_GRAPH      = YES
 
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
 
@@ -889,6 +1046,17 @@ MAX_DOT_GRAPH_WIDTH    = 1024
 
 MAX_DOT_GRAPH_HEIGHT   = 1024
 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes that 
+# lay further from the root node will be omitted. Note that setting this option to 
+# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
+# note that a graph may be further truncated if the graph's image dimensions are 
+# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
+# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
 # arrows in the dot generated graphs.
@@ -896,7 +1064,7 @@ MAX_DOT_GRAPH_HEIGHT   = 1024
 GENERATE_LEGEND        = YES
 
 # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermedate dot files that are used to generate 
+# remove the intermediate dot files that are used to generate 
 # the various graphs.
 
 DOT_CLEANUP            = YES
@@ -909,38 +1077,3 @@ DOT_CLEANUP            = YES
 # used. If set to NO the values of all tags below this one will be ignored.
 
 SEARCHENGINE           = NO
-
-# The CGI_NAME tag should be the name of the CGI script that 
-# starts the search engine (doxysearch) with the correct parameters. 
-# A script with this name will be generated by doxygen.
-
-CGI_NAME               = search.cgi
-
-# The CGI_URL tag should be the absolute URL to the directory where the 
-# cgi binaries are located. See the documentation of your http daemon for 
-# details.
-
-CGI_URL                = 
-
-# The DOC_URL tag should be the absolute URL to the directory where the 
-# documentation is located. If left blank the absolute path to the 
-# documentation, with file:// prepended to it, will be used.
-
-DOC_URL                = 
-
-# The DOC_ABSPATH tag should be the absolute path to the directory where the 
-# documentation is located. If left blank the directory on the local machine 
-# will be used.
-
-DOC_ABSPATH            = 
-
-# The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
-# is installed.
-
-BIN_ABSPATH            = /usr/local/bin/
-
-# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
-# documentation generated for other projects. This allows doxysearch to search 
-# the documentation for these projects as well.
-
-EXT_DOC_PATHS          = 

Makefile.am.newautomake

@@ -80,10 +80,13 @@ EXTRA_DIST =	\
 	INSTALL \
 	TODO \
 	Doxyfile \
-	CWProjects.sit \
+	CWProjects.sitx \
 	physfs.spec \
 	physfs.dsp \
 	test_physfs.dsp \
+	physfs_static.dsp \
+	physfs.vcproj \
+	test_physfs.vcproj \
 	platform/skeleton.c    \
 	platform/macclassic.c  \
 	platform/win32.c       \
@@ -96,6 +99,7 @@ EXTRA_DIST =	\
 	Makefile.am.newautomake \
 	zlib_license_change.txt \
     makeos2.cmd             \
+    PBProjects             \
     $(ZLIB_EXTRADIST) $(BEOS_EXTRADIST) $(TEST_EXTRADIST)
 
 else
@@ -128,11 +132,15 @@ EXTRA_DIST =	\
 	INSTALL \
 	TODO \
 	Doxyfile \
-	CWProjects.sit \
+	PBProjects \
+	CWProjects.sitx \
 	physfs.spec.in \
 	physfs.spec \
 	physfs.dsp \
 	test_physfs.dsp \
+	physfs_static.dsp \
+	physfs.vcproj \
+	test_physfs.vcproj \
 	zlib_license_change.txt \
 	makeos2.cmd
 
@@ -141,6 +149,7 @@ endif
 
 
 dist-hook:
+	perl -w -pi -e 'chomp; $$_ .= "\r\n";' $(distdir)/*.dsp $(distdir)/*.vcproj
 	mkdir $(distdir)/docs
 	echo "Docs are generated with the program "Doxygen" (http://www.doxygen.org/)," >> $(distdir)/docs/README
 	echo " or can be read online at http://icculus.org/physfs/docs/" >> $(distdir)/docs/README

Makefile.am.oldautomake

@@ -32,17 +32,22 @@ EXTRA_DIST =	\
 	INSTALL \
 	TODO \
 	Doxyfile \
-	CWProjects.sit \
+	PBProjects \
+	CWProjects.sitx \
 	physfs.spec.in \
 	physfs.spec \
 	physfs.dsp \
+	physfs_static.dsp \
 	test_physfs.dsp \
+	physfs.vcproj \
+	test_physfs.vcproj \
 	zlib_license_change.txt \
 	makeos2.cmd
 
 dist-hook:
+	perl -w -pi -e 'chomp; $$_ .= "\r\n";' $(distdir)/*.dsp $(distdir)/*.vcproj
 	mkdir $(distdir)/docs
 	echo "Docs are generated with the program "Doxygen" (http://www.doxygen.org/)," >> $(distdir)/docs/README
 	echo " or can be read online at http://icculus.org/physfs/docs/" >> $(distdir)/docs/README
 	echo >> $(distdir)/docs/README
-
+	rm -rf `find $(distdir) -name "CVS" -type d`

PBProjects/physfs.pbproj/project.pbxproj

@@ -66,6 +66,7 @@
 				014CEA440018CDF011CA2923,
 				014CEA450018CDF011CA2923,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			mainGroup = 0867D691FE84028FC02AAC07;
 			productRefGroup = 034768DFFF38A50411DB9C8B;
@@ -110,8 +111,8 @@
 				HEADER_SEARCH_PATHS = "";
 				INSTALL_PATH = "$(HOME)/Library/Frameworks";
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "-DPHYSFS_HAVE_SYS_UCRED_H -DNDEBUG -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_QPAK";
-				OTHER_LDFLAGS = "-seg1addr 0x30A00000";
+				OTHER_CFLAGS = "-DPHYSFS_HAVE_SYS_UCRED_H -DZ_PREFIX -DNDEBUG -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_SUPPORTS_WAD";
+				OTHER_LDFLAGS = "-seg1addr 0x30A00000 -framework IOKit -framework Carbon";
 				PRODUCT_NAME = physfs;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -145,17 +146,16 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.7</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
+	<string>1.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 1;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
@@ -163,12 +163,9 @@
 				F8FDCE0A03AEDD6801A8000A,
 				F8FDCE6B03AEDE1F01A8000A,
 				F8FDCE8A03AEDE1F01A8000A,
-				F8FDCE8C03AEDE1F01A8000A,
-				F8FDCE8E03AEDE1F01A8000A,
 				F8FDCE9003AEDE1F01A8000A,
 				F8FDCE9103AEDE1F01A8000A,
 				F8FDCE9403AEDE1F01A8000A,
-				F8FDCE9603AEDE1F01A8000A,
 				F8FDCE9B03AEDE1F01A8000A,
 				F8FDCE9D03AEDE1F01A8000A,
 				F8FDCE9E03AEDE1F01A8000A,
@@ -197,17 +194,17 @@
 				F8FDCE8703AEDE1F01A8000A,
 				F8FDCE8803AEDE1F01A8000A,
 				F8FDCE8903AEDE1F01A8000A,
-				F8FDCE8B03AEDE1F01A8000A,
-				F8FDCE8D03AEDE1F01A8000A,
 				F8FDCE8F03AEDE1F01A8000A,
 				F8FDCE9203AEDE1F01A8000A,
 				F8FDCE9303AEDE1F01A8000A,
-				F8FDCE9503AEDE1F01A8000A,
 				F8FDCE9A03AEDE1F01A8000A,
 				F8FDCE9C03AEDE1F01A8000A,
 				F8FDCE9F03AEDE1F01A8000A,
 				F8FDCEC703AEDE3A01A8000A,
 				F886735503B8AF5501A8000A,
+				56E7B5B005A6A75B00A801AA,
+				56E7B5B105A6A75B00A801AA,
+				56E7B5B205A6A75B00A801AA,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -267,12 +264,77 @@
 //082
 //083
 //084
+//560
+//561
+//562
+//563
+//564
+		56E7B5AD05A6A75B00A801AA = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = hog.c;
+			refType = 4;
+		};
+		56E7B5AE05A6A75B00A801AA = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = mvl.c;
+			refType = 4;
+		};
+		56E7B5AF05A6A75B00A801AA = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = wad.c;
+			refType = 4;
+		};
+		56E7B5B005A6A75B00A801AA = {
+			fileRef = 56E7B5AD05A6A75B00A801AA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		56E7B5B105A6A75B00A801AA = {
+			fileRef = 56E7B5AE05A6A75B00A801AA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		56E7B5B205A6A75B00A801AA = {
+			fileRef = 56E7B5AF05A6A75B00A801AA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		56E7B5B305A6A75B00A801AA = {
+			fileRef = 56E7B5AD05A6A75B00A801AA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		56E7B5B405A6A75B00A801AA = {
+			fileRef = 56E7B5AE05A6A75B00A801AA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		56E7B5B505A6A75B00A801AA = {
+			fileRef = 56E7B5AF05A6A75B00A801AA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//560
+//561
+//562
+//563
+//564
 //F80
 //F81
 //F82
 //F83
 //F84
 		F886735403B8AF5501A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = qpak.c;
 			path = ../archivers/qpak.c;
@@ -380,7 +442,6 @@
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 0;
 		};
 		F886735D03B8B31801A8000A = {
 			isa = PBXApplicationReference;
@@ -400,6 +461,7 @@
 			refType = 4;
 		};
 		F886736303B8B37C01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = test_physfs.c;
 			path = ../test/test_physfs.c;
@@ -423,12 +485,9 @@
 				F8FDCE0903AEDD6801A8000A,
 				F8FDCEA703AEDE1F01A8000A,
 				F8FDCEB303AEDE1F01A8000A,
-				F8FDCEB503AEDE1F01A8000A,
-				F8FDCEB703AEDE1F01A8000A,
 				F8FDCEB903AEDE1F01A8000A,
 				F8FDCEBA03AEDE1F01A8000A,
 				F8FDCEBD03AEDE1F01A8000A,
-				F8FDCEBF03AEDE1F01A8000A,
 				F8FDCEC103AEDE1F01A8000A,
 				F8FDCEC303AEDE1F01A8000A,
 				F8FDCEC403AEDE1F01A8000A,
@@ -450,17 +509,17 @@
 				F8FDCEB003AEDE1F01A8000A,
 				F8FDCEB103AEDE1F01A8000A,
 				F8FDCEB203AEDE1F01A8000A,
-				F8FDCEB403AEDE1F01A8000A,
-				F8FDCEB603AEDE1F01A8000A,
 				F8FDCEB803AEDE1F01A8000A,
 				F8FDCEBB03AEDE1F01A8000A,
 				F8FDCEBC03AEDE1F01A8000A,
-				F8FDCEBE03AEDE1F01A8000A,
 				F8FDCEC003AEDE1F01A8000A,
 				F8FDCEC203AEDE1F01A8000A,
 				F8FDCEC503AEDE1F01A8000A,
 				F8FDCECA03AF0B0001A8000A,
 				F886735603B8AF5501A8000A,
+				56E7B5B305A6A75B00A801AA,
+				56E7B5B405A6A75B00A801AA,
+				56E7B5B505A6A75B00A801AA,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -506,7 +565,6 @@
 			productInstallPath = /usr/local/lib;
 			productName = libphysfs.a;
 			productReference = F8FDCD0303AEBD5D01A8000A;
-			shouldUseHeadermap = 0;
 		};
 		F8FDCD0303AEBD5D01A8000A = {
 			isa = PBXLibraryReference;
@@ -534,7 +592,6 @@
 			productInstallPath = /usr/local/bin;
 			productName = "Standard Package";
 			productReference = F8FDCD0903AEBD7901A8000A;
-			shouldUseHeadermap = 0;
 		};
 		F8FDCD0903AEBD7901A8000A = {
 			isa = PBXExecutableFileReference;
@@ -562,7 +619,6 @@
 			productInstallPath = /usr/local/bin;
 			productName = "Devel Package";
 			productReference = F8FDCD1003AEBD8901A8000A;
-			shouldUseHeadermap = 0;
 		};
 		F8FDCD1003AEBD8901A8000A = {
 			isa = PBXExecutableFileReference;
@@ -623,6 +679,7 @@
 			shellScript = "exec ./pkg-support/mkpackage.sh \"physfs\" \"devel\"";
 		};
 		F8FDCE0803AEDD6801A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = physfs.h;
 			path = ../physfs.h;
@@ -655,33 +712,39 @@
 			refType = 2;
 		};
 		F8FDCE0C03AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXExecutableFileReference;
 			path = install.sh;
 			refType = 4;
 		};
 		F8FDCE0D03AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = ReadMe.txt;
 			refType = 4;
 		};
 		F8FDCE0E03AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = Welcome.txt;
 			refType = 4;
 		};
 		F8FDCE0F03AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXExecutableFileReference;
 			name = mkpackage.sh;
 			path = "pkg-support/mkpackage.sh";
 			refType = 2;
 		};
 		F8FDCE1003AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = "physfs-devel.info";
 			path = "pkg-support/physfs-devel.info";
 			refType = 2;
 		};
 		F8FDCE1103AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = physfs.info;
 			path = "pkg-support/physfs.info";
@@ -698,11 +761,13 @@
 			refType = 2;
 		};
 		F8FDCE1303AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = ReadMe.txt;
 			refType = 4;
 		};
 		F8FDCE1403AEDDC901A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = Welcome.txt;
 			refType = 4;
@@ -713,6 +778,9 @@
 				F8FDCE1C03AEDE1F01A8000A,
 				F8FDCE2203AEDE1F01A8000A,
 				F886735403B8AF5501A8000A,
+				56E7B5AD05A6A75B00A801AA,
+				56E7B5AE05A6A75B00A801AA,
+				56E7B5AF05A6A75B00A801AA,
 			);
 			isa = PBXGroup;
 			name = archivers;
@@ -720,33 +788,39 @@
 			refType = 2;
 		};
 		F8FDCE1B03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = dir.c;
 			refType = 4;
 		};
 		F8FDCE1C03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = grp.c;
 			refType = 4;
 		};
 		F8FDCE2203AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = zip.c;
 			refType = 4;
 		};
 		F8FDCE2303AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = physfs_byteorder.c;
 			path = ../physfs_byteorder.c;
 			refType = 2;
 		};
 		F8FDCE2403AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = physfs_internal.h;
 			path = ../physfs_internal.h;
 			refType = 2;
 		};
 		F8FDCE2503AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = physfs.c;
 			path = ../physfs.c;
@@ -767,31 +841,37 @@
 			refType = 2;
 		};
 		F8FDCE2B03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = beos.cpp;
 			refType = 4;
 		};
 		F8FDCE2C03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = macclassic.c;
 			refType = 4;
 		};
 		F8FDCE3003AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = posix.c;
 			refType = 4;
 		};
 		F8FDCE3103AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = skeleton.c;
 			refType = 4;
 		};
 		F8FDCE3203AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = unix.c;
 			refType = 4;
 		};
 		F8FDCE3303AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = win32.c;
 			refType = 4;
@@ -803,18 +883,12 @@
 				F8FDCE4503AEDE1F01A8000A,
 				F8FDCE4603AEDE1F01A8000A,
 				F8FDCE4703AEDE1F01A8000A,
-				F8FDCE4803AEDE1F01A8000A,
-				F8FDCE4903AEDE1F01A8000A,
-				F8FDCE4A03AEDE1F01A8000A,
-				F8FDCE4B03AEDE1F01A8000A,
 				F8FDCE4C03AEDE1F01A8000A,
 				F8FDCE4D03AEDE1F01A8000A,
 				F8FDCE4E03AEDE1F01A8000A,
 				F8FDCE4F03AEDE1F01A8000A,
 				F8FDCE5003AEDE1F01A8000A,
 				F8FDCE5103AEDE1F01A8000A,
-				F8FDCE5203AEDE1F01A8000A,
-				F8FDCE5303AEDE1F01A8000A,
 				F8FDCE5703AEDE1F01A8000A,
 				F8FDCE5803AEDE1F01A8000A,
 				F8FDCE5903AEDE1F01A8000A,
@@ -824,126 +898,114 @@
 				F8FDCE5D03AEDE1F01A8000A,
 			);
 			isa = PBXGroup;
-			name = zlib114;
-			path = ../zlib114;
+			name = zlib121;
+			path = ../zlib121;
 			refType = 2;
 		};
 		F8FDCE4303AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = adler32.c;
 			refType = 4;
 		};
 		F8FDCE4403AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = compress.c;
 			refType = 4;
 		};
 		F8FDCE4503AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = crc32.c;
 			refType = 4;
 		};
 		F8FDCE4603AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = deflate.c;
 			refType = 4;
 		};
 		F8FDCE4703AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = deflate.h;
 			refType = 4;
 		};
-		F8FDCE4803AEDE1F01A8000A = {
-			isa = PBXFileReference;
-			path = infblock.c;
-			refType = 4;
-		};
-		F8FDCE4903AEDE1F01A8000A = {
-			isa = PBXFileReference;
-			path = infblock.h;
-			refType = 4;
-		};
-		F8FDCE4A03AEDE1F01A8000A = {
-			isa = PBXFileReference;
-			path = infcodes.c;
-			refType = 4;
-		};
-		F8FDCE4B03AEDE1F01A8000A = {
-			isa = PBXFileReference;
-			path = infcodes.h;
-			refType = 4;
-		};
 		F8FDCE4C03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = inffast.c;
 			refType = 4;
 		};
 		F8FDCE4D03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = inffast.h;
 			refType = 4;
 		};
 		F8FDCE4E03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = inffixed.h;
 			refType = 4;
 		};
 		F8FDCE4F03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = inflate.c;
 			refType = 4;
 		};
 		F8FDCE5003AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = inftrees.c;
 			refType = 4;
 		};
 		F8FDCE5103AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = inftrees.h;
 			refType = 4;
 		};
-		F8FDCE5203AEDE1F01A8000A = {
-			isa = PBXFileReference;
-			path = infutil.c;
-			refType = 4;
-		};
-		F8FDCE5303AEDE1F01A8000A = {
-			isa = PBXFileReference;
-			path = infutil.h;
-			refType = 4;
-		};
 		F8FDCE5703AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = trees.c;
 			refType = 4;
 		};
 		F8FDCE5803AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = trees.h;
 			refType = 4;
 		};
 		F8FDCE5903AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = uncompr.c;
 			refType = 4;
 		};
 		F8FDCE5A03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = zconf.h;
 			refType = 4;
 		};
 		F8FDCE5B03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = zlib.h;
 			refType = 4;
 		};
 		F8FDCE5C03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = zutil.c;
 			refType = 4;
 		};
 		F8FDCE5D03AEDE1F01A8000A = {
+			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = zutil.h;
 			refType = 4;
@@ -1020,30 +1082,6 @@
 			settings = {
 			};
 		};
-		F8FDCE8B03AEDE1F01A8000A = {
-			fileRef = F8FDCE4803AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCE8C03AEDE1F01A8000A = {
-			fileRef = F8FDCE4903AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCE8D03AEDE1F01A8000A = {
-			fileRef = F8FDCE4A03AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCE8E03AEDE1F01A8000A = {
-			fileRef = F8FDCE4B03AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F8FDCE8F03AEDE1F01A8000A = {
 			fileRef = F8FDCE4C03AEDE1F01A8000A;
 			isa = PBXBuildFile;
@@ -1080,18 +1118,6 @@
 			settings = {
 			};
 		};
-		F8FDCE9503AEDE1F01A8000A = {
-			fileRef = F8FDCE5203AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCE9603AEDE1F01A8000A = {
-			fileRef = F8FDCE5303AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F8FDCE9A03AEDE1F01A8000A = {
 			fileRef = F8FDCE5703AEDE1F01A8000A;
 			isa = PBXBuildFile;
@@ -1206,30 +1232,6 @@
 			settings = {
 			};
 		};
-		F8FDCEB403AEDE1F01A8000A = {
-			fileRef = F8FDCE4803AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCEB503AEDE1F01A8000A = {
-			fileRef = F8FDCE4903AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCEB603AEDE1F01A8000A = {
-			fileRef = F8FDCE4A03AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCEB703AEDE1F01A8000A = {
-			fileRef = F8FDCE4B03AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F8FDCEB803AEDE1F01A8000A = {
 			fileRef = F8FDCE4C03AEDE1F01A8000A;
 			isa = PBXBuildFile;
@@ -1266,18 +1268,6 @@
 			settings = {
 			};
 		};
-		F8FDCEBE03AEDE1F01A8000A = {
-			fileRef = F8FDCE5203AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F8FDCEBF03AEDE1F01A8000A = {
-			fileRef = F8FDCE5303AEDE1F01A8000A;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F8FDCEC003AEDE1F01A8000A = {
 			fileRef = F8FDCE5703AEDE1F01A8000A;
 			isa = PBXBuildFile;

PBProjects/pkg-support/physfs-devel.info

@@ -1,6 +1,6 @@
-Title PhysFS-Devel 0.1.8
+Title PhysFS-Devel 1.0.0
 Version 1
-Description PhysFS Library for Mac OS X (http://www.icculus.org/physfs/)
+Description PhysicsFS Library for Mac OS X (http://www.icculus.org/physfs/)
 DefaultLocation /Developer/Documentation/physfs
 Diskname (null)
 DeleteWarning 

PBProjects/pkg-support/physfs.info

@@ -1,6 +1,6 @@
-Title PhysFS 0.1.9
+Title PhysFS 1.0.0
 Version 1
-Description PhysFS Library for Mac OS X (http://www.icculus.org/physfs/)
+Description PhysicsFS Library for Mac OS X (http://www.icculus.org/physfs/)
 DefaultLocation /Library/Frameworks
 Diskname (null)
 DeleteWarning 

archivers/.cvsignore

@@ -10,3 +10,4 @@ mvl.lo
 zip.lo
 libarchivers.la
 qpak.lo
+wad.lo

archivers/Makefile.am

@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libarchivers.la
 
 if BUILD_ZLIB
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib114
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib121
 else
 INCLUDES = -I$(top_srcdir)
 endif

bootstrap

@@ -2,6 +2,7 @@
 
 set -e
 echo "Initial preparation...this can take awhile, so sit tight..."
+rm -f Makefile.am
 perl -w -e 'use File::Copy; exit 0 if (-f "Makefile.am"); my $x = `automake --version |head -n 1`; chomp($x); $x = 0.0 if ($x !~ s/\A.*?(\d+\.\d+).*\Z/$1/); if ($x < 1.5) { copy("./Makefile.am.oldautomake", "./Makefile.am"); } else { copy("./Makefile.am.newautomake", "./Makefile.am"); }'
 aclocal
 libtoolize --automake --copy --force

configure.in

@@ -13,9 +13,9 @@ dnl ---------------------------------------------------------------------
 # if backwards compatibility has been broken,
 # set BINARY_AGE and INTERFACE_AGE to 0.
 
-MAJOR_VERSION=0
-MINOR_VERSION=1
-MICRO_VERSION=9
+MAJOR_VERSION=1
+MINOR_VERSION=0
+MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
@@ -202,6 +202,7 @@ else
 
   if test x$enable_internal_zlib = xyes; then
     AC_MSG_RESULT([internal zlib])
+    PHYSFSCFLAGS="$PHYSFSCFLAGS -DZ_PREFIX"
   else
     if test x$enable_external_zlib = xyes; then
       AC_MSG_RESULT([external zlib])
@@ -347,8 +348,9 @@ have_non_posix_threads=no
 AC_MSG_CHECKING([if this is BeOS])
 if test x$target_os = xbeos; then
   this_is_beos=yes
-  enable_pthreads=no
   have_non_posix_threads=yes
+  enable_cdrom=yes
+  enable_pthreads=no
   LIBS="$LIBS -lroot -lbe"
 else
   this_is_beos=no
@@ -360,6 +362,7 @@ AC_MSG_CHECKING([if this is Cygwin])
 if test x$target_os = xcygwin; then
   this_is_cygwin=yes
   PHYSFSCFLAGS="$PHYSFSCFLAGS -DWIN32"
+  enable_cdrom=yes
   enable_pthreads=no
   have_non_posix_threads=yes
 else
@@ -423,6 +426,9 @@ if test x$we_have_sed = xyes; then
   x=`echo $target_os |tr A-Z a-z |sed "s/.*os2.*/os2/"`
   if test x$x = xos2; then
     this_is_os2=yes
+    have_non_posix_threads=yes
+    enable_cdrom=yes
+    enable_pthreads=no
     PHYSFSCFLAGS="$PHYSFSCFLAGS -DOS2"
   fi
 

makeos2.cmd

@@ -7,13 +7,16 @@ rem  Patches go to icculus@clutteredmind.org ...
 
 set PHYSFSLANG=PHYSFS_LANG_ENGLISH
 set DEBUGFLAGS=-D_NDEBUG -O2 -s
-rem set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H
-set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DHAVE_ASSERT_H
+rem set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H
+set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DHAVE_ASSERT_H
 
-@echo on
-mkdir bin
-erase /N bin\*.*
+rem goto :dolinking
+
+@echo cleaning up any previous build...
+@mkdir bin 2>NUL
+@erase /N bin\*.* 2>NUL
 
+@echo Building export definitions...
 @echo ;don't edit this directly! It is rewritten by makeos2.cmd! > bin\test_physfs.def
 @echo NAME TESTPHYSFS WINDOWCOMPAT >> bin\test_physfs.def
 @echo DESCRIPTION 'PhysicsFS: http://icculus.org/physfs/' >> bin\test_physfs.def
@@ -102,8 +105,11 @@ erase /N bin\*.*
 @echo  "PHYSFS_setBuffer" >> bin\physfs.def
 @echo  "PHYSFS_flush" >> bin\physfs.def
 
+@echo Building export library...
 emximp -o bin/physfs.lib bin/physfs.def
 
+@echo Compiling PhysicsFS library...
+@echo on
 gcc %CFLAGS% -o bin/physfs.obj physfs.c
 gcc %CFLAGS% -o bin/physfs_byteorder.obj physfs_byteorder.c
 gcc %CFLAGS% -o bin/os2.obj platform/os2.c
@@ -114,7 +120,6 @@ gcc %CFLAGS% -o bin/zip.obj archivers/zip.c
 gcc %CFLAGS% -o bin/qpak.obj archivers/qpak.c
 gcc %CFLAGS% -o bin/hog.obj archivers/hog.c
 gcc %CFLAGS% -o bin/mvl.obj archivers/mvl.c
-
 gcc %CFLAGS% -o bin/adler32.obj zlib121/adler32.c
 gcc %CFLAGS% -o bin/compress.obj zlib121/compress.c
 gcc %CFLAGS% -o bin/crc32.obj zlib121/crc32.c
@@ -127,9 +132,22 @@ gcc %CFLAGS% -o bin/inftrees.obj zlib121/inftrees.c
 gcc %CFLAGS% -o bin/trees.obj zlib121/trees.c
 gcc %CFLAGS% -o bin/uncompr.obj zlib121/uncompr.c
 gcc %CFLAGS% -o bin/zutil.obj zlib121/zutil.c
+@echo off
 
+:dolinking
+@echo Linking PhysicsFS library...
 gcc %DEBUGFLAGS% -Zdll -Zcrtdll -Zomf -Zmt -Zmtd -o bin/physfs.dll bin/*.obj bin/physfs.def
 
+rem goto :builddone
+
+@echo Compiling test program...
 gcc %CFLAGS% -o bin/test_physfs.obj test/test_physfs.c
+@echo Linking test program...
 gcc %DEBUGFLAGS% -Zomf -Zcrtdll -Zmt -Zmtd -o bin/test_physfs.exe bin/test_physfs.obj bin/physfs.lib bin/test_physfs.def
 
+:builddone
+
+@echo "All done!"
+
+rem end of makeos2.cmd ...
+

physfs.dsp

@@ -43,8 +43,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /ZI /Od /I "." /I "zlibwin32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_WAD" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /WX /Gm- /GX- /Zi /Od /I "." /I "zlib114" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_WAD" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /ZI /Od /I "." /I "zlibwin32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Z_PREFIX" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_WAD" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /D "PHYSFS_SUPPORTS_MVL" /D "PHYSFS_SUPPORTS_HOG" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /WX /Zi /Od /I "." /I "zlib121" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Z_PREFIX" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_WAD" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /D "PHYSFS_SUPPORTS_MVL" /D "PHYSFS_SUPPORTS_HOG" /FR /YX /FD /GZ /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -74,7 +74,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /WX /O2 /I "." /I "zlibwin32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_WAD" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /O2 /I "." /I "zlib114" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_WAD" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /O2 /I "." /I "zlib121" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_WAD" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /D "PHYSFS_SUPPORTS_HOG" /D "PHYSFS_SUPPORTS_MVL" /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"
@@ -97,19 +97,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\zlib114\adler32.c
+SOURCE=.\zlib121\adler32.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\compress.c
+SOURCE=.\zlib121\compress.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\crc32.c
+SOURCE=.\zlib121\crc32.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\deflate.c
+SOURCE=.\zlib121\deflate.c
 # End Source File
 # Begin Source File
 
@@ -121,31 +121,23 @@ SOURCE=.\archivers\grp.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\archivers\wad.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib114\infblock.c
+SOURCE=.\archivers\hog.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\infcodes.c
+SOURCE=.\zlib121\inffast.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\inffast.c
+SOURCE=.\zlib121\inflate.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\inflate.c
+SOURCE=.\zlib121\inftrees.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib114\infutil.c
+SOURCE=.\archivers\mvl.c
 # End Source File
 # Begin Source File
 
@@ -161,11 +153,15 @@ SOURCE=.\archivers\qpak.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\trees.c
+SOURCE=.\zlib121\trees.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\uncompr.c
+SOURCE=.\zlib121\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\archivers\wad.c
 # End Source File
 # Begin Source File
 
@@ -177,7 +173,7 @@ SOURCE=.\archivers\zip.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\zutil.c
+SOURCE=.\zlib121\zutil.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -185,31 +181,31 @@ SOURCE=.\zlib114\zutil.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\zlib114\deflate.h
+SOURCE=.\zlib121\deflate.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\infblock.h
+SOURCE=.\zlib121\infblock.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\infcodes.h
+SOURCE=.\zlib121\infcodes.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\inffast.h
+SOURCE=.\zlib121\inffast.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\inffixed.h
+SOURCE=.\zlib121\inffixed.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\inftrees.h
+SOURCE=.\zlib121\inftrees.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\infutil.h
+SOURCE=.\zlib121\infutil.h
 # End Source File
 # Begin Source File
 
@@ -221,19 +217,19 @@ SOURCE=.\physfs_internal.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\trees.h
+SOURCE=.\zlib121\trees.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\zconf.h
+SOURCE=.\zlib121\zconf.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\zlib.h
+SOURCE=.\zlib121\zlib.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zlib114\zutil.h
+SOURCE=.\zlib121\zutil.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"

physfs.h

@@ -26,7 +26,7 @@
  *  writing directory to "C:\MyGame\MyWritingDirectory", then no PHYSFS calls
  *  could touch anything above this directory, including the "C:\MyGame" and
  *  "C:\" directories. This prevents an application's internal scripting
- *  language from piddling over c:\config.sys, for example. If you'd rather
+ *  language from piddling over c:\\config.sys, for example. If you'd rather
  *  give PHYSFS full access to the system's REAL file system, set the writing
  *  dir to "C:\", but that's generally A Bad Thing for several reasons.
  *
@@ -61,20 +61,21 @@
  * Once the search path is defined, you may open files for reading. If you've
  *  got the following search path defined (to use a win32 example again):
  *
- *    C:\mygame
- *    C:\mygame\myuserfiles
- *    D:\mygamescdromdatafiles
- *    C:\mygame\installeddatafiles.zip
+ *  - C:\\mygame
+ *  - C:\\mygame\\myuserfiles
+ *  - D:\\mygamescdromdatafiles
+ *  - C:\\mygame\\installeddatafiles.zip
  *
  * Then a call to PHYSFS_openRead("textfiles/myfile.txt") (note the directory
  *  separator, lack of drive letter, and lack of dir separator at the start of
  *  the string; this is platform-independent notation) will check for
- *  C:\mygame\textfiles\myfile.txt, then
- *  C:\mygame\myuserfiles\textfiles\myfile.txt, then
- *  D:\mygamescdromdatafiles\textfiles\myfile.txt, then, finally, for
- *  textfiles\myfile.txt inside of C:\mygame\installeddatafiles.zip. Remember
- *  that most archive types and platform filesystems store their filenames in
- *  a case-sensitive manner, so you should be careful to specify it correctly.
+ *  C:\\mygame\\textfiles\\myfile.txt, then
+ *  C:\\mygame\\myuserfiles\\textfiles\\myfile.txt, then
+ *  D:\\mygamescdromdatafiles\\textfiles\\myfile.txt, then, finally, for
+ *  textfiles\\myfile.txt inside of C:\\mygame\\installeddatafiles.zip.
+ *  Remember that most archive types and platform filesystems store their
+ *  filenames in a case-sensitive manner, so you should be careful to specify
+ *  it correctly.
  *
  * Files opened through PhysicsFS may NOT contain "." or ".." or ":" as dir
  *  elements. Not only are these meaningless on MacOS and/or Unix, they are a
@@ -317,9 +318,9 @@ typedef struct
 } PHYSFS_Version;
 
 #ifndef DOXYGEN_SHOULD_IGNORE_THIS
-#define PHYSFS_VER_MAJOR 0
-#define PHYSFS_VER_MINOR 1
-#define PHYSFS_VER_PATCH 9
+#define PHYSFS_VER_MAJOR 1
+#define PHYSFS_VER_MINOR 0
+#define PHYSFS_VER_PATCH 0
 #endif  /* DOXYGEN_SHOULD_IGNORE_THIS */
 
 
@@ -854,8 +855,8 @@ __EXPORT__ int PHYSFS_delete(const char *filename);
  *  matches in different parts of the search path, only the first one found
  *  is used, just like when opening a file.
  *
- * So, if you look for "maps/level1.map", and C:\mygame is in your search
- *  path and C:\mygame\maps\level1.map exists, then "C:\mygame" is returned.
+ * So, if you look for "maps/level1.map", and C:\\mygame is in your search
+ *  path and C:\\mygame\\maps\\level1.map exists, then "C:\mygame" is returned.
  *
  * If a any part of a match is a symbolic link, and you've not explicitly
  *  permitted symlinks, then it will be ignored, and the search for a match

physfs.vcproj

@@ -22,8 +22,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,zlib114"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;PHYSFS_EXPORTS;PHYSFS_SUPPORTS_GRP;PHYSFS_SUPPORTS_WAD;PHYSFS_SUPPORTS_ZIP;PHYSFS_SUPPORTS_QPAK"
+				AdditionalIncludeDirectories=".,zlib121"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;Z_PREFIX;PHYSFS_EXPORTS;PHYSFS_SUPPORTS_GRP;PHYSFS_SUPPORTS_WAD;PHYSFS_SUPPORTS_ZIP;PHYSFS_SUPPORTS_QPAK;PHYSFS_SUPPORTS_HOG;PHYSFS_SUPPORTS_MVL"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,8 +93,8 @@
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="FALSE"
-				AdditionalIncludeDirectories=".,zlib114"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;PHYSFS_EXPORTS;PHYSFS_SUPPORTS_GRP;PHYSFS_SUPPORTS_WAD;PHYSFS_SUPPORTS_ZIP;PHYSFS_SUPPORTS_QPAK"
+				AdditionalIncludeDirectories=".,zlib121"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;Z_PREFIX;PHYSFS_EXPORTS;PHYSFS_SUPPORTS_GRP;PHYSFS_SUPPORTS_WAD;PHYSFS_SUPPORTS_ZIP;PHYSFS_SUPPORTS_QPAK;PHYSFS_SUPPORTS_HOG;PHYSFS_SUPPORTS_MVL"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
 				RuntimeLibrary="2"
@@ -155,16 +155,16 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath=".\zlib114\adler32.c">
+				RelativePath=".\zlib121\adler32.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\compress.c">
+				RelativePath=".\zlib121\compress.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\crc32.c">
+				RelativePath=".\zlib121\crc32.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\deflate.c">
+				RelativePath=".\zlib121\deflate.c">
 			</File>
 			<File
 				RelativePath=".\archivers\dir.c">
@@ -173,25 +173,19 @@
 				RelativePath=".\archivers\grp.c">
 			</File>
 			<File
-				RelativePath=".\archivers\wad.c">
-			</File>
-			<File
-				RelativePath=".\zlib114\infblock.c">
-			</File>
-			<File
-				RelativePath=".\zlib114\infcodes.c">
+				RelativePath="archivers\hog.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\inffast.c">
+				RelativePath=".\zlib121\inffast.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\inflate.c">
+				RelativePath=".\zlib121\inflate.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\inftrees.c">
+				RelativePath=".\zlib121\inftrees.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\infutil.c">
+				RelativePath="archivers\mvl.c">
 			</File>
 			<File
 				RelativePath=".\physfs.c">
@@ -203,10 +197,13 @@
 				RelativePath="archivers\qpak.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\trees.c">
+				RelativePath=".\zlib121\trees.c">
+			</File>
+			<File
+				RelativePath=".\zlib121\uncompr.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\uncompr.c">
+				RelativePath=".\archivers\wad.c">
 			</File>
 			<File
 				RelativePath=".\platform\win32.c">
@@ -215,32 +212,32 @@
 				RelativePath=".\archivers\zip.c">
 			</File>
 			<File
-				RelativePath=".\zlib114\zutil.c">
+				RelativePath=".\zlib121\zutil.c">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath=".\zlib114\deflate.h">
+				RelativePath=".\zlib121\deflate.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\infblock.h">
+				RelativePath=".\zlib121\infblock.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\infcodes.h">
+				RelativePath=".\zlib121\infcodes.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\inffast.h">
+				RelativePath=".\zlib121\inffast.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\inffixed.h">
+				RelativePath=".\zlib121\inffixed.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\inftrees.h">
+				RelativePath=".\zlib121\inftrees.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\infutil.h">
+				RelativePath=".\zlib121\infutil.h">
 			</File>
 			<File
 				RelativePath=".\physfs.h">
@@ -249,16 +246,16 @@
 				RelativePath=".\physfs_internal.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\trees.h">
+				RelativePath=".\zlib121\trees.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\zconf.h">
+				RelativePath=".\zlib121\zconf.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\zlib.h">
+				RelativePath=".\zlib121\zlib.h">
 			</File>
 			<File
-				RelativePath=".\zlib114\zutil.h">
+				RelativePath=".\zlib121\zutil.h">
 			</File>
 		</Filter>
 		<Filter

physfs_static.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "zlib121" /I "../physfs" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /D Z_PREFIX=1 /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "zlib121" /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /D Z_PREFIX=1 /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "zlib121" /I "../physfs" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /D Z_PREFIX=1 /FR /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "zlib121" /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /D Z_PREFIX=1 /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

test/test_physfs.c

@@ -29,9 +29,9 @@
 
 #include "physfs.h"
 
-#define TEST_VERSION_MAJOR  0
-#define TEST_VERSION_MINOR  1
-#define TEST_VERSION_PATCH  9
+#define TEST_VERSION_MAJOR  1
+#define TEST_VERSION_MINOR  0
+#define TEST_VERSION_PATCH  0
 
 static FILE *history_file = NULL;
 static PHYSFS_uint32 do_buffer_size = 0;