diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index cced632c26..180f658b6c 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -7570,6 +7570,9 @@ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; GCC_DYNAMIC_NO_PIC = YES; GCC_MODEL_TUNING = G5; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = tommath; SYMROOT = "$(SRCROOT)/build"; @@ -7582,6 +7585,9 @@ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; GCC_DYNAMIC_NO_PIC = YES; GCC_MODEL_TUNING = G5; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = tommath; SYMROOT = "$(SRCROOT)/build"; @@ -7596,6 +7602,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = tommath; SYMROOT = "$(SRCROOT)/build"; @@ -7610,6 +7619,8 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; KEEP_PRIVATE_EXTERNS = YES; PRODUCT_NAME = tomcrypt; @@ -7625,6 +7636,8 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; KEEP_PRIVATE_EXTERNS = YES; PRODUCT_NAME = tomcrypt; @@ -7640,6 +7653,8 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; KEEP_PRIVATE_EXTERNS = YES; PRODUCT_NAME = tomcrypt; @@ -7668,7 +7683,13 @@ "SIZEOF_LONG=4", "$(FPM)", ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; GCC_WARN_SIGN_COMPARE = NO; HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b"; INSTALL_PATH = /usr/local/lib; @@ -7698,7 +7719,13 @@ "SIZEOF_LONG=4", "$(FPM)", ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; GCC_WARN_SIGN_COMPARE = NO; HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b"; INSTALL_PATH = /usr/local/lib; @@ -7728,7 +7755,13 @@ "SIZEOF_LONG=4", "$(FPM)", ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; GCC_WARN_SIGN_COMPARE = NO; HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b"; INSTALL_PATH = /usr/local/lib; @@ -7761,7 +7794,13 @@ "SIZEOF_LONG=4", "$(FPM)", ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; GCC_WARN_SIGN_COMPARE = NO; HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b"; INSTALL_PATH = /usr/local/lib; @@ -7964,6 +8003,10 @@ "$(value)", LUA_USE_MACOSX, ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; INSTALL_PATH = /usr/local/lib; OBJROOT = "$(SRCROOT)/build"; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; @@ -8018,6 +8061,9 @@ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; GCC_DYNAMIC_NO_PIC = YES; GCC_MODEL_TUNING = G5; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = tommath; SYMROOT = "$(SRCROOT)/build"; @@ -8032,6 +8078,8 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; INSTALL_PATH = /usr/local/lib; KEEP_PRIVATE_EXTERNS = YES; PRODUCT_NAME = tomcrypt; @@ -8309,6 +8357,10 @@ "$(value)", LUA_USE_MACOSX, ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; INSTALL_PATH = /usr/local/lib; OBJROOT = "$(SRCROOT)/build"; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; @@ -8329,6 +8381,10 @@ "$(value)", LUA_USE_MACOSX, ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; INSTALL_PATH = /usr/local/lib; OBJROOT = "$(SRCROOT)/build"; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; @@ -8349,6 +8405,10 @@ "$(value)", LUA_USE_MACOSX, ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; INSTALL_PATH = /usr/local/lib; OBJROOT = "$(SRCROOT)/build"; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; diff --git a/src/NotesLoaderDWI.cpp b/src/NotesLoaderDWI.cpp index 1c50103288..9277a7a464 100644 --- a/src/NotesLoaderDWI.cpp +++ b/src/NotesLoaderDWI.cpp @@ -198,7 +198,7 @@ static bool LoadFromDWITokens( else if( sMode == "SOLO" ) out.m_StepsType = StepsType_dance_solo; else { - ASSERT(0); // Unrecognized DWI notes format + ASSERT_M(0, "Unrecognized DWI notes format " + sMode + "!"); out.m_StepsType = StepsType_dance_single; } @@ -333,6 +333,10 @@ static bool LoadFromDWITokens( if( iCol2 != -1 ) newNoteData.SetTapNote(iCol2, iIndex, TAP_ORIGINAL_TAP); + if(i>=sStepData.length()) { + break;//we ran out of data while looking for the ending > mark + } + if( sStepData[i] == '!' ) { i++; diff --git a/src/StepMania-net2010.vcxproj b/src/StepMania-net2010.vcxproj index 73fde6e785..9aae00b00f 100644 --- a/src/StepMania-net2010.vcxproj +++ b/src/StepMania-net2010.vcxproj @@ -97,8 +97,7 @@ archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - +cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) _DEBUG;%(PreprocessorDefinitions) @@ -109,7 +108,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ Disabled - .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) @@ -137,7 +136,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/modern_working/lib/avformat.lib;ffmpeg/modern_working/lib/avutil.lib;ffmpeg/modern_working/lib/swscale.lib;%(AdditionalDependencies) ../Program/StepMania-debug.exe true - ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -156,8 +155,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - +cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) NDEBUG;%(PreprocessorDefinitions) @@ -172,7 +170,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ AnySuitable true Size - .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) true false @@ -203,7 +201,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/modern_working/lib/avformat.lib;ffmpeg/modern_working/lib/avutil.lib;ffmpeg/modern_working/lib/swscale.lib;%(AdditionalDependencies) ../Program/StepMania.exe true - ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania.pdb true @@ -222,8 +220,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - +cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) _DEBUG;%(PreprocessorDefinitions) @@ -234,7 +231,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ Disabled - .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) @@ -262,7 +259,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/lib/avformat.lib;ffmpeg/lib/avutil.lib;ffmpeg/lib/swscale.lib;%(AdditionalDependencies) ../Program/StepMania-fastdebug.exe true - ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -281,8 +278,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ archutils\Win32\verinc -cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - +cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) NDEBUG;%(PreprocessorDefinitions) @@ -297,7 +293,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ AnySuitable true Speed - .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) + .;..\extern\lua-5.1\src;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) true false @@ -329,7 +325,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/modern_working/lib/avformat.lib;ffmpeg/modern_working/lib/avutil.lib;ffmpeg/modern_working/lib/swscale.lib;%(AdditionalDependencies) ..\Program/StepMania-SSE2.exe true - ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) + ..\extern\libpng\lib;ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania-SSE2.pdb true @@ -469,6 +465,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + @@ -1192,94 +1189,94 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing - - - - + NotUsing + NotUsing + NotUsing + NotUsing @@ -1786,6 +1783,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + diff --git a/src/StepMania-net2010.vcxproj.filters b/src/StepMania-net2010.vcxproj.filters new file mode 100644 index 0000000000..37961b681b --- /dev/null +++ b/src/StepMania-net2010.vcxproj.filters @@ -0,0 +1,3151 @@ + + + + + {499eeb19-5960-444d-b411-19d081889b15} + + + {7374b57a-894a-455d-9005-31ec8182ef1f} + + + {f95bd5c1-b158-4130-9920-2963e4f00821} + + + {03e9a63d-2660-4086-80ba-8c4734317c34} + + + {0d7a3c39-ac85-4040-8379-3b790cb9d687} + + + {33ad08c0-708a-489d-b95e-f2d95fa26b5e} + + + {8ed6a7cc-d70d-463f-a069-8e6602c4ff90} + + + {48e2a90f-22fb-43c5-b702-09eb19321a7a} + + + {59ec1714-aac9-4da1-b409-f75eead865f8} + + + {dafaf471-0654-4704-9773-13d78caeeb9b} + + + {eb3b5843-3d55-4ef7-816c-8c27b0e4898c} + + + {0aedb235-8389-48a5-ae3a-1938807ce182} + + + {bf943b89-b3a7-4565-85d5-55a43d959c5c} + + + {abab063b-8f74-441a-a461-d21c8bcf4390} + + + {7d083a3b-3121-4848-99c4-00928682d01d} + + + {4adcace8-8e8e-42c1-8cff-4fb55ad97faf} + + + {babeda37-148f-48d6-a5f0-4459c8e9c061} + + + {b4aa0865-e07d-438b-887e-a2afcd21301d} + + + {4feef3e5-646f-4ab8-9369-29b54b7607a1} + + + {cfefd67e-7fd4-4bf7-aa4b-0032ded96b5e} + + + {361d936e-6d5a-44df-a363-d8f305fafeac} + + + {148c21c0-1798-463e-8494-060eeb389f01} + + + {0a42b7f0-1202-401f-8e16-42d1dd50a4a5} + + + {8bcf27ef-f964-4001-bda2-ae3a982d86ec} + + + {672a8d1d-bb79-4eb7-9950-bbf3dcff4770} + + + {a432da5c-eeb6-4012-9e34-0aef2bd8f59e} + + + {68f5026f-06bd-483b-b577-24d1fcb15592} + + + {d61d93ca-80d7-4ca3-8f99-fae33523caae} + + + {b3893dd5-1761-4d69-bb3f-18bcaefd5064} + + + {44550b7c-6a30-41c1-92bd-e0a9c3199de5} + + + {e7ecc1c5-b142-4259-b87c-4728177e2fae} + + + {2d157d5c-7c0e-4967-925a-3976a6ad0dd0} + + + {46a5ab77-6eaf-44eb-93ec-43b2db4741ff} + + + {a89b61cf-bbf6-4303-a32a-6eec76f78893} + + + {b4c5e8c8-60f5-44c6-9529-832212276d1a} + + + {c2c701a5-a88f-4a36-ab40-43619668f88f} + + + {52c8e19c-32ec-4115-bee6-f5957389d7ea} + + + {ba251bae-0742-4c91-9b1f-488c32791a63} + + + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens\Gameplay + + + Screens\Gameplay + + + Screens\Gameplay + + + Screens\Gameplay + + + Screens\Gameplay + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\Courses + + + Data Structures\Courses + + + Data Structures\Courses + + + Data Structures\Courses + + + Data Structures\Fonts + + + Data Structures\Fonts + + + Data Structures\Fonts + + + Data Structures\Lua + + + Data Structures\Lua + + + Data Structures\Lua + + + Data Structures\NoteData + + + Data Structures\NoteData + + + Data Structures\NoteData + + + Data Structures\NotesWriter + + + Data Structures\NotesWriter + + + Data Structures\NotesWriter + + + Data Structures\NotesWriter + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + File Types + + + File Types + + + File Types + + + File Types + + + StepMania + + + StepMania + + + StepMania + + + StepMania + + + StepMania\arch + + + StepMania\arch\LoadingWindow + + + StepMania\arch\LoadingWindow + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\ArchHooks + + + StepMania\arch\ArchHooks + + + StepMania\arch\ArchHooks + + + StepMania\arch\ArchHooks + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\LowLevelWindow + + + StepMania\arch\LowLevelWindow + + + StepMania\arch\MemoryCard + + + StepMania\arch\MemoryCard + + + StepMania\arch\Dialog + + + StepMania\arch\Dialog + + + StepMania\arch\Dialog + + + StepMania\arch\Threads + + + StepMania\arch\Lights + + + StepMania\arch\Lights + + + StepMania\arch\Lights + + + StepMania\arch\Lights + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\pcre + + + Helpers\pcre + + + Helpers\pcre + + + Helpers\pcre + + + Helpers\pcre + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\jsoncpp + + + Helpers\jsoncpp + + + Helpers\jsoncpp + + + Helpers\glew + + + Data Structures + + + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens + + + Screens\Gameplay + + + Screens\Gameplay + + + Screens\Gameplay + + + Screens\Gameplay + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Screens\Options + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\NotesLoader + + + Data Structures\Courses + + + Data Structures\Courses + + + Data Structures\Courses + + + Data Structures\Courses + + + Data Structures\Fonts + + + Data Structures\Fonts + + + Data Structures\Fonts + + + Data Structures\Lua + + + Data Structures\Lua + + + Data Structures\Lua + + + Data Structures\NoteData + + + Data Structures\NoteData + + + Data Structures\NoteData + + + Data Structures\NotesWriter + + + Data Structures\NotesWriter + + + Data Structures\NotesWriter + + + Data Structures\NotesWriter + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + Data Structures\ScoreKeeper + + + File Types + + + File Types + + + File Types + + + File Types + + + StepMania + + + StepMania + + + StepMania + + + StepMania + + + StepMania + + + StepMania + + + StepMania\arch + + + StepMania\arch + + + StepMania\arch + + + StepMania\arch + + + StepMania\arch\LoadingWindow + + + StepMania\arch\LoadingWindow + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\Sound + + + StepMania\arch\ArchHooks + + + StepMania\arch\ArchHooks + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\InputHandler + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + StepMania\arch\LowLevelWindow + + + StepMania\arch\LowLevelWindow + + + StepMania\arch\MemoryCard + + + StepMania\arch\MemoryCard + + + StepMania\arch\MemoryCard + + + StepMania\arch\Dialog + + + StepMania\arch\Dialog + + + StepMania\arch\Dialog + + + StepMania\arch\Dialog + + + StepMania\arch\Threads + + + StepMania\arch\Threads + + + StepMania\arch\Lights + + + StepMania\arch\Lights + + + StepMania\arch\Lights + + + StepMania\arch\Lights + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + StepMania\system + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Gameplay and Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Menus + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Actors used in Gameplay + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Rage + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Actors + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Global Singletons + + + Helpers + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\libpng + + + Helpers\pcre + + + Helpers\pcre + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Helpers\Lua + + + Data Structures + + + + + StepMania\system + + + StepMania\system + + + + + + + + + StepMania\system + + + + + StepMania\arch\MovieTexture + + + StepMania\arch\MovieTexture + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + BaseClasses + + + \ No newline at end of file diff --git a/src/Texture Font Generator/Texture Font Generator-net2008.vcproj b/src/Texture Font Generator/Texture Font Generator-net2008.vcproj index dee8b0dace..2cc8d70684 100644 --- a/src/Texture Font Generator/Texture Font Generator-net2008.vcproj +++ b/src/Texture Font Generator/Texture Font Generator-net2008.vcproj @@ -46,7 +46,7 @@ io_ptr; + FILE *f = (FILE *) png_get_io_ptr(pPng); size_t iGot = fwrite( pData, (int) iSize, 1, f ); if( iGot == 0 ) png_error( pPng, strerror(errno) ); @@ -117,7 +117,7 @@ static void File_png_write( png_struct *pPng, png_byte *pData, png_size_t iSize static void File_png_flush( png_struct *pPng ) { - FILE *f = (FILE *) pPng->io_ptr; + FILE *f = (FILE *) png_get_io_ptr(pPng); int iGot = fflush(f); if( iGot == -1 ) png_error( pPng, strerror(errno) ); @@ -130,10 +130,10 @@ struct error_info static void PNG_Error( png_struct *pPng, const char *szError ) { - error_info *pInfo = (error_info *) pPng->error_ptr; + error_info *pInfo = (error_info *) png_get_error_ptr(pPng); strncpy( pInfo->szErr, szError, 1024 ); pInfo->szErr[1023] = 0; - longjmp( pPng->jmpbuf, 1 ); + longjmp( png_jmpbuf(pPng), 1 ); } static void PNG_Warning( png_struct *png, const char *warning ) @@ -168,7 +168,7 @@ bool SavePNG( FILE *f, char szErrorbuf[1024], const Surface *pSurf ) return false; } - if( setjmp(pPng->jmpbuf) ) + if( setjmp(png_jmpbuf(pPng)) ) { png_destroy_read_struct( &pPng, &pInfo, NULL ); return false; diff --git a/src/libtomcrypt/libtomcrypt-net2010.vcxproj.filters b/src/libtomcrypt/libtomcrypt-net2010.vcxproj.filters new file mode 100644 index 0000000000..324bacfbbc --- /dev/null +++ b/src/libtomcrypt/libtomcrypt-net2010.vcxproj.filters @@ -0,0 +1,478 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {ad1b2be2-aa3e-4683-8892-a9742e0e933a} + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + src\headers + + + \ No newline at end of file diff --git a/src/libtommath/libtommath-net2010.vcxproj.filters b/src/libtommath/libtommath-net2010.vcxproj.filters new file mode 100644 index 0000000000..3f78ab53fa --- /dev/null +++ b/src/libtommath/libtommath-net2010.vcxproj.filters @@ -0,0 +1,378 @@ + + + + + {d28820c7-38c7-477c-8993-1124bc2d2caf} + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + src + + + src + + + src + + + \ No newline at end of file