Permalink
Browse files

Stuff

  • Loading branch information...
1 parent b4f9d5e commit 97a57e58f3dce725abbc76de5a6f39e16c9f66a3 Scott Davies committed Oct 17, 2014
Showing with 18,824 additions and 2,994 deletions.
  1. +63 −0 .gitattributes
  2. +44 −1 .gitignore
  3. +3 −3 RAGens/win32/Makefile
  4. +1 −1 RAGens/win32/RAGens.sln
  5. +0 −673 RAGens/win32/RAGens.vcproj
  6. +2 −3 RAGens/win32/RAGens.vcxproj
  7. +3 −1 RAGens/win32/RAGens.vcxproj.filters
  8. +1 −1 RAGens/win32/RAGens_VS08.sln
  9. BIN RANes/output/RANes.exe
  10. BIN RANes/output/RANes.exp
  11. BIN RANes/output/RANes.lib
  12. +3 −3 RANes/output/fceux.cfg
  13. +0 −7 RANes/vc/1446-Notes2.txt
  14. +0 −2 RANes/vc/1446-Unofficial.txt
  15. +0 −2 RANes/vc/1446-User.txt
  16. +0 −29 RANes/vc/1446.txt
  17. BIN RANes/vc/Overlay/Thumbs.db
  18. +14 −14 RANes/vc/RANes.sln
  19. +1,145 −0 RANes/vc/RANes.vcxproj
  20. +1,494 −0 RANes/vc/RANes.vcxproj.filters
  21. +43 −0 RANes/vc/RANes_VS08.sln
  22. +4,722 −0 RANes/vc/RANes_VS08.vcproj
  23. BIN RANes/vc/luaperks.lib
  24. BIN RANes/vc/luaperks.lib.bak
  25. BIN RANes/vc/luaperks_MD.lib
  26. +10 −0 RANes/vc/ra_prefs_RANes.cfg
  27. +24 −0 RANes/vc/vc12_fceux.sln
  28. +1,267 −0 RANes/vc/vc12_fceux.vcxproj
  29. +0 −15 RANes/vc/vc9_obj_Release/RANes.exe.intermediate.manifest
  30. BIN RANes/vc/vc9_obj_Release/vc90.idb
  31. +1 −0 RASnes9x/cheats.cpp
  32. BIN RASnes9x/libpng/projects/visualc71/Win32_LIB_Release/libpng.lib
  33. BIN RASnes9x/libpng/projects/visualc71/Win32_LIB_Release/libpng.pch
  34. BIN RASnes9x/libpng/projects/visualc71/Win32_LIB_Release/vc90.idb
  35. +292 −0 RASnes9x/libpng/projects/visualc71/libpng.vcxproj
  36. +86 −0 RASnes9x/libpng/projects/visualc71/libpng.vcxproj.filters
  37. +0 −5 RASnes9x/win32/228-Notes2.txt
  38. +0 −2 RASnes9x/win32/228-Unofficial.txt
  39. +0 −2 RASnes9x/win32/228-User.txt
  40. +0 −38 RASnes9x/win32/228.txt
  41. +0 −5 RASnes9x/win32/236-Unofficial.txt
  42. +0 −2 RASnes9x/win32/236-User.txt
  43. +0 −60 RASnes9x/win32/236.txt
  44. +0 −37 RASnes9x/win32/253-Notes2.txt
  45. +0 −2 RASnes9x/win32/253-Unofficial.txt
  46. +0 −2 RASnes9x/win32/253-User.txt
  47. +0 −2 RASnes9x/win32/253.txt
  48. +57 −0 RASnes9x/win32/Backup/RASnes9x.sln
  49. +27 −15 RASnes9x/win32/RASnes9x.sln
  50. +57 −0 RASnes9x/win32/RASnes9x_VS08.sln
  51. +0 −20 RASnes9x/win32/Release/RASnes9X.exe.intermediate.manifest
  52. BIN RASnes9x/win32/Release/snes9x.res
  53. BIN RASnes9x/win32/Release/vc90.idb
  54. +1,056 −0 RASnes9x/win32/snes9xw.vcxproj
  55. +797 −0 RASnes9x/win32/snes9xw.vcxproj.filters
  56. +4,790 −0 RASnes9x/win32/snes9xw_VS08.vcproj
  57. BIN RASnes9x/zlib-1.2.8/contrib/vstudio/vc9/x86/ZlibStatRelease/zlibstat.lib
  58. +319 −0 RASnes9x/zlib-1.2.8/contrib/vstudio/vc9/zlibstat.vcxproj
  59. +82 −0 RASnes9x/zlib-1.2.8/contrib/vstudio/vc9/zlibstat.vcxproj.filters
  60. +137 −0 RAVBA-M/dependencies/SFML/build/vc2012/sfml-network.vcxproj
  61. +40 −0 RAVBA-M/dependencies/SFML/build/vc2012/sfml-network.vcxproj.filters
  62. BIN RAVBA-M/dependencies/libpng/project/vs2012/Win32/Release/libpng.lib
  63. +166 −0 RAVBA-M/dependencies/libpng/project/vs2012/libpng.vcxproj
  64. +85 −0 RAVBA-M/dependencies/libpng/project/vs2012/libpng.vcxproj.filters
  65. BIN RAVBA-M/dependencies/zlib/project/vs2012/zlib.sdf
  66. +111 −0 RAVBA-M/dependencies/zlib/project/vs2012/zlib.vcxproj
  67. +87 −0 RAVBA-M/dependencies/zlib/project/vs2012/zlib.vcxproj.filters
  68. +20 −0 RAVBA-M/fex/File_Extractor2012.sln
  69. +154 −0 RAVBA-M/fex/File_Extractor2012.vcxproj
  70. +190 −0 RAVBA-M/fex/File_Extractor2012.vcxproj.filters
  71. +74 −0 RAVBA-M/project/vs2012_mfc/RAVBA2012.sln
  72. +685 −0 RAVBA-M/project/vs2012_mfc/RAVBA2012.vcxproj
  73. +26 −0 RAVBA-M/project/vs2012_mfc/nasm.props
  74. +168 −0 RAVBA-M/project/vs2012_mfc/nasm.rules
  75. +90 −0 RAVBA-M/project/vs2012_mfc/nasm.targets
  76. +250 −0 RAVBA-M/project/vs2012_mfc/nasm.xml
  77. +6 −0 RAVBA-M/project/vs2012_mfc/per_user_settings.props
  78. +1 −0 RAVBA-M/src/gb/gbGfx.cpp
  79. +1 −0 RAVBA-M/src/gba/EEprom.cpp
  80. +5 −2 RAVBA-M/src/win32/Direct3D.cpp
  81. +0 −3 RA_Integration/RA_Defs.cpp
  82. +2 −2 RA_Integration/RA_Defs.h
  83. +7 −1 RA_Integration/RA_Implementation/RA_Implementation.cpp
  84. +10 −7 RA_Integration/RA_Integration.sln
  85. +0 −377 RA_Integration/RA_Integration.vcproj
  86. +17 −18 RA_Integration/{RA_Integration_MD2012.vcxproj → RA_Integration.vcxproj}
  87. +71 −77 RA_Integration/{RA_Integration_MD.vcxproj.filters → RA_Integration.vcxproj.filters}
  88. +0 −20 RA_Integration/RA_Integration2012.sln
  89. BIN RA_Integration/RA_Integration2012.v11.suo
  90. +0 −486 RA_Integration/RA_Integration_MD.vcproj
  91. +0 −192 RA_Integration/RA_Integration_MD.vcxproj
  92. +0 −486 RA_Integration/RA_Integration_MD2012.vcproj
  93. +0 −4 RA_Integration/RA_Integration_MD2012.vcxproj.user
  94. +0 −366 RA_Integration/RA_Integration_MT.vcproj
  95. +1 −1 RA_Integration/RA_Integration_VS08.sln
  96. 0 RA_Integration/{RA_Integration_MD_VS08.vcproj → RA_Integration_VS08.vcproj}
  97. +10 −5 RA_Integration/RA_Interface.cpp
  98. BIN RA_Integration/msvcp110.dll
  99. BIN RA_Integration/msvcr110.dll
  100. +7 −0 bizhawk/RAInterface/RAInterface.csproj
View
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln merge=binary
+#*.csproj merge=binary
+#*.vbproj merge=binary
+#*.vcxproj merge=binary
+#*.vcproj merge=binary
+#*.dbproj merge=binary
+#*.fsproj merge=binary
+#*.lsproj merge=binary
+#*.wixproj merge=binary
+#*.modelproj merge=binary
+#*.sqlproj merge=binary
+#*.wwaproj merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg binary
+#*.png binary
+#*.gif binary
+
+###############################################################################
+# diff behavior for common document formats
+#
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the
+# entries below.
+###############################################################################
+#*.doc diff=astextplain
+#*.DOC diff=astextplain
+#*.docx diff=astextplain
+#*.DOCX diff=astextplain
+#*.dot diff=astextplain
+#*.DOT diff=astextplain
+#*.pdf diff=astextplain
+#*.PDF diff=astextplain
+#*.rtf diff=astextplain
+#*.RTF diff=astextplain
View
@@ -35,7 +35,6 @@
/RA_Integration/Debug
/RA_Integration/Release
/RA_Integration/ReleaseWithDebug
-/RA_Integration/*.dll
/RA_Integration/*.exp
/RA_Integration/*.ilk
/RA_Integration/*.lib
@@ -97,3 +96,47 @@
/bizhawk/output/RAInterface.pdb
/bizhawk/output/SlimDX.dll
/bizhawk/BizHawk.v11.suo
+/RA_Integration/RA_Integration_d.dll
+/RA_Integration/*.opensdf
+/RA_Integration/*.suo
+/RANes/vc/*.sdf
+/RANes/vc/*.opensdf
+/RANes/vc/*.suo
+/RANes/vc/vc9_obj_Release
+/RASnes9x/libpng/projects/visualc71/Win32_LIB_Release
+/RASnes9x/win32/Release
+/RASnes9x/win32/Backup/*.suo
+/RASnes9x/win32/*.sdf
+/RASnes9x/win32/*.suo
+/RASnes9x/zlib-1.2.8/contrib/vstudio/vc9/x86/ZlibStatRelease/Tmp
+/RAVBA-M/dependencies/SFML/build/vc2012/Release
+/RAVBA-M/dependencies/zlib/project/vs2012/Release
+/RAVBA-M/dependencies/libpng/project/vs2012/Win32/Release_temp
+/RAVBA-M/fex/Release
+/RAVBA-M/project/vs2012_mfc/Win32/Release_temp
+/RANes/output/RANes.pdb
+/RANes/output/RA_Integration.dll
+/RANes/vc/RACache/Data/RALog.txt
+/RANes/vc/RACache/Data/gamelibraryfound.txt
+/RANes/vc/RACache/Data/ra_news.txt
+/RANes/vc/RANes.vcxproj.user
+/RANes/vc/RA_Keys.dll
+/RANes/vc/vc9_obj_Debug/RANes.vcxprojResolveAssemblyReference.cache
+/RASnes9x/zlib-1.2.8/contrib/vstudio/vc9/x86/ZlibStatRelease/vc110.pdb
+/RAVBA-M/dependencies/SFML/build/vc2012/sfml-network.vcxproj.user
+/RAVBA-M/dependencies/libpng/project/vs2012/libpng.vcxproj.user
+/RAVBA-M/dependencies/zlib/project/vs2012/zlib.vcxproj.user
+/RAVBA-M/fex/File_Extractor2012.vcxproj.user
+/RAVBA-M/project/vs2012_mfc/RAVBA2012.sdf
+/RAVBA-M/project/vs2012_mfc/RAVBA2012.suo
+/RAVBA-M/project/vs2012_mfc/RAVBA2012.v11.suo
+/RAVBA-M/project/vs2012_mfc/RAVBA2012.vcxproj.user
+/RAVBA-M/project/vs2012_mfc/Release/File_Extractor.lib
+/RAVBA-M/project/vs2012_mfc/Release/SFML.lib
+/RAVBA-M/project/vs2012_mfc/Release/zlib.lib
+/RAVBA-M/project/vs2012_mfc/Win32/Debug_temp/VBA2012.vcxprojResolveAssemblyReference.cache
+/RAVBA-M/project/vs2012_mfc/ipch/ravba2012-b6f3912b/ravisualboyadvance-m-dc603907.ipch
+/RAVBA-M/src/filters/temp.obj
+/RAVBA-M/src/temp.obj
+/bizhawk/LuaInterface/LuaInterface.sdf
+/bizhawk/LuaInterface/LuaInterface.suo
@@ -36,7 +36,7 @@ POSTBUILD=copy $(SRC_RA)\RA_Integration_d.dll . && copy $(SRC_RA)\*.pdb .
!ENDIF
!IF "$(RELEASE)"=="1" && "$(RELEASEDEBUG)"!="1"
-LINK_FLAGS=/RELEASE /OPT:REF /OPT:ICF
+LINK_FLAGS=/DEBUG
!ELSE
LINK_FLAGS=/DEBUG
!ENDIF
@@ -52,9 +52,9 @@ RC_FLAGS=
RC=rc.exe /l 0x40c $(RC_FLAGS)
!IF "$(RELEASE)"=="1"
-CC_FLAGS=/Ox /Zi /D "NDEBUG" /MD
+CC_FLAGS=/Ox /Zi /D "NDEBUG" /MT
!ELSE
-CC_FLAGS=/Od /Z7 /D "_DEBUG" /MDd
+CC_FLAGS=/Od /Z7 /D "_DEBUG" /MTd
!ENDIF
CC=cl.exe /c /nologo /EHsc /W3 /D "WIN32" /D "_MBCS" /D "RA_GENS" /D "_CRT_SECURE_NO_WARNINGS" /wd4101 /wd4244 /wd4018 /wd4305 /I$(SRCCOMMONPATH) /I$(SRC_RA) /I$(SRCPATH) /I$(DX_SDK) $(CC_FLAGS)
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RAGens", "RAGens.vcxproj", "{9FFB7437-AB3B-4B33-9647-2B60D1E93411}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RA_Integration_MD", "..\..\RA_Integration\RA_Integration_MD.vcxproj", "{2C1B0023-8EF1-4C4B-99F3-E86BFF8B7300}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RA_Integration", "..\..\RA_Integration\RA_Integration.vcxproj", "{825CB292-F069-4B27-82CF-3417746ACDF3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Oops, something went wrong.

0 comments on commit 97a57e5

Please sign in to comment.