From 3fc622916df8c3b53df94c0f4a16732327ecd443 Mon Sep 17 00:00:00 2001 From: Rodolfo Bogado Date: Sat, 21 Feb 2015 19:16:58 -0300 Subject: [PATCH] Merge latest master --- .gitmodules | 4 + Contributing.md | 7 + Data/Sys/GameSettings/{DLSE64.ini => DLS.ini} | 2 +- Data/Sys/GameSettings/DLSP64.ini | 30 - Data/Sys/GameSettings/FA6.ini | 33 + Data/Sys/GameSettings/{FA7E01.ini => FA7.ini} | 2 +- Data/Sys/GameSettings/FA8.ini | 33 + Data/Sys/GameSettings/FA8E01.ini | 33 - Data/Sys/GameSettings/{FABE01.ini => FAA.ini} | 4 +- Data/Sys/GameSettings/{FAAP01.ini => FAB.ini} | 4 +- Data/Sys/GameSettings/FAG.ini | 29 + Data/Sys/GameSettings/FAGE01.ini | 29 - Data/Sys/GameSettings/FAGP01.ini | 29 - Data/Sys/GameSettings/{FAKE01.ini => FAK.ini} | 2 +- Data/Sys/GameSettings/FAKP01.ini | 29 - Data/Sys/GameSettings/{FABP01.ini => FAL.ini} | 2 +- Data/Sys/GameSettings/FALE01.ini | 29 - Data/Sys/GameSettings/FALP01.ini | 29 - Data/Sys/GameSettings/{FAAE01.ini => FAO.ini} | 4 +- Data/Sys/GameSettings/FAOE01.ini | 29 - Data/Sys/GameSettings/FAOP01.ini | 29 - Data/Sys/GameSettings/FAP.ini | 33 + Data/Sys/GameSettings/FAPE01.ini | 33 - Data/Sys/GameSettings/FAPP01.ini | 33 - Data/Sys/GameSettings/{FASE01.ini => FAS.ini} | 2 +- Data/Sys/GameSettings/FASP01.ini | 29 - Data/Sys/GameSettings/{FA7P01.ini => FAX.ini} | 4 +- Data/Sys/GameSettings/{FA8P01.ini => FB4.ini} | 4 +- Data/Sys/GameSettings/FB4E01.ini | 33 - Data/Sys/GameSettings/FB4P01.ini | 33 - Data/Sys/GameSettings/FBB.ini | 33 + Data/Sys/GameSettings/FBBE01.ini | 33 - Data/Sys/GameSettings/FBBP01.ini | 33 - Data/Sys/GameSettings/FBD.ini | 33 + Data/Sys/GameSettings/FBDE01.ini | 33 - Data/Sys/GameSettings/FBDP01.ini | 33 - Data/Sys/GameSettings/FBE.ini | 33 + Data/Sys/GameSettings/FBEE01.ini | 33 - Data/Sys/GameSettings/FBEP01.ini | 33 - Data/Sys/GameSettings/FBH.ini | 33 + Data/Sys/GameSettings/FBHE01.ini | 33 - Data/Sys/GameSettings/FBHJ01.ini | 33 - Data/Sys/GameSettings/FBHP01.ini | 33 - Data/Sys/GameSettings/FBI.ini | 33 + Data/Sys/GameSettings/FBIE01.ini | 33 - Data/Sys/GameSettings/FBIP01.ini | 33 - Data/Sys/GameSettings/FBJ.ini | 33 + Data/Sys/GameSettings/FBJE01.ini | 33 - Data/Sys/GameSettings/FBJP01.ini | 33 - Data/Sys/GameSettings/FBL.ini | 33 + Data/Sys/GameSettings/FBLE01.ini | 33 - Data/Sys/GameSettings/FBLM01.ini | 33 - Data/Sys/GameSettings/FBR.ini | 33 + Data/Sys/GameSettings/FBRE01.ini | 33 - Data/Sys/GameSettings/FBRJ01.ini | 33 - Data/Sys/GameSettings/FBRP01.ini | 33 - Data/Sys/GameSettings/FBS.ini | 33 + Data/Sys/GameSettings/FBSE01.ini | 33 - Data/Sys/GameSettings/FBSM01.ini | 33 - Data/Sys/GameSettings/FBU.ini | 33 + Data/Sys/GameSettings/FBUE01.ini | 33 - Data/Sys/GameSettings/FBUP01.ini | 33 - Data/Sys/GameSettings/{FA6P01.ini => FC3.ini} | 4 +- Data/Sys/GameSettings/FC3E01.ini | 33 - Data/Sys/GameSettings/FC3P01.ini | 33 - Data/Sys/GameSettings/FC6.ini | 33 + Data/Sys/GameSettings/FC6E01.ini | 33 - Data/Sys/GameSettings/FC6P01.ini | 33 - Data/Sys/GameSettings/FC8.ini | 33 + Data/Sys/GameSettings/FC8E01.ini | 33 - Data/Sys/GameSettings/FC8J01.ini | 33 - Data/Sys/GameSettings/FC8P01.ini | 33 - Data/Sys/GameSettings/FCP.ini | 33 + Data/Sys/GameSettings/FCPE01.ini | 33 - Data/Sys/GameSettings/FCPP01.ini | 33 - Data/Sys/GameSettings/{FCRE01.ini => FCR.ini} | 2 +- Data/Sys/GameSettings/FCRP01.ini | 33 - Data/Sys/GameSettings/{FAXE01.ini => FCS.ini} | 2 +- Data/Sys/GameSettings/FCSE01.ini | 33 - Data/Sys/GameSettings/FCSP01.ini | 33 - Data/Sys/GameSettings/FCT.ini | 33 + Data/Sys/GameSettings/FCTE01.ini | 33 - Data/Sys/GameSettings/FCTJ01.ini | 33 - Data/Sys/GameSettings/FCTP01.ini | 33 - Data/Sys/GameSettings/FCU.ini | 33 + Data/Sys/GameSettings/FCUE01.ini | 33 - Data/Sys/GameSettings/FCUP01.ini | 33 - Data/Sys/GameSettings/FCV.ini | 33 + Data/Sys/GameSettings/FCVE01.ini | 33 - Data/Sys/GameSettings/FCVP01.ini | 33 - Data/Sys/GameSettings/FCW.ini | 33 + Data/Sys/GameSettings/FCWE01.ini | 33 - Data/Sys/GameSettings/FCWP01.ini | 33 - Data/Sys/GameSettings/FCY.ini | 33 + Data/Sys/GameSettings/FCYE01.ini | 33 - Data/Sys/GameSettings/FCYP01.ini | 33 - Data/Sys/GameSettings/FD2.ini | 33 + Data/Sys/GameSettings/FD2E01.ini | 33 - Data/Sys/GameSettings/FD2P01.ini | 33 - Data/Sys/GameSettings/FD7.ini | 33 + Data/Sys/GameSettings/FD7E01.ini | 33 - Data/Sys/GameSettings/FD7J01.ini | 33 - Data/Sys/GameSettings/FD7P01.ini | 33 - Data/Sys/GameSettings/{FA8F01.ini => FDA.ini} | 4 +- Data/Sys/GameSettings/FDAE01.ini | 33 - Data/Sys/GameSettings/FDAM01.ini | 33 - Data/Sys/GameSettings/FDP.ini | 33 + Data/Sys/GameSettings/FDPE01.ini | 33 - Data/Sys/GameSettings/FDPP01.ini | 33 - Data/Sys/GameSettings/FDV.ini | 33 + Data/Sys/GameSettings/FDVE01.ini | 33 - Data/Sys/GameSettings/FDVP01.ini | 33 - Data/Sys/GameSettings/{FAXP01.ini => FED.ini} | 2 +- Data/Sys/GameSettings/FEDL01.ini | 33 - Data/Sys/GameSettings/FEDN01.ini | 33 - Data/Sys/GameSettings/FEI.ini | 33 + Data/Sys/GameSettings/FEIE01.ini | 33 - Data/Sys/GameSettings/FEIP01.ini | 33 - Data/Sys/GameSettings/FEQ.ini | 33 + Data/Sys/GameSettings/FEQE01.ini | 33 - Data/Sys/GameSettings/FEQJ01.ini | 33 - Data/Sys/GameSettings/FEQP01.ini | 33 - Data/Sys/GameSettings/FER.ini | 33 + Data/Sys/GameSettings/FERE01.ini | 33 - Data/Sys/GameSettings/FERM01.ini | 33 - Data/Sys/GameSettings/{FA6E01.ini => FES.ini} | 4 +- Data/Sys/GameSettings/FESE01.ini | 33 - Data/Sys/GameSettings/FESP01.ini | 33 - Data/Sys/GameSettings/FEU.ini | 33 + Data/Sys/GameSettings/FEUE01.ini | 33 - Data/Sys/GameSettings/FEUP01.ini | 33 - Data/Sys/GameSettings/FFA.ini | 33 + Data/Sys/GameSettings/FFAE01.ini | 33 - Data/Sys/GameSettings/FFAM01.ini | 33 - Data/Sys/GameSettings/FFE.ini | 33 + Data/Sys/GameSettings/FFEE01.ini | 33 - Data/Sys/GameSettings/FFEP01.ini | 33 - Data/Sys/GameSettings/FFM.ini | 33 + Data/Sys/GameSettings/FFME01.ini | 33 - Data/Sys/GameSettings/FFMP01.ini | 33 - Data/Sys/GameSettings/FFN.ini | 33 + Data/Sys/GameSettings/FFNE01.ini | 33 - Data/Sys/GameSettings/FFNJ01.ini | 33 - Data/Sys/GameSettings/FFNP01.ini | 33 - Data/Sys/GameSettings/FFQ.ini | 33 + Data/Sys/GameSettings/FFQE01.ini | 33 - Data/Sys/GameSettings/FFQM01.ini | 33 - Data/Sys/GameSettings/{G6TE5G.ini => G2O.ini} | 2 +- Data/Sys/GameSettings/{G2TE52.ini => G2T.ini} | 2 +- Data/Sys/GameSettings/G2TP52.ini | 27 - Data/Sys/GameSettings/{G2VE08.ini => G2V.ini} | 2 +- Data/Sys/GameSettings/G2VP08.ini | 31 - Data/Sys/GameSettings/{G2XE8P.ini => G2X.ini} | 2 +- Data/Sys/GameSettings/G2XP8P.ini | 32 - Data/Sys/GameSettings/{G3AP69.ini => G3A.ini} | 2 +- Data/Sys/GameSettings/G3AE69.ini | 30 - Data/Sys/GameSettings/{G3BP9G.ini => G3B.ini} | 2 +- Data/Sys/GameSettings/G3BE9G.ini | 30 - Data/Sys/GameSettings/G3BP54.ini | 30 - Data/Sys/GameSettings/{GRVEA4.ini => G3D.ini} | 2 +- Data/Sys/GameSettings/{G3FE69.ini => G3F.ini} | 2 +- Data/Sys/GameSettings/G3FP69.ini | 22 - Data/Sys/GameSettings/{G3RE52.ini => G3R.ini} | 2 +- Data/Sys/GameSettings/G3RD52.ini | 30 - Data/Sys/GameSettings/G3RF52.ini | 30 - Data/Sys/GameSettings/G3RP52.ini | 30 - Data/Sys/GameSettings/{G3DX6L.ini => G3V.ini} | 3 +- Data/Sys/GameSettings/G3VE69.ini | 18 - Data/Sys/GameSettings/G3VP69.ini | 18 - Data/Sys/GameSettings/{G3XE52.ini => G3X.ini} | 2 +- Data/Sys/GameSettings/{G4BP08.ini => G4B.ini} | 2 +- Data/Sys/GameSettings/{G4CE54.ini => G4C.ini} | 2 +- Data/Sys/GameSettings/G4CP54.ini | 22 - Data/Sys/GameSettings/G4F.ini | 27 + Data/Sys/GameSettings/{G4ME69.ini => G4M.ini} | 2 +- Data/Sys/GameSettings/{GL7E64.ini => G4O.ini} | 2 +- Data/Sys/GameSettings/{G4ZE69.ini => G4Z.ini} | 2 +- Data/Sys/GameSettings/G4ZP69.ini | 19 - Data/Sys/GameSettings/{G5DP78.ini => G5D.ini} | 2 +- Data/Sys/GameSettings/{G5NEAF.ini => G5N.ini} | 2 +- Data/Sys/GameSettings/G5NP69.ini | 31 - Data/Sys/GameSettings/{G5SP7D.ini => G5S.ini} | 2 +- Data/Sys/GameSettings/G5SE7D.ini | 31 - Data/Sys/GameSettings/{G5TE69.ini => G5T.ini} | 2 +- Data/Sys/GameSettings/G5TP69.ini | 33 - Data/Sys/GameSettings/{G6FE69.ini => G6F.ini} | 2 +- Data/Sys/GameSettings/G6FF69.ini | 18 - Data/Sys/GameSettings/G6FP69.ini | 18 - Data/Sys/GameSettings/{G6ME69.ini => G6M.ini} | 2 +- Data/Sys/GameSettings/G6MP69.ini | 20 - Data/Sys/GameSettings/{G4FP69.ini => G6N.ini} | 4 +- Data/Sys/GameSettings/G6NE69.ini | 27 - Data/Sys/GameSettings/G6NP69.ini | 27 - Data/Sys/GameSettings/{G6TP5G.ini => G6T.ini} | 2 +- Data/Sys/GameSettings/{G6WE69.ini => G6W.ini} | 2 +- Data/Sys/GameSettings/G6WP69.ini | 30 - Data/Sys/GameSettings/{G9RD7D.ini => G9R.ini} | 2 +- Data/Sys/GameSettings/G9RE7D.ini | 20 - Data/Sys/GameSettings/G9RF7D.ini | 20 - Data/Sys/GameSettings/G9RP7D.ini | 20 - Data/Sys/GameSettings/{G9SE8P.ini => G9S.ini} | 2 +- Data/Sys/GameSettings/G9SJ8P.ini | 31 - Data/Sys/GameSettings/G9SP8P.ini | 31 - Data/Sys/GameSettings/{G9TD52.ini => G9T.ini} | 2 +- Data/Sys/GameSettings/G9TE52.ini | 30 - Data/Sys/GameSettings/G9TF52.ini | 30 - Data/Sys/GameSettings/G9TI52.ini | 30 - Data/Sys/GameSettings/G9TP52.ini | 30 - Data/Sys/GameSettings/GAZ.ini | 27 + Data/Sys/GameSettings/GAZD69.ini | 27 - Data/Sys/GameSettings/GAZE69.ini | 27 - Data/Sys/GameSettings/GAZF69.ini | 27 - Data/Sys/GameSettings/GAZH69.ini | 27 - Data/Sys/GameSettings/GAZI69.ini | 27 - Data/Sys/GameSettings/GAZJ69.ini | 27 - Data/Sys/GameSettings/GAZM69.ini | 27 - Data/Sys/GameSettings/GAZP69.ini | 27 - Data/Sys/GameSettings/GAZS69.ini | 27 - Data/Sys/GameSettings/{GB3E51.ini => GB3.ini} | 2 +- Data/Sys/GameSettings/GB3P51.ini | 22 - Data/Sys/GameSettings/{GBHDC8.ini => GBH.ini} | 2 +- Data/Sys/GameSettings/GBHFC8.ini | 31 - Data/Sys/GameSettings/GBHPC8.ini | 31 - Data/Sys/GameSettings/{RDZP01.ini => GBI.ini} | 2 +- Data/Sys/GameSettings/{GBSE8P.ini => GBS.ini} | 2 +- Data/Sys/GameSettings/GBSP8P.ini | 31 - Data/Sys/GameSettings/{GBWF64.ini => GBW.ini} | 2 +- Data/Sys/GameSettings/GBWP64.ini | 31 - Data/Sys/GameSettings/{GBXE51.ini => GBX.ini} | 2 +- Data/Sys/GameSettings/GBXP51.ini | 23 - Data/Sys/GameSettings/GC3.ini | 27 + Data/Sys/GameSettings/GC3D78.ini | 27 - Data/Sys/GameSettings/GC3E78.ini | 27 - Data/Sys/GameSettings/GC3F78.ini | 27 - Data/Sys/GameSettings/GC3P78.ini | 27 - Data/Sys/GameSettings/{GC6E01.ini => GC6.ini} | 2 +- Data/Sys/GameSettings/GC6P01.ini | 32 - Data/Sys/GameSettings/{GCDP08.ini => GCD.ini} | 2 +- Data/Sys/GameSettings/GCDE08.ini | 26 - Data/Sys/GameSettings/GCDJ08.ini | 26 - Data/Sys/GameSettings/{GCEE41.ini => GCE.ini} | 2 +- Data/Sys/GameSettings/GCEP41.ini | 17 - Data/Sys/GameSettings/{GCIE69.ini => GCI.ini} | 2 +- Data/Sys/GameSettings/{GCJE41.ini => GCJ.ini} | 2 +- Data/Sys/GameSettings/GCJP41.ini | 15 - Data/Sys/GameSettings/{GCPE6S.ini => GCP.ini} | 2 +- Data/Sys/GameSettings/GCPP6S.ini | 33 - Data/Sys/GameSettings/{GCZE69.ini => GCZ.ini} | 2 +- Data/Sys/GameSettings/GCZP69.ini | 30 - Data/Sys/GameSettings/{GDGE7H.ini => GDG.ini} | 2 +- Data/Sys/GameSettings/GDGP78.ini | 31 - Data/Sys/GameSettings/{GDKEA4.ini => GDK.ini} | 2 +- Data/Sys/GameSettings/GDKJA4.ini | 22 - Data/Sys/GameSettings/GDKPA4.ini | 22 - Data/Sys/GameSettings/{GDME01.ini => GDM.ini} | 2 +- Data/Sys/GameSettings/GDMJ01.ini | 19 - Data/Sys/GameSettings/GDMP01.ini | 19 - Data/Sys/GameSettings/{GDQP6S.ini => GDQ.ini} | 2 +- Data/Sys/GameSettings/GDQE6S.ini | 21 - Data/Sys/GameSettings/{GDSE78.ini => GDS.ini} | 2 +- Data/Sys/GameSettings/{GDXEA4.ini => GDX.ini} | 2 +- Data/Sys/GameSettings/GDXJA4.ini | 10 - Data/Sys/GameSettings/GDXPA4.ini | 10 - Data/Sys/GameSettings/{GEAE8P.ini => GEA.ini} | 2 +- Data/Sys/GameSettings/GEAP8P.ini | 34 - Data/Sys/GameSettings/{GEDE01.ini => GED.ini} | 2 +- Data/Sys/GameSettings/GEN.ini | 30 + Data/Sys/GameSettings/GEND69.ini | 30 - Data/Sys/GameSettings/GENE69.ini | 30 - Data/Sys/GameSettings/GENP69.ini | 30 - Data/Sys/GameSettings/GENS69.ini | 30 - Data/Sys/GameSettings/{GEOE08.ini => GEO.ini} | 2 +- Data/Sys/GameSettings/GEOP08.ini | 32 - Data/Sys/GameSettings/{G2OE41.ini => GEZ.ini} | 4 +- Data/Sys/GameSettings/GEZE8P.ini | 30 - Data/Sys/GameSettings/GEZP8P.ini | 30 - Data/Sys/GameSettings/{GFDD69.ini => GF4.ini} | 4 +- Data/Sys/GameSettings/{G4FE69.ini => GF6.ini} | 2 +- Data/Sys/GameSettings/GF6E69.ini | 27 - Data/Sys/GameSettings/GF6F69.ini | 27 - Data/Sys/GameSettings/GFA.ini | 27 + Data/Sys/GameSettings/GFAD69.ini | 27 - Data/Sys/GameSettings/GFAE69.ini | 27 - Data/Sys/GameSettings/GFAP69.ini | 27 - Data/Sys/GameSettings/GFAS69.ini | 27 - Data/Sys/GameSettings/{GF4F52.ini => GFD.ini} | 4 +- Data/Sys/GameSettings/GFDE69.ini | 31 - Data/Sys/GameSettings/{GFGEA4.ini => GFG.ini} | 2 +- Data/Sys/GameSettings/GFGPA4.ini | 26 - Data/Sys/GameSettings/{GGEE41.ini => GGE.ini} | 2 +- Data/Sys/GameSettings/GGEP41.ini | 34 - Data/Sys/GameSettings/GGEY41.ini | 34 - Data/Sys/GameSettings/{GGPE01.ini => GGP.ini} | 2 +- Data/Sys/GameSettings/{GGVP78.ini => GGV.ini} | 2 +- Data/Sys/GameSettings/GGVD78.ini | 18 - Data/Sys/GameSettings/GGVE78.ini | 18 - Data/Sys/GameSettings/GGVX78.ini | 18 - Data/Sys/GameSettings/{GGYE41.ini => GGY.ini} | 2 +- Data/Sys/GameSettings/GGYP41.ini | 33 - Data/Sys/GameSettings/{GGZE52.ini => GGZ.ini} | 2 +- Data/Sys/GameSettings/GGZX52.ini | 31 - Data/Sys/GameSettings/{GH2P69.ini => GH2.ini} | 2 +- Data/Sys/GameSettings/GH2E69.ini | 31 - Data/Sys/GameSettings/{G3AD69.ini => GH4.ini} | 5 +- Data/Sys/GameSettings/GH4D69.ini | 27 - Data/Sys/GameSettings/GH4E69.ini | 27 - Data/Sys/GameSettings/GH4F69.ini | 27 - Data/Sys/GameSettings/GH4H69.ini | 27 - Data/Sys/GameSettings/GH4I69.ini | 27 - Data/Sys/GameSettings/GH4J69.ini | 27 - Data/Sys/GameSettings/GH4M69.ini | 27 - Data/Sys/GameSettings/GH4P69.ini | 27 - Data/Sys/GameSettings/GH4S69.ini | 27 - Data/Sys/GameSettings/{GH5F52.ini => GH5.ini} | 2 +- Data/Sys/GameSettings/GH5D52.ini | 18 - Data/Sys/GameSettings/GH5E52.ini | 18 - Data/Sys/GameSettings/{GN6P69.ini => GHB.ini} | 2 +- Data/Sys/GameSettings/GHBE7D.ini | 27 - Data/Sys/GameSettings/GHBP7D.ini | 27 - Data/Sys/GameSettings/{GHCE4Q.ini => GHC.ini} | 2 +- Data/Sys/GameSettings/{GHKF7D.ini => GHK.ini} | 2 +- Data/Sys/GameSettings/GHKD7D.ini | 20 - Data/Sys/GameSettings/GHKE7D.ini | 20 - Data/Sys/GameSettings/GHKP7D.ini | 20 - Data/Sys/GameSettings/GHKS7D.ini | 20 - Data/Sys/GameSettings/GHL.ini | 27 + Data/Sys/GameSettings/GHLE69.ini | 27 - Data/Sys/GameSettings/GHLJ69.ini | 27 - Data/Sys/GameSettings/GHLP69.ini | 27 - Data/Sys/GameSettings/GHLX69.ini | 27 - Data/Sys/GameSettings/GHLY69.ini | 27 - Data/Sys/GameSettings/GHLZ69.ini | 27 - Data/Sys/GameSettings/{GHMD4F.ini => GHM.ini} | 2 +- Data/Sys/GameSettings/GHMP4F.ini | 27 - Data/Sys/GameSettings/{GNED78.ini => GHN.ini} | 2 +- Data/Sys/GameSettings/GHNE71.ini | 22 - Data/Sys/GameSettings/GHNX71.ini | 22 - Data/Sys/GameSettings/GHQ.ini | 31 + Data/Sys/GameSettings/GHQE7D.ini | 31 - Data/Sys/GameSettings/GHQP7D.ini | 31 - Data/Sys/GameSettings/{GHSE69.ini => GHS.ini} | 2 +- Data/Sys/GameSettings/GHSJ69.ini | 31 - Data/Sys/GameSettings/GHSP69.ini | 31 - Data/Sys/GameSettings/GHSX69.ini | 31 - Data/Sys/GameSettings/GHSY69.ini | 31 - Data/Sys/GameSettings/GHU.ini | 20 + Data/Sys/GameSettings/GHUE7D.ini | 19 - Data/Sys/GameSettings/GHUF7D.ini | 19 - Data/Sys/GameSettings/GHUP7D.ini | 19 - Data/Sys/GameSettings/{GT4D52.ini => GIA.ini} | 2 +- Data/Sys/GameSettings/GIAP7D.ini | 22 - Data/Sys/GameSettings/{GICJG9.ini => GIC.ini} | 2 +- Data/Sys/GameSettings/GICD78.ini | 21 - Data/Sys/GameSettings/GICF78.ini | 21 - Data/Sys/GameSettings/GICP78.ini | 21 - Data/Sys/GameSettings/{GILE51.ini => GIL.ini} | 2 +- Data/Sys/GameSettings/GILP51.ini | 33 - Data/Sys/GameSettings/{GISE36.ini => GIS.ini} | 2 +- Data/Sys/GameSettings/{RTNE41.ini => GIT.ini} | 4 +- Data/Sys/GameSettings/GITE01.ini | 27 - Data/Sys/GameSettings/GITP01.ini | 27 - Data/Sys/GameSettings/{GJKD52.ini => GJK.ini} | 2 +- Data/Sys/GameSettings/GJKE52.ini | 20 - Data/Sys/GameSettings/GJKF52.ini | 20 - Data/Sys/GameSettings/GJKP52.ini | 20 - Data/Sys/GameSettings/{GJUF78.ini => GJU.ini} | 2 +- Data/Sys/GameSettings/{G4FD69.ini => GJX.ini} | 2 +- Data/Sys/GameSettings/GJXE51.ini | 27 - Data/Sys/GameSettings/GJXP51.ini | 27 - Data/Sys/GameSettings/{GK2F52.ini => GK2.ini} | 2 +- Data/Sys/GameSettings/GK2D52.ini | 24 - Data/Sys/GameSettings/GK2E52.ini | 24 - Data/Sys/GameSettings/GK2I52.ini | 24 - Data/Sys/GameSettings/GK2P52.ini | 24 - Data/Sys/GameSettings/{G2OP41.ini => GK5.ini} | 2 +- Data/Sys/GameSettings/GK5E78.ini | 30 - Data/Sys/GameSettings/GK5X78.ini | 30 - Data/Sys/GameSettings/{GK7E08.ini => GK7.ini} | 2 +- Data/Sys/GameSettings/GK7P08.ini | 30 - Data/Sys/GameSettings/{GKHEA4.ini => GKH.ini} | 2 +- Data/Sys/GameSettings/GKHPA4.ini | 25 - Data/Sys/GameSettings/{G3XP52.ini => GKL.ini} | 3 +- Data/Sys/GameSettings/GKLD69.ini | 30 - Data/Sys/GameSettings/GKLE69.ini | 30 - Data/Sys/GameSettings/GKLF69.ini | 30 - Data/Sys/GameSettings/GKLI69.ini | 30 - Data/Sys/GameSettings/GKLJ69.ini | 30 - Data/Sys/GameSettings/GKLP69.ini | 30 - Data/Sys/GameSettings/GKLS69.ini | 30 - Data/Sys/GameSettings/{GKMP41.ini => GKM.ini} | 2 +- Data/Sys/GameSettings/{GKME41.ini => GKO.ini} | 2 +- Data/Sys/GameSettings/{GKYJ01.ini => GKY.ini} | 2 +- Data/Sys/GameSettings/{GKZD9G.ini => GKZ.ini} | 2 +- Data/Sys/GameSettings/GKZE9G.ini | 22 - Data/Sys/GameSettings/GKZF9G.ini | 22 - Data/Sys/GameSettings/GKZP54.ini | 22 - Data/Sys/GameSettings/{GL7P64.ini => GL7.ini} | 2 +- Data/Sys/GameSettings/{GL8E4F.ini => GL8.ini} | 2 +- Data/Sys/GameSettings/GL8F4F.ini | 27 - Data/Sys/GameSettings/{GLCE52.ini => GLC.ini} | 2 +- Data/Sys/GameSettings/GLCF52.ini | 37 - Data/Sys/GameSettings/{GLRD64.ini => GLR.ini} | 2 +- Data/Sys/GameSettings/GLRF64.ini | 29 - Data/Sys/GameSettings/GLRJ13.ini | 29 - Data/Sys/GameSettings/GLRP64.ini | 29 - Data/Sys/GameSettings/{GLSD64.ini => GLS.ini} | 2 +- Data/Sys/GameSettings/GLSE64.ini | 32 - Data/Sys/GameSettings/GLSF64.ini | 32 - Data/Sys/GameSettings/GLSP64.ini | 32 - Data/Sys/GameSettings/GLY.ini | 27 + Data/Sys/GameSettings/GLYE69.ini | 27 - Data/Sys/GameSettings/GLYP69.ini | 27 - Data/Sys/GameSettings/{G4OP69.ini => GLZ.ini} | 2 +- Data/Sys/GameSettings/GLZE69.ini | 19 - Data/Sys/GameSettings/GLZF69.ini | 19 - Data/Sys/GameSettings/{GM2E8P.ini => GM2.ini} | 2 +- Data/Sys/GameSettings/GM2J8P.ini | 30 - Data/Sys/GameSettings/GM2P8P.ini | 30 - Data/Sys/GameSettings/{GM3E69.ini => GM3.ini} | 2 +- Data/Sys/GameSettings/GM5.ini | 30 + Data/Sys/GameSettings/GM5E7D.ini | 30 - Data/Sys/GameSettings/GM5F7D.ini | 30 - Data/Sys/GameSettings/GM5P7D.ini | 30 - Data/Sys/GameSettings/{GM6EE9.ini => GM6.ini} | 2 +- Data/Sys/GameSettings/GM6PE9.ini | 29 - Data/Sys/GameSettings/{GMHE52.ini => GMH.ini} | 2 +- Data/Sys/GameSettings/GMHF52.ini | 31 - Data/Sys/GameSettings/GMHP52.ini | 31 - Data/Sys/GameSettings/{GMIE70.ini => GMI.ini} | 2 +- Data/Sys/GameSettings/GMIP70.ini | 35 - Data/Sys/GameSettings/{GMNE78.ini => GMN.ini} | 2 +- Data/Sys/GameSettings/GMNP78.ini | 34 - Data/Sys/GameSettings/{GN6E69.ini => GN6.ini} | 2 +- Data/Sys/GameSettings/{GN7E69.ini => GN7.ini} | 2 +- Data/Sys/GameSettings/GN7P69.ini | 22 - Data/Sys/GameSettings/GN8.ini | 27 + Data/Sys/GameSettings/GN8E69.ini | 27 - Data/Sys/GameSettings/GN8P69.ini | 27 - Data/Sys/GameSettings/{GNEE78.ini => GNE.ini} | 2 +- Data/Sys/GameSettings/GNEF78.ini | 22 - Data/Sys/GameSettings/GNEP78.ini | 22 - Data/Sys/GameSettings/GNES78.ini | 22 - Data/Sys/GameSettings/{GNIEA4.ini => GNI.ini} | 2 +- Data/Sys/GameSettings/GNIPA4.ini | 15 - Data/Sys/GameSettings/{GNNE69.ini => GNN.ini} | 2 +- Data/Sys/GameSettings/GNNP69.ini | 26 - Data/Sys/GameSettings/{GNZE69.ini => GNZ.ini} | 2 +- Data/Sys/GameSettings/GNZP69.ini | 20 - Data/Sys/GameSettings/{GO2F4F.ini => GO2.ini} | 2 +- Data/Sys/GameSettings/GO2D4F.ini | 30 - Data/Sys/GameSettings/GO2E4F.ini | 30 - Data/Sys/GameSettings/GO2P4F.ini | 30 - Data/Sys/GameSettings/{GOBE4Z.ini => GOB.ini} | 2 +- Data/Sys/GameSettings/GOBP7N.ini | 22 - Data/Sys/GameSettings/{GOSE41.ini => GOS.ini} | 2 +- Data/Sys/GameSettings/GOSX41.ini | 29 - Data/Sys/GameSettings/{GOSP41.ini => GOW.ini} | 3 +- Data/Sys/GameSettings/GOWD69.ini | 28 - Data/Sys/GameSettings/GOWE69.ini | 28 - Data/Sys/GameSettings/GOWF69.ini | 28 - Data/Sys/GameSettings/GOWJ69.ini | 28 - Data/Sys/GameSettings/GOWP69.ini | 28 - Data/Sys/GameSettings/{GOYD69.ini => GOY.ini} | 2 +- Data/Sys/GameSettings/GOYF69.ini | 30 - Data/Sys/GameSettings/GOYP69.ini | 30 - Data/Sys/GameSettings/GOYS69.ini | 30 - Data/Sys/GameSettings/{GP2E82.ini => GP2.ini} | 2 +- Data/Sys/GameSettings/GP2EAF.ini | 31 - Data/Sys/GameSettings/{GP6J01.ini => GP6.ini} | 2 +- Data/Sys/GameSettings/GP6E01.ini | 30 - Data/Sys/GameSettings/GP6P01.ini | 30 - Data/Sys/GameSettings/{GPAE01.ini => GPA.ini} | 2 +- Data/Sys/GameSettings/GPAJ01.ini | 31 - Data/Sys/GameSettings/GPAP01.ini | 31 - Data/Sys/GameSettings/GPAU01.ini | 31 - Data/Sys/GameSettings/GPH.ini | 25 + Data/Sys/GameSettings/GPHD52.ini | 25 - Data/Sys/GameSettings/GPHE52.ini | 25 - Data/Sys/GameSettings/GPHP52.ini | 25 - Data/Sys/GameSettings/{GPTE41.ini => GPT.ini} | 2 +- Data/Sys/GameSettings/GPTP41.ini | 31 - Data/Sys/GameSettings/{GPXE01.ini => GPX.ini} | 2 +- Data/Sys/GameSettings/GPXP01.ini | 19 - Data/Sys/GameSettings/{GQCD52.ini => GQC.ini} | 2 +- Data/Sys/GameSettings/GQCE52.ini | 19 - Data/Sys/GameSettings/GQCF52.ini | 19 - Data/Sys/GameSettings/GQCP52.ini | 19 - Data/Sys/GameSettings/GQCS52.ini | 19 - Data/Sys/GameSettings/{GCIP69.ini => GQQ.ini} | 4 +- Data/Sys/GameSettings/GQQD78.ini | 15 - Data/Sys/GameSettings/GQQE78.ini | 15 - Data/Sys/GameSettings/GQQF78.ini | 15 - Data/Sys/GameSettings/GQQH78.ini | 15 - Data/Sys/GameSettings/GQQP78.ini | 15 - Data/Sys/GameSettings/{GQSDAF.ini => GQS.ini} | 2 +- Data/Sys/GameSettings/GQSFAF.ini | 32 - Data/Sys/GameSettings/GQSPAF.ini | 32 - Data/Sys/GameSettings/GQW.ini | 27 + Data/Sys/GameSettings/GQWE69.ini | 27 - Data/Sys/GameSettings/GQWJ69.ini | 27 - Data/Sys/GameSettings/GQWP69.ini | 27 - Data/Sys/GameSettings/GQWX69.ini | 27 - Data/Sys/GameSettings/{GM3P69.ini => GQX.ini} | 2 +- Data/Sys/GameSettings/GQXE69.ini | 23 - Data/Sys/GameSettings/GQXP69.ini | 23 - Data/Sys/GameSettings/{GH5P52.ini => GR8.ini} | 2 +- Data/Sys/GameSettings/GR8D69.ini | 18 - Data/Sys/GameSettings/GR8E69.ini | 18 - Data/Sys/GameSettings/GR8F69.ini | 18 - Data/Sys/GameSettings/GR8J69.ini | 18 - Data/Sys/GameSettings/GR8P69.ini | 18 - Data/Sys/GameSettings/{GDSP78.ini => GRB.ini} | 2 +- Data/Sys/GameSettings/GRBP6S.ini | 31 - Data/Sys/GameSettings/{GRJP69.ini => GRJ.ini} | 2 +- Data/Sys/GameSettings/GRJEAF.ini | 25 - Data/Sys/GameSettings/GRJJAF.ini | 25 - Data/Sys/GameSettings/{GRKE41.ini => GRK.ini} | 2 +- Data/Sys/GameSettings/GRKP7G.ini | 33 - Data/Sys/GameSettings/{G3DE6L.ini => GRV.ini} | 2 +- Data/Sys/GameSettings/GRVJA4.ini | 18 - Data/Sys/GameSettings/{GS2D78.ini => GS2.ini} | 2 +- Data/Sys/GameSettings/GS2E78.ini | 31 - Data/Sys/GameSettings/GS2F78.ini | 31 - Data/Sys/GameSettings/GS2P78.ini | 31 - Data/Sys/GameSettings/{GSAE01.ini => GSA.ini} | 2 +- Data/Sys/GameSettings/GSAJ01.ini | 27 - Data/Sys/GameSettings/{GSMD52.ini => GSM.ini} | 2 +- Data/Sys/GameSettings/GSME52.ini | 24 - Data/Sys/GameSettings/GSMF52.ini | 24 - Data/Sys/GameSettings/GSMP52.ini | 24 - Data/Sys/GameSettings/{GSOE8P.ini => GSO.ini} | 2 +- Data/Sys/GameSettings/GSOP8P.ini | 32 - Data/Sys/GameSettings/{GSQE78.ini => GSQ.ini} | 2 +- Data/Sys/GameSettings/GSQP78.ini | 18 - Data/Sys/GameSettings/{GSWD64.ini => GSW.ini} | 2 +- Data/Sys/GameSettings/GSWE64.ini | 30 - Data/Sys/GameSettings/GSWF64.ini | 30 - Data/Sys/GameSettings/GSWI64.ini | 30 - Data/Sys/GameSettings/GSWJ64.ini | 30 - Data/Sys/GameSettings/GSWP64.ini | 30 - Data/Sys/GameSettings/GSWS64.ini | 30 - Data/Sys/GameSettings/{GT3J52.ini => GT3.ini} | 2 +- Data/Sys/GameSettings/GT3D52.ini | 34 - Data/Sys/GameSettings/GT3E52.ini | 34 - Data/Sys/GameSettings/{GT4E52.ini => GT4.ini} | 2 +- Data/Sys/GameSettings/GT4F52.ini | 22 - Data/Sys/GameSettings/GT4P52.ini | 22 - Data/Sys/GameSettings/{GT7X41.ini => GT7.ini} | 2 +- Data/Sys/GameSettings/GT7E41.ini | 33 - Data/Sys/GameSettings/GT7P41.ini | 33 - Data/Sys/GameSettings/GTK.ini | 30 + Data/Sys/GameSettings/GTKE51.ini | 30 - Data/Sys/GameSettings/GTKP51.ini | 30 - Data/Sys/GameSettings/{GTLE52.ini => GTL.ini} | 2 +- Data/Sys/GameSettings/GTLP52.ini | 27 - Data/Sys/GameSettings/GTLX52.ini | 27 - Data/Sys/GameSettings/{GTRE78.ini => GTR.ini} | 2 +- Data/Sys/GameSettings/GTRP78.ini | 18 - Data/Sys/GameSettings/{GTWE70.ini => GTW.ini} | 2 +- Data/Sys/GameSettings/GTWP70.ini | 31 - Data/Sys/GameSettings/{GBIP08.ini => GTY.ini} | 4 +- Data/Sys/GameSettings/GTYE69.ini | 27 - Data/Sys/GameSettings/GTYP69.ini | 27 - Data/Sys/GameSettings/{GTZE41.ini => GTZ.ini} | 2 +- Data/Sys/GameSettings/GTZP41.ini | 31 - Data/Sys/GameSettings/GUB.ini | 30 + Data/Sys/GameSettings/GUBE69.ini | 30 - Data/Sys/GameSettings/GUBP69.ini | 30 - Data/Sys/GameSettings/{GUME52.ini => GUM.ini} | 2 +- Data/Sys/GameSettings/GUMP52.ini | 28 - Data/Sys/GameSettings/{GUPP8P.ini => GUP.ini} | 2 +- Data/Sys/GameSettings/GUPE8P.ini | 25 - Data/Sys/GameSettings/GUPJ8P.ini | 25 - Data/Sys/GameSettings/{GUTD52.ini => GUT.ini} | 2 +- Data/Sys/GameSettings/GUTF52.ini | 31 - Data/Sys/GameSettings/GUTI52.ini | 31 - Data/Sys/GameSettings/GUTJC0.ini | 31 - Data/Sys/GameSettings/GUTP52.ini | 31 - Data/Sys/GameSettings/GUTS52.ini | 31 - Data/Sys/GameSettings/{GUZE41.ini => GUZ.ini} | 2 +- Data/Sys/GameSettings/GUZP41.ini | 31 - Data/Sys/GameSettings/{GBWE64.ini => GVC.ini} | 2 +- Data/Sys/GameSettings/GVCE08.ini | 31 - Data/Sys/GameSettings/GVCP08.ini | 31 - Data/Sys/GameSettings/{GBWD64.ini => GVJ.ini} | 2 +- Data/Sys/GameSettings/GVJJ08.ini | 31 - Data/Sys/GameSettings/GVJP08.ini | 31 - Data/Sys/GameSettings/{GVLD69.ini => GVL.ini} | 2 +- Data/Sys/GameSettings/GVLE69.ini | 28 - Data/Sys/GameSettings/GVLF69.ini | 28 - Data/Sys/GameSettings/GVLP69.ini | 28 - Data/Sys/GameSettings/{GVJE08.ini => GVO.ini} | 3 +- Data/Sys/GameSettings/GVOE69.ini | 30 - Data/Sys/GameSettings/GVOP69.ini | 30 - Data/Sys/GameSettings/{GGPE02.ini => GVS.ini} | 2 +- Data/Sys/GameSettings/GVS46E.ini | 24 - Data/Sys/GameSettings/GVS46J.ini | 24 - Data/Sys/GameSettings/{GW2E78.ini => GW2.ini} | 2 +- Data/Sys/GameSettings/{G4OE69.ini => GW3.ini} | 2 +- Data/Sys/GameSettings/GW3E78.ini | 19 - Data/Sys/GameSettings/GW3P78.ini | 19 - Data/Sys/GameSettings/GW5.ini | 19 + Data/Sys/GameSettings/GW5D69.ini | 18 - Data/Sys/GameSettings/GW5E69.ini | 18 - Data/Sys/GameSettings/GW5F69.ini | 18 - Data/Sys/GameSettings/GW5P69.ini | 18 - Data/Sys/GameSettings/{GW7D69.ini => GW7.ini} | 2 +- Data/Sys/GameSettings/GW7E69.ini | 25 - Data/Sys/GameSettings/GW7P69.ini | 25 - Data/Sys/GameSettings/GWA.ini | 27 + Data/Sys/GameSettings/GWAE8P.ini | 27 - Data/Sys/GameSettings/GWAF8P.ini | 27 - Data/Sys/GameSettings/GWAP8P.ini | 27 - Data/Sys/GameSettings/{GWEE51.ini => GWE.ini} | 2 +- Data/Sys/GameSettings/GWEJB0.ini | 19 - Data/Sys/GameSettings/{GW2P78.ini => GWP.ini} | 2 +- Data/Sys/GameSettings/GWPE78.ini | 31 - Data/Sys/GameSettings/GWPJG2.ini | 31 - Data/Sys/GameSettings/GWPP78.ini | 31 - Data/Sys/GameSettings/{GWTEA4.ini => GWT.ini} | 2 +- Data/Sys/GameSettings/GWTJA4.ini | 21 - Data/Sys/GameSettings/GWTPA4.ini | 21 - Data/Sys/GameSettings/GWV.ini | 22 + Data/Sys/GameSettings/GWVE52.ini | 22 - Data/Sys/GameSettings/GWVP52.ini | 22 - Data/Sys/GameSettings/GWVX52.ini | 22 - Data/Sys/GameSettings/GX2.ini | 27 + Data/Sys/GameSettings/GX2E52.ini | 27 - Data/Sys/GameSettings/GX2P52.ini | 27 - Data/Sys/GameSettings/{GX3E41.ini => GX3.ini} | 2 +- Data/Sys/GameSettings/GX3P41.ini | 31 - Data/Sys/GameSettings/GX3X41.ini | 31 - Data/Sys/GameSettings/{GXBE69.ini => GXB.ini} | 2 +- Data/Sys/GameSettings/GXBP69.ini | 30 - Data/Sys/GameSettings/{G4FF69.ini => GXC.ini} | 2 +- Data/Sys/GameSettings/GXCE01.ini | 27 - Data/Sys/GameSettings/GXCJ01.ini | 27 - Data/Sys/GameSettings/{G6FD69.ini => GXE.ini} | 4 +- Data/Sys/GameSettings/GXEE8P.ini | 18 - Data/Sys/GameSettings/GXEJ8P.ini | 18 - Data/Sys/GameSettings/GXF.ini | 27 + Data/Sys/GameSettings/GXFE69.ini | 27 - Data/Sys/GameSettings/GXFF69.ini | 27 - Data/Sys/GameSettings/GXFP69.ini | 27 - Data/Sys/GameSettings/{GRBE6S.ini => GXM.ini} | 3 +- Data/Sys/GameSettings/GXME52.ini | 30 - Data/Sys/GameSettings/GXMF52.ini | 30 - Data/Sys/GameSettings/GXMP52.ini | 30 - Data/Sys/GameSettings/GXO.ini | 27 + Data/Sys/GameSettings/GXOE69.ini | 27 - Data/Sys/GameSettings/GXOX69.ini | 27 - Data/Sys/GameSettings/{GXSE8P.ini => GXS.ini} | 2 +- Data/Sys/GameSettings/GXSP6W.ini | 25 - Data/Sys/GameSettings/{GXXE01.ini => GXX.ini} | 2 +- Data/Sys/GameSettings/GXXP01.ini | 33 - Data/Sys/GameSettings/{GYQE01.ini => GYQ.ini} | 2 +- Data/Sys/GameSettings/GYQJ01.ini | 33 - Data/Sys/GameSettings/GYQP01.ini | 33 - Data/Sys/GameSettings/{GYTE69.ini => GYT.ini} | 2 +- Data/Sys/GameSettings/GYTP69.ini | 28 - Data/Sys/GameSettings/GYW.ini | 27 + Data/Sys/GameSettings/GYWD41.ini | 27 - Data/Sys/GameSettings/GYWEE9.ini | 27 - Data/Sys/GameSettings/GYWP41.ini | 27 - Data/Sys/GameSettings/{GZDE70.ini => GZD.ini} | 2 +- Data/Sys/GameSettings/GZDJ70.ini | 17 - Data/Sys/GameSettings/GZDP70.ini | 17 - Data/Sys/GameSettings/{GZWE01.ini => GZW.ini} | 2 +- Data/Sys/GameSettings/GZWJ01.ini | 33 - Data/Sys/GameSettings/GZWP01.ini | 33 - Data/Sys/GameSettings/{HABA01.ini => HAB.ini} | 2 +- Data/Sys/GameSettings/HABK01.ini | 22 - Data/Sys/GameSettings/{LABE8P.ini => LAB.ini} | 2 +- Data/Sys/GameSettings/LAC.ini | 24 + Data/Sys/GameSettings/LACP8P.ini | 24 - Data/Sys/GameSettings/LAD.ini | 26 + Data/Sys/GameSettings/{LACE8P.ini => LAE.ini} | 2 +- Data/Sys/GameSettings/LAEE8P.ini | 24 - Data/Sys/GameSettings/LAEP8P.ini | 24 - Data/Sys/GameSettings/{LADJ8P.ini => LAF.ini} | 2 +- Data/Sys/GameSettings/LAFP8P.ini | 26 - Data/Sys/GameSettings/LAG.ini | 24 + Data/Sys/GameSettings/LAGE8P.ini | 24 - Data/Sys/GameSettings/LAGJ8P.ini | 24 - Data/Sys/GameSettings/LAGP8P.ini | 24 - Data/Sys/GameSettings/{LABP8P.ini => LAI.ini} | 2 +- Data/Sys/GameSettings/LAIE8P.ini | 24 - Data/Sys/GameSettings/LAIP8P.ini | 24 - Data/Sys/GameSettings/LAJ.ini | 24 + Data/Sys/GameSettings/LAJE8P.ini | 24 - Data/Sys/GameSettings/LAJJ8P.ini | 24 - Data/Sys/GameSettings/LAJP8P.ini | 24 - Data/Sys/GameSettings/LAK.ini | 26 + Data/Sys/GameSettings/LAKE8P.ini | 26 - Data/Sys/GameSettings/LAKJ8P.ini | 26 - Data/Sys/GameSettings/LAKP8P.ini | 26 - Data/Sys/GameSettings/LAL.ini | 26 + Data/Sys/GameSettings/LALE8P.ini | 26 - Data/Sys/GameSettings/LALP8P.ini | 26 - Data/Sys/GameSettings/LAM.ini | 24 + Data/Sys/GameSettings/LAME8P.ini | 24 - Data/Sys/GameSettings/LAMJ8P.ini | 24 - Data/Sys/GameSettings/LAMP8P.ini | 24 - Data/Sys/GameSettings/{LADP8P.ini => LAN.ini} | 2 +- Data/Sys/GameSettings/LANE8P.ini | 26 - Data/Sys/GameSettings/LANP8P.ini | 26 - Data/Sys/GameSettings/{LADE8P.ini => LAO.ini} | 2 +- Data/Sys/GameSettings/LAOE8P.ini | 26 - Data/Sys/GameSettings/LAOP8P.ini | 26 - Data/Sys/GameSettings/{LAFN8P.ini => LAP.ini} | 2 +- Data/Sys/GameSettings/LAPE8P.ini | 26 - Data/Sys/GameSettings/LAPP8P.ini | 26 - Data/Sys/GameSettings/LAQ.ini | 26 + Data/Sys/GameSettings/LAQE8P.ini | 26 - Data/Sys/GameSettings/LAQP8P.ini | 26 - Data/Sys/GameSettings/MA6.ini | 25 + Data/Sys/GameSettings/MA8.ini | 25 + Data/Sys/GameSettings/MAD.ini | 24 + Data/Sys/GameSettings/MADE8P.ini | 24 - Data/Sys/GameSettings/MADP8P.ini | 24 - Data/Sys/GameSettings/{LACJ8P.ini => MAE.ini} | 4 +- Data/Sys/GameSettings/MAEE8P.ini | 24 - Data/Sys/GameSettings/MAEP8P.ini | 24 - Data/Sys/GameSettings/MAL.ini | 24 + Data/Sys/GameSettings/MALE8P.ini | 24 - Data/Sys/GameSettings/MALP8P.ini | 24 - Data/Sys/GameSettings/MAM.ini | 25 + Data/Sys/GameSettings/MAME8P.ini | 25 - Data/Sys/GameSettings/MAMP8P.ini | 25 - Data/Sys/GameSettings/{MA6P8P.ini => MAN.ini} | 2 +- Data/Sys/GameSettings/MANE8P.ini | 25 - Data/Sys/GameSettings/MANP8P.ini | 25 - Data/Sys/GameSettings/MAO.ini | 25 + Data/Sys/GameSettings/MAOE8P.ini | 25 - Data/Sys/GameSettings/MAOP8P.ini | 25 - Data/Sys/GameSettings/MAQ.ini | 25 + Data/Sys/GameSettings/MAQE8P.ini | 25 - Data/Sys/GameSettings/MAQP8P.ini | 25 - Data/Sys/GameSettings/MAR.ini | 25 + Data/Sys/GameSettings/MARE8P.ini | 25 - Data/Sys/GameSettings/MARP8P.ini | 25 - Data/Sys/GameSettings/{MA6E8P.ini => MAS.ini} | 2 +- Data/Sys/GameSettings/MASE8P.ini | 25 - Data/Sys/GameSettings/MASP8P.ini | 25 - Data/Sys/GameSettings/MAT.ini | 25 + Data/Sys/GameSettings/MATE8P.ini | 25 - Data/Sys/GameSettings/MATP8P.ini | 25 - Data/Sys/GameSettings/MAV.ini | 24 + Data/Sys/GameSettings/MAVE8P.ini | 24 - Data/Sys/GameSettings/MAVP8P.ini | 24 - Data/Sys/GameSettings/MAW.ini | 25 + Data/Sys/GameSettings/MAWE8P.ini | 25 - Data/Sys/GameSettings/MAWP8P.ini | 25 - Data/Sys/GameSettings/{MA8E8P.ini => MAY.ini} | 2 +- Data/Sys/GameSettings/MAYE8P.ini | 25 - Data/Sys/GameSettings/MAYP8P.ini | 25 - Data/Sys/GameSettings/MAZ.ini | 25 + Data/Sys/GameSettings/MAZE8P.ini | 25 - Data/Sys/GameSettings/MAZP8P.ini | 25 - Data/Sys/GameSettings/MB8.ini | 25 + Data/Sys/GameSettings/MB8E8P.ini | 25 - Data/Sys/GameSettings/MB8P8P.ini | 25 - Data/Sys/GameSettings/MBB.ini | 25 + Data/Sys/GameSettings/MBBE8P.ini | 25 - Data/Sys/GameSettings/MBBP8P.ini | 25 - Data/Sys/GameSettings/MBC.ini | 25 + Data/Sys/GameSettings/MBCE8P.ini | 25 - Data/Sys/GameSettings/MBCP8P.ini | 25 - Data/Sys/GameSettings/MBD.ini | 25 + Data/Sys/GameSettings/MBDE8P.ini | 25 - Data/Sys/GameSettings/MBDP8P.ini | 25 - Data/Sys/GameSettings/MBE.ini | 25 + Data/Sys/GameSettings/MBEE8P.ini | 25 - Data/Sys/GameSettings/MBEP8P.ini | 25 - Data/Sys/GameSettings/{MA8P8P.ini => MBF.ini} | 2 +- Data/Sys/GameSettings/MBFE8P.ini | 25 - Data/Sys/GameSettings/MBFP8P.ini | 25 - Data/Sys/GameSettings/MBG.ini | 25 + Data/Sys/GameSettings/MBGE8P.ini | 25 - Data/Sys/GameSettings/MBGP8P.ini | 25 - Data/Sys/GameSettings/MBI.ini | 25 + Data/Sys/GameSettings/MBIE8P.ini | 25 - Data/Sys/GameSettings/MBIP8P.ini | 25 - Data/Sys/GameSettings/MBM.ini | 25 + Data/Sys/GameSettings/MBME8P.ini | 25 - Data/Sys/GameSettings/MBMP8P.ini | 25 - Data/Sys/GameSettings/MBO.ini | 25 + Data/Sys/GameSettings/MBOE8P.ini | 25 - Data/Sys/GameSettings/MBOP8P.ini | 25 - Data/Sys/GameSettings/MBP.ini | 25 + Data/Sys/GameSettings/MBPE8P.ini | 25 - Data/Sys/GameSettings/MBPP8P.ini | 25 - Data/Sys/GameSettings/MBQ.ini | 25 + Data/Sys/GameSettings/MBQE8P.ini | 25 - Data/Sys/GameSettings/MBQP8P.ini | 25 - Data/Sys/GameSettings/MBR.ini | 25 + Data/Sys/GameSettings/MBRE8P.ini | 25 - Data/Sys/GameSettings/MBRP8P.ini | 25 - Data/Sys/GameSettings/MBT.ini | 25 + Data/Sys/GameSettings/MBTE8P.ini | 25 - Data/Sys/GameSettings/MBTP8P.ini | 25 - Data/Sys/GameSettings/MBU.ini | 25 + Data/Sys/GameSettings/MBUE8P.ini | 25 - Data/Sys/GameSettings/MBUP8P.ini | 25 - Data/Sys/GameSettings/{NAFE01.ini => NAF.ini} | 2 +- Data/Sys/GameSettings/NAFP01.ini | 25 - Data/Sys/GameSettings/{NAHE01.ini => NAH.ini} | 2 +- Data/Sys/GameSettings/NAHP01.ini | 17 - Data/Sys/GameSettings/PAG.ini | 24 + Data/Sys/GameSettings/PAO.ini | 24 + Data/Sys/GameSettings/PAR.ini | 24 + Data/Sys/GameSettings/PARL18.ini | 24 - Data/Sys/GameSettings/PARN18.ini | 24 - Data/Sys/GameSettings/{PAGL18.ini => PC2.ini} | 2 +- Data/Sys/GameSettings/PC2E18.ini | 24 - Data/Sys/GameSettings/PC2P18.ini | 24 - Data/Sys/GameSettings/{PAGN18.ini => PCO.ini} | 2 +- Data/Sys/GameSettings/PCOE18.ini | 24 - Data/Sys/GameSettings/PCOP18.ini | 24 - Data/Sys/GameSettings/{PAON18.ini => PCR.ini} | 2 +- Data/Sys/GameSettings/PCRL18.ini | 24 - Data/Sys/GameSettings/PCRN18.ini | 24 - Data/Sys/GameSettings/PCS.ini | 24 + Data/Sys/GameSettings/PCSL18.ini | 24 - Data/Sys/GameSettings/PCSN18.ini | 24 - Data/Sys/GameSettings/PDJ.ini | 24 + Data/Sys/GameSettings/PDJL18.ini | 24 - Data/Sys/GameSettings/PDJN18.ini | 24 - Data/Sys/GameSettings/{PZLE01.ini => PZL.ini} | 2 +- Data/Sys/GameSettings/PZLJ01.ini | 32 - Data/Sys/GameSettings/PZLP01.ini | 32 - Data/Sys/GameSettings/QAA.ini | 24 + Data/Sys/GameSettings/QAAE18.ini | 24 - Data/Sys/GameSettings/QAAP18.ini | 24 - Data/Sys/GameSettings/QAB.ini | 24 + Data/Sys/GameSettings/QABE18.ini | 24 - Data/Sys/GameSettings/QABP18.ini | 24 - Data/Sys/GameSettings/{PAOL18.ini => QAC.ini} | 2 +- Data/Sys/GameSettings/QACL18.ini | 24 - Data/Sys/GameSettings/QACN18.ini | 24 - Data/Sys/GameSettings/QAD.ini | 24 + Data/Sys/GameSettings/QADL18.ini | 24 - Data/Sys/GameSettings/QADN18.ini | 24 - Data/Sys/GameSettings/QAP.ini | 24 + Data/Sys/GameSettings/QAPL18.ini | 24 - Data/Sys/GameSettings/QAPN18.ini | 24 - Data/Sys/GameSettings/QAW.ini | 24 + Data/Sys/GameSettings/QAWL18.ini | 24 - Data/Sys/GameSettings/QAWN18.ini | 24 - Data/Sys/GameSettings/QBB.ini | 24 + Data/Sys/GameSettings/QBBE18.ini | 24 - Data/Sys/GameSettings/QBBP18.ini | 24 - Data/Sys/GameSettings/{R22P01.ini => R22.ini} | 2 +- Data/Sys/GameSettings/R22E01.ini | 33 - Data/Sys/GameSettings/R22J01.ini | 33 - Data/Sys/GameSettings/{R2GJAF.ini => R2G.ini} | 2 +- Data/Sys/GameSettings/R2GEXJ.ini | 34 - Data/Sys/GameSettings/R2GP99.ini | 34 - Data/Sys/GameSettings/{R3BE8P.ini => R3B.ini} | 2 +- Data/Sys/GameSettings/R3BJ8P.ini | 31 - Data/Sys/GameSettings/{R3DES5.ini => R3D.ini} | 2 +- Data/Sys/GameSettings/R3DPS5.ini | 31 - Data/Sys/GameSettings/{R3ME01.ini => R3M.ini} | 2 +- Data/Sys/GameSettings/R3MP01.ini | 31 - Data/Sys/GameSettings/{GKOP70.ini => R3N.ini} | 2 +- Data/Sys/GameSettings/R3NEXS.ini | 25 - Data/Sys/GameSettings/R3NPH3.ini | 25 - Data/Sys/GameSettings/{R3OP01.ini => R3O.ini} | 2 +- Data/Sys/GameSettings/R3OE01.ini | 32 - Data/Sys/GameSettings/R3OJ01.ini | 32 - Data/Sys/GameSettings/{R3RE8P.ini => R3R.ini} | 2 +- Data/Sys/GameSettings/R3RP8P.ini | 21 - Data/Sys/GameSettings/{R4EP01.ini => R4E.ini} | 2 +- Data/Sys/GameSettings/R4EJ01.ini | 31 - Data/Sys/GameSettings/{GKYE01.ini => R4Q.ini} | 3 +- Data/Sys/GameSettings/R4QE01.ini | 29 - Data/Sys/GameSettings/{R5IP4Q.ini => R5I.ini} | 2 +- Data/Sys/GameSettings/R5IE4Q.ini | 33 - Data/Sys/GameSettings/R5IX4Q.ini | 33 - Data/Sys/GameSettings/R5V.ini | 29 + Data/Sys/GameSettings/R5VX41.ini | 29 - Data/Sys/GameSettings/{R5WEA4.ini => R5W.ini} | 2 +- Data/Sys/GameSettings/R5WJA4.ini | 30 - Data/Sys/GameSettings/{R64J01.ini => R64.ini} | 2 +- Data/Sys/GameSettings/{R6BJ78.ini => R6B.ini} | 2 +- Data/Sys/GameSettings/R6BE78.ini | 34 - Data/Sys/GameSettings/R6BK78.ini | 34 - Data/Sys/GameSettings/R6BP78.ini | 34 - Data/Sys/GameSettings/R6BX78.ini | 34 - Data/Sys/GameSettings/{R6TEA4.ini => R6T.ini} | 2 +- Data/Sys/GameSettings/R6TPA4.ini | 24 - Data/Sys/GameSettings/R7F.ini | 27 + Data/Sys/GameSettings/R7FEGD.ini | 27 - Data/Sys/GameSettings/R7FPGD.ini | 27 - Data/Sys/GameSettings/{R7GEAF.ini => R7G.ini} | 2 +- Data/Sys/GameSettings/R7GJAF.ini | 31 - Data/Sys/GameSettings/R7GPAF.ini | 31 - Data/Sys/GameSettings/{R7XP69.ini => R7X.ini} | 2 +- Data/Sys/GameSettings/R7XE69.ini | 34 - Data/Sys/GameSettings/R7XJ13.ini | 34 - Data/Sys/GameSettings/{G3AF69.ini => R84.ini} | 2 +- Data/Sys/GameSettings/R84EE9.ini | 30 - Data/Sys/GameSettings/R84P99.ini | 30 - Data/Sys/GameSettings/{R8AP01.ini => R8A.ini} | 2 +- Data/Sys/GameSettings/R8AE01.ini | 34 - Data/Sys/GameSettings/R8D.ini | 27 + Data/Sys/GameSettings/R8DEA4.ini | 27 - Data/Sys/GameSettings/R8DJA4.ini | 27 - Data/Sys/GameSettings/R8DPA4.ini | 27 - Data/Sys/GameSettings/{R8JPWR.ini => R8J.ini} | 2 +- Data/Sys/GameSettings/R8JEWR.ini | 30 - Data/Sys/GameSettings/{R8LE20.ini => R8L.ini} | 2 +- Data/Sys/GameSettings/R8LP7J.ini | 31 - Data/Sys/GameSettings/{RBBP99.ini => RBB.ini} | 2 +- Data/Sys/GameSettings/{RBHJ08.ini => RBH.ini} | 2 +- Data/Sys/GameSettings/RBHE08.ini | 33 - Data/Sys/GameSettings/RBHP08.ini | 33 - Data/Sys/GameSettings/RBI.ini | 29 + Data/Sys/GameSettings/RBIEE9.ini | 29 - Data/Sys/GameSettings/RBIJ99.ini | 29 - Data/Sys/GameSettings/RBIP99.ini | 29 - Data/Sys/GameSettings/{R3BP8P.ini => RBR.ini} | 3 +- Data/Sys/GameSettings/RBRE5G.ini | 30 - Data/Sys/GameSettings/RBRP5G.ini | 30 - Data/Sys/GameSettings/RBRX5G.ini | 30 - Data/Sys/GameSettings/{RBWE01.ini => RBW.ini} | 2 +- Data/Sys/GameSettings/RBWP01.ini | 28 - Data/Sys/GameSettings/{GW7F69.ini => RCL.ini} | 2 +- Data/Sys/GameSettings/RCLE4Q.ini | 25 - Data/Sys/GameSettings/RCLP4Q.ini | 25 - Data/Sys/GameSettings/{RD2E41.ini => RD2.ini} | 2 +- Data/Sys/GameSettings/RD2J41.ini | 27 - Data/Sys/GameSettings/RD2K41.ini | 27 - Data/Sys/GameSettings/RD2P41.ini | 27 - Data/Sys/GameSettings/RD2X41.ini | 27 - Data/Sys/GameSettings/{GIAE7D.ini => RDF.ini} | 5 +- Data/Sys/GameSettings/RDFE41.ini | 21 - Data/Sys/GameSettings/RDFP41.ini | 21 - Data/Sys/GameSettings/{RDZJ01.ini => RDZ.ini} | 2 +- Data/Sys/GameSettings/{GBIE08.ini => RE4.ini} | 2 +- Data/Sys/GameSettings/RE4E08.ini | 29 - Data/Sys/GameSettings/RE4J08.ini | 29 - Data/Sys/GameSettings/RE4P08.ini | 29 - Data/Sys/GameSettings/{REDE41.ini => RED.ini} | 2 +- Data/Sys/GameSettings/REDJ41.ini | 27 - Data/Sys/GameSettings/REDP41.ini | 27 - Data/Sys/GameSettings/{RENE8P.ini => REN.ini} | 2 +- Data/Sys/GameSettings/RENJ8P.ini | 27 - Data/Sys/GameSettings/{RFBE01.ini => RFB.ini} | 2 +- Data/Sys/GameSettings/RFBJ01.ini | 31 - Data/Sys/GameSettings/RFBP01.ini | 31 - Data/Sys/GameSettings/{RFCJGD.ini => RFC.ini} | 2 +- Data/Sys/GameSettings/RFCEGD.ini | 28 - Data/Sys/GameSettings/RFCPGD.ini | 28 - Data/Sys/GameSettings/{RFEE01.ini => RFE.ini} | 2 +- Data/Sys/GameSettings/RFEJ01.ini | 27 - Data/Sys/GameSettings/{RFFJGD.ini => RFF.ini} | 2 +- Data/Sys/GameSettings/RFFEGD.ini | 31 - Data/Sys/GameSettings/RFFPGD.ini | 31 - Data/Sys/GameSettings/{RFSEEB.ini => RFS.ini} | 2 +- Data/Sys/GameSettings/RFSJ8P.ini | 28 - Data/Sys/GameSettings/{RGWE41.ini => RGW.ini} | 2 +- Data/Sys/GameSettings/RGWJ41.ini | 23 - Data/Sys/GameSettings/RGWP41.ini | 23 - Data/Sys/GameSettings/RGWX41.ini | 23 - Data/Sys/GameSettings/{RH8E4F.ini => RH8.ini} | 2 +- Data/Sys/GameSettings/RH8JEL.ini | 31 - Data/Sys/GameSettings/RH8P4F.ini | 31 - Data/Sys/GameSettings/RH8X4F.ini | 31 - Data/Sys/GameSettings/{R4QK01.ini => RHA.ini} | 2 +- Data/Sys/GameSettings/RHAE01.ini | 29 - Data/Sys/GameSettings/RHAJ01.ini | 29 - Data/Sys/GameSettings/RHAK01.ini | 29 - Data/Sys/GameSettings/RHAP01.ini | 29 - Data/Sys/GameSettings/RHAW01.ini | 29 - Data/Sys/GameSettings/{R4QJ01.ini => RHM.ini} | 2 +- Data/Sys/GameSettings/RHMEE9.ini | 29 - Data/Sys/GameSettings/RHMP99.ini | 29 - Data/Sys/GameSettings/{RHOE8P.ini => RHO.ini} | 2 +- Data/Sys/GameSettings/RHOJ8P.ini | 20 - Data/Sys/GameSettings/RHOP8P.ini | 20 - Data/Sys/GameSettings/RIP.ini | 25 + Data/Sys/GameSettings/RIPEAF.ini | 25 - Data/Sys/GameSettings/RIPJAF.ini | 25 - Data/Sys/GameSettings/RIPPAF.ini | 25 - Data/Sys/GameSettings/{GKOE70.ini => RIU.ini} | 2 +- Data/Sys/GameSettings/RIUJAF.ini | 25 - Data/Sys/GameSettings/RIUPAF.ini | 25 - Data/Sys/GameSettings/{RKDEEB.ini => RK2.ini} | 2 +- Data/Sys/GameSettings/RK2EEB.ini | 25 - Data/Sys/GameSettings/RK2JEB.ini | 25 - Data/Sys/GameSettings/{RK2P01.ini => RKD.ini} | 2 +- Data/Sys/GameSettings/RKDJEB.ini | 25 - Data/Sys/GameSettings/RKDPEB.ini | 25 - Data/Sys/GameSettings/{GHMF4F.ini => RLG.ini} | 4 +- Data/Sys/GameSettings/RLGE64.ini | 27 - Data/Sys/GameSettings/RLGJ52.ini | 27 - Data/Sys/GameSettings/RLGP64.ini | 27 - Data/Sys/GameSettings/{RM3E01.ini => RM3.ini} | 2 +- Data/Sys/GameSettings/RM3J01.ini | 23 - Data/Sys/GameSettings/{RM8K01.ini => RM8.ini} | 2 +- Data/Sys/GameSettings/RM8E01.ini | 23 - Data/Sys/GameSettings/RM8J01.ini | 23 - Data/Sys/GameSettings/RM8P01.ini | 23 - Data/Sys/GameSettings/{R64E01.ini => RMC.ini} | 2 +- Data/Sys/GameSettings/RMCE01.ini | 30 - Data/Sys/GameSettings/RMCJ01.ini | 30 - Data/Sys/GameSettings/RMCK01.ini | 30 - Data/Sys/GameSettings/RMCP01.ini | 30 - Data/Sys/GameSettings/{RMGK01.ini => RMG.ini} | 2 +- Data/Sys/GameSettings/RMGE01.ini | 29 - Data/Sys/GameSettings/RMGJ01.ini | 29 - Data/Sys/GameSettings/RMGP01.ini | 29 - Data/Sys/GameSettings/{RMKE01.ini => RMK.ini} | 2 +- Data/Sys/GameSettings/RMKJ01.ini | 24 - Data/Sys/GameSettings/RMKP01.ini | 24 - Data/Sys/GameSettings/{RNEEDA.ini => RNE.ini} | 2 +- Data/Sys/GameSettings/RNEJDA.ini | 22 - Data/Sys/GameSettings/RNEPDA.ini | 22 - Data/Sys/GameSettings/{RNJE4F.ini => RNJ.ini} | 2 +- Data/Sys/GameSettings/RNJP4F.ini | 21 - Data/Sys/GameSettings/{RNOP01.ini => RNO.ini} | 2 +- Data/Sys/GameSettings/RNOJ01.ini | 35 - Data/Sys/GameSettings/{GF4E52.ini => RO9.ini} | 2 +- Data/Sys/GameSettings/RO9EFS.ini | 31 - Data/Sys/GameSettings/RO9PNK.ini | 31 - Data/Sys/GameSettings/{ROAE36.ini => ROA.ini} | 2 +- Data/Sys/GameSettings/ROAP36.ini | 30 - Data/Sys/GameSettings/{GKYP01.ini => ROD.ini} | 2 +- Data/Sys/GameSettings/RODE01.ini | 30 - Data/Sys/GameSettings/RODJ01.ini | 30 - Data/Sys/GameSettings/RODK01.ini | 30 - Data/Sys/GameSettings/RODP01.ini | 30 - Data/Sys/GameSettings/{GEDP01.ini => ROL.ini} | 2 +- Data/Sys/GameSettings/ROLE8P.ini | 30 - Data/Sys/GameSettings/ROLJ01.ini | 30 - Data/Sys/GameSettings/ROLK01.ini | 30 - Data/Sys/GameSettings/ROLP8P.ini | 30 - Data/Sys/GameSettings/{R64P01.ini => RON.ini} | 2 +- Data/Sys/GameSettings/RONEG9.ini | 30 - Data/Sys/GameSettings/RONJG9.ini | 30 - Data/Sys/GameSettings/RONPG9.ini | 30 - Data/Sys/GameSettings/{GKOP6V.ini => ROU.ini} | 2 +- Data/Sys/GameSettings/ROUJAF.ini | 25 - Data/Sys/GameSettings/ROUPAF.ini | 25 - Data/Sys/GameSettings/{RPBE01.ini => RPB.ini} | 2 +- Data/Sys/GameSettings/RPBJ01.ini | 30 - Data/Sys/GameSettings/RPBP01.ini | 30 - Data/Sys/GameSettings/{RPJE7U.ini => RPJ.ini} | 2 +- Data/Sys/GameSettings/RPJJ99.ini | 32 - Data/Sys/GameSettings/{RPOPC8.ini => RPO.ini} | 2 +- Data/Sys/GameSettings/RPOEC8.ini | 30 - Data/Sys/GameSettings/RPOJC8.ini | 30 - Data/Sys/GameSettings/{RPWX41.ini => RPW.ini} | 2 +- Data/Sys/GameSettings/RPWZ41.ini | 30 - Data/Sys/GameSettings/{RQ6EJJ.ini => RQ6.ini} | 2 +- Data/Sys/GameSettings/RQ6PKM.ini | 31 - Data/Sys/GameSettings/RQ6XKM.ini | 31 - Data/Sys/GameSettings/{RQREXJ.ini => RQR.ini} | 2 +- Data/Sys/GameSettings/RQRJAF.ini | 28 - Data/Sys/GameSettings/RQRPAF.ini | 28 - Data/Sys/GameSettings/{RRBE41.ini => RRB.ini} | 2 +- Data/Sys/GameSettings/RRBJ41.ini | 28 - Data/Sys/GameSettings/RRBP41.ini | 28 - Data/Sys/GameSettings/{RBBE18.ini => RRK.ini} | 2 +- Data/Sys/GameSettings/RRKE70.ini | 33 - Data/Sys/GameSettings/RRKP70.ini | 33 - Data/Sys/GameSettings/{GF4P52.ini => RRZ.ini} | 2 +- Data/Sys/GameSettings/RRZEGY.ini | 31 - Data/Sys/GameSettings/RRZPGY.ini | 31 - Data/Sys/GameSettings/{R64K01.ini => RS5.ini} | 2 +- Data/Sys/GameSettings/RS5EC8.ini | 30 - Data/Sys/GameSettings/RS5JC8.ini | 30 - Data/Sys/GameSettings/RS5PC8.ini | 30 - Data/Sys/GameSettings/RS9.ini | 19 + Data/Sys/GameSettings/RS9E8P.ini | 19 - Data/Sys/GameSettings/RS9P8P.ini | 19 - Data/Sys/GameSettings/{RSBE01.ini => RSB.ini} | 2 +- Data/Sys/GameSettings/RSBJ01.ini | 18 - Data/Sys/GameSettings/RSBK01.ini | 18 - Data/Sys/GameSettings/{RSFE7U.ini => RSF.ini} | 2 +- Data/Sys/GameSettings/RSFJ99.ini | 30 - Data/Sys/GameSettings/RSFP99.ini | 30 - Data/Sys/GameSettings/{RSHK69.ini => RSH.ini} | 2 +- Data/Sys/GameSettings/RSHE69.ini | 25 - Data/Sys/GameSettings/RSHJ13.ini | 25 - Data/Sys/GameSettings/RSHP69.ini | 25 - Data/Sys/GameSettings/{RSIE69.ini => RSI.ini} | 2 +- Data/Sys/GameSettings/RSIJ13.ini | 34 - Data/Sys/GameSettings/RSIP69.ini | 34 - Data/Sys/GameSettings/{G4MP69.ini => RSL.ini} | 2 +- Data/Sys/GameSettings/RSLEAF.ini | 30 - Data/Sys/GameSettings/RSLJAF.ini | 30 - Data/Sys/GameSettings/RSLKAF.ini | 30 - Data/Sys/GameSettings/RSLPAF.ini | 30 - Data/Sys/GameSettings/{RSMJ8P.ini => RSM.ini} | 2 +- Data/Sys/GameSettings/RSME8P.ini | 20 - Data/Sys/GameSettings/{RSNF69.ini => RSN.ini} | 2 +- Data/Sys/GameSettings/RSND69.ini | 29 - Data/Sys/GameSettings/RSNE69.ini | 29 - Data/Sys/GameSettings/RSNP69.ini | 29 - Data/Sys/GameSettings/RSNX69.ini | 29 - Data/Sys/GameSettings/{RSPJ01.ini => RSP.ini} | 2 +- Data/Sys/GameSettings/RSPP01.ini | 22 - Data/Sys/GameSettings/{RSXJ13.ini => RSX.ini} | 2 +- Data/Sys/GameSettings/RSXE69.ini | 34 - Data/Sys/GameSettings/RSXK69.ini | 34 - Data/Sys/GameSettings/RSXP69.ini | 34 - Data/Sys/GameSettings/{RT3E54.ini => RT3.ini} | 2 +- Data/Sys/GameSettings/RT3JEL.ini | 17 - Data/Sys/GameSettings/RT3P54.ini | 17 - Data/Sys/GameSettings/{RT4JAF.ini => RT4.ini} | 2 +- Data/Sys/GameSettings/RT4PAF.ini | 30 - Data/Sys/GameSettings/{RTME41.ini => RTM.ini} | 2 +- Data/Sys/GameSettings/RTMP41.ini | 30 - Data/Sys/GameSettings/{GHCF4Q.ini => RTN.ini} | 2 +- Data/Sys/GameSettings/RTNJCQ.ini | 27 - Data/Sys/GameSettings/RTNP41.ini | 27 - Data/Sys/GameSettings/RTZ.ini | 31 + Data/Sys/GameSettings/RTZE08.ini | 31 - Data/Sys/GameSettings/RTZJ08.ini | 31 - Data/Sys/GameSettings/RTZK08.ini | 31 - Data/Sys/GameSettings/RTZP08.ini | 31 - Data/Sys/GameSettings/{RUUE01.ini => RUU.ini} | 2 +- Data/Sys/GameSettings/RUUJ01.ini | 21 - Data/Sys/GameSettings/RUUK01.ini | 21 - Data/Sys/GameSettings/RUUP01.ini | 21 - Data/Sys/GameSettings/{RVKEXJ.ini => RVK.ini} | 2 +- Data/Sys/GameSettings/RVKP99.ini | 22 - Data/Sys/GameSettings/{R5VP41.ini => RWR.ini} | 2 +- Data/Sys/GameSettings/RWRE4F.ini | 29 - Data/Sys/GameSettings/RWRP4F.ini | 29 - Data/Sys/GameSettings/{RT4EAF.ini => RWS.ini} | 4 +- Data/Sys/GameSettings/RWSE8P.ini | 30 - Data/Sys/GameSettings/RWSJ01.ini | 30 - Data/Sys/GameSettings/RWSK01.ini | 30 - Data/Sys/GameSettings/RWSP8P.ini | 30 - Data/Sys/GameSettings/RX9.ini | 18 + Data/Sys/GameSettings/RX9P69.ini | 18 - Data/Sys/GameSettings/RX9Y69.ini | 18 - Data/Sys/GameSettings/{RXXE4Q.ini => RXX.ini} | 2 +- Data/Sys/GameSettings/RXXJ4Q.ini | 34 - Data/Sys/GameSettings/RXXP4Q.ini | 34 - Data/Sys/GameSettings/RZJ.ini | 30 + Data/Sys/GameSettings/RZJD69.ini | 30 - Data/Sys/GameSettings/RZJE69.ini | 30 - Data/Sys/GameSettings/RZJJ13.ini | 30 - Data/Sys/GameSettings/{RZOE78.ini => RZO.ini} | 2 +- Data/Sys/GameSettings/RZOP78.ini | 31 - Data/Sys/GameSettings/{GJUD78.ini => RZP.ini} | 4 +- Data/Sys/GameSettings/RZPE01.ini | 22 - Data/Sys/GameSettings/RZPJ01.ini | 22 - Data/Sys/GameSettings/{RZTJ01.ini => RZT.ini} | 2 +- Data/Sys/GameSettings/RZTE01.ini | 20 - Data/Sys/GameSettings/RZTK01.ini | 20 - Data/Sys/GameSettings/RZTP01.ini | 20 - Data/Sys/GameSettings/RZTW01.ini | 20 - Data/Sys/GameSettings/{G5DE78.ini => RZZ.ini} | 2 +- Data/Sys/GameSettings/RZZE8P.ini | 27 - Data/Sys/GameSettings/RZZJEL.ini | 27 - Data/Sys/GameSettings/RZZP8P.ini | 27 - Data/Sys/GameSettings/{S2LE01.ini => S2L.ini} | 2 +- Data/Sys/GameSettings/S2LJ01.ini | 30 - Data/Sys/GameSettings/S2LP01.ini | 30 - Data/Sys/GameSettings/{S2WP78.ini => S2W.ini} | 2 +- Data/Sys/GameSettings/S2WE78.ini | 33 - Data/Sys/GameSettings/{S3BEWR.ini => S3B.ini} | 2 +- Data/Sys/GameSettings/S3BPWR.ini | 32 - Data/Sys/GameSettings/{S59E01.ini => S59.ini} | 2 +- Data/Sys/GameSettings/S59P01.ini | 26 - Data/Sys/GameSettings/{S72J01.ini => S72.ini} | 2 +- Data/Sys/GameSettings/S72E01.ini | 36 - Data/Sys/GameSettings/{SB3E08.ini => SB3.ini} | 2 +- Data/Sys/GameSettings/SB3J08.ini | 31 - Data/Sys/GameSettings/SB3P08.ini | 31 - Data/Sys/GameSettings/{SBDJ08.ini => SBD.ini} | 2 +- Data/Sys/GameSettings/SBDE08.ini | 34 - Data/Sys/GameSettings/SBDK08.ini | 34 - Data/Sys/GameSettings/{R4QP01.ini => SC4.ini} | 2 +- Data/Sys/GameSettings/SC4E64.ini | 29 - Data/Sys/GameSettings/SC4P64.ini | 29 - Data/Sys/GameSettings/{SC7P52.ini => SC7.ini} | 2 +- Data/Sys/GameSettings/SC7D52.ini | 29 - Data/Sys/GameSettings/SC7F52.ini | 29 - Data/Sys/GameSettings/SC7S52.ini | 29 - Data/Sys/GameSettings/{SC8E01.ini => SC8.ini} | 2 +- Data/Sys/GameSettings/SC8J01.ini | 27 - Data/Sys/GameSettings/SC8P01.ini | 27 - Data/Sys/GameSettings/{RBBJ18.ini => SCA.ini} | 2 +- Data/Sys/GameSettings/SCAE18.ini | 33 - Data/Sys/GameSettings/SCAJ18.ini | 33 - Data/Sys/GameSettings/SCAP18.ini | 33 - Data/Sys/GameSettings/{SCYE4Q.ini => SCY.ini} | 2 +- Data/Sys/GameSettings/SCYP4Q.ini | 27 - Data/Sys/GameSettings/SCYX4Q.ini | 27 - Data/Sys/GameSettings/SCYY4Q.ini | 27 - Data/Sys/GameSettings/SCYZ4Q.ini | 27 - Data/Sys/GameSettings/{SD2J01.ini => SD2.ini} | 2 +- Data/Sys/GameSettings/SD2E41.ini | 33 - Data/Sys/GameSettings/SD2P41.ini | 33 - Data/Sys/GameSettings/SD2Y41.ini | 33 - Data/Sys/GameSettings/{SDBP78.ini => SDB.ini} | 2 +- Data/Sys/GameSettings/SDBE78.ini | 31 - Data/Sys/GameSettings/{SG8EG9.ini => SDM.ini} | 2 +- Data/Sys/GameSettings/SDMEG9.ini | 34 - Data/Sys/GameSettings/{SDNE41.ini => SDN.ini} | 2 +- Data/Sys/GameSettings/SDNP41.ini | 33 - Data/Sys/GameSettings/{SDWE18.ini => SDW.ini} | 2 +- Data/Sys/GameSettings/SDWJ18.ini | 31 - Data/Sys/GameSettings/SDWP18.ini | 31 - Data/Sys/GameSettings/{SEAE69.ini => SEA.ini} | 2 +- Data/Sys/GameSettings/SEAP69.ini | 28 - Data/Sys/GameSettings/{SEMP4Q.ini => SEM.ini} | 2 +- Data/Sys/GameSettings/SEME4Q.ini | 36 - Data/Sys/GameSettings/SEMJ01.ini | 36 - Data/Sys/GameSettings/SEMX4Q.ini | 36 - Data/Sys/GameSettings/SEMY4Q.ini | 36 - Data/Sys/GameSettings/SEMZ4Q.ini | 36 - Data/Sys/GameSettings/{SERE4Q.ini => SER.ini} | 2 +- Data/Sys/GameSettings/SERF4Q.ini | 31 - Data/Sys/GameSettings/SERP4Q.ini | 31 - Data/Sys/GameSettings/{SF8J01.ini => SF8.ini} | 2 +- Data/Sys/GameSettings/SF8E01.ini | 31 - Data/Sys/GameSettings/SF8P01.ini | 31 - Data/Sys/GameSettings/{SFIE01.ini => SFI.ini} | 2 +- Data/Sys/GameSettings/SFIP01.ini | 32 - Data/Sys/GameSettings/{SDMPAF.ini => SG8.ini} | 2 +- Data/Sys/GameSettings/SG8PAF.ini | 34 - Data/Sys/GameSettings/{SILE78.ini => SIL.ini} | 2 +- Data/Sys/GameSettings/SILP78.ini | 31 - Data/Sys/GameSettings/{SJBE52.ini => SJB.ini} | 2 +- Data/Sys/GameSettings/SJBP52.ini | 32 - Data/Sys/GameSettings/{SJDZ41.ini => SJD.ini} | 2 +- Data/Sys/GameSettings/SJDE41.ini | 20 - Data/Sys/GameSettings/{SLSJ01.ini => SLS.ini} | 2 +- Data/Sys/GameSettings/SLSEXJ.ini | 33 - Data/Sys/GameSettings/SLSP01.ini | 33 - Data/Sys/GameSettings/{SMBE8P.ini => SMB.ini} | 2 +- Data/Sys/GameSettings/SMBP8P.ini | 20 - Data/Sys/GameSettings/{SMOE41.ini => SMO.ini} | 2 +- Data/Sys/GameSettings/SMOP41.ini | 33 - Data/Sys/GameSettings/SMOX41.ini | 33 - Data/Sys/GameSettings/SN4.ini | 22 + Data/Sys/GameSettings/SN4EDA.ini | 22 - Data/Sys/GameSettings/SN4JDA.ini | 22 - Data/Sys/GameSettings/SN4XGT.ini | 22 - Data/Sys/GameSettings/{SNCE8P.ini => SNC.ini} | 2 +- Data/Sys/GameSettings/SNCJ8P.ini | 33 - Data/Sys/GameSettings/SNCP8P.ini | 33 - Data/Sys/GameSettings/{SNYEVZ.ini => SNY.ini} | 2 +- Data/Sys/GameSettings/SNYPVZ.ini | 17 - Data/Sys/GameSettings/{SOJE41.ini => SOJ.ini} | 2 +- Data/Sys/GameSettings/SOJP41.ini | 27 - Data/Sys/GameSettings/{SSTEG9.ini => SOS.ini} | 2 +- Data/Sys/GameSettings/SOSEG9.ini | 24 - Data/Sys/GameSettings/SOSPAF.ini | 24 - Data/Sys/GameSettings/{SPDE52.ini => SPD.ini} | 2 +- Data/Sys/GameSettings/SPDP52.ini | 34 - Data/Sys/GameSettings/SPV.ini | 30 + Data/Sys/GameSettings/SPVEA4.ini | 30 - Data/Sys/GameSettings/SPVPA4.ini | 30 - Data/Sys/GameSettings/SPVXA4.ini | 30 - Data/Sys/GameSettings/SPVYA4.ini | 30 - Data/Sys/GameSettings/SQM.ini | 27 + Data/Sys/GameSettings/SQME52.ini | 27 - Data/Sys/GameSettings/SQMP52.ini | 27 - Data/Sys/GameSettings/{R5VE41.ini => SRQ.ini} | 2 +- Data/Sys/GameSettings/SRQE41.ini | 29 - Data/Sys/GameSettings/SRQP41.ini | 29 - Data/Sys/GameSettings/{SSQP01.ini => SSQ.ini} | 2 +- Data/Sys/GameSettings/SSQE01.ini | 31 - Data/Sys/GameSettings/SSQJ01.ini | 31 - Data/Sys/GameSettings/{SSRE20.ini => SSR.ini} | 2 +- Data/Sys/GameSettings/SSRPXT.ini | 31 - Data/Sys/GameSettings/{SSTPY5.ini => SST.ini} | 2 +- Data/Sys/GameSettings/{STKE08.ini => STK.ini} | 2 +- Data/Sys/GameSettings/STKJ08.ini | 22 - Data/Sys/GameSettings/STKP08.ini | 22 - Data/Sys/GameSettings/{STSE4Q.ini => STS.ini} | 2 +- Data/Sys/GameSettings/STSP4Q.ini | 24 - Data/Sys/GameSettings/STSX4Q.ini | 24 - Data/Sys/GameSettings/STSY4Q.ini | 24 - Data/Sys/GameSettings/STSZ4Q.ini | 24 - Data/Sys/GameSettings/{SU7PAF.ini => SU7.ini} | 2 +- Data/Sys/GameSettings/SU7EG9.ini | 17 - Data/Sys/GameSettings/{SUKE01.ini => SUK.ini} | 2 +- Data/Sys/GameSettings/SUKJ01.ini | 31 - Data/Sys/GameSettings/SUKP01.ini | 31 - Data/Sys/GameSettings/{SVBP52.ini => SVB.ini} | 2 +- Data/Sys/GameSettings/SVBE52.ini | 30 - Data/Sys/GameSettings/{R4EE01.ini => SVM.ini} | 2 +- Data/Sys/GameSettings/SVME01.ini | 31 - Data/Sys/GameSettings/SVMJ01.ini | 31 - Data/Sys/GameSettings/SVMP01.ini | 31 - Data/Sys/GameSettings/{SVXE52.ini => SVX.ini} | 2 +- Data/Sys/GameSettings/SVXF52.ini | 30 - Data/Sys/GameSettings/SVXI52.ini | 30 - Data/Sys/GameSettings/SVXP52.ini | 30 - Data/Sys/GameSettings/SVXY52.ini | 30 - Data/Sys/GameSettings/{SVZPVZ.ini => SVZ.ini} | 2 +- Data/Sys/GameSettings/SVZEVZ.ini | 22 - Data/Sys/GameSettings/{R84J99.ini => SX3.ini} | 2 +- Data/Sys/GameSettings/SX3J01.ini | 30 - Data/Sys/GameSettings/SX3P01.ini | 30 - Data/Sys/GameSettings/{SX7E52.ini => SX7.ini} | 2 +- Data/Sys/GameSettings/SX7P52.ini | 25 - Data/Sys/GameSettings/{SXCE52.ini => SXC.ini} | 2 +- Data/Sys/GameSettings/SXCP52.ini | 25 - Data/Sys/GameSettings/{SZAE69.ini => SZA.ini} | 2 +- Data/Sys/GameSettings/SZAP69.ini | 22 - Data/Sys/GameSettings/{SZBE69.ini => SZB.ini} | 2 +- Data/Sys/GameSettings/SZBP69.ini | 30 - Data/Sys/GameSettings/{UGPE01.ini => UGP.ini} | 2 +- Data/Sys/GameSettings/UGPP01.ini | 27 - Data/Sys/GameSettings/{G4BE08.ini => WDM.ini} | 2 +- Data/Sys/GameSettings/WDME01.ini | 22 - Data/Sys/GameSettings/WDMP01.ini | 22 - Data/Sys/GameSettings/{GISP36.ini => WGD.ini} | 3 +- Data/Sys/GameSettings/WGDEA4.ini | 22 - Data/Sys/GameSettings/WGDPA4.ini | 22 - Data/Sys/GameSettings/{RSPE01.ini => WGO.ini} | 2 +- Data/Sys/GameSettings/WGOEWG.ini | 22 - Data/Sys/GameSettings/{WGSE08.ini => WGS.ini} | 2 +- Data/Sys/GameSettings/WGSP08.ini | 22 - Data/Sys/GameSettings/{WHWEFJ.ini => WHW.ini} | 2 +- Data/Sys/GameSettings/WHWPFJ.ini | 19 - Data/Sys/GameSettings/{WGOPWG.ini => WKT.ini} | 2 +- Data/Sys/GameSettings/WKTJA4.ini | 22 - Data/Sys/GameSettings/WKTPA4.ini | 22 - Data/Sys/GameSettings/WPPJJF.ini | 27 - Data/Sys/GameSettings/{WR9E08.ini => WR9.ini} | 2 +- Data/Sys/GameSettings/WR9P08.ini | 34 - Data/Sys/Shaders/Anaglyph/dubois.glsl | 18 + Data/Sys/Shaders/Anaglyph/fullcolor.glsl | 8 + Data/Sys/Shaders/Anaglyph/grayscale.glsl | 10 + Data/Sys/Shaders/Anaglyph/grayscale2.glsl | 12 + Externals/{libusbx => libusb}/AUTHORS | 28 +- Externals/{libusbx => libusb}/COPYING | 0 Externals/{libusbx => libusb}/ChangeLog | 51 +- Externals/libusb/DOLPHIN | 7 + Externals/{libusbx => libusb}/INSTALL | 0 Externals/libusb/NEWS | 2 + Externals/{libusbx => libusb}/PORTING | 26 +- Externals/libusb/README | 27 + Externals/libusb/TODO | 2 + .../{libusbx => libusb}/libusb/Makefile.am | 11 +- .../{libusbx => libusb}/libusb/Makefile.in | 238 +- Externals/{libusbx => libusb}/libusb/core.c | 360 +- .../{libusbx => libusb}/libusb/descriptor.c | 10 +- .../{libusbx => libusb}/libusb/hotplug.c | 59 +- .../{libusbx => libusb}/libusb/hotplug.h | 2 +- Externals/{libusbx => libusb}/libusb/io.c | 318 +- .../{libusbx => libusb}/libusb/libusb-1.0.def | 8 + .../{libusbx => libusb}/libusb/libusb-1.0.rc | 2 +- Externals/{libusbx => libusb}/libusb/libusb.h | 143 +- .../{libusbx => libusb}/libusb/libusbi.h | 47 +- .../libusb/os/darwin_usb.c | 274 +- .../libusb/os/darwin_usb.h | 4 +- .../libusb/os/linux_netlink.c | 159 +- .../libusb/os/linux_udev.c | 68 +- .../libusb/os/linux_usbfs.c | 197 +- .../libusb/os/linux_usbfs.h | 15 +- .../libusb/os/netbsd_usb.c} | 130 +- Externals/libusb/libusb/os/openbsd_usb.c | 832 + .../libusb/os/poll_posix.c | 0 .../libusb/os/poll_posix.h | 0 .../libusb/os/poll_windows.c | 6 +- .../libusb/os/poll_windows.h | 18 +- .../libusb/os/threads_posix.c | 6 +- .../libusb/os/threads_posix.h | 2 +- .../libusb/os/threads_windows.c | 2 +- .../libusb/os/threads_windows.h | 2 +- .../{libusbx => libusb}/libusb/os/wince_usb.c | 25 +- .../{libusbx => libusb}/libusb/os/wince_usb.h | 4 +- .../libusb/os/windows_common.h | 2 +- .../libusb/os/windows_usb.c | 292 +- .../libusb/os/windows_usb.h | 42 +- .../{libusbx => libusb}/libusb/strerror.c | 23 +- Externals/{libusbx => libusb}/libusb/sync.c | 12 +- .../{libusbx => libusb}/libusb/version.h | 2 +- Externals/libusb/libusb/version_nano.h | 1 + .../libusb_static_2013.vcxproj | 51 +- Externals/{libusbx => libusb}/msvc/config.h | 3 + .../{libusbx => libusb}/msvc/ddk_build.cmd | 0 Externals/{libusbx => libusb}/msvc/errno.h | 0 Externals/libusb/msvc/fxload_2010.vcxproj | 170 + .../libusb/msvc/fxload_2010.vcxproj.filters | 25 + Externals/libusb/msvc/fxload_2012.vcxproj | 174 + .../libusb/msvc/fxload_2012.vcxproj.filters | 25 + Externals/libusb/msvc/fxload_2013.vcxproj | 174 + Externals/libusb/msvc/fxload_sources | 23 + Externals/libusb/msvc/getopt_2005.vcproj | 288 + Externals/libusb/msvc/getopt_2010.vcxproj | 131 + .../libusb/msvc/getopt_2010.vcxproj.filters | 26 + Externals/libusb/msvc/getopt_2012.vcxproj | 136 + .../libusb/msvc/getopt_2012.vcxproj.filters | 26 + Externals/libusb/msvc/getopt_2013.vcxproj | 136 + Externals/libusb/msvc/getopt_sources | 20 + .../libusb/msvc/hotplugtest_2010.vcxproj | 163 + .../msvc/hotplugtest_2010.vcxproj.filters | 14 + .../libusb/msvc/hotplugtest_2012.vcxproj | 167 + .../msvc/hotplugtest_2012.vcxproj.filters | 14 + .../libusb/msvc/hotplugtest_2013.vcxproj | 167 + Externals/libusb/msvc/hotplugtest_sources | 20 + Externals/{libusbx => libusb}/msvc/inttypes.h | 0 Externals/libusb/msvc/libusb.dsw | 71 + Externals/libusb/msvc/libusb_2005.sln | 95 + Externals/libusb/msvc/libusb_2010.sln | 94 + Externals/libusb/msvc/libusb_2012.sln | 94 + Externals/libusb/msvc/libusb_2013.sln | 100 + Externals/libusb/msvc/libusb_dll.dsp | 194 + Externals/libusb/msvc/libusb_dll_2005.vcproj | 436 + Externals/libusb/msvc/libusb_dll_2010.vcxproj | 170 + .../msvc/libusb_dll_2010.vcxproj.filters | 81 + Externals/libusb/msvc/libusb_dll_2012.vcxproj | 175 + .../msvc/libusb_dll_2012.vcxproj.filters} | 18 +- Externals/libusb/msvc/libusb_dll_2013.vcxproj | 175 + Externals/libusb/msvc/libusb_dll_wince.vcproj | 1243 ++ .../{libusbx => libusb}/msvc/libusb_sources | 0 .../msvc/libusb_static.dsp | 0 .../msvc/libusb_static_2005.vcproj | 0 .../msvc/libusb_static_2010.vcxproj | 75 +- .../msvc/libusb_static_2010.vcxproj.filters | 0 .../msvc/libusb_static_2012.vcxproj | 6 +- .../msvc/libusb_static_2012.vcxproj.filters | 0 .../libusb/msvc/libusb_static_2013.vcxproj | 160 + .../msvc/libusb_static_wince.vcproj | 0 Externals/libusb/msvc/libusb_wince.sln | 246 + Externals/libusb/msvc/listdevs.dsp | 103 + Externals/libusb/msvc/listdevs_2005.vcproj | 360 + Externals/libusb/msvc/listdevs_2010.vcxproj | 165 + .../libusb/msvc/listdevs_2010.vcxproj.filters | 14 + Externals/libusb/msvc/listdevs_2012.vcxproj | 169 + .../libusb/msvc/listdevs_2012.vcxproj.filters | 14 + Externals/libusb/msvc/listdevs_2013.vcxproj | 169 + Externals/libusb/msvc/listdevs_sources | 19 + Externals/libusb/msvc/listdevs_wince.vcproj | 1120 ++ Externals/{libusbx => libusb}/msvc/missing.c | 0 Externals/{libusbx => libusb}/msvc/missing.h | 0 Externals/{libusbx => libusb}/msvc/stdint.h | 0 Externals/libusb/msvc/stress_2005.vcproj | 390 + Externals/libusb/msvc/stress_2010.vcxproj | 167 + .../libusb/msvc/stress_2010.vcxproj.filters | 25 + Externals/libusb/msvc/stress_2012.vcxproj | 171 + .../libusb/msvc/stress_2012.vcxproj.filters | 25 + Externals/libusb/msvc/stress_2013.vcxproj | 171 + Externals/libusb/msvc/stress_wince.vcproj | 1128 ++ Externals/libusb/msvc/xusb.dsp | 102 + Externals/libusb/msvc/xusb_2005.vcproj | 344 + Externals/libusb/msvc/xusb_2010.vcxproj | 163 + .../libusb/msvc/xusb_2010.vcxproj.filters | 14 + Externals/libusb/msvc/xusb_2012.vcxproj | 167 + .../libusb/msvc/xusb_2012.vcxproj.filters | 14 + Externals/libusb/msvc/xusb_2013.vcxproj | 167 + Externals/libusb/msvc/xusb_sources | 20 + Externals/libusb/msvc/xusb_wince.vcproj | 1120 ++ Externals/libusbx/Makefile.am | 27 - Externals/libusbx/Makefile.in | 875 - Externals/libusbx/NEWS | 2 - Externals/libusbx/README | 28 - Externals/libusbx/THANKS | 7 - Externals/libusbx/TODO | 2 - Externals/libusbx/aclocal.m4 | 1112 -- Externals/libusbx/compile | 347 - Externals/libusbx/config.guess | 1535 -- Externals/libusbx/config.h.in | 134 - Externals/libusbx/config.sub | 1790 -- Externals/libusbx/configure | 15137 ---------------- Externals/libusbx/configure.ac | 249 - Externals/libusbx/depcomp | 790 - Externals/libusbx/install-sh | 527 - Externals/libusbx/libusb-1.0.pc.in | 11 - Externals/libusbx/libusb/version_nano.h | 1 - Externals/libusbx/ltmain.sh | 9655 ---------- Externals/libusbx/m4/libtool.m4 | 7986 -------- Externals/libusbx/m4/ltoptions.m4 | 384 - Externals/libusbx/m4/ltsugar.m4 | 123 - Externals/libusbx/m4/ltversion.m4 | 23 - Externals/libusbx/m4/lt~obsolete.m4 | 98 - Externals/libusbx/missing | 215 - .../dolphinemu/AssetCopyService.java | 1 - .../dolphinemu/settings/UserPreferences.java | 11 +- Source/CMakeLists.txt | 55 +- Source/Core/Common/Arm64Emitter.cpp | 241 +- Source/Core/Common/Arm64Emitter.h | 54 +- Source/Core/Common/ArmEmitter.h | 2 +- Source/Core/Common/Common.vcxproj | 2 +- Source/Core/Common/Common.vcxproj.filters | 7 +- Source/Core/Common/CommonPaths.h | 1 + Source/Core/Common/JitRegister.h | 3 +- Source/Core/Common/MemArena.cpp | 6 +- Source/Core/Common/MemArena.h | 6 +- Source/Core/Common/Timer.cpp | 27 +- Source/Core/Core/ActionReplay.cpp | 52 +- Source/Core/Core/Boot/Boot.cpp | 35 +- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 84 +- Source/Core/Core/Boot/Boot_DOL.cpp | 1 + Source/Core/Core/Boot/Boot_WiiWAD.cpp | 2 +- Source/Core/Core/BootManager.cpp | 21 +- Source/Core/Core/CMakeLists.txt | 2 +- Source/Core/Core/ConfigManager.cpp | 219 +- Source/Core/Core/ConfigManager.h | 1 + Source/Core/Core/Core.cpp | 4 +- Source/Core/Core/Core.vcxproj | 8 +- Source/Core/Core/Core.vcxproj.filters | 33 +- Source/Core/Core/CoreParameter.cpp | 204 +- Source/Core/Core/CoreParameter.h | 25 +- Source/Core/Core/CoreTiming.cpp | 12 +- Source/Core/Core/CoreTiming.h | 10 +- Source/Core/Core/DSPEmulator.cpp | 4 - .../Core/Core/Debugger/Debugger_SymbolMap.cpp | 10 +- .../Core/Core/Debugger/PPCDebugInterface.cpp | 30 +- Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 15 +- Source/Core/Core/GeckoCode.cpp | 25 +- Source/Core/Core/HLE/HLE_Misc.cpp | 4 +- Source/Core/Core/HLE/HLE_OS.cpp | 10 +- Source/Core/Core/HW/CPU.cpp | 3 +- Source/Core/Core/HW/DSP.cpp | 5 +- .../Core/Core/HW/DSPLLE/DSPDebugInterface.cpp | 4 +- Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 4 +- Source/Core/Core/HW/DVDInterface.cpp | 172 +- Source/Core/Core/HW/DVDInterface.h | 10 +- Source/Core/Core/HW/EXI_DeviceAGP.cpp | 154 +- Source/Core/Core/HW/EXI_DeviceAGP.h | 14 +- Source/Core/Core/HW/Memmap.cpp | 236 +- Source/Core/Core/HW/Memmap.h | 65 +- Source/Core/Core/HW/ProcessorInterface.cpp | 7 +- Source/Core/Core/HW/SI.cpp | 1 + Source/Core/Core/HW/SI_GCAdapter.cpp | 255 +- Source/Core/Core/HW/SI_GCAdapter.h | 5 + Source/Core/Core/HW/SystemTimers.cpp | 4 +- Source/Core/Core/HW/VideoInterface.cpp | 2 +- Source/Core/Core/HW/WII_IPC.cpp | 8 +- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 15 +- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 14 +- Source/Core/Core/HotkeyManager.cpp | 549 + Source/Core/Core/HotkeyManager.h | 39 + Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp | 9 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE.h | 1 + .../Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 98 +- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h | 17 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 2 +- Source/Core/Core/MemTools.cpp | 2 +- Source/Core/Core/Movie.cpp | 12 +- Source/Core/Core/NetPlayProto.h | 2 +- Source/Core/Core/PatchEngine.cpp | 21 +- Source/Core/Core/PatchEngine.h | 1 - .../Core/PowerPC/Interpreter/Interpreter.cpp | 16 +- .../Interpreter/Interpreter_Branch.cpp | 2 +- .../Interpreter/Interpreter_FloatingPoint.cpp | 6 - .../Interpreter/Interpreter_Integer.cpp | 4 +- .../Interpreter/Interpreter_LoadStore.cpp | 134 +- .../Interpreter_LoadStorePaired.cpp | 20 +- .../Interpreter/Interpreter_Paired.cpp | 2 +- .../Interpreter_SystemRegisters.cpp | 12 +- .../Interpreter/Interpreter_Tables.cpp | 28 +- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 7 +- Source/Core/Core/PowerPC/Jit64/Jit.h | 3 +- .../Core/Core/PowerPC/Jit64/Jit64_Tables.cpp | 16 +- Source/Core/Core/PowerPC/Jit64/JitAsm.cpp | 24 +- .../Core/Core/PowerPC/Jit64/JitRegCache.cpp | 35 - Source/Core/Core/PowerPC/Jit64/JitRegCache.h | 31 +- .../Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp | 31 +- .../PowerPC/Jit64/Jit_SystemRegisters.cpp | 5 +- .../PowerPC/Jit64Common/Jit64AsmCommon.cpp | 4 +- Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp | 4 +- Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 7 +- Source/Core/Core/PowerPC/Jit64IL/JitIL.h | 1 - .../Core/PowerPC/Jit64IL/JitIL_Tables.cpp | 10 +- Source/Core/Core/PowerPC/JitArm32/Jit.cpp | 4 - Source/Core/Core/PowerPC/JitArm32/Jit.h | 1 - .../PowerPC/JitArm32/JitArm_BackPatch.cpp | 22 +- .../PowerPC/JitArm32/JitArm_LoadStore.cpp | 10 +- .../JitArm32/JitArm_LoadStoreFloating.cpp | 4 +- .../Core/PowerPC/JitArm32/JitArm_Tables.cpp | 10 +- Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp | 120 +- Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 5 - Source/Core/Core/PowerPC/JitArm64/Jit.h | 1 - .../PowerPC/JitArm64/JitArm64_BackPatch.cpp | 33 +- .../PowerPC/JitArm64/JitArm64_LoadStore.cpp | 10 +- .../JitArm64/JitArm64_LoadStoreFloating.cpp | 6 +- .../PowerPC/JitArm64/JitArm64_RegCache.cpp | 4 +- .../Core/PowerPC/JitArm64/JitArm64_Tables.cpp | 10 +- Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp | 108 +- .../Core/PowerPC/JitCommon/JitBackpatch.cpp | 7 +- .../Core/Core/PowerPC/JitCommon/Jit_Util.cpp | 50 +- .../PowerPC/JitCommon/TrampolineCache.cpp | 16 +- .../Core/Core/PowerPC/JitILCommon/JitILBase.h | 1 - .../PowerPC/JitILCommon/JitILBase_Branch.cpp | 7 +- .../JitILCommon/JitILBase_LoadStore.cpp | 16 +- Source/Core/Core/PowerPC/JitInterface.cpp | 130 +- Source/Core/Core/PowerPC/JitInterface.h | 3 - Source/Core/Core/PowerPC/MMU.cpp | 1052 ++ Source/Core/Core/PowerPC/PPCAnalyst.cpp | 303 +- Source/Core/Core/PowerPC/PPCCache.cpp | 4 +- Source/Core/Core/PowerPC/PPCSymbolDB.cpp | 6 +- Source/Core/Core/PowerPC/PPCTables.cpp | 61 +- Source/Core/Core/PowerPC/PPCTables.h | 81 +- Source/Core/Core/PowerPC/PowerPC.cpp | 44 +- Source/Core/Core/PowerPC/PowerPC.h | 80 +- Source/Core/Core/PowerPC/SignatureDB.cpp | 2 +- Source/Core/Core/State.cpp | 5 +- Source/Core/DiscIO/CompressedBlob.cpp | 8 +- Source/Core/DiscIO/Volume.h | 1 - Source/Core/DiscIO/VolumeGC.cpp | 5 - Source/Core/DiscIO/VolumeGC.h | 1 - Source/Core/DiscIO/VolumeWad.cpp | 11 + Source/Core/DiscIO/VolumeWad.h | 1 + Source/Core/DiscIO/VolumeWiiCrypted.cpp | 39 +- Source/Core/DiscIO/VolumeWiiCrypted.h | 6 +- Source/Core/DiscIO/WbfsBlob.cpp | 23 +- Source/Core/DolphinQt/GameList/GameFile.cpp | 7 +- Source/Core/DolphinQt/MainWindow.cpp | 2 +- Source/Core/DolphinWX/AboutDolphin.cpp | 2 +- Source/Core/DolphinWX/Cheats/CheatsWindow.cpp | 7 +- .../Core/DolphinWX/Cheats/GeckoCodeDiag.cpp | 2 +- Source/Core/DolphinWX/ConfigMain.cpp | 207 +- .../Core/DolphinWX/ControllerConfigDiag.cpp | 9 +- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 10 +- .../Core/DolphinWX/Debugger/DebuggerPanel.cpp | 28 +- Source/Core/DolphinWX/Debugger/MemoryView.cpp | 4 +- .../Core/DolphinWX/Debugger/MemoryWindow.cpp | 2 +- Source/Core/DolphinWX/Debugger/WatchView.cpp | 8 +- Source/Core/DolphinWX/Frame.cpp | 776 +- Source/Core/DolphinWX/Frame.h | 59 +- Source/Core/DolphinWX/FrameTools.cpp | 565 +- Source/Core/DolphinWX/GameListCtrl.cpp | 20 +- Source/Core/DolphinWX/Globals.h | 1 + Source/Core/DolphinWX/HotkeyDlg.cpp | 244 +- Source/Core/DolphinWX/HotkeyDlg.h | 2 +- Source/Core/DolphinWX/ISOFile.cpp | 12 +- Source/Core/DolphinWX/ISOProperties.cpp | 47 +- Source/Core/DolphinWX/ISOProperties.h | 7 +- Source/Core/DolphinWX/InputConfigDiag.cpp | 13 +- Source/Core/DolphinWX/InputConfigDiag.h | 7 +- .../Core/DolphinWX/InputConfigDiagBitmaps.cpp | 4 +- Source/Core/DolphinWX/Main.cpp | 1 + Source/Core/DolphinWX/MainAndroid.cpp | 8 + .../DolphinWX/PostProcessingConfigDiag.cpp | 2 +- Source/Core/InputCommon/InputConfig.cpp | 6 +- Source/Core/UICommon/UICommon.cpp | 1 + Source/DSPTool/DSPTool.vcxproj | 16 +- Source/Dolphin.sln | 2 +- Source/UnitTests/CMakeLists.txt | 3 + Source/UnitTests/Common/BitFieldTest.cpp | 170 + Source/UnitTests/Common/CommonFuncsTest.cpp | 40 + Source/UnitTests/Common/EventTest.cpp | 42 + Source/UnitTests/Common/FifoQueueTest.cpp | 67 + .../UnitTests/Common/FixedSizeQueueTest.cpp | 33 + Source/UnitTests/Common/FlagTest.cpp | 91 + Source/UnitTests/TestUtils/CMakeLists.txt | 9 + Source/UnitTests/UnitTests.vcxproj | 241 +- Source/UnitTests/VideoCommon/CMakeLists.txt | 1 + .../VideoCommon/VertexLoaderTest.cpp | 14 +- Source/VSProps/Base.props | 2 +- 1655 files changed, 23479 insertions(+), 69011 deletions(-) create mode 100644 .gitmodules rename Data/Sys/GameSettings/{DLSE64.ini => DLS.ini} (84%) delete mode 100644 Data/Sys/GameSettings/DLSP64.ini create mode 100644 Data/Sys/GameSettings/FA6.ini rename Data/Sys/GameSettings/{FA7E01.ini => FA7.ini} (96%) create mode 100644 Data/Sys/GameSettings/FA8.ini delete mode 100644 Data/Sys/GameSettings/FA8E01.ini rename Data/Sys/GameSettings/{FABE01.ini => FAA.ini} (94%) rename Data/Sys/GameSettings/{FAAP01.ini => FAB.ini} (94%) create mode 100644 Data/Sys/GameSettings/FAG.ini delete mode 100644 Data/Sys/GameSettings/FAGE01.ini delete mode 100644 Data/Sys/GameSettings/FAGP01.ini rename Data/Sys/GameSettings/{FAKE01.ini => FAK.ini} (93%) delete mode 100644 Data/Sys/GameSettings/FAKP01.ini rename Data/Sys/GameSettings/{FABP01.ini => FAL.ini} (95%) delete mode 100644 Data/Sys/GameSettings/FALE01.ini delete mode 100644 Data/Sys/GameSettings/FALP01.ini rename Data/Sys/GameSettings/{FAAE01.ini => FAO.ini} (94%) delete mode 100644 Data/Sys/GameSettings/FAOE01.ini delete mode 100644 Data/Sys/GameSettings/FAOP01.ini create mode 100644 Data/Sys/GameSettings/FAP.ini delete mode 100644 Data/Sys/GameSettings/FAPE01.ini delete mode 100644 Data/Sys/GameSettings/FAPP01.ini rename Data/Sys/GameSettings/{FASE01.ini => FAS.ini} (95%) delete mode 100644 Data/Sys/GameSettings/FASP01.ini rename Data/Sys/GameSettings/{FA7P01.ini => FAX.ini} (95%) rename Data/Sys/GameSettings/{FA8P01.ini => FB4.ini} (95%) delete mode 100644 Data/Sys/GameSettings/FB4E01.ini delete mode 100644 Data/Sys/GameSettings/FB4P01.ini create mode 100644 Data/Sys/GameSettings/FBB.ini delete mode 100644 Data/Sys/GameSettings/FBBE01.ini delete mode 100644 Data/Sys/GameSettings/FBBP01.ini create mode 100644 Data/Sys/GameSettings/FBD.ini delete mode 100644 Data/Sys/GameSettings/FBDE01.ini delete mode 100644 Data/Sys/GameSettings/FBDP01.ini create mode 100644 Data/Sys/GameSettings/FBE.ini delete mode 100644 Data/Sys/GameSettings/FBEE01.ini delete mode 100644 Data/Sys/GameSettings/FBEP01.ini create mode 100644 Data/Sys/GameSettings/FBH.ini delete mode 100644 Data/Sys/GameSettings/FBHE01.ini delete mode 100644 Data/Sys/GameSettings/FBHJ01.ini delete mode 100644 Data/Sys/GameSettings/FBHP01.ini create mode 100644 Data/Sys/GameSettings/FBI.ini delete mode 100644 Data/Sys/GameSettings/FBIE01.ini delete mode 100644 Data/Sys/GameSettings/FBIP01.ini create mode 100644 Data/Sys/GameSettings/FBJ.ini delete mode 100644 Data/Sys/GameSettings/FBJE01.ini delete mode 100644 Data/Sys/GameSettings/FBJP01.ini create mode 100644 Data/Sys/GameSettings/FBL.ini delete mode 100644 Data/Sys/GameSettings/FBLE01.ini delete mode 100644 Data/Sys/GameSettings/FBLM01.ini create mode 100644 Data/Sys/GameSettings/FBR.ini delete mode 100644 Data/Sys/GameSettings/FBRE01.ini delete mode 100644 Data/Sys/GameSettings/FBRJ01.ini delete mode 100644 Data/Sys/GameSettings/FBRP01.ini create mode 100644 Data/Sys/GameSettings/FBS.ini delete mode 100644 Data/Sys/GameSettings/FBSE01.ini delete mode 100644 Data/Sys/GameSettings/FBSM01.ini create mode 100644 Data/Sys/GameSettings/FBU.ini delete mode 100644 Data/Sys/GameSettings/FBUE01.ini delete mode 100644 Data/Sys/GameSettings/FBUP01.ini rename Data/Sys/GameSettings/{FA6P01.ini => FC3.ini} (94%) delete mode 100644 Data/Sys/GameSettings/FC3E01.ini delete mode 100644 Data/Sys/GameSettings/FC3P01.ini create mode 100644 Data/Sys/GameSettings/FC6.ini delete mode 100644 Data/Sys/GameSettings/FC6E01.ini delete mode 100644 Data/Sys/GameSettings/FC6P01.ini create mode 100644 Data/Sys/GameSettings/FC8.ini delete mode 100644 Data/Sys/GameSettings/FC8E01.ini delete mode 100644 Data/Sys/GameSettings/FC8J01.ini delete mode 100644 Data/Sys/GameSettings/FC8P01.ini create mode 100644 Data/Sys/GameSettings/FCP.ini delete mode 100644 Data/Sys/GameSettings/FCPE01.ini delete mode 100644 Data/Sys/GameSettings/FCPP01.ini rename Data/Sys/GameSettings/{FCRE01.ini => FCR.ini} (94%) delete mode 100644 Data/Sys/GameSettings/FCRP01.ini rename Data/Sys/GameSettings/{FAXE01.ini => FCS.ini} (95%) delete mode 100644 Data/Sys/GameSettings/FCSE01.ini delete mode 100644 Data/Sys/GameSettings/FCSP01.ini create mode 100644 Data/Sys/GameSettings/FCT.ini delete mode 100644 Data/Sys/GameSettings/FCTE01.ini delete mode 100644 Data/Sys/GameSettings/FCTJ01.ini delete mode 100644 Data/Sys/GameSettings/FCTP01.ini create mode 100644 Data/Sys/GameSettings/FCU.ini delete mode 100644 Data/Sys/GameSettings/FCUE01.ini delete mode 100644 Data/Sys/GameSettings/FCUP01.ini create mode 100644 Data/Sys/GameSettings/FCV.ini delete mode 100644 Data/Sys/GameSettings/FCVE01.ini delete mode 100644 Data/Sys/GameSettings/FCVP01.ini create mode 100644 Data/Sys/GameSettings/FCW.ini delete mode 100644 Data/Sys/GameSettings/FCWE01.ini delete mode 100644 Data/Sys/GameSettings/FCWP01.ini create mode 100644 Data/Sys/GameSettings/FCY.ini delete mode 100644 Data/Sys/GameSettings/FCYE01.ini delete mode 100644 Data/Sys/GameSettings/FCYP01.ini create mode 100644 Data/Sys/GameSettings/FD2.ini delete mode 100644 Data/Sys/GameSettings/FD2E01.ini delete mode 100644 Data/Sys/GameSettings/FD2P01.ini create mode 100644 Data/Sys/GameSettings/FD7.ini delete mode 100644 Data/Sys/GameSettings/FD7E01.ini delete mode 100644 Data/Sys/GameSettings/FD7J01.ini delete mode 100644 Data/Sys/GameSettings/FD7P01.ini rename Data/Sys/GameSettings/{FA8F01.ini => FDA.ini} (95%) delete mode 100644 Data/Sys/GameSettings/FDAE01.ini delete mode 100644 Data/Sys/GameSettings/FDAM01.ini create mode 100644 Data/Sys/GameSettings/FDP.ini delete mode 100644 Data/Sys/GameSettings/FDPE01.ini delete mode 100644 Data/Sys/GameSettings/FDPP01.ini create mode 100644 Data/Sys/GameSettings/FDV.ini delete mode 100644 Data/Sys/GameSettings/FDVE01.ini delete mode 100644 Data/Sys/GameSettings/FDVP01.ini rename Data/Sys/GameSettings/{FAXP01.ini => FED.ini} (95%) delete mode 100644 Data/Sys/GameSettings/FEDL01.ini delete mode 100644 Data/Sys/GameSettings/FEDN01.ini create mode 100644 Data/Sys/GameSettings/FEI.ini delete mode 100644 Data/Sys/GameSettings/FEIE01.ini delete mode 100644 Data/Sys/GameSettings/FEIP01.ini create mode 100644 Data/Sys/GameSettings/FEQ.ini delete mode 100644 Data/Sys/GameSettings/FEQE01.ini delete mode 100644 Data/Sys/GameSettings/FEQJ01.ini delete mode 100644 Data/Sys/GameSettings/FEQP01.ini create mode 100644 Data/Sys/GameSettings/FER.ini delete mode 100644 Data/Sys/GameSettings/FERE01.ini delete mode 100644 Data/Sys/GameSettings/FERM01.ini rename Data/Sys/GameSettings/{FA6E01.ini => FES.ini} (95%) delete mode 100644 Data/Sys/GameSettings/FESE01.ini delete mode 100644 Data/Sys/GameSettings/FESP01.ini create mode 100644 Data/Sys/GameSettings/FEU.ini delete mode 100644 Data/Sys/GameSettings/FEUE01.ini delete mode 100644 Data/Sys/GameSettings/FEUP01.ini create mode 100644 Data/Sys/GameSettings/FFA.ini delete mode 100644 Data/Sys/GameSettings/FFAE01.ini delete mode 100644 Data/Sys/GameSettings/FFAM01.ini create mode 100644 Data/Sys/GameSettings/FFE.ini delete mode 100644 Data/Sys/GameSettings/FFEE01.ini delete mode 100644 Data/Sys/GameSettings/FFEP01.ini create mode 100644 Data/Sys/GameSettings/FFM.ini delete mode 100644 Data/Sys/GameSettings/FFME01.ini delete mode 100644 Data/Sys/GameSettings/FFMP01.ini create mode 100644 Data/Sys/GameSettings/FFN.ini delete mode 100644 Data/Sys/GameSettings/FFNE01.ini delete mode 100644 Data/Sys/GameSettings/FFNJ01.ini delete mode 100644 Data/Sys/GameSettings/FFNP01.ini create mode 100644 Data/Sys/GameSettings/FFQ.ini delete mode 100644 Data/Sys/GameSettings/FFQE01.ini delete mode 100644 Data/Sys/GameSettings/FFQM01.ini rename Data/Sys/GameSettings/{G6TE5G.ini => G2O.ini} (95%) rename Data/Sys/GameSettings/{G2TE52.ini => G2T.ini} (90%) delete mode 100644 Data/Sys/GameSettings/G2TP52.ini rename Data/Sys/GameSettings/{G2VE08.ini => G2V.ini} (93%) delete mode 100644 Data/Sys/GameSettings/G2VP08.ini rename Data/Sys/GameSettings/{G2XE8P.ini => G2X.ini} (93%) delete mode 100644 Data/Sys/GameSettings/G2XP8P.ini rename Data/Sys/GameSettings/{G3AP69.ini => G3A.ini} (87%) delete mode 100644 Data/Sys/GameSettings/G3AE69.ini rename Data/Sys/GameSettings/{G3BP9G.ini => G3B.ini} (90%) delete mode 100644 Data/Sys/GameSettings/G3BE9G.ini delete mode 100644 Data/Sys/GameSettings/G3BP54.ini rename Data/Sys/GameSettings/{GRVEA4.ini => G3D.ini} (90%) rename Data/Sys/GameSettings/{G3FE69.ini => G3F.ini} (89%) delete mode 100644 Data/Sys/GameSettings/G3FP69.ini rename Data/Sys/GameSettings/{G3RE52.ini => G3R.ini} (92%) delete mode 100644 Data/Sys/GameSettings/G3RD52.ini delete mode 100644 Data/Sys/GameSettings/G3RF52.ini delete mode 100644 Data/Sys/GameSettings/G3RP52.ini rename Data/Sys/GameSettings/{G3DX6L.ini => G3V.ini} (90%) delete mode 100644 Data/Sys/GameSettings/G3VE69.ini delete mode 100644 Data/Sys/GameSettings/G3VP69.ini rename Data/Sys/GameSettings/{G3XE52.ini => G3X.ini} (92%) rename Data/Sys/GameSettings/{G4BP08.ini => G4B.ini} (89%) rename Data/Sys/GameSettings/{G4CE54.ini => G4C.ini} (89%) delete mode 100644 Data/Sys/GameSettings/G4CP54.ini create mode 100644 Data/Sys/GameSettings/G4F.ini rename Data/Sys/GameSettings/{G4ME69.ini => G4M.ini} (91%) rename Data/Sys/GameSettings/{GL7E64.ini => G4O.ini} (91%) rename Data/Sys/GameSettings/{G4ZE69.ini => G4Z.ini} (90%) delete mode 100644 Data/Sys/GameSettings/G4ZP69.ini rename Data/Sys/GameSettings/{G5DP78.ini => G5D.ini} (91%) rename Data/Sys/GameSettings/{G5NEAF.ini => G5N.ini} (91%) delete mode 100644 Data/Sys/GameSettings/G5NP69.ini rename Data/Sys/GameSettings/{G5SP7D.ini => G5S.ini} (95%) delete mode 100644 Data/Sys/GameSettings/G5SE7D.ini rename Data/Sys/GameSettings/{G5TE69.ini => G5T.ini} (92%) delete mode 100644 Data/Sys/GameSettings/G5TP69.ini rename Data/Sys/GameSettings/{G6FE69.ini => G6F.ini} (86%) delete mode 100644 Data/Sys/GameSettings/G6FF69.ini delete mode 100644 Data/Sys/GameSettings/G6FP69.ini rename Data/Sys/GameSettings/{G6ME69.ini => G6M.ini} (92%) delete mode 100644 Data/Sys/GameSettings/G6MP69.ini rename Data/Sys/GameSettings/{G4FP69.ini => G6N.ini} (93%) delete mode 100644 Data/Sys/GameSettings/G6NE69.ini delete mode 100644 Data/Sys/GameSettings/G6NP69.ini rename Data/Sys/GameSettings/{G6TP5G.ini => G6T.ini} (94%) rename Data/Sys/GameSettings/{G6WE69.ini => G6W.ini} (92%) delete mode 100644 Data/Sys/GameSettings/G6WP69.ini rename Data/Sys/GameSettings/{G9RD7D.ini => G9R.ini} (87%) delete mode 100644 Data/Sys/GameSettings/G9RE7D.ini delete mode 100644 Data/Sys/GameSettings/G9RF7D.ini delete mode 100644 Data/Sys/GameSettings/G9RP7D.ini rename Data/Sys/GameSettings/{G9SE8P.ini => G9S.ini} (93%) delete mode 100644 Data/Sys/GameSettings/G9SJ8P.ini delete mode 100644 Data/Sys/GameSettings/G9SP8P.ini rename Data/Sys/GameSettings/{G9TD52.ini => G9T.ini} (90%) delete mode 100644 Data/Sys/GameSettings/G9TE52.ini delete mode 100644 Data/Sys/GameSettings/G9TF52.ini delete mode 100644 Data/Sys/GameSettings/G9TI52.ini delete mode 100644 Data/Sys/GameSettings/G9TP52.ini create mode 100644 Data/Sys/GameSettings/GAZ.ini delete mode 100644 Data/Sys/GameSettings/GAZD69.ini delete mode 100644 Data/Sys/GameSettings/GAZE69.ini delete mode 100644 Data/Sys/GameSettings/GAZF69.ini delete mode 100644 Data/Sys/GameSettings/GAZH69.ini delete mode 100644 Data/Sys/GameSettings/GAZI69.ini delete mode 100644 Data/Sys/GameSettings/GAZJ69.ini delete mode 100644 Data/Sys/GameSettings/GAZM69.ini delete mode 100644 Data/Sys/GameSettings/GAZP69.ini delete mode 100644 Data/Sys/GameSettings/GAZS69.ini rename Data/Sys/GameSettings/{GB3E51.ini => GB3.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GB3P51.ini rename Data/Sys/GameSettings/{GBHDC8.ini => GBH.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GBHFC8.ini delete mode 100644 Data/Sys/GameSettings/GBHPC8.ini rename Data/Sys/GameSettings/{RDZP01.ini => GBI.ini} (93%) rename Data/Sys/GameSettings/{GBSE8P.ini => GBS.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GBSP8P.ini rename Data/Sys/GameSettings/{GBWF64.ini => GBW.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GBWP64.ini rename Data/Sys/GameSettings/{GBXE51.ini => GBX.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GBXP51.ini create mode 100644 Data/Sys/GameSettings/GC3.ini delete mode 100644 Data/Sys/GameSettings/GC3D78.ini delete mode 100644 Data/Sys/GameSettings/GC3E78.ini delete mode 100644 Data/Sys/GameSettings/GC3F78.ini delete mode 100644 Data/Sys/GameSettings/GC3P78.ini rename Data/Sys/GameSettings/{GC6E01.ini => GC6.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GC6P01.ini rename Data/Sys/GameSettings/{GCDP08.ini => GCD.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GCDE08.ini delete mode 100644 Data/Sys/GameSettings/GCDJ08.ini rename Data/Sys/GameSettings/{GCEE41.ini => GCE.ini} (85%) delete mode 100644 Data/Sys/GameSettings/GCEP41.ini rename Data/Sys/GameSettings/{GCIE69.ini => GCI.ini} (89%) rename Data/Sys/GameSettings/{GCJE41.ini => GCJ.ini} (75%) delete mode 100644 Data/Sys/GameSettings/GCJP41.ini rename Data/Sys/GameSettings/{GCPE6S.ini => GCP.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GCPP6S.ini rename Data/Sys/GameSettings/{GCZE69.ini => GCZ.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GCZP69.ini rename Data/Sys/GameSettings/{GDGE7H.ini => GDG.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GDGP78.ini rename Data/Sys/GameSettings/{GDKEA4.ini => GDK.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GDKJA4.ini delete mode 100644 Data/Sys/GameSettings/GDKPA4.ini rename Data/Sys/GameSettings/{GDME01.ini => GDM.ini} (82%) delete mode 100644 Data/Sys/GameSettings/GDMJ01.ini delete mode 100644 Data/Sys/GameSettings/GDMP01.ini rename Data/Sys/GameSettings/{GDQP6S.ini => GDQ.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GDQE6S.ini rename Data/Sys/GameSettings/{GDSE78.ini => GDS.ini} (94%) rename Data/Sys/GameSettings/{GDXEA4.ini => GDX.ini} (85%) delete mode 100644 Data/Sys/GameSettings/GDXJA4.ini delete mode 100644 Data/Sys/GameSettings/GDXPA4.ini rename Data/Sys/GameSettings/{GEAE8P.ini => GEA.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GEAP8P.ini rename Data/Sys/GameSettings/{GEDE01.ini => GED.ini} (93%) create mode 100644 Data/Sys/GameSettings/GEN.ini delete mode 100644 Data/Sys/GameSettings/GEND69.ini delete mode 100644 Data/Sys/GameSettings/GENE69.ini delete mode 100644 Data/Sys/GameSettings/GENP69.ini delete mode 100644 Data/Sys/GameSettings/GENS69.ini rename Data/Sys/GameSettings/{GEOE08.ini => GEO.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GEOP08.ini rename Data/Sys/GameSettings/{G2OE41.ini => GEZ.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GEZE8P.ini delete mode 100644 Data/Sys/GameSettings/GEZP8P.ini rename Data/Sys/GameSettings/{GFDD69.ini => GF4.ini} (92%) rename Data/Sys/GameSettings/{G4FE69.ini => GF6.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GF6E69.ini delete mode 100644 Data/Sys/GameSettings/GF6F69.ini create mode 100644 Data/Sys/GameSettings/GFA.ini delete mode 100644 Data/Sys/GameSettings/GFAD69.ini delete mode 100644 Data/Sys/GameSettings/GFAE69.ini delete mode 100644 Data/Sys/GameSettings/GFAP69.ini delete mode 100644 Data/Sys/GameSettings/GFAS69.ini rename Data/Sys/GameSettings/{GF4F52.ini => GFD.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GFDE69.ini rename Data/Sys/GameSettings/{GFGEA4.ini => GFG.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GFGPA4.ini rename Data/Sys/GameSettings/{GGEE41.ini => GGE.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GGEP41.ini delete mode 100644 Data/Sys/GameSettings/GGEY41.ini rename Data/Sys/GameSettings/{GGPE01.ini => GGP.ini} (93%) rename Data/Sys/GameSettings/{GGVP78.ini => GGV.ini} (80%) delete mode 100644 Data/Sys/GameSettings/GGVD78.ini delete mode 100644 Data/Sys/GameSettings/GGVE78.ini delete mode 100644 Data/Sys/GameSettings/GGVX78.ini rename Data/Sys/GameSettings/{GGYE41.ini => GGY.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GGYP41.ini rename Data/Sys/GameSettings/{GGZE52.ini => GGZ.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GGZX52.ini rename Data/Sys/GameSettings/{GH2P69.ini => GH2.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GH2E69.ini rename Data/Sys/GameSettings/{G3AD69.ini => GH4.ini} (80%) delete mode 100644 Data/Sys/GameSettings/GH4D69.ini delete mode 100644 Data/Sys/GameSettings/GH4E69.ini delete mode 100644 Data/Sys/GameSettings/GH4F69.ini delete mode 100644 Data/Sys/GameSettings/GH4H69.ini delete mode 100644 Data/Sys/GameSettings/GH4I69.ini delete mode 100644 Data/Sys/GameSettings/GH4J69.ini delete mode 100644 Data/Sys/GameSettings/GH4M69.ini delete mode 100644 Data/Sys/GameSettings/GH4P69.ini delete mode 100644 Data/Sys/GameSettings/GH4S69.ini rename Data/Sys/GameSettings/{GH5F52.ini => GH5.ini} (87%) delete mode 100644 Data/Sys/GameSettings/GH5D52.ini delete mode 100644 Data/Sys/GameSettings/GH5E52.ini rename Data/Sys/GameSettings/{GN6P69.ini => GHB.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GHBE7D.ini delete mode 100644 Data/Sys/GameSettings/GHBP7D.ini rename Data/Sys/GameSettings/{GHCE4Q.ini => GHC.ini} (92%) rename Data/Sys/GameSettings/{GHKF7D.ini => GHK.ini} (87%) delete mode 100644 Data/Sys/GameSettings/GHKD7D.ini delete mode 100644 Data/Sys/GameSettings/GHKE7D.ini delete mode 100644 Data/Sys/GameSettings/GHKP7D.ini delete mode 100644 Data/Sys/GameSettings/GHKS7D.ini create mode 100644 Data/Sys/GameSettings/GHL.ini delete mode 100644 Data/Sys/GameSettings/GHLE69.ini delete mode 100644 Data/Sys/GameSettings/GHLJ69.ini delete mode 100644 Data/Sys/GameSettings/GHLP69.ini delete mode 100644 Data/Sys/GameSettings/GHLX69.ini delete mode 100644 Data/Sys/GameSettings/GHLY69.ini delete mode 100644 Data/Sys/GameSettings/GHLZ69.ini rename Data/Sys/GameSettings/{GHMD4F.ini => GHM.ini} (89%) delete mode 100644 Data/Sys/GameSettings/GHMP4F.ini rename Data/Sys/GameSettings/{GNED78.ini => GHN.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GHNE71.ini delete mode 100644 Data/Sys/GameSettings/GHNX71.ini create mode 100644 Data/Sys/GameSettings/GHQ.ini delete mode 100644 Data/Sys/GameSettings/GHQE7D.ini delete mode 100644 Data/Sys/GameSettings/GHQP7D.ini rename Data/Sys/GameSettings/{GHSE69.ini => GHS.ini} (89%) delete mode 100644 Data/Sys/GameSettings/GHSJ69.ini delete mode 100644 Data/Sys/GameSettings/GHSP69.ini delete mode 100644 Data/Sys/GameSettings/GHSX69.ini delete mode 100644 Data/Sys/GameSettings/GHSY69.ini create mode 100644 Data/Sys/GameSettings/GHU.ini delete mode 100644 Data/Sys/GameSettings/GHUE7D.ini delete mode 100644 Data/Sys/GameSettings/GHUF7D.ini delete mode 100644 Data/Sys/GameSettings/GHUP7D.ini rename Data/Sys/GameSettings/{GT4D52.ini => GIA.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GIAP7D.ini rename Data/Sys/GameSettings/{GICJG9.ini => GIC.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GICD78.ini delete mode 100644 Data/Sys/GameSettings/GICF78.ini delete mode 100644 Data/Sys/GameSettings/GICP78.ini rename Data/Sys/GameSettings/{GILE51.ini => GIL.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GILP51.ini rename Data/Sys/GameSettings/{GISE36.ini => GIS.ini} (92%) rename Data/Sys/GameSettings/{RTNE41.ini => GIT.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GITE01.ini delete mode 100644 Data/Sys/GameSettings/GITP01.ini rename Data/Sys/GameSettings/{GJKD52.ini => GJK.ini} (85%) delete mode 100644 Data/Sys/GameSettings/GJKE52.ini delete mode 100644 Data/Sys/GameSettings/GJKF52.ini delete mode 100644 Data/Sys/GameSettings/GJKP52.ini rename Data/Sys/GameSettings/{GJUF78.ini => GJU.ini} (89%) rename Data/Sys/GameSettings/{G4FD69.ini => GJX.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GJXE51.ini delete mode 100644 Data/Sys/GameSettings/GJXP51.ini rename Data/Sys/GameSettings/{GK2F52.ini => GK2.ini} (81%) delete mode 100644 Data/Sys/GameSettings/GK2D52.ini delete mode 100644 Data/Sys/GameSettings/GK2E52.ini delete mode 100644 Data/Sys/GameSettings/GK2I52.ini delete mode 100644 Data/Sys/GameSettings/GK2P52.ini rename Data/Sys/GameSettings/{G2OP41.ini => GK5.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GK5E78.ini delete mode 100644 Data/Sys/GameSettings/GK5X78.ini rename Data/Sys/GameSettings/{GK7E08.ini => GK7.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GK7P08.ini rename Data/Sys/GameSettings/{GKHEA4.ini => GKH.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GKHPA4.ini rename Data/Sys/GameSettings/{G3XP52.ini => GKL.ini} (82%) delete mode 100644 Data/Sys/GameSettings/GKLD69.ini delete mode 100644 Data/Sys/GameSettings/GKLE69.ini delete mode 100644 Data/Sys/GameSettings/GKLF69.ini delete mode 100644 Data/Sys/GameSettings/GKLI69.ini delete mode 100644 Data/Sys/GameSettings/GKLJ69.ini delete mode 100644 Data/Sys/GameSettings/GKLP69.ini delete mode 100644 Data/Sys/GameSettings/GKLS69.ini rename Data/Sys/GameSettings/{GKMP41.ini => GKM.ini} (89%) rename Data/Sys/GameSettings/{GKME41.ini => GKO.ini} (90%) rename Data/Sys/GameSettings/{GKYJ01.ini => GKY.ini} (92%) rename Data/Sys/GameSettings/{GKZD9G.ini => GKZ.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GKZE9G.ini delete mode 100644 Data/Sys/GameSettings/GKZF9G.ini delete mode 100644 Data/Sys/GameSettings/GKZP54.ini rename Data/Sys/GameSettings/{GL7P64.ini => GL7.ini} (91%) rename Data/Sys/GameSettings/{GL8E4F.ini => GL8.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GL8F4F.ini rename Data/Sys/GameSettings/{GLCE52.ini => GLC.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GLCF52.ini rename Data/Sys/GameSettings/{GLRD64.ini => GLR.ini} (86%) delete mode 100644 Data/Sys/GameSettings/GLRF64.ini delete mode 100644 Data/Sys/GameSettings/GLRJ13.ini delete mode 100644 Data/Sys/GameSettings/GLRP64.ini rename Data/Sys/GameSettings/{GLSD64.ini => GLS.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GLSE64.ini delete mode 100644 Data/Sys/GameSettings/GLSF64.ini delete mode 100644 Data/Sys/GameSettings/GLSP64.ini create mode 100644 Data/Sys/GameSettings/GLY.ini delete mode 100644 Data/Sys/GameSettings/GLYE69.ini delete mode 100644 Data/Sys/GameSettings/GLYP69.ini rename Data/Sys/GameSettings/{G4OP69.ini => GLZ.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GLZE69.ini delete mode 100644 Data/Sys/GameSettings/GLZF69.ini rename Data/Sys/GameSettings/{GM2E8P.ini => GM2.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GM2J8P.ini delete mode 100644 Data/Sys/GameSettings/GM2P8P.ini rename Data/Sys/GameSettings/{GM3E69.ini => GM3.ini} (93%) create mode 100644 Data/Sys/GameSettings/GM5.ini delete mode 100644 Data/Sys/GameSettings/GM5E7D.ini delete mode 100644 Data/Sys/GameSettings/GM5F7D.ini delete mode 100644 Data/Sys/GameSettings/GM5P7D.ini rename Data/Sys/GameSettings/{GM6EE9.ini => GM6.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GM6PE9.ini rename Data/Sys/GameSettings/{GMHE52.ini => GMH.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GMHF52.ini delete mode 100644 Data/Sys/GameSettings/GMHP52.ini rename Data/Sys/GameSettings/{GMIE70.ini => GMI.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GMIP70.ini rename Data/Sys/GameSettings/{GMNE78.ini => GMN.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GMNP78.ini rename Data/Sys/GameSettings/{GN6E69.ini => GN6.ini} (94%) rename Data/Sys/GameSettings/{GN7E69.ini => GN7.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GN7P69.ini create mode 100644 Data/Sys/GameSettings/GN8.ini delete mode 100644 Data/Sys/GameSettings/GN8E69.ini delete mode 100644 Data/Sys/GameSettings/GN8P69.ini rename Data/Sys/GameSettings/{GNEE78.ini => GNE.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GNEF78.ini delete mode 100644 Data/Sys/GameSettings/GNEP78.ini delete mode 100644 Data/Sys/GameSettings/GNES78.ini rename Data/Sys/GameSettings/{GNIEA4.ini => GNI.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GNIPA4.ini rename Data/Sys/GameSettings/{GNNE69.ini => GNN.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GNNP69.ini rename Data/Sys/GameSettings/{GNZE69.ini => GNZ.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GNZP69.ini rename Data/Sys/GameSettings/{GO2F4F.ini => GO2.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GO2D4F.ini delete mode 100644 Data/Sys/GameSettings/GO2E4F.ini delete mode 100644 Data/Sys/GameSettings/GO2P4F.ini rename Data/Sys/GameSettings/{GOBE4Z.ini => GOB.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GOBP7N.ini rename Data/Sys/GameSettings/{GOSE41.ini => GOS.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GOSX41.ini rename Data/Sys/GameSettings/{GOSP41.ini => GOW.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GOWD69.ini delete mode 100644 Data/Sys/GameSettings/GOWE69.ini delete mode 100644 Data/Sys/GameSettings/GOWF69.ini delete mode 100644 Data/Sys/GameSettings/GOWJ69.ini delete mode 100644 Data/Sys/GameSettings/GOWP69.ini rename Data/Sys/GameSettings/{GOYD69.ini => GOY.ini} (89%) delete mode 100644 Data/Sys/GameSettings/GOYF69.ini delete mode 100644 Data/Sys/GameSettings/GOYP69.ini delete mode 100644 Data/Sys/GameSettings/GOYS69.ini rename Data/Sys/GameSettings/{GP2E82.ini => GP2.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GP2EAF.ini rename Data/Sys/GameSettings/{GP6J01.ini => GP6.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GP6E01.ini delete mode 100644 Data/Sys/GameSettings/GP6P01.ini rename Data/Sys/GameSettings/{GPAE01.ini => GPA.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GPAJ01.ini delete mode 100644 Data/Sys/GameSettings/GPAP01.ini delete mode 100644 Data/Sys/GameSettings/GPAU01.ini create mode 100644 Data/Sys/GameSettings/GPH.ini delete mode 100644 Data/Sys/GameSettings/GPHD52.ini delete mode 100644 Data/Sys/GameSettings/GPHE52.ini delete mode 100644 Data/Sys/GameSettings/GPHP52.ini rename Data/Sys/GameSettings/{GPTE41.ini => GPT.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GPTP41.ini rename Data/Sys/GameSettings/{GPXE01.ini => GPX.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GPXP01.ini rename Data/Sys/GameSettings/{GQCD52.ini => GQC.ini} (84%) delete mode 100644 Data/Sys/GameSettings/GQCE52.ini delete mode 100644 Data/Sys/GameSettings/GQCF52.ini delete mode 100644 Data/Sys/GameSettings/GQCP52.ini delete mode 100644 Data/Sys/GameSettings/GQCS52.ini rename Data/Sys/GameSettings/{GCIP69.ini => GQQ.ini} (71%) delete mode 100644 Data/Sys/GameSettings/GQQD78.ini delete mode 100644 Data/Sys/GameSettings/GQQE78.ini delete mode 100644 Data/Sys/GameSettings/GQQF78.ini delete mode 100644 Data/Sys/GameSettings/GQQH78.ini delete mode 100644 Data/Sys/GameSettings/GQQP78.ini rename Data/Sys/GameSettings/{GQSDAF.ini => GQS.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GQSFAF.ini delete mode 100644 Data/Sys/GameSettings/GQSPAF.ini create mode 100644 Data/Sys/GameSettings/GQW.ini delete mode 100644 Data/Sys/GameSettings/GQWE69.ini delete mode 100644 Data/Sys/GameSettings/GQWJ69.ini delete mode 100644 Data/Sys/GameSettings/GQWP69.ini delete mode 100644 Data/Sys/GameSettings/GQWX69.ini rename Data/Sys/GameSettings/{GM3P69.ini => GQX.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GQXE69.ini delete mode 100644 Data/Sys/GameSettings/GQXP69.ini rename Data/Sys/GameSettings/{GH5P52.ini => GR8.ini} (83%) delete mode 100644 Data/Sys/GameSettings/GR8D69.ini delete mode 100644 Data/Sys/GameSettings/GR8E69.ini delete mode 100644 Data/Sys/GameSettings/GR8F69.ini delete mode 100644 Data/Sys/GameSettings/GR8J69.ini delete mode 100644 Data/Sys/GameSettings/GR8P69.ini rename Data/Sys/GameSettings/{GDSP78.ini => GRB.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GRBP6S.ini rename Data/Sys/GameSettings/{GRJP69.ini => GRJ.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GRJEAF.ini delete mode 100644 Data/Sys/GameSettings/GRJJAF.ini rename Data/Sys/GameSettings/{GRKE41.ini => GRK.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GRKP7G.ini rename Data/Sys/GameSettings/{G3DE6L.ini => GRV.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GRVJA4.ini rename Data/Sys/GameSettings/{GS2D78.ini => GS2.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GS2E78.ini delete mode 100644 Data/Sys/GameSettings/GS2F78.ini delete mode 100644 Data/Sys/GameSettings/GS2P78.ini rename Data/Sys/GameSettings/{GSAE01.ini => GSA.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GSAJ01.ini rename Data/Sys/GameSettings/{GSMD52.ini => GSM.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GSME52.ini delete mode 100644 Data/Sys/GameSettings/GSMF52.ini delete mode 100644 Data/Sys/GameSettings/GSMP52.ini rename Data/Sys/GameSettings/{GSOE8P.ini => GSO.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GSOP8P.ini rename Data/Sys/GameSettings/{GSQE78.ini => GSQ.ini} (85%) delete mode 100644 Data/Sys/GameSettings/GSQP78.ini rename Data/Sys/GameSettings/{GSWD64.ini => GSW.ini} (86%) delete mode 100644 Data/Sys/GameSettings/GSWE64.ini delete mode 100644 Data/Sys/GameSettings/GSWF64.ini delete mode 100644 Data/Sys/GameSettings/GSWI64.ini delete mode 100644 Data/Sys/GameSettings/GSWJ64.ini delete mode 100644 Data/Sys/GameSettings/GSWP64.ini delete mode 100644 Data/Sys/GameSettings/GSWS64.ini rename Data/Sys/GameSettings/{GT3J52.ini => GT3.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GT3D52.ini delete mode 100644 Data/Sys/GameSettings/GT3E52.ini rename Data/Sys/GameSettings/{GT4E52.ini => GT4.ini} (87%) delete mode 100644 Data/Sys/GameSettings/GT4F52.ini delete mode 100644 Data/Sys/GameSettings/GT4P52.ini rename Data/Sys/GameSettings/{GT7X41.ini => GT7.ini} (89%) delete mode 100644 Data/Sys/GameSettings/GT7E41.ini delete mode 100644 Data/Sys/GameSettings/GT7P41.ini create mode 100644 Data/Sys/GameSettings/GTK.ini delete mode 100644 Data/Sys/GameSettings/GTKE51.ini delete mode 100644 Data/Sys/GameSettings/GTKP51.ini rename Data/Sys/GameSettings/{GTLE52.ini => GTL.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GTLP52.ini delete mode 100644 Data/Sys/GameSettings/GTLX52.ini rename Data/Sys/GameSettings/{GTRE78.ini => GTR.ini} (89%) delete mode 100644 Data/Sys/GameSettings/GTRP78.ini rename Data/Sys/GameSettings/{GTWE70.ini => GTW.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GTWP70.ini rename Data/Sys/GameSettings/{GBIP08.ini => GTY.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GTYE69.ini delete mode 100644 Data/Sys/GameSettings/GTYP69.ini rename Data/Sys/GameSettings/{GTZE41.ini => GTZ.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GTZP41.ini create mode 100644 Data/Sys/GameSettings/GUB.ini delete mode 100644 Data/Sys/GameSettings/GUBE69.ini delete mode 100644 Data/Sys/GameSettings/GUBP69.ini rename Data/Sys/GameSettings/{GUME52.ini => GUM.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GUMP52.ini rename Data/Sys/GameSettings/{GUPP8P.ini => GUP.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GUPE8P.ini delete mode 100644 Data/Sys/GameSettings/GUPJ8P.ini rename Data/Sys/GameSettings/{GUTD52.ini => GUT.ini} (87%) delete mode 100644 Data/Sys/GameSettings/GUTF52.ini delete mode 100644 Data/Sys/GameSettings/GUTI52.ini delete mode 100644 Data/Sys/GameSettings/GUTJC0.ini delete mode 100644 Data/Sys/GameSettings/GUTP52.ini delete mode 100644 Data/Sys/GameSettings/GUTS52.ini rename Data/Sys/GameSettings/{GUZE41.ini => GUZ.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GUZP41.ini rename Data/Sys/GameSettings/{GBWE64.ini => GVC.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GVCE08.ini delete mode 100644 Data/Sys/GameSettings/GVCP08.ini rename Data/Sys/GameSettings/{GBWD64.ini => GVJ.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GVJJ08.ini delete mode 100644 Data/Sys/GameSettings/GVJP08.ini rename Data/Sys/GameSettings/{GVLD69.ini => GVL.ini} (87%) delete mode 100644 Data/Sys/GameSettings/GVLE69.ini delete mode 100644 Data/Sys/GameSettings/GVLF69.ini delete mode 100644 Data/Sys/GameSettings/GVLP69.ini rename Data/Sys/GameSettings/{GVJE08.ini => GVO.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GVOE69.ini delete mode 100644 Data/Sys/GameSettings/GVOP69.ini rename Data/Sys/GameSettings/{GGPE02.ini => GVS.ini} (89%) delete mode 100644 Data/Sys/GameSettings/GVS46E.ini delete mode 100644 Data/Sys/GameSettings/GVS46J.ini rename Data/Sys/GameSettings/{GW2E78.ini => GW2.ini} (92%) rename Data/Sys/GameSettings/{G4OE69.ini => GW3.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GW3E78.ini delete mode 100644 Data/Sys/GameSettings/GW3P78.ini create mode 100644 Data/Sys/GameSettings/GW5.ini delete mode 100644 Data/Sys/GameSettings/GW5D69.ini delete mode 100644 Data/Sys/GameSettings/GW5E69.ini delete mode 100644 Data/Sys/GameSettings/GW5F69.ini delete mode 100644 Data/Sys/GameSettings/GW5P69.ini rename Data/Sys/GameSettings/{GW7D69.ini => GW7.ini} (88%) delete mode 100644 Data/Sys/GameSettings/GW7E69.ini delete mode 100644 Data/Sys/GameSettings/GW7P69.ini create mode 100644 Data/Sys/GameSettings/GWA.ini delete mode 100644 Data/Sys/GameSettings/GWAE8P.ini delete mode 100644 Data/Sys/GameSettings/GWAF8P.ini delete mode 100644 Data/Sys/GameSettings/GWAP8P.ini rename Data/Sys/GameSettings/{GWEE51.ini => GWE.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GWEJB0.ini rename Data/Sys/GameSettings/{GW2P78.ini => GWP.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GWPE78.ini delete mode 100644 Data/Sys/GameSettings/GWPJG2.ini delete mode 100644 Data/Sys/GameSettings/GWPP78.ini rename Data/Sys/GameSettings/{GWTEA4.ini => GWT.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GWTJA4.ini delete mode 100644 Data/Sys/GameSettings/GWTPA4.ini create mode 100644 Data/Sys/GameSettings/GWV.ini delete mode 100644 Data/Sys/GameSettings/GWVE52.ini delete mode 100644 Data/Sys/GameSettings/GWVP52.ini delete mode 100644 Data/Sys/GameSettings/GWVX52.ini create mode 100644 Data/Sys/GameSettings/GX2.ini delete mode 100644 Data/Sys/GameSettings/GX2E52.ini delete mode 100644 Data/Sys/GameSettings/GX2P52.ini rename Data/Sys/GameSettings/{GX3E41.ini => GX3.ini} (94%) delete mode 100644 Data/Sys/GameSettings/GX3P41.ini delete mode 100644 Data/Sys/GameSettings/GX3X41.ini rename Data/Sys/GameSettings/{GXBE69.ini => GXB.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GXBP69.ini rename Data/Sys/GameSettings/{G4FF69.ini => GXC.ini} (93%) delete mode 100644 Data/Sys/GameSettings/GXCE01.ini delete mode 100644 Data/Sys/GameSettings/GXCJ01.ini rename Data/Sys/GameSettings/{G6FD69.ini => GXE.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GXEE8P.ini delete mode 100644 Data/Sys/GameSettings/GXEJ8P.ini create mode 100644 Data/Sys/GameSettings/GXF.ini delete mode 100644 Data/Sys/GameSettings/GXFE69.ini delete mode 100644 Data/Sys/GameSettings/GXFF69.ini delete mode 100644 Data/Sys/GameSettings/GXFP69.ini rename Data/Sys/GameSettings/{GRBE6S.ini => GXM.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GXME52.ini delete mode 100644 Data/Sys/GameSettings/GXMF52.ini delete mode 100644 Data/Sys/GameSettings/GXMP52.ini create mode 100644 Data/Sys/GameSettings/GXO.ini delete mode 100644 Data/Sys/GameSettings/GXOE69.ini delete mode 100644 Data/Sys/GameSettings/GXOX69.ini rename Data/Sys/GameSettings/{GXSE8P.ini => GXS.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GXSP6W.ini rename Data/Sys/GameSettings/{GXXE01.ini => GXX.ini} (95%) delete mode 100644 Data/Sys/GameSettings/GXXP01.ini rename Data/Sys/GameSettings/{GYQE01.ini => GYQ.ini} (92%) delete mode 100644 Data/Sys/GameSettings/GYQJ01.ini delete mode 100644 Data/Sys/GameSettings/GYQP01.ini rename Data/Sys/GameSettings/{GYTE69.ini => GYT.ini} (91%) delete mode 100644 Data/Sys/GameSettings/GYTP69.ini create mode 100644 Data/Sys/GameSettings/GYW.ini delete mode 100644 Data/Sys/GameSettings/GYWD41.ini delete mode 100644 Data/Sys/GameSettings/GYWEE9.ini delete mode 100644 Data/Sys/GameSettings/GYWP41.ini rename Data/Sys/GameSettings/{GZDE70.ini => GZD.ini} (86%) delete mode 100644 Data/Sys/GameSettings/GZDJ70.ini delete mode 100644 Data/Sys/GameSettings/GZDP70.ini rename Data/Sys/GameSettings/{GZWE01.ini => GZW.ini} (90%) delete mode 100644 Data/Sys/GameSettings/GZWJ01.ini delete mode 100644 Data/Sys/GameSettings/GZWP01.ini rename Data/Sys/GameSettings/{HABA01.ini => HAB.ini} (92%) delete mode 100644 Data/Sys/GameSettings/HABK01.ini rename Data/Sys/GameSettings/{LABE8P.ini => LAB.ini} (93%) create mode 100644 Data/Sys/GameSettings/LAC.ini delete mode 100644 Data/Sys/GameSettings/LACP8P.ini create mode 100644 Data/Sys/GameSettings/LAD.ini rename Data/Sys/GameSettings/{LACE8P.ini => LAE.ini} (93%) delete mode 100644 Data/Sys/GameSettings/LAEE8P.ini delete mode 100644 Data/Sys/GameSettings/LAEP8P.ini rename Data/Sys/GameSettings/{LADJ8P.ini => LAF.ini} (93%) delete mode 100644 Data/Sys/GameSettings/LAFP8P.ini create mode 100644 Data/Sys/GameSettings/LAG.ini delete mode 100644 Data/Sys/GameSettings/LAGE8P.ini delete mode 100644 Data/Sys/GameSettings/LAGJ8P.ini delete mode 100644 Data/Sys/GameSettings/LAGP8P.ini rename Data/Sys/GameSettings/{LABP8P.ini => LAI.ini} (93%) delete mode 100644 Data/Sys/GameSettings/LAIE8P.ini delete mode 100644 Data/Sys/GameSettings/LAIP8P.ini create mode 100644 Data/Sys/GameSettings/LAJ.ini delete mode 100644 Data/Sys/GameSettings/LAJE8P.ini delete mode 100644 Data/Sys/GameSettings/LAJJ8P.ini delete mode 100644 Data/Sys/GameSettings/LAJP8P.ini create mode 100644 Data/Sys/GameSettings/LAK.ini delete mode 100644 Data/Sys/GameSettings/LAKE8P.ini delete mode 100644 Data/Sys/GameSettings/LAKJ8P.ini delete mode 100644 Data/Sys/GameSettings/LAKP8P.ini create mode 100644 Data/Sys/GameSettings/LAL.ini delete mode 100644 Data/Sys/GameSettings/LALE8P.ini delete mode 100644 Data/Sys/GameSettings/LALP8P.ini create mode 100644 Data/Sys/GameSettings/LAM.ini delete mode 100644 Data/Sys/GameSettings/LAME8P.ini delete mode 100644 Data/Sys/GameSettings/LAMJ8P.ini delete mode 100644 Data/Sys/GameSettings/LAMP8P.ini rename Data/Sys/GameSettings/{LADP8P.ini => LAN.ini} (93%) delete mode 100644 Data/Sys/GameSettings/LANE8P.ini delete mode 100644 Data/Sys/GameSettings/LANP8P.ini rename Data/Sys/GameSettings/{LADE8P.ini => LAO.ini} (94%) delete mode 100644 Data/Sys/GameSettings/LAOE8P.ini delete mode 100644 Data/Sys/GameSettings/LAOP8P.ini rename Data/Sys/GameSettings/{LAFN8P.ini => LAP.ini} (93%) delete mode 100644 Data/Sys/GameSettings/LAPE8P.ini delete mode 100644 Data/Sys/GameSettings/LAPP8P.ini create mode 100644 Data/Sys/GameSettings/LAQ.ini delete mode 100644 Data/Sys/GameSettings/LAQE8P.ini delete mode 100644 Data/Sys/GameSettings/LAQP8P.ini create mode 100644 Data/Sys/GameSettings/MA6.ini create mode 100644 Data/Sys/GameSettings/MA8.ini create mode 100644 Data/Sys/GameSettings/MAD.ini delete mode 100644 Data/Sys/GameSettings/MADE8P.ini delete mode 100644 Data/Sys/GameSettings/MADP8P.ini rename Data/Sys/GameSettings/{LACJ8P.ini => MAE.ini} (93%) delete mode 100644 Data/Sys/GameSettings/MAEE8P.ini delete mode 100644 Data/Sys/GameSettings/MAEP8P.ini create mode 100644 Data/Sys/GameSettings/MAL.ini delete mode 100644 Data/Sys/GameSettings/MALE8P.ini delete mode 100644 Data/Sys/GameSettings/MALP8P.ini create mode 100644 Data/Sys/GameSettings/MAM.ini delete mode 100644 Data/Sys/GameSettings/MAME8P.ini delete mode 100644 Data/Sys/GameSettings/MAMP8P.ini rename Data/Sys/GameSettings/{MA6P8P.ini => MAN.ini} (93%) delete mode 100644 Data/Sys/GameSettings/MANE8P.ini delete mode 100644 Data/Sys/GameSettings/MANP8P.ini create mode 100644 Data/Sys/GameSettings/MAO.ini delete mode 100644 Data/Sys/GameSettings/MAOE8P.ini delete mode 100644 Data/Sys/GameSettings/MAOP8P.ini create mode 100644 Data/Sys/GameSettings/MAQ.ini delete mode 100644 Data/Sys/GameSettings/MAQE8P.ini delete mode 100644 Data/Sys/GameSettings/MAQP8P.ini create mode 100644 Data/Sys/GameSettings/MAR.ini delete mode 100644 Data/Sys/GameSettings/MARE8P.ini delete mode 100644 Data/Sys/GameSettings/MARP8P.ini rename Data/Sys/GameSettings/{MA6E8P.ini => MAS.ini} (94%) delete mode 100644 Data/Sys/GameSettings/MASE8P.ini delete mode 100644 Data/Sys/GameSettings/MASP8P.ini create mode 100644 Data/Sys/GameSettings/MAT.ini delete mode 100644 Data/Sys/GameSettings/MATE8P.ini delete mode 100644 Data/Sys/GameSettings/MATP8P.ini create mode 100644 Data/Sys/GameSettings/MAV.ini delete mode 100644 Data/Sys/GameSettings/MAVE8P.ini delete mode 100644 Data/Sys/GameSettings/MAVP8P.ini create mode 100644 Data/Sys/GameSettings/MAW.ini delete mode 100644 Data/Sys/GameSettings/MAWE8P.ini delete mode 100644 Data/Sys/GameSettings/MAWP8P.ini rename Data/Sys/GameSettings/{MA8E8P.ini => MAY.ini} (93%) delete mode 100644 Data/Sys/GameSettings/MAYE8P.ini delete mode 100644 Data/Sys/GameSettings/MAYP8P.ini create mode 100644 Data/Sys/GameSettings/MAZ.ini delete mode 100644 Data/Sys/GameSettings/MAZE8P.ini delete mode 100644 Data/Sys/GameSettings/MAZP8P.ini create mode 100644 Data/Sys/GameSettings/MB8.ini delete mode 100644 Data/Sys/GameSettings/MB8E8P.ini delete mode 100644 Data/Sys/GameSettings/MB8P8P.ini create mode 100644 Data/Sys/GameSettings/MBB.ini delete mode 100644 Data/Sys/GameSettings/MBBE8P.ini delete mode 100644 Data/Sys/GameSettings/MBBP8P.ini create mode 100644 Data/Sys/GameSettings/MBC.ini delete mode 100644 Data/Sys/GameSettings/MBCE8P.ini delete mode 100644 Data/Sys/GameSettings/MBCP8P.ini create mode 100644 Data/Sys/GameSettings/MBD.ini delete mode 100644 Data/Sys/GameSettings/MBDE8P.ini delete mode 100644 Data/Sys/GameSettings/MBDP8P.ini create mode 100644 Data/Sys/GameSettings/MBE.ini delete mode 100644 Data/Sys/GameSettings/MBEE8P.ini delete mode 100644 Data/Sys/GameSettings/MBEP8P.ini rename Data/Sys/GameSettings/{MA8P8P.ini => MBF.ini} (93%) delete mode 100644 Data/Sys/GameSettings/MBFE8P.ini delete mode 100644 Data/Sys/GameSettings/MBFP8P.ini create mode 100644 Data/Sys/GameSettings/MBG.ini delete mode 100644 Data/Sys/GameSettings/MBGE8P.ini delete mode 100644 Data/Sys/GameSettings/MBGP8P.ini create mode 100644 Data/Sys/GameSettings/MBI.ini delete mode 100644 Data/Sys/GameSettings/MBIE8P.ini delete mode 100644 Data/Sys/GameSettings/MBIP8P.ini create mode 100644 Data/Sys/GameSettings/MBM.ini delete mode 100644 Data/Sys/GameSettings/MBME8P.ini delete mode 100644 Data/Sys/GameSettings/MBMP8P.ini create mode 100644 Data/Sys/GameSettings/MBO.ini delete mode 100644 Data/Sys/GameSettings/MBOE8P.ini delete mode 100644 Data/Sys/GameSettings/MBOP8P.ini create mode 100644 Data/Sys/GameSettings/MBP.ini delete mode 100644 Data/Sys/GameSettings/MBPE8P.ini delete mode 100644 Data/Sys/GameSettings/MBPP8P.ini create mode 100644 Data/Sys/GameSettings/MBQ.ini delete mode 100644 Data/Sys/GameSettings/MBQE8P.ini delete mode 100644 Data/Sys/GameSettings/MBQP8P.ini create mode 100644 Data/Sys/GameSettings/MBR.ini delete mode 100644 Data/Sys/GameSettings/MBRE8P.ini delete mode 100644 Data/Sys/GameSettings/MBRP8P.ini create mode 100644 Data/Sys/GameSettings/MBT.ini delete mode 100644 Data/Sys/GameSettings/MBTE8P.ini delete mode 100644 Data/Sys/GameSettings/MBTP8P.ini create mode 100644 Data/Sys/GameSettings/MBU.ini delete mode 100644 Data/Sys/GameSettings/MBUE8P.ini delete mode 100644 Data/Sys/GameSettings/MBUP8P.ini rename Data/Sys/GameSettings/{NAFE01.ini => NAF.ini} (94%) delete mode 100644 Data/Sys/GameSettings/NAFP01.ini rename Data/Sys/GameSettings/{NAHE01.ini => NAH.ini} (83%) delete mode 100644 Data/Sys/GameSettings/NAHP01.ini create mode 100644 Data/Sys/GameSettings/PAG.ini create mode 100644 Data/Sys/GameSettings/PAO.ini create mode 100644 Data/Sys/GameSettings/PAR.ini delete mode 100644 Data/Sys/GameSettings/PARL18.ini delete mode 100644 Data/Sys/GameSettings/PARN18.ini rename Data/Sys/GameSettings/{PAGL18.ini => PC2.ini} (93%) delete mode 100644 Data/Sys/GameSettings/PC2E18.ini delete mode 100644 Data/Sys/GameSettings/PC2P18.ini rename Data/Sys/GameSettings/{PAGN18.ini => PCO.ini} (93%) delete mode 100644 Data/Sys/GameSettings/PCOE18.ini delete mode 100644 Data/Sys/GameSettings/PCOP18.ini rename Data/Sys/GameSettings/{PAON18.ini => PCR.ini} (93%) delete mode 100644 Data/Sys/GameSettings/PCRL18.ini delete mode 100644 Data/Sys/GameSettings/PCRN18.ini create mode 100644 Data/Sys/GameSettings/PCS.ini delete mode 100644 Data/Sys/GameSettings/PCSL18.ini delete mode 100644 Data/Sys/GameSettings/PCSN18.ini create mode 100644 Data/Sys/GameSettings/PDJ.ini delete mode 100644 Data/Sys/GameSettings/PDJL18.ini delete mode 100644 Data/Sys/GameSettings/PDJN18.ini rename Data/Sys/GameSettings/{PZLE01.ini => PZL.ini} (90%) delete mode 100644 Data/Sys/GameSettings/PZLJ01.ini delete mode 100644 Data/Sys/GameSettings/PZLP01.ini create mode 100644 Data/Sys/GameSettings/QAA.ini delete mode 100644 Data/Sys/GameSettings/QAAE18.ini delete mode 100644 Data/Sys/GameSettings/QAAP18.ini create mode 100644 Data/Sys/GameSettings/QAB.ini delete mode 100644 Data/Sys/GameSettings/QABE18.ini delete mode 100644 Data/Sys/GameSettings/QABP18.ini rename Data/Sys/GameSettings/{PAOL18.ini => QAC.ini} (93%) delete mode 100644 Data/Sys/GameSettings/QACL18.ini delete mode 100644 Data/Sys/GameSettings/QACN18.ini create mode 100644 Data/Sys/GameSettings/QAD.ini delete mode 100644 Data/Sys/GameSettings/QADL18.ini delete mode 100644 Data/Sys/GameSettings/QADN18.ini create mode 100644 Data/Sys/GameSettings/QAP.ini delete mode 100644 Data/Sys/GameSettings/QAPL18.ini delete mode 100644 Data/Sys/GameSettings/QAPN18.ini create mode 100644 Data/Sys/GameSettings/QAW.ini delete mode 100644 Data/Sys/GameSettings/QAWL18.ini delete mode 100644 Data/Sys/GameSettings/QAWN18.ini create mode 100644 Data/Sys/GameSettings/QBB.ini delete mode 100644 Data/Sys/GameSettings/QBBE18.ini delete mode 100644 Data/Sys/GameSettings/QBBP18.ini rename Data/Sys/GameSettings/{R22P01.ini => R22.ini} (93%) delete mode 100644 Data/Sys/GameSettings/R22E01.ini delete mode 100644 Data/Sys/GameSettings/R22J01.ini rename Data/Sys/GameSettings/{R2GJAF.ini => R2G.ini} (93%) delete mode 100644 Data/Sys/GameSettings/R2GEXJ.ini delete mode 100644 Data/Sys/GameSettings/R2GP99.ini rename Data/Sys/GameSettings/{R3BE8P.ini => R3B.ini} (92%) delete mode 100644 Data/Sys/GameSettings/R3BJ8P.ini rename Data/Sys/GameSettings/{R3DES5.ini => R3D.ini} (93%) delete mode 100644 Data/Sys/GameSettings/R3DPS5.ini rename Data/Sys/GameSettings/{R3ME01.ini => R3M.ini} (93%) delete mode 100644 Data/Sys/GameSettings/R3MP01.ini rename Data/Sys/GameSettings/{GKOP70.ini => R3N.ini} (91%) delete mode 100644 Data/Sys/GameSettings/R3NEXS.ini delete mode 100644 Data/Sys/GameSettings/R3NPH3.ini rename Data/Sys/GameSettings/{R3OP01.ini => R3O.ini} (92%) delete mode 100644 Data/Sys/GameSettings/R3OE01.ini delete mode 100644 Data/Sys/GameSettings/R3OJ01.ini rename Data/Sys/GameSettings/{R3RE8P.ini => R3R.ini} (90%) delete mode 100644 Data/Sys/GameSettings/R3RP8P.ini rename Data/Sys/GameSettings/{R4EP01.ini => R4E.ini} (90%) delete mode 100644 Data/Sys/GameSettings/R4EJ01.ini rename Data/Sys/GameSettings/{GKYE01.ini => R4Q.ini} (88%) delete mode 100644 Data/Sys/GameSettings/R4QE01.ini rename Data/Sys/GameSettings/{R5IP4Q.ini => R5I.ini} (92%) delete mode 100644 Data/Sys/GameSettings/R5IE4Q.ini delete mode 100644 Data/Sys/GameSettings/R5IX4Q.ini create mode 100644 Data/Sys/GameSettings/R5V.ini delete mode 100644 Data/Sys/GameSettings/R5VX41.ini rename Data/Sys/GameSettings/{R5WEA4.ini => R5W.ini} (91%) delete mode 100644 Data/Sys/GameSettings/R5WJA4.ini rename Data/Sys/GameSettings/{R64J01.ini => R64.ini} (90%) rename Data/Sys/GameSettings/{R6BJ78.ini => R6B.ini} (91%) delete mode 100644 Data/Sys/GameSettings/R6BE78.ini delete mode 100644 Data/Sys/GameSettings/R6BK78.ini delete mode 100644 Data/Sys/GameSettings/R6BP78.ini delete mode 100644 Data/Sys/GameSettings/R6BX78.ini rename Data/Sys/GameSettings/{R6TEA4.ini => R6T.ini} (93%) delete mode 100644 Data/Sys/GameSettings/R6TPA4.ini create mode 100644 Data/Sys/GameSettings/R7F.ini delete mode 100644 Data/Sys/GameSettings/R7FEGD.ini delete mode 100644 Data/Sys/GameSettings/R7FPGD.ini rename Data/Sys/GameSettings/{R7GEAF.ini => R7G.ini} (93%) delete mode 100644 Data/Sys/GameSettings/R7GJAF.ini delete mode 100644 Data/Sys/GameSettings/R7GPAF.ini rename Data/Sys/GameSettings/{R7XP69.ini => R7X.ini} (92%) delete mode 100644 Data/Sys/GameSettings/R7XE69.ini delete mode 100644 Data/Sys/GameSettings/R7XJ13.ini rename Data/Sys/GameSettings/{G3AF69.ini => R84.ini} (89%) delete mode 100644 Data/Sys/GameSettings/R84EE9.ini delete mode 100644 Data/Sys/GameSettings/R84P99.ini rename Data/Sys/GameSettings/{R8AP01.ini => R8A.ini} (95%) delete mode 100644 Data/Sys/GameSettings/R8AE01.ini create mode 100644 Data/Sys/GameSettings/R8D.ini delete mode 100644 Data/Sys/GameSettings/R8DEA4.ini delete mode 100644 Data/Sys/GameSettings/R8DJA4.ini delete mode 100644 Data/Sys/GameSettings/R8DPA4.ini rename Data/Sys/GameSettings/{R8JPWR.ini => R8J.ini} (90%) delete mode 100644 Data/Sys/GameSettings/R8JEWR.ini rename Data/Sys/GameSettings/{R8LE20.ini => R8L.ini} (93%) delete mode 100644 Data/Sys/GameSettings/R8LP7J.ini rename Data/Sys/GameSettings/{RBBP99.ini => RBB.ini} (92%) rename Data/Sys/GameSettings/{RBHJ08.ini => RBH.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RBHE08.ini delete mode 100644 Data/Sys/GameSettings/RBHP08.ini create mode 100644 Data/Sys/GameSettings/RBI.ini delete mode 100644 Data/Sys/GameSettings/RBIEE9.ini delete mode 100644 Data/Sys/GameSettings/RBIJ99.ini delete mode 100644 Data/Sys/GameSettings/RBIP99.ini rename Data/Sys/GameSettings/{R3BP8P.ini => RBR.ini} (89%) delete mode 100644 Data/Sys/GameSettings/RBRE5G.ini delete mode 100644 Data/Sys/GameSettings/RBRP5G.ini delete mode 100644 Data/Sys/GameSettings/RBRX5G.ini rename Data/Sys/GameSettings/{RBWE01.ini => RBW.ini} (93%) delete mode 100644 Data/Sys/GameSettings/RBWP01.ini rename Data/Sys/GameSettings/{GW7F69.ini => RCL.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RCLE4Q.ini delete mode 100644 Data/Sys/GameSettings/RCLP4Q.ini rename Data/Sys/GameSettings/{RD2E41.ini => RD2.ini} (89%) delete mode 100644 Data/Sys/GameSettings/RD2J41.ini delete mode 100644 Data/Sys/GameSettings/RD2K41.ini delete mode 100644 Data/Sys/GameSettings/RD2P41.ini delete mode 100644 Data/Sys/GameSettings/RD2X41.ini rename Data/Sys/GameSettings/{GIAE7D.ini => RDF.ini} (87%) delete mode 100644 Data/Sys/GameSettings/RDFE41.ini delete mode 100644 Data/Sys/GameSettings/RDFP41.ini rename Data/Sys/GameSettings/{RDZJ01.ini => RDZ.ini} (94%) rename Data/Sys/GameSettings/{GBIE08.ini => RE4.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RE4E08.ini delete mode 100644 Data/Sys/GameSettings/RE4J08.ini delete mode 100644 Data/Sys/GameSettings/RE4P08.ini rename Data/Sys/GameSettings/{REDE41.ini => RED.ini} (92%) delete mode 100644 Data/Sys/GameSettings/REDJ41.ini delete mode 100644 Data/Sys/GameSettings/REDP41.ini rename Data/Sys/GameSettings/{RENE8P.ini => REN.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RENJ8P.ini rename Data/Sys/GameSettings/{RFBE01.ini => RFB.ini} (93%) delete mode 100644 Data/Sys/GameSettings/RFBJ01.ini delete mode 100644 Data/Sys/GameSettings/RFBP01.ini rename Data/Sys/GameSettings/{RFCJGD.ini => RFC.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RFCEGD.ini delete mode 100644 Data/Sys/GameSettings/RFCPGD.ini rename Data/Sys/GameSettings/{RFEE01.ini => RFE.ini} (93%) delete mode 100644 Data/Sys/GameSettings/RFEJ01.ini rename Data/Sys/GameSettings/{RFFJGD.ini => RFF.ini} (94%) delete mode 100644 Data/Sys/GameSettings/RFFEGD.ini delete mode 100644 Data/Sys/GameSettings/RFFPGD.ini rename Data/Sys/GameSettings/{RFSEEB.ini => RFS.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RFSJ8P.ini rename Data/Sys/GameSettings/{RGWE41.ini => RGW.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RGWJ41.ini delete mode 100644 Data/Sys/GameSettings/RGWP41.ini delete mode 100644 Data/Sys/GameSettings/RGWX41.ini rename Data/Sys/GameSettings/{RH8E4F.ini => RH8.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RH8JEL.ini delete mode 100644 Data/Sys/GameSettings/RH8P4F.ini delete mode 100644 Data/Sys/GameSettings/RH8X4F.ini rename Data/Sys/GameSettings/{R4QK01.ini => RHA.ini} (89%) delete mode 100644 Data/Sys/GameSettings/RHAE01.ini delete mode 100644 Data/Sys/GameSettings/RHAJ01.ini delete mode 100644 Data/Sys/GameSettings/RHAK01.ini delete mode 100644 Data/Sys/GameSettings/RHAP01.ini delete mode 100644 Data/Sys/GameSettings/RHAW01.ini rename Data/Sys/GameSettings/{R4QJ01.ini => RHM.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RHMEE9.ini delete mode 100644 Data/Sys/GameSettings/RHMP99.ini rename Data/Sys/GameSettings/{RHOE8P.ini => RHO.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RHOJ8P.ini delete mode 100644 Data/Sys/GameSettings/RHOP8P.ini create mode 100644 Data/Sys/GameSettings/RIP.ini delete mode 100644 Data/Sys/GameSettings/RIPEAF.ini delete mode 100644 Data/Sys/GameSettings/RIPJAF.ini delete mode 100644 Data/Sys/GameSettings/RIPPAF.ini rename Data/Sys/GameSettings/{GKOE70.ini => RIU.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RIUJAF.ini delete mode 100644 Data/Sys/GameSettings/RIUPAF.ini rename Data/Sys/GameSettings/{RKDEEB.ini => RK2.ini} (89%) delete mode 100644 Data/Sys/GameSettings/RK2EEB.ini delete mode 100644 Data/Sys/GameSettings/RK2JEB.ini rename Data/Sys/GameSettings/{RK2P01.ini => RKD.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RKDJEB.ini delete mode 100644 Data/Sys/GameSettings/RKDPEB.ini rename Data/Sys/GameSettings/{GHMF4F.ini => RLG.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RLGE64.ini delete mode 100644 Data/Sys/GameSettings/RLGJ52.ini delete mode 100644 Data/Sys/GameSettings/RLGP64.ini rename Data/Sys/GameSettings/{RM3E01.ini => RM3.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RM3J01.ini rename Data/Sys/GameSettings/{RM8K01.ini => RM8.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RM8E01.ini delete mode 100644 Data/Sys/GameSettings/RM8J01.ini delete mode 100644 Data/Sys/GameSettings/RM8P01.ini rename Data/Sys/GameSettings/{R64E01.ini => RMC.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RMCE01.ini delete mode 100644 Data/Sys/GameSettings/RMCJ01.ini delete mode 100644 Data/Sys/GameSettings/RMCK01.ini delete mode 100644 Data/Sys/GameSettings/RMCP01.ini rename Data/Sys/GameSettings/{RMGK01.ini => RMG.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RMGE01.ini delete mode 100644 Data/Sys/GameSettings/RMGJ01.ini delete mode 100644 Data/Sys/GameSettings/RMGP01.ini rename Data/Sys/GameSettings/{RMKE01.ini => RMK.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RMKJ01.ini delete mode 100644 Data/Sys/GameSettings/RMKP01.ini rename Data/Sys/GameSettings/{RNEEDA.ini => RNE.ini} (85%) delete mode 100644 Data/Sys/GameSettings/RNEJDA.ini delete mode 100644 Data/Sys/GameSettings/RNEPDA.ini rename Data/Sys/GameSettings/{RNJE4F.ini => RNJ.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RNJP4F.ini rename Data/Sys/GameSettings/{RNOP01.ini => RNO.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RNOJ01.ini rename Data/Sys/GameSettings/{GF4E52.ini => RO9.ini} (94%) delete mode 100644 Data/Sys/GameSettings/RO9EFS.ini delete mode 100644 Data/Sys/GameSettings/RO9PNK.ini rename Data/Sys/GameSettings/{ROAE36.ini => ROA.ini} (93%) delete mode 100644 Data/Sys/GameSettings/ROAP36.ini rename Data/Sys/GameSettings/{GKYP01.ini => ROD.ini} (89%) delete mode 100644 Data/Sys/GameSettings/RODE01.ini delete mode 100644 Data/Sys/GameSettings/RODJ01.ini delete mode 100644 Data/Sys/GameSettings/RODK01.ini delete mode 100644 Data/Sys/GameSettings/RODP01.ini rename Data/Sys/GameSettings/{GEDP01.ini => ROL.ini} (86%) delete mode 100644 Data/Sys/GameSettings/ROLE8P.ini delete mode 100644 Data/Sys/GameSettings/ROLJ01.ini delete mode 100644 Data/Sys/GameSettings/ROLK01.ini delete mode 100644 Data/Sys/GameSettings/ROLP8P.ini rename Data/Sys/GameSettings/{R64P01.ini => RON.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RONEG9.ini delete mode 100644 Data/Sys/GameSettings/RONJG9.ini delete mode 100644 Data/Sys/GameSettings/RONPG9.ini rename Data/Sys/GameSettings/{GKOP6V.ini => ROU.ini} (88%) delete mode 100644 Data/Sys/GameSettings/ROUJAF.ini delete mode 100644 Data/Sys/GameSettings/ROUPAF.ini rename Data/Sys/GameSettings/{RPBE01.ini => RPB.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RPBJ01.ini delete mode 100644 Data/Sys/GameSettings/RPBP01.ini rename Data/Sys/GameSettings/{RPJE7U.ini => RPJ.ini} (93%) delete mode 100644 Data/Sys/GameSettings/RPJJ99.ini rename Data/Sys/GameSettings/{RPOPC8.ini => RPO.ini} (94%) delete mode 100644 Data/Sys/GameSettings/RPOEC8.ini delete mode 100644 Data/Sys/GameSettings/RPOJC8.ini rename Data/Sys/GameSettings/{RPWX41.ini => RPW.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RPWZ41.ini rename Data/Sys/GameSettings/{RQ6EJJ.ini => RQ6.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RQ6PKM.ini delete mode 100644 Data/Sys/GameSettings/RQ6XKM.ini rename Data/Sys/GameSettings/{RQREXJ.ini => RQR.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RQRJAF.ini delete mode 100644 Data/Sys/GameSettings/RQRPAF.ini rename Data/Sys/GameSettings/{RRBE41.ini => RRB.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RRBJ41.ini delete mode 100644 Data/Sys/GameSettings/RRBP41.ini rename Data/Sys/GameSettings/{RBBE18.ini => RRK.ini} (93%) delete mode 100644 Data/Sys/GameSettings/RRKE70.ini delete mode 100644 Data/Sys/GameSettings/RRKP70.ini rename Data/Sys/GameSettings/{GF4P52.ini => RRZ.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RRZEGY.ini delete mode 100644 Data/Sys/GameSettings/RRZPGY.ini rename Data/Sys/GameSettings/{R64K01.ini => RS5.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RS5EC8.ini delete mode 100644 Data/Sys/GameSettings/RS5JC8.ini delete mode 100644 Data/Sys/GameSettings/RS5PC8.ini create mode 100644 Data/Sys/GameSettings/RS9.ini delete mode 100644 Data/Sys/GameSettings/RS9E8P.ini delete mode 100644 Data/Sys/GameSettings/RS9P8P.ini rename Data/Sys/GameSettings/{RSBE01.ini => RSB.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RSBJ01.ini delete mode 100644 Data/Sys/GameSettings/RSBK01.ini rename Data/Sys/GameSettings/{RSFE7U.ini => RSF.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RSFJ99.ini delete mode 100644 Data/Sys/GameSettings/RSFP99.ini rename Data/Sys/GameSettings/{RSHK69.ini => RSH.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RSHE69.ini delete mode 100644 Data/Sys/GameSettings/RSHJ13.ini delete mode 100644 Data/Sys/GameSettings/RSHP69.ini rename Data/Sys/GameSettings/{RSIE69.ini => RSI.ini} (94%) delete mode 100644 Data/Sys/GameSettings/RSIJ13.ini delete mode 100644 Data/Sys/GameSettings/RSIP69.ini rename Data/Sys/GameSettings/{G4MP69.ini => RSL.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RSLEAF.ini delete mode 100644 Data/Sys/GameSettings/RSLJAF.ini delete mode 100644 Data/Sys/GameSettings/RSLKAF.ini delete mode 100644 Data/Sys/GameSettings/RSLPAF.ini rename Data/Sys/GameSettings/{RSMJ8P.ini => RSM.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RSME8P.ini rename Data/Sys/GameSettings/{RSNF69.ini => RSN.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RSND69.ini delete mode 100644 Data/Sys/GameSettings/RSNE69.ini delete mode 100644 Data/Sys/GameSettings/RSNP69.ini delete mode 100644 Data/Sys/GameSettings/RSNX69.ini rename Data/Sys/GameSettings/{RSPJ01.ini => RSP.ini} (90%) delete mode 100644 Data/Sys/GameSettings/RSPP01.ini rename Data/Sys/GameSettings/{RSXJ13.ini => RSX.ini} (93%) delete mode 100644 Data/Sys/GameSettings/RSXE69.ini delete mode 100644 Data/Sys/GameSettings/RSXK69.ini delete mode 100644 Data/Sys/GameSettings/RSXP69.ini rename Data/Sys/GameSettings/{RT3E54.ini => RT3.ini} (78%) delete mode 100644 Data/Sys/GameSettings/RT3JEL.ini delete mode 100644 Data/Sys/GameSettings/RT3P54.ini rename Data/Sys/GameSettings/{RT4JAF.ini => RT4.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RT4PAF.ini rename Data/Sys/GameSettings/{RTME41.ini => RTM.ini} (95%) delete mode 100644 Data/Sys/GameSettings/RTMP41.ini rename Data/Sys/GameSettings/{GHCF4Q.ini => RTN.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RTNJCQ.ini delete mode 100644 Data/Sys/GameSettings/RTNP41.ini create mode 100644 Data/Sys/GameSettings/RTZ.ini delete mode 100644 Data/Sys/GameSettings/RTZE08.ini delete mode 100644 Data/Sys/GameSettings/RTZJ08.ini delete mode 100644 Data/Sys/GameSettings/RTZK08.ini delete mode 100644 Data/Sys/GameSettings/RTZP08.ini rename Data/Sys/GameSettings/{RUUE01.ini => RUU.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RUUJ01.ini delete mode 100644 Data/Sys/GameSettings/RUUK01.ini delete mode 100644 Data/Sys/GameSettings/RUUP01.ini rename Data/Sys/GameSettings/{RVKEXJ.ini => RVK.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RVKP99.ini rename Data/Sys/GameSettings/{R5VP41.ini => RWR.ini} (91%) delete mode 100644 Data/Sys/GameSettings/RWRE4F.ini delete mode 100644 Data/Sys/GameSettings/RWRP4F.ini rename Data/Sys/GameSettings/{RT4EAF.ini => RWS.ini} (88%) delete mode 100644 Data/Sys/GameSettings/RWSE8P.ini delete mode 100644 Data/Sys/GameSettings/RWSJ01.ini delete mode 100644 Data/Sys/GameSettings/RWSK01.ini delete mode 100644 Data/Sys/GameSettings/RWSP8P.ini create mode 100644 Data/Sys/GameSettings/RX9.ini delete mode 100644 Data/Sys/GameSettings/RX9P69.ini delete mode 100644 Data/Sys/GameSettings/RX9Y69.ini rename Data/Sys/GameSettings/{RXXE4Q.ini => RXX.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RXXJ4Q.ini delete mode 100644 Data/Sys/GameSettings/RXXP4Q.ini create mode 100644 Data/Sys/GameSettings/RZJ.ini delete mode 100644 Data/Sys/GameSettings/RZJD69.ini delete mode 100644 Data/Sys/GameSettings/RZJE69.ini delete mode 100644 Data/Sys/GameSettings/RZJJ13.ini rename Data/Sys/GameSettings/{RZOE78.ini => RZO.ini} (94%) delete mode 100644 Data/Sys/GameSettings/RZOP78.ini rename Data/Sys/GameSettings/{GJUD78.ini => RZP.ini} (89%) delete mode 100644 Data/Sys/GameSettings/RZPE01.ini delete mode 100644 Data/Sys/GameSettings/RZPJ01.ini rename Data/Sys/GameSettings/{RZTJ01.ini => RZT.ini} (87%) delete mode 100644 Data/Sys/GameSettings/RZTE01.ini delete mode 100644 Data/Sys/GameSettings/RZTK01.ini delete mode 100644 Data/Sys/GameSettings/RZTP01.ini delete mode 100644 Data/Sys/GameSettings/RZTW01.ini rename Data/Sys/GameSettings/{G5DE78.ini => RZZ.ini} (92%) delete mode 100644 Data/Sys/GameSettings/RZZE8P.ini delete mode 100644 Data/Sys/GameSettings/RZZJEL.ini delete mode 100644 Data/Sys/GameSettings/RZZP8P.ini rename Data/Sys/GameSettings/{S2LE01.ini => S2L.ini} (93%) delete mode 100644 Data/Sys/GameSettings/S2LJ01.ini delete mode 100644 Data/Sys/GameSettings/S2LP01.ini rename Data/Sys/GameSettings/{S2WP78.ini => S2W.ini} (94%) delete mode 100644 Data/Sys/GameSettings/S2WE78.ini rename Data/Sys/GameSettings/{S3BEWR.ini => S3B.ini} (91%) delete mode 100644 Data/Sys/GameSettings/S3BPWR.ini rename Data/Sys/GameSettings/{S59E01.ini => S59.ini} (92%) delete mode 100644 Data/Sys/GameSettings/S59P01.ini rename Data/Sys/GameSettings/{S72J01.ini => S72.ini} (91%) delete mode 100644 Data/Sys/GameSettings/S72E01.ini rename Data/Sys/GameSettings/{SB3E08.ini => SB3.ini} (92%) delete mode 100644 Data/Sys/GameSettings/SB3J08.ini delete mode 100644 Data/Sys/GameSettings/SB3P08.ini rename Data/Sys/GameSettings/{SBDJ08.ini => SBD.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SBDE08.ini delete mode 100644 Data/Sys/GameSettings/SBDK08.ini rename Data/Sys/GameSettings/{R4QP01.ini => SC4.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SC4E64.ini delete mode 100644 Data/Sys/GameSettings/SC4P64.ini rename Data/Sys/GameSettings/{SC7P52.ini => SC7.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SC7D52.ini delete mode 100644 Data/Sys/GameSettings/SC7F52.ini delete mode 100644 Data/Sys/GameSettings/SC7S52.ini rename Data/Sys/GameSettings/{SC8E01.ini => SC8.ini} (91%) delete mode 100644 Data/Sys/GameSettings/SC8J01.ini delete mode 100644 Data/Sys/GameSettings/SC8P01.ini rename Data/Sys/GameSettings/{RBBJ18.ini => SCA.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SCAE18.ini delete mode 100644 Data/Sys/GameSettings/SCAJ18.ini delete mode 100644 Data/Sys/GameSettings/SCAP18.ini rename Data/Sys/GameSettings/{SCYE4Q.ini => SCY.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SCYP4Q.ini delete mode 100644 Data/Sys/GameSettings/SCYX4Q.ini delete mode 100644 Data/Sys/GameSettings/SCYY4Q.ini delete mode 100644 Data/Sys/GameSettings/SCYZ4Q.ini rename Data/Sys/GameSettings/{SD2J01.ini => SD2.ini} (91%) delete mode 100644 Data/Sys/GameSettings/SD2E41.ini delete mode 100644 Data/Sys/GameSettings/SD2P41.ini delete mode 100644 Data/Sys/GameSettings/SD2Y41.ini rename Data/Sys/GameSettings/{SDBP78.ini => SDB.ini} (94%) delete mode 100644 Data/Sys/GameSettings/SDBE78.ini rename Data/Sys/GameSettings/{SG8EG9.ini => SDM.ini} (94%) delete mode 100644 Data/Sys/GameSettings/SDMEG9.ini rename Data/Sys/GameSettings/{SDNE41.ini => SDN.ini} (94%) delete mode 100644 Data/Sys/GameSettings/SDNP41.ini rename Data/Sys/GameSettings/{SDWE18.ini => SDW.ini} (92%) delete mode 100644 Data/Sys/GameSettings/SDWJ18.ini delete mode 100644 Data/Sys/GameSettings/SDWP18.ini rename Data/Sys/GameSettings/{SEAE69.ini => SEA.ini} (90%) delete mode 100644 Data/Sys/GameSettings/SEAP69.ini rename Data/Sys/GameSettings/{SEMP4Q.ini => SEM.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SEME4Q.ini delete mode 100644 Data/Sys/GameSettings/SEMJ01.ini delete mode 100644 Data/Sys/GameSettings/SEMX4Q.ini delete mode 100644 Data/Sys/GameSettings/SEMY4Q.ini delete mode 100644 Data/Sys/GameSettings/SEMZ4Q.ini rename Data/Sys/GameSettings/{SERE4Q.ini => SER.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SERF4Q.ini delete mode 100644 Data/Sys/GameSettings/SERP4Q.ini rename Data/Sys/GameSettings/{SF8J01.ini => SF8.ini} (91%) delete mode 100644 Data/Sys/GameSettings/SF8E01.ini delete mode 100644 Data/Sys/GameSettings/SF8P01.ini rename Data/Sys/GameSettings/{SFIE01.ini => SFI.ini} (90%) delete mode 100644 Data/Sys/GameSettings/SFIP01.ini rename Data/Sys/GameSettings/{SDMPAF.ini => SG8.ini} (95%) delete mode 100644 Data/Sys/GameSettings/SG8PAF.ini rename Data/Sys/GameSettings/{SILE78.ini => SIL.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SILP78.ini rename Data/Sys/GameSettings/{SJBE52.ini => SJB.ini} (94%) delete mode 100644 Data/Sys/GameSettings/SJBP52.ini rename Data/Sys/GameSettings/{SJDZ41.ini => SJD.ini} (92%) delete mode 100644 Data/Sys/GameSettings/SJDE41.ini rename Data/Sys/GameSettings/{SLSJ01.ini => SLS.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SLSEXJ.ini delete mode 100644 Data/Sys/GameSettings/SLSP01.ini rename Data/Sys/GameSettings/{SMBE8P.ini => SMB.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SMBP8P.ini rename Data/Sys/GameSettings/{SMOE41.ini => SMO.ini} (87%) delete mode 100644 Data/Sys/GameSettings/SMOP41.ini delete mode 100644 Data/Sys/GameSettings/SMOX41.ini create mode 100644 Data/Sys/GameSettings/SN4.ini delete mode 100644 Data/Sys/GameSettings/SN4EDA.ini delete mode 100644 Data/Sys/GameSettings/SN4JDA.ini delete mode 100644 Data/Sys/GameSettings/SN4XGT.ini rename Data/Sys/GameSettings/{SNCE8P.ini => SNC.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SNCJ8P.ini delete mode 100644 Data/Sys/GameSettings/SNCP8P.ini rename Data/Sys/GameSettings/{SNYEVZ.ini => SNY.ini} (77%) delete mode 100644 Data/Sys/GameSettings/SNYPVZ.ini rename Data/Sys/GameSettings/{SOJE41.ini => SOJ.ini} (92%) delete mode 100644 Data/Sys/GameSettings/SOJP41.ini rename Data/Sys/GameSettings/{SSTEG9.ini => SOS.ini} (90%) delete mode 100644 Data/Sys/GameSettings/SOSEG9.ini delete mode 100644 Data/Sys/GameSettings/SOSPAF.ini rename Data/Sys/GameSettings/{SPDE52.ini => SPD.ini} (94%) delete mode 100644 Data/Sys/GameSettings/SPDP52.ini create mode 100644 Data/Sys/GameSettings/SPV.ini delete mode 100644 Data/Sys/GameSettings/SPVEA4.ini delete mode 100644 Data/Sys/GameSettings/SPVPA4.ini delete mode 100644 Data/Sys/GameSettings/SPVXA4.ini delete mode 100644 Data/Sys/GameSettings/SPVYA4.ini create mode 100644 Data/Sys/GameSettings/SQM.ini delete mode 100644 Data/Sys/GameSettings/SQME52.ini delete mode 100644 Data/Sys/GameSettings/SQMP52.ini rename Data/Sys/GameSettings/{R5VE41.ini => SRQ.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SRQE41.ini delete mode 100644 Data/Sys/GameSettings/SRQP41.ini rename Data/Sys/GameSettings/{SSQP01.ini => SSQ.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SSQE01.ini delete mode 100644 Data/Sys/GameSettings/SSQJ01.ini rename Data/Sys/GameSettings/{SSRE20.ini => SSR.ini} (92%) delete mode 100644 Data/Sys/GameSettings/SSRPXT.ini rename Data/Sys/GameSettings/{SSTPY5.ini => SST.ini} (90%) rename Data/Sys/GameSettings/{STKE08.ini => STK.ini} (86%) delete mode 100644 Data/Sys/GameSettings/STKJ08.ini delete mode 100644 Data/Sys/GameSettings/STKP08.ini rename Data/Sys/GameSettings/{STSE4Q.ini => STS.ini} (88%) delete mode 100644 Data/Sys/GameSettings/STSP4Q.ini delete mode 100644 Data/Sys/GameSettings/STSX4Q.ini delete mode 100644 Data/Sys/GameSettings/STSY4Q.ini delete mode 100644 Data/Sys/GameSettings/STSZ4Q.ini rename Data/Sys/GameSettings/{SU7PAF.ini => SU7.ini} (84%) delete mode 100644 Data/Sys/GameSettings/SU7EG9.ini rename Data/Sys/GameSettings/{SUKE01.ini => SUK.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SUKJ01.ini delete mode 100644 Data/Sys/GameSettings/SUKP01.ini rename Data/Sys/GameSettings/{SVBP52.ini => SVB.ini} (94%) delete mode 100644 Data/Sys/GameSettings/SVBE52.ini rename Data/Sys/GameSettings/{R4EE01.ini => SVM.ini} (91%) delete mode 100644 Data/Sys/GameSettings/SVME01.ini delete mode 100644 Data/Sys/GameSettings/SVMJ01.ini delete mode 100644 Data/Sys/GameSettings/SVMP01.ini rename Data/Sys/GameSettings/{SVXE52.ini => SVX.ini} (88%) delete mode 100644 Data/Sys/GameSettings/SVXF52.ini delete mode 100644 Data/Sys/GameSettings/SVXI52.ini delete mode 100644 Data/Sys/GameSettings/SVXP52.ini delete mode 100644 Data/Sys/GameSettings/SVXY52.ini rename Data/Sys/GameSettings/{SVZPVZ.ini => SVZ.ini} (89%) delete mode 100644 Data/Sys/GameSettings/SVZEVZ.ini rename Data/Sys/GameSettings/{R84J99.ini => SX3.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SX3J01.ini delete mode 100644 Data/Sys/GameSettings/SX3P01.ini rename Data/Sys/GameSettings/{SX7E52.ini => SX7.ini} (90%) delete mode 100644 Data/Sys/GameSettings/SX7P52.ini rename Data/Sys/GameSettings/{SXCE52.ini => SXC.ini} (92%) delete mode 100644 Data/Sys/GameSettings/SXCP52.ini rename Data/Sys/GameSettings/{SZAE69.ini => SZA.ini} (93%) delete mode 100644 Data/Sys/GameSettings/SZAP69.ini rename Data/Sys/GameSettings/{SZBE69.ini => SZB.ini} (95%) delete mode 100644 Data/Sys/GameSettings/SZBP69.ini rename Data/Sys/GameSettings/{UGPE01.ini => UGP.ini} (89%) delete mode 100644 Data/Sys/GameSettings/UGPP01.ini rename Data/Sys/GameSettings/{G4BE08.ini => WDM.ini} (90%) delete mode 100644 Data/Sys/GameSettings/WDME01.ini delete mode 100644 Data/Sys/GameSettings/WDMP01.ini rename Data/Sys/GameSettings/{GISP36.ini => WGD.ini} (91%) delete mode 100644 Data/Sys/GameSettings/WGDEA4.ini delete mode 100644 Data/Sys/GameSettings/WGDPA4.ini rename Data/Sys/GameSettings/{RSPE01.ini => WGO.ini} (92%) delete mode 100644 Data/Sys/GameSettings/WGOEWG.ini rename Data/Sys/GameSettings/{WGSE08.ini => WGS.ini} (92%) delete mode 100644 Data/Sys/GameSettings/WGSP08.ini rename Data/Sys/GameSettings/{WHWEFJ.ini => WHW.ini} (90%) delete mode 100644 Data/Sys/GameSettings/WHWPFJ.ini rename Data/Sys/GameSettings/{WGOPWG.ini => WKT.ini} (91%) delete mode 100644 Data/Sys/GameSettings/WKTJA4.ini delete mode 100644 Data/Sys/GameSettings/WKTPA4.ini delete mode 100644 Data/Sys/GameSettings/WPPJJF.ini rename Data/Sys/GameSettings/{WR9E08.ini => WR9.ini} (94%) delete mode 100644 Data/Sys/GameSettings/WR9P08.ini create mode 100644 Data/Sys/Shaders/Anaglyph/dubois.glsl create mode 100644 Data/Sys/Shaders/Anaglyph/fullcolor.glsl create mode 100644 Data/Sys/Shaders/Anaglyph/grayscale.glsl create mode 100644 Data/Sys/Shaders/Anaglyph/grayscale2.glsl rename Externals/{libusbx => libusb}/AUTHORS (64%) rename Externals/{libusbx => libusb}/COPYING (100%) rename Externals/{libusbx => libusb}/ChangeLog (74%) create mode 100644 Externals/libusb/DOLPHIN rename Externals/{libusbx => libusb}/INSTALL (100%) create mode 100644 Externals/libusb/NEWS rename Externals/{libusbx => libusb}/PORTING (75%) create mode 100644 Externals/libusb/README create mode 100644 Externals/libusb/TODO rename Externals/{libusbx => libusb}/libusb/Makefile.am (88%) rename Externals/{libusbx => libusb}/libusb/Makefile.in (73%) rename Externals/{libusbx => libusb}/libusb/core.c (87%) rename Externals/{libusbx => libusb}/libusb/descriptor.c (99%) rename Externals/{libusbx => libusb}/libusb/hotplug.c (88%) rename Externals/{libusbx => libusb}/libusb/hotplug.h (98%) rename Externals/{libusbx => libusb}/libusb/io.c (90%) rename Externals/{libusbx => libusb}/libusb/libusb-1.0.def (95%) rename Externals/{libusbx => libusb}/libusb/libusb-1.0.rc (97%) rename Externals/{libusbx => libusb}/libusb/libusb.h (92%) rename Externals/{libusbx => libusb}/libusb/libusbi.h (95%) rename Externals/{libusbx => libusb}/libusb/os/darwin_usb.c (89%) rename Externals/{libusbx => libusb}/libusb/os/darwin_usb.h (97%) rename Externals/{libusbx => libusb}/libusb/os/linux_netlink.c (63%) rename Externals/{libusbx => libusb}/libusb/os/linux_udev.c (82%) rename Externals/{libusbx => libusb}/libusb/os/linux_usbfs.c (93%) rename Externals/{libusbx => libusb}/libusb/os/linux_usbfs.h (91%) rename Externals/{libusbx/libusb/os/openbsd_usb.c => libusb/libusb/os/netbsd_usb.c} (81%) create mode 100644 Externals/libusb/libusb/os/openbsd_usb.c rename Externals/{libusbx => libusb}/libusb/os/poll_posix.c (100%) rename Externals/{libusbx => libusb}/libusb/os/poll_posix.h (100%) rename Externals/{libusbx => libusb}/libusb/os/poll_windows.c (99%) rename Externals/{libusbx => libusb}/libusb/os/poll_windows.h (94%) rename Externals/{libusbx => libusb}/libusb/os/threads_posix.c (95%) rename Externals/{libusbx => libusb}/libusb/os/threads_posix.h (97%) rename Externals/{libusbx => libusb}/libusb/os/threads_windows.c (99%) rename Externals/{libusbx => libusb}/libusb/os/threads_windows.h (98%) rename Externals/{libusbx => libusb}/libusb/os/wince_usb.c (97%) rename Externals/{libusbx => libusb}/libusb/os/wince_usb.h (99%) rename Externals/{libusbx => libusb}/libusb/os/windows_common.h (99%) rename Externals/{libusbx => libusb}/libusb/os/windows_usb.c (94%) rename Externals/{libusbx => libusb}/libusb/os/windows_usb.h (96%) rename Externals/{libusbx => libusb}/libusb/strerror.c (87%) rename Externals/{libusbx => libusb}/libusb/sync.c (96%) rename Externals/{libusbx => libusb}/libusb/version.h (94%) create mode 100644 Externals/libusb/libusb/version_nano.h rename Externals/{libusbx/msvc => libusb}/libusb_static_2013.vcxproj (62%) rename Externals/{libusbx => libusb}/msvc/config.h (93%) rename Externals/{libusbx => libusb}/msvc/ddk_build.cmd (100%) rename Externals/{libusbx => libusb}/msvc/errno.h (100%) create mode 100644 Externals/libusb/msvc/fxload_2010.vcxproj create mode 100644 Externals/libusb/msvc/fxload_2010.vcxproj.filters create mode 100644 Externals/libusb/msvc/fxload_2012.vcxproj create mode 100644 Externals/libusb/msvc/fxload_2012.vcxproj.filters create mode 100644 Externals/libusb/msvc/fxload_2013.vcxproj create mode 100644 Externals/libusb/msvc/fxload_sources create mode 100644 Externals/libusb/msvc/getopt_2005.vcproj create mode 100644 Externals/libusb/msvc/getopt_2010.vcxproj create mode 100644 Externals/libusb/msvc/getopt_2010.vcxproj.filters create mode 100644 Externals/libusb/msvc/getopt_2012.vcxproj create mode 100644 Externals/libusb/msvc/getopt_2012.vcxproj.filters create mode 100644 Externals/libusb/msvc/getopt_2013.vcxproj create mode 100644 Externals/libusb/msvc/getopt_sources create mode 100644 Externals/libusb/msvc/hotplugtest_2010.vcxproj create mode 100644 Externals/libusb/msvc/hotplugtest_2010.vcxproj.filters create mode 100644 Externals/libusb/msvc/hotplugtest_2012.vcxproj create mode 100644 Externals/libusb/msvc/hotplugtest_2012.vcxproj.filters create mode 100644 Externals/libusb/msvc/hotplugtest_2013.vcxproj create mode 100644 Externals/libusb/msvc/hotplugtest_sources rename Externals/{libusbx => libusb}/msvc/inttypes.h (100%) create mode 100644 Externals/libusb/msvc/libusb.dsw create mode 100644 Externals/libusb/msvc/libusb_2005.sln create mode 100644 Externals/libusb/msvc/libusb_2010.sln create mode 100644 Externals/libusb/msvc/libusb_2012.sln create mode 100644 Externals/libusb/msvc/libusb_2013.sln create mode 100644 Externals/libusb/msvc/libusb_dll.dsp create mode 100644 Externals/libusb/msvc/libusb_dll_2005.vcproj create mode 100644 Externals/libusb/msvc/libusb_dll_2010.vcxproj create mode 100644 Externals/libusb/msvc/libusb_dll_2010.vcxproj.filters create mode 100644 Externals/libusb/msvc/libusb_dll_2012.vcxproj rename Externals/{libusbx/msvc/libusb_static_2013.vcxproj.filters => libusb/msvc/libusb_dll_2012.vcxproj.filters} (85%) create mode 100644 Externals/libusb/msvc/libusb_dll_2013.vcxproj create mode 100644 Externals/libusb/msvc/libusb_dll_wince.vcproj rename Externals/{libusbx => libusb}/msvc/libusb_sources (100%) rename Externals/{libusbx => libusb}/msvc/libusb_static.dsp (100%) rename Externals/{libusbx => libusb}/msvc/libusb_static_2005.vcproj (100%) rename Externals/{libusbx => libusb}/msvc/libusb_static_2010.vcxproj (67%) rename Externals/{libusbx => libusb}/msvc/libusb_static_2010.vcxproj.filters (100%) rename Externals/{libusbx => libusb}/msvc/libusb_static_2012.vcxproj (96%) rename Externals/{libusbx => libusb}/msvc/libusb_static_2012.vcxproj.filters (100%) create mode 100644 Externals/libusb/msvc/libusb_static_2013.vcxproj rename Externals/{libusbx => libusb}/msvc/libusb_static_wince.vcproj (100%) create mode 100644 Externals/libusb/msvc/libusb_wince.sln create mode 100644 Externals/libusb/msvc/listdevs.dsp create mode 100644 Externals/libusb/msvc/listdevs_2005.vcproj create mode 100644 Externals/libusb/msvc/listdevs_2010.vcxproj create mode 100644 Externals/libusb/msvc/listdevs_2010.vcxproj.filters create mode 100644 Externals/libusb/msvc/listdevs_2012.vcxproj create mode 100644 Externals/libusb/msvc/listdevs_2012.vcxproj.filters create mode 100644 Externals/libusb/msvc/listdevs_2013.vcxproj create mode 100644 Externals/libusb/msvc/listdevs_sources create mode 100644 Externals/libusb/msvc/listdevs_wince.vcproj rename Externals/{libusbx => libusb}/msvc/missing.c (100%) rename Externals/{libusbx => libusb}/msvc/missing.h (100%) rename Externals/{libusbx => libusb}/msvc/stdint.h (100%) create mode 100644 Externals/libusb/msvc/stress_2005.vcproj create mode 100644 Externals/libusb/msvc/stress_2010.vcxproj create mode 100644 Externals/libusb/msvc/stress_2010.vcxproj.filters create mode 100644 Externals/libusb/msvc/stress_2012.vcxproj create mode 100644 Externals/libusb/msvc/stress_2012.vcxproj.filters create mode 100644 Externals/libusb/msvc/stress_2013.vcxproj create mode 100644 Externals/libusb/msvc/stress_wince.vcproj create mode 100644 Externals/libusb/msvc/xusb.dsp create mode 100644 Externals/libusb/msvc/xusb_2005.vcproj create mode 100644 Externals/libusb/msvc/xusb_2010.vcxproj create mode 100644 Externals/libusb/msvc/xusb_2010.vcxproj.filters create mode 100644 Externals/libusb/msvc/xusb_2012.vcxproj create mode 100644 Externals/libusb/msvc/xusb_2012.vcxproj.filters create mode 100644 Externals/libusb/msvc/xusb_2013.vcxproj create mode 100644 Externals/libusb/msvc/xusb_sources create mode 100644 Externals/libusb/msvc/xusb_wince.vcproj delete mode 100644 Externals/libusbx/Makefile.am delete mode 100644 Externals/libusbx/Makefile.in delete mode 100644 Externals/libusbx/NEWS delete mode 100644 Externals/libusbx/README delete mode 100644 Externals/libusbx/THANKS delete mode 100644 Externals/libusbx/TODO delete mode 100644 Externals/libusbx/aclocal.m4 delete mode 100644 Externals/libusbx/compile delete mode 100644 Externals/libusbx/config.guess delete mode 100644 Externals/libusbx/config.h.in delete mode 100644 Externals/libusbx/config.sub delete mode 100644 Externals/libusbx/configure delete mode 100644 Externals/libusbx/configure.ac delete mode 100644 Externals/libusbx/depcomp delete mode 100644 Externals/libusbx/install-sh delete mode 100644 Externals/libusbx/libusb-1.0.pc.in delete mode 100644 Externals/libusbx/libusb/version_nano.h delete mode 100644 Externals/libusbx/ltmain.sh delete mode 100644 Externals/libusbx/m4/libtool.m4 delete mode 100644 Externals/libusbx/m4/ltoptions.m4 delete mode 100644 Externals/libusbx/m4/ltsugar.m4 delete mode 100644 Externals/libusbx/m4/ltversion.m4 delete mode 100644 Externals/libusbx/m4/lt~obsolete.m4 delete mode 100644 Externals/libusbx/missing create mode 100644 Source/Core/Core/HotkeyManager.cpp create mode 100644 Source/Core/Core/HotkeyManager.h create mode 100644 Source/Core/Core/PowerPC/MMU.cpp create mode 100644 Source/UnitTests/Common/BitFieldTest.cpp create mode 100644 Source/UnitTests/Common/CommonFuncsTest.cpp create mode 100644 Source/UnitTests/Common/EventTest.cpp create mode 100644 Source/UnitTests/Common/FifoQueueTest.cpp create mode 100644 Source/UnitTests/Common/FixedSizeQueueTest.cpp create mode 100644 Source/UnitTests/Common/FlagTest.cpp create mode 100644 Source/UnitTests/TestUtils/CMakeLists.txt create mode 100644 Source/UnitTests/VideoCommon/CMakeLists.txt diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..7d8b9393f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "Externals/Qt"] + path = Externals/Qt + url = https://github.com/dolphin-emu/ext-win-qt.git + branch = master diff --git a/Contributing.md b/Contributing.md index d0a717e8a..8784f85fb 100644 --- a/Contributing.md +++ b/Contributing.md @@ -159,6 +159,13 @@ private: - Empty-bodied loops should use braces after their header, not a semicolon. - Yes: `while (condition) {}` - No: `while (condition);` +- For do-while loops, place 'while' on the same line as the closing brackets + + ```c++ + do + { + } while (false); + ``` ### Functions - If a function parameter is a pointer or reference and its value or data isn't intended to be changed, please mark that parameter as `const`. diff --git a/Data/Sys/GameSettings/DLSE64.ini b/Data/Sys/GameSettings/DLS.ini similarity index 84% rename from Data/Sys/GameSettings/DLSE64.ini rename to Data/Sys/GameSettings/DLS.ini index 8a8b118f1..3a10cd39b 100644 --- a/Data/Sys/GameSettings/DLSE64.ini +++ b/Data/Sys/GameSettings/DLS.ini @@ -1,4 +1,4 @@ -# DLSE64 - Star Wars: Rogue Squadron III: Rebel Strike: Limited Edition Bonus Disc (Demo) +# DLSE64, DLSP64 - Star Wars: Rogue Squadron III: Rebel Strike: Limited Edition Bonus Disc (Demo) [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/DLSP64.ini b/Data/Sys/GameSettings/DLSP64.ini deleted file mode 100644 index 2ab4bcdbf..000000000 --- a/Data/Sys/GameSettings/DLSP64.ini +++ /dev/null @@ -1,30 +0,0 @@ -# DLSP64 - Star Wars: Rogue Squadron III: Rebel Strike: Limited Edition Bonus Disc (Demo) - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/FA6.ini b/Data/Sys/GameSettings/FA6.ini new file mode 100644 index 000000000..0b99fb4ba --- /dev/null +++ b/Data/Sys/GameSettings/FA6.ini @@ -0,0 +1,33 @@ +# FA6E01, FA6P01 - Donkey Kong Jr. Math + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FA7E01.ini b/Data/Sys/GameSettings/FA7.ini similarity index 96% rename from Data/Sys/GameSettings/FA7E01.ini rename to Data/Sys/GameSettings/FA7.ini index ac66ec746..af1470dde 100644 --- a/Data/Sys/GameSettings/FA7E01.ini +++ b/Data/Sys/GameSettings/FA7.ini @@ -1,4 +1,4 @@ -# FA7E01 - Yoshi +# FA7E01, FA7P01 - Yoshi [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/FA8.ini b/Data/Sys/GameSettings/FA8.ini new file mode 100644 index 000000000..2332c02b2 --- /dev/null +++ b/Data/Sys/GameSettings/FA8.ini @@ -0,0 +1,33 @@ +# FA8E01, FA8F01, FA8P01 - Kirby's Adventure [NES] + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FA8E01.ini b/Data/Sys/GameSettings/FA8E01.ini deleted file mode 100644 index f4b3e596c..000000000 --- a/Data/Sys/GameSettings/FA8E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FA8E01 - Kirby's Adventure [NES] - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FABE01.ini b/Data/Sys/GameSettings/FAA.ini similarity index 94% rename from Data/Sys/GameSettings/FABE01.ini rename to Data/Sys/GameSettings/FAA.ini index e61e7d44f..09e96aee5 100644 --- a/Data/Sys/GameSettings/FABE01.ini +++ b/Data/Sys/GameSettings/FAA.ini @@ -1,12 +1,12 @@ -# FABE01 - Donkey Kong Jr. +# FAAE01, FAAP01 - Donkey Kong [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FAAP01.ini b/Data/Sys/GameSettings/FAB.ini similarity index 94% rename from Data/Sys/GameSettings/FAAP01.ini rename to Data/Sys/GameSettings/FAB.ini index 272bb635d..3f4329fac 100644 --- a/Data/Sys/GameSettings/FAAP01.ini +++ b/Data/Sys/GameSettings/FAB.ini @@ -1,12 +1,12 @@ -# FAAP01 - Donkey Kong +# FABE01, FABP01 - Donkey Kong Jr. [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FAG.ini b/Data/Sys/GameSettings/FAG.ini new file mode 100644 index 000000000..5cddea93c --- /dev/null +++ b/Data/Sys/GameSettings/FAG.ini @@ -0,0 +1,29 @@ +# FAGE01, FAGP01 - Super Mario Bros. + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 512 +EFBScale = 2 + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAGE01.ini b/Data/Sys/GameSettings/FAGE01.ini deleted file mode 100644 index e0ea08078..000000000 --- a/Data/Sys/GameSettings/FAGE01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FAGE01 - Super Mario Bros. - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAGP01.ini b/Data/Sys/GameSettings/FAGP01.ini deleted file mode 100644 index 0d56442f5..000000000 --- a/Data/Sys/GameSettings/FAGP01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FAGP01 - Super Mario Bros. - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAKE01.ini b/Data/Sys/GameSettings/FAK.ini similarity index 93% rename from Data/Sys/GameSettings/FAKE01.ini rename to Data/Sys/GameSettings/FAK.ini index e56fb9564..a14f07e13 100644 --- a/Data/Sys/GameSettings/FAKE01.ini +++ b/Data/Sys/GameSettings/FAK.ini @@ -1,4 +1,4 @@ -# FAKE01 - The Legend of Zelda +# FAKE01, FAKP01 - The Legend of Zelda [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/FAKP01.ini b/Data/Sys/GameSettings/FAKP01.ini deleted file mode 100644 index ce832befb..000000000 --- a/Data/Sys/GameSettings/FAKP01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FAKP01 - The Legend of Zelda - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FABP01.ini b/Data/Sys/GameSettings/FAL.ini similarity index 95% rename from Data/Sys/GameSettings/FABP01.ini rename to Data/Sys/GameSettings/FAL.ini index e1a641de1..14e1b1b45 100644 --- a/Data/Sys/GameSettings/FABP01.ini +++ b/Data/Sys/GameSettings/FAL.ini @@ -1,4 +1,4 @@ -# FABP01 - Donkey Kong Jr. +# FALE01, FALP01 - Baseball [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/FALE01.ini b/Data/Sys/GameSettings/FALE01.ini deleted file mode 100644 index c0b332ee4..000000000 --- a/Data/Sys/GameSettings/FALE01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FALE01 - Baseball - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FALP01.ini b/Data/Sys/GameSettings/FALP01.ini deleted file mode 100644 index 3faa0982f..000000000 --- a/Data/Sys/GameSettings/FALP01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FALP01 - Baseball - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAAE01.ini b/Data/Sys/GameSettings/FAO.ini similarity index 94% rename from Data/Sys/GameSettings/FAAE01.ini rename to Data/Sys/GameSettings/FAO.ini index 9d03bee13..d854f257e 100644 --- a/Data/Sys/GameSettings/FAAE01.ini +++ b/Data/Sys/GameSettings/FAO.ini @@ -1,12 +1,12 @@ -# FAAE01 - Donkey Kong +# FAOE01, FAOP01 - Solomon's Key [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FAOE01.ini b/Data/Sys/GameSettings/FAOE01.ini deleted file mode 100644 index 878b833af..000000000 --- a/Data/Sys/GameSettings/FAOE01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FAOE01 - Solomon's Key - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAOP01.ini b/Data/Sys/GameSettings/FAOP01.ini deleted file mode 100644 index 1e6177760..000000000 --- a/Data/Sys/GameSettings/FAOP01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FAOP01 - Solomon's Key - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAP.ini b/Data/Sys/GameSettings/FAP.ini new file mode 100644 index 000000000..aeaaf94c6 --- /dev/null +++ b/Data/Sys/GameSettings/FAP.ini @@ -0,0 +1,33 @@ +# FAPE01, FAPP01 - NES Open Tour. Golf + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAPE01.ini b/Data/Sys/GameSettings/FAPE01.ini deleted file mode 100644 index a2735c524..000000000 --- a/Data/Sys/GameSettings/FAPE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FAPE01 - NES Open Tour. Golf - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAPP01.ini b/Data/Sys/GameSettings/FAPP01.ini deleted file mode 100644 index 70c8f7796..000000000 --- a/Data/Sys/GameSettings/FAPP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FAPP01 - NES Open Tour. Golf - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FASE01.ini b/Data/Sys/GameSettings/FAS.ini similarity index 95% rename from Data/Sys/GameSettings/FASE01.ini rename to Data/Sys/GameSettings/FAS.ini index b5fbb8edb..9bba9805d 100644 --- a/Data/Sys/GameSettings/FASE01.ini +++ b/Data/Sys/GameSettings/FAS.ini @@ -1,4 +1,4 @@ -# FASE01 - Xevious +# FASE01, FASP01 - Xevious [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/FASP01.ini b/Data/Sys/GameSettings/FASP01.ini deleted file mode 100644 index c08ab59ad..000000000 --- a/Data/Sys/GameSettings/FASP01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# FASP01 - Xevious - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FA7P01.ini b/Data/Sys/GameSettings/FAX.ini similarity index 95% rename from Data/Sys/GameSettings/FA7P01.ini rename to Data/Sys/GameSettings/FAX.ini index 0345733c2..1ba16c2f9 100644 --- a/Data/Sys/GameSettings/FA7P01.ini +++ b/Data/Sys/GameSettings/FAX.ini @@ -1,12 +1,12 @@ -# FA7P01 - Mario & Yoshi +# FAXE01, FAXP01 - Pac-Man [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FA8P01.ini b/Data/Sys/GameSettings/FB4.ini similarity index 95% rename from Data/Sys/GameSettings/FA8P01.ini rename to Data/Sys/GameSettings/FB4.ini index caef04d7c..939aafec9 100644 --- a/Data/Sys/GameSettings/FA8P01.ini +++ b/Data/Sys/GameSettings/FB4.ini @@ -1,12 +1,12 @@ -# FA8P01 - Kirby's Adventure +# FB4E01, FB4P01 - Lunar Pool [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FB4E01.ini b/Data/Sys/GameSettings/FB4E01.ini deleted file mode 100644 index 2828f389d..000000000 --- a/Data/Sys/GameSettings/FB4E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FB4E01 - Lunar Pool - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FB4P01.ini b/Data/Sys/GameSettings/FB4P01.ini deleted file mode 100644 index c14e221cd..000000000 --- a/Data/Sys/GameSettings/FB4P01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FB4P01 - Lunar Pool - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBB.ini b/Data/Sys/GameSettings/FBB.ini new file mode 100644 index 000000000..125e5ad75 --- /dev/null +++ b/Data/Sys/GameSettings/FBB.ini @@ -0,0 +1,33 @@ +# FBBE01, FBBP01 - Mach Rider + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBBE01.ini b/Data/Sys/GameSettings/FBBE01.ini deleted file mode 100644 index d4053c8c6..000000000 --- a/Data/Sys/GameSettings/FBBE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBBE01 - Mach Rider - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBBP01.ini b/Data/Sys/GameSettings/FBBP01.ini deleted file mode 100644 index 7a8a0da1f..000000000 --- a/Data/Sys/GameSettings/FBBP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBBP01 - Mach Rider - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBD.ini b/Data/Sys/GameSettings/FBD.ini new file mode 100644 index 000000000..f354ce1c6 --- /dev/null +++ b/Data/Sys/GameSettings/FBD.ini @@ -0,0 +1,33 @@ +# FBDE01, FBDP01 - Kid Icarus + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBDE01.ini b/Data/Sys/GameSettings/FBDE01.ini deleted file mode 100644 index 194d6960e..000000000 --- a/Data/Sys/GameSettings/FBDE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBDE01 - Kid Icarus - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBDP01.ini b/Data/Sys/GameSettings/FBDP01.ini deleted file mode 100644 index d423b54e2..000000000 --- a/Data/Sys/GameSettings/FBDP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBDP01 - Kid Icarus - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBE.ini b/Data/Sys/GameSettings/FBE.ini new file mode 100644 index 000000000..a96401b74 --- /dev/null +++ b/Data/Sys/GameSettings/FBE.ini @@ -0,0 +1,33 @@ +# FBEE01, FBEP01 - Ice Climber + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBEE01.ini b/Data/Sys/GameSettings/FBEE01.ini deleted file mode 100644 index 29746c3a3..000000000 --- a/Data/Sys/GameSettings/FBEE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBEE01 - Ice Climber - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBEP01.ini b/Data/Sys/GameSettings/FBEP01.ini deleted file mode 100644 index 4fa8c180f..000000000 --- a/Data/Sys/GameSettings/FBEP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBEP01 - Ice Climber - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBH.ini b/Data/Sys/GameSettings/FBH.ini new file mode 100644 index 000000000..68c929e9a --- /dev/null +++ b/Data/Sys/GameSettings/FBH.ini @@ -0,0 +1,33 @@ +# FBHE01, FBHJ01, FBHP01 - Castlevania + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBHE01.ini b/Data/Sys/GameSettings/FBHE01.ini deleted file mode 100644 index 1c2f3d470..000000000 --- a/Data/Sys/GameSettings/FBHE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBHE01 - Castlevania - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBHJ01.ini b/Data/Sys/GameSettings/FBHJ01.ini deleted file mode 100644 index 1e8d64f8f..000000000 --- a/Data/Sys/GameSettings/FBHJ01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBHJ01 - Castlevania - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBHP01.ini b/Data/Sys/GameSettings/FBHP01.ini deleted file mode 100644 index 77a1c6a9a..000000000 --- a/Data/Sys/GameSettings/FBHP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBHP01 - Castlevania - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBI.ini b/Data/Sys/GameSettings/FBI.ini new file mode 100644 index 000000000..bc41d0a7e --- /dev/null +++ b/Data/Sys/GameSettings/FBI.ini @@ -0,0 +1,33 @@ +# FBIE01, FBIP01 - Punch-Out!! + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBIE01.ini b/Data/Sys/GameSettings/FBIE01.ini deleted file mode 100644 index 465c7f9e6..000000000 --- a/Data/Sys/GameSettings/FBIE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBIE01 - Punch-Out!! - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBIP01.ini b/Data/Sys/GameSettings/FBIP01.ini deleted file mode 100644 index 47967b66a..000000000 --- a/Data/Sys/GameSettings/FBIP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBIP01 - Punch-Out!! - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBJ.ini b/Data/Sys/GameSettings/FBJ.ini new file mode 100644 index 000000000..1e55ff858 --- /dev/null +++ b/Data/Sys/GameSettings/FBJ.ini @@ -0,0 +1,33 @@ +# FBJE01, FBJP01 - Mighty Bomb Jack + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBJE01.ini b/Data/Sys/GameSettings/FBJE01.ini deleted file mode 100644 index 4df8d4f51..000000000 --- a/Data/Sys/GameSettings/FBJE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBJE01 - Mighty Bomb Jack - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBJP01.ini b/Data/Sys/GameSettings/FBJP01.ini deleted file mode 100644 index 34d60feb0..000000000 --- a/Data/Sys/GameSettings/FBJP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBJP01 - Mighty Bomb Jack - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBL.ini b/Data/Sys/GameSettings/FBL.ini new file mode 100644 index 000000000..096a92f95 --- /dev/null +++ b/Data/Sys/GameSettings/FBL.ini @@ -0,0 +1,33 @@ +# FBLE01, FBLM01 - Lode Runner + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBLE01.ini b/Data/Sys/GameSettings/FBLE01.ini deleted file mode 100644 index d0eddfe0e..000000000 --- a/Data/Sys/GameSettings/FBLE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBLE01 - Lode Runner - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBLM01.ini b/Data/Sys/GameSettings/FBLM01.ini deleted file mode 100644 index 558f31bed..000000000 --- a/Data/Sys/GameSettings/FBLM01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBLM01 - Lode Runner - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBR.ini b/Data/Sys/GameSettings/FBR.ini new file mode 100644 index 000000000..45ce6b657 --- /dev/null +++ b/Data/Sys/GameSettings/FBR.ini @@ -0,0 +1,33 @@ +# FBRE01, FBRJ01, FBRP01 - Galaga + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBRE01.ini b/Data/Sys/GameSettings/FBRE01.ini deleted file mode 100644 index 810859469..000000000 --- a/Data/Sys/GameSettings/FBRE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBRE01 - Galaga - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBRJ01.ini b/Data/Sys/GameSettings/FBRJ01.ini deleted file mode 100644 index 63e804ef0..000000000 --- a/Data/Sys/GameSettings/FBRJ01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBRJ01 - Galaga - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBRP01.ini b/Data/Sys/GameSettings/FBRP01.ini deleted file mode 100644 index f27bed8fe..000000000 --- a/Data/Sys/GameSettings/FBRP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBRP01 - Galaga - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBS.ini b/Data/Sys/GameSettings/FBS.ini new file mode 100644 index 000000000..4d8f78d44 --- /dev/null +++ b/Data/Sys/GameSettings/FBS.ini @@ -0,0 +1,33 @@ +# FBSE01, FBSM01 - Milon's Secret Castle + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBSE01.ini b/Data/Sys/GameSettings/FBSE01.ini deleted file mode 100644 index 272e5aec0..000000000 --- a/Data/Sys/GameSettings/FBSE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBSE01 - Milon's Secret Castle - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBSM01.ini b/Data/Sys/GameSettings/FBSM01.ini deleted file mode 100644 index bb3e213a8..000000000 --- a/Data/Sys/GameSettings/FBSM01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBSM01 - Milon's Secret Castle - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBU.ini b/Data/Sys/GameSettings/FBU.ini new file mode 100644 index 000000000..6e1900b38 --- /dev/null +++ b/Data/Sys/GameSettings/FBU.ini @@ -0,0 +1,33 @@ +# FBUE01, FBUP01 - Adventures of Lolo + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBUE01.ini b/Data/Sys/GameSettings/FBUE01.ini deleted file mode 100644 index c20629ee2..000000000 --- a/Data/Sys/GameSettings/FBUE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBUE01 - Adventures of Lolo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FBUP01.ini b/Data/Sys/GameSettings/FBUP01.ini deleted file mode 100644 index 4eb9897eb..000000000 --- a/Data/Sys/GameSettings/FBUP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FBUP01 - Adventures of Lolo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FA6P01.ini b/Data/Sys/GameSettings/FC3.ini similarity index 94% rename from Data/Sys/GameSettings/FA6P01.ini rename to Data/Sys/GameSettings/FC3.ini index e683d8923..3a456859a 100644 --- a/Data/Sys/GameSettings/FA6P01.ini +++ b/Data/Sys/GameSettings/FC3.ini @@ -1,12 +1,12 @@ -# FA6P01 - Donkey Kong Jr. Math +# FC3E01, FC3P01 - Bubble Bobble [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FC3E01.ini b/Data/Sys/GameSettings/FC3E01.ini deleted file mode 100644 index 110d69ea1..000000000 --- a/Data/Sys/GameSettings/FC3E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FC3E01 - Bubble Bobble - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC3P01.ini b/Data/Sys/GameSettings/FC3P01.ini deleted file mode 100644 index fa00afc88..000000000 --- a/Data/Sys/GameSettings/FC3P01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FC3P01 - Bubble Bobble - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC6.ini b/Data/Sys/GameSettings/FC6.ini new file mode 100644 index 000000000..7f69ba44a --- /dev/null +++ b/Data/Sys/GameSettings/FC6.ini @@ -0,0 +1,33 @@ +# FC6E01, FC6P01 - StarTropics + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC6E01.ini b/Data/Sys/GameSettings/FC6E01.ini deleted file mode 100644 index dc9445f2f..000000000 --- a/Data/Sys/GameSettings/FC6E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FC6E01 - StarTropics - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC6P01.ini b/Data/Sys/GameSettings/FC6P01.ini deleted file mode 100644 index d3b7e214d..000000000 --- a/Data/Sys/GameSettings/FC6P01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FC6P01 - StarTropics - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC8.ini b/Data/Sys/GameSettings/FC8.ini new file mode 100644 index 000000000..a1626fdd8 --- /dev/null +++ b/Data/Sys/GameSettings/FC8.ini @@ -0,0 +1,33 @@ +# FC8E01, FC8J01, FC8P01 - Castlevania II + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC8E01.ini b/Data/Sys/GameSettings/FC8E01.ini deleted file mode 100644 index d1966e743..000000000 --- a/Data/Sys/GameSettings/FC8E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FC8E01 - Castlevania II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC8J01.ini b/Data/Sys/GameSettings/FC8J01.ini deleted file mode 100644 index d965c1fed..000000000 --- a/Data/Sys/GameSettings/FC8J01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FC8J01 - Castlevania II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FC8P01.ini b/Data/Sys/GameSettings/FC8P01.ini deleted file mode 100644 index 30fad9ad5..000000000 --- a/Data/Sys/GameSettings/FC8P01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FC8P01 - Castlevania II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCP.ini b/Data/Sys/GameSettings/FCP.ini new file mode 100644 index 000000000..7b93f0cc9 --- /dev/null +++ b/Data/Sys/GameSettings/FCP.ini @@ -0,0 +1,33 @@ +# FCPE01, FCPP01 - Balloon Fight + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCPE01.ini b/Data/Sys/GameSettings/FCPE01.ini deleted file mode 100644 index 7c23f38ec..000000000 --- a/Data/Sys/GameSettings/FCPE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCPE01 - Balloon Fight - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCPP01.ini b/Data/Sys/GameSettings/FCPP01.ini deleted file mode 100644 index 404fb2195..000000000 --- a/Data/Sys/GameSettings/FCPP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCPP01 - Balloon Fight - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCRE01.ini b/Data/Sys/GameSettings/FCR.ini similarity index 94% rename from Data/Sys/GameSettings/FCRE01.ini rename to Data/Sys/GameSettings/FCR.ini index 0ccc65248..37ef659c5 100644 --- a/Data/Sys/GameSettings/FCRE01.ini +++ b/Data/Sys/GameSettings/FCR.ini @@ -1,4 +1,4 @@ -# FCRE01 - Adventure Island +# FCRE01, FCRP01 - Adventure Island [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/FCRP01.ini b/Data/Sys/GameSettings/FCRP01.ini deleted file mode 100644 index 7f8862be8..000000000 --- a/Data/Sys/GameSettings/FCRP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCRP01 - Adventure Island - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAXE01.ini b/Data/Sys/GameSettings/FCS.ini similarity index 95% rename from Data/Sys/GameSettings/FAXE01.ini rename to Data/Sys/GameSettings/FCS.ini index bb372d353..d0cb3e932 100644 --- a/Data/Sys/GameSettings/FAXE01.ini +++ b/Data/Sys/GameSettings/FCS.ini @@ -1,4 +1,4 @@ -# FAXE01 - Pac-Man +# FCSE01, FCSP01 - Super C [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/FCSE01.ini b/Data/Sys/GameSettings/FCSE01.ini deleted file mode 100644 index 8a5d09e32..000000000 --- a/Data/Sys/GameSettings/FCSE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCSE01 - Super C - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCSP01.ini b/Data/Sys/GameSettings/FCSP01.ini deleted file mode 100644 index a2733026b..000000000 --- a/Data/Sys/GameSettings/FCSP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCSP01 - Probotector II: Return of the Evil Forces - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCT.ini b/Data/Sys/GameSettings/FCT.ini new file mode 100644 index 000000000..b1ce140d0 --- /dev/null +++ b/Data/Sys/GameSettings/FCT.ini @@ -0,0 +1,33 @@ +# FCTE01, FCTJ01, FCTP01 - Mega Man + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCTE01.ini b/Data/Sys/GameSettings/FCTE01.ini deleted file mode 100644 index ffc99a138..000000000 --- a/Data/Sys/GameSettings/FCTE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCTE01 - Mega Man - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCTJ01.ini b/Data/Sys/GameSettings/FCTJ01.ini deleted file mode 100644 index a508192a8..000000000 --- a/Data/Sys/GameSettings/FCTJ01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCTJ01 - Mega Man - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCTP01.ini b/Data/Sys/GameSettings/FCTP01.ini deleted file mode 100644 index 1e7427bd8..000000000 --- a/Data/Sys/GameSettings/FCTP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCTP01 - Mega Man - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCU.ini b/Data/Sys/GameSettings/FCU.ini new file mode 100644 index 000000000..c94793e2c --- /dev/null +++ b/Data/Sys/GameSettings/FCU.ini @@ -0,0 +1,33 @@ +# FCUE01, FCUP01 - Volleyball + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCUE01.ini b/Data/Sys/GameSettings/FCUE01.ini deleted file mode 100644 index 41e5488ce..000000000 --- a/Data/Sys/GameSettings/FCUE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCUE01 - Volleyball - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCUP01.ini b/Data/Sys/GameSettings/FCUP01.ini deleted file mode 100644 index d4ca7b1ae..000000000 --- a/Data/Sys/GameSettings/FCUP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCUP01 - Volleyball - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCV.ini b/Data/Sys/GameSettings/FCV.ini new file mode 100644 index 000000000..f7b1f94cb --- /dev/null +++ b/Data/Sys/GameSettings/FCV.ini @@ -0,0 +1,33 @@ +# FCVE01, FCVP01 - Wrecking Crew + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCVE01.ini b/Data/Sys/GameSettings/FCVE01.ini deleted file mode 100644 index 5f4bb6252..000000000 --- a/Data/Sys/GameSettings/FCVE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCVE01 - Wrecking Crew - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCVP01.ini b/Data/Sys/GameSettings/FCVP01.ini deleted file mode 100644 index 5f4f38c40..000000000 --- a/Data/Sys/GameSettings/FCVP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCVP01 - Wrecking Crew - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCW.ini b/Data/Sys/GameSettings/FCW.ini new file mode 100644 index 000000000..09957e9c3 --- /dev/null +++ b/Data/Sys/GameSettings/FCW.ini @@ -0,0 +1,33 @@ +# FCWE01, FCWP01 - Super Mario Bros. 3 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCWE01.ini b/Data/Sys/GameSettings/FCWE01.ini deleted file mode 100644 index eec135642..000000000 --- a/Data/Sys/GameSettings/FCWE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCWE01 - Super Mario Bros. 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCWP01.ini b/Data/Sys/GameSettings/FCWP01.ini deleted file mode 100644 index ab0a919f3..000000000 --- a/Data/Sys/GameSettings/FCWP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCWP01 - Super Mario Bros. 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCY.ini b/Data/Sys/GameSettings/FCY.ini new file mode 100644 index 000000000..acd5aa63c --- /dev/null +++ b/Data/Sys/GameSettings/FCY.ini @@ -0,0 +1,33 @@ +# FCYE01, FCYP01 - Yoshi's Cookie + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCYE01.ini b/Data/Sys/GameSettings/FCYE01.ini deleted file mode 100644 index cb59cfb4e..000000000 --- a/Data/Sys/GameSettings/FCYE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCYE01 - Yoshi's Cookie - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FCYP01.ini b/Data/Sys/GameSettings/FCYP01.ini deleted file mode 100644 index 84a0354cb..000000000 --- a/Data/Sys/GameSettings/FCYP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FCYP01 - Yoshi's Cookie - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FD2.ini b/Data/Sys/GameSettings/FD2.ini new file mode 100644 index 000000000..68ce28cb6 --- /dev/null +++ b/Data/Sys/GameSettings/FD2.ini @@ -0,0 +1,33 @@ +# FD2E01, FD2P01 - Double Dragon + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Texture filtering will cause glitches. + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FD2E01.ini b/Data/Sys/GameSettings/FD2E01.ini deleted file mode 100644 index 523f5f4c1..000000000 --- a/Data/Sys/GameSettings/FD2E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FD2E01 - Double Dragon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FD2P01.ini b/Data/Sys/GameSettings/FD2P01.ini deleted file mode 100644 index d4bfa8713..000000000 --- a/Data/Sys/GameSettings/FD2P01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FD2P01 - Double Dragon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Texture filtering will cause glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FD7.ini b/Data/Sys/GameSettings/FD7.ini new file mode 100644 index 000000000..1cc5674df --- /dev/null +++ b/Data/Sys/GameSettings/FD7.ini @@ -0,0 +1,33 @@ +# FD7E01, FD7J01, FD7P01 - Mega Man 3 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FD7E01.ini b/Data/Sys/GameSettings/FD7E01.ini deleted file mode 100644 index 68a5379e0..000000000 --- a/Data/Sys/GameSettings/FD7E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FD7E01 - Mega Man 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FD7J01.ini b/Data/Sys/GameSettings/FD7J01.ini deleted file mode 100644 index 88f9271aa..000000000 --- a/Data/Sys/GameSettings/FD7J01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FD7J01 - Mega Man 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FD7P01.ini b/Data/Sys/GameSettings/FD7P01.ini deleted file mode 100644 index 9c1e02964..000000000 --- a/Data/Sys/GameSettings/FD7P01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FD7P01 - Mega Man 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FA8F01.ini b/Data/Sys/GameSettings/FDA.ini similarity index 95% rename from Data/Sys/GameSettings/FA8F01.ini rename to Data/Sys/GameSettings/FDA.ini index 66b272812..019cab39f 100644 --- a/Data/Sys/GameSettings/FA8F01.ini +++ b/Data/Sys/GameSettings/FDA.ini @@ -1,12 +1,12 @@ -# FA8F01 - Kirby's Adventure +# FDAE01, FDAM01 - Spelunker [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FDAE01.ini b/Data/Sys/GameSettings/FDAE01.ini deleted file mode 100644 index ee499fd97..000000000 --- a/Data/Sys/GameSettings/FDAE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FDAE01 - Spelunker - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FDAM01.ini b/Data/Sys/GameSettings/FDAM01.ini deleted file mode 100644 index 008c73d0c..000000000 --- a/Data/Sys/GameSettings/FDAM01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FDAM01 - Spelunker - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FDP.ini b/Data/Sys/GameSettings/FDP.ini new file mode 100644 index 000000000..9b1e3ac7b --- /dev/null +++ b/Data/Sys/GameSettings/FDP.ini @@ -0,0 +1,33 @@ +# FDPE01, FDPP01 - Blades of Steel + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FDPE01.ini b/Data/Sys/GameSettings/FDPE01.ini deleted file mode 100644 index 63b1d952e..000000000 --- a/Data/Sys/GameSettings/FDPE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FDPE01 - Blades of Steel - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FDPP01.ini b/Data/Sys/GameSettings/FDPP01.ini deleted file mode 100644 index f81552203..000000000 --- a/Data/Sys/GameSettings/FDPP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FDPP01 - Blades of Steel - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FDV.ini b/Data/Sys/GameSettings/FDV.ini new file mode 100644 index 000000000..65d06dc9a --- /dev/null +++ b/Data/Sys/GameSettings/FDV.ini @@ -0,0 +1,33 @@ +# FDVE01, FDVP01 - River City Ransom + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FDVE01.ini b/Data/Sys/GameSettings/FDVE01.ini deleted file mode 100644 index aead663ad..000000000 --- a/Data/Sys/GameSettings/FDVE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FDVE01 - River City Ransom - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FDVP01.ini b/Data/Sys/GameSettings/FDVP01.ini deleted file mode 100644 index 744a03beb..000000000 --- a/Data/Sys/GameSettings/FDVP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FDVP01 - Street Gangs - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FAXP01.ini b/Data/Sys/GameSettings/FED.ini similarity index 95% rename from Data/Sys/GameSettings/FAXP01.ini rename to Data/Sys/GameSettings/FED.ini index ae6dc8140..bb0c2f680 100644 --- a/Data/Sys/GameSettings/FAXP01.ini +++ b/Data/Sys/GameSettings/FED.ini @@ -1,4 +1,4 @@ -# FAXP01 - Pac-Man +# FEDL01, FEDN01 - DIG DUG [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/FEDL01.ini b/Data/Sys/GameSettings/FEDL01.ini deleted file mode 100644 index 0584f3972..000000000 --- a/Data/Sys/GameSettings/FEDL01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEDL01 - DIG DUG - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEDN01.ini b/Data/Sys/GameSettings/FEDN01.ini deleted file mode 100644 index c4bb43187..000000000 --- a/Data/Sys/GameSettings/FEDN01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEDN01 - DIG DUG - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEI.ini b/Data/Sys/GameSettings/FEI.ini new file mode 100644 index 000000000..0553adbbf --- /dev/null +++ b/Data/Sys/GameSettings/FEI.ini @@ -0,0 +1,33 @@ +# FEIE01, FEIP01 - City Connection + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEIE01.ini b/Data/Sys/GameSettings/FEIE01.ini deleted file mode 100644 index 13a2da0ca..000000000 --- a/Data/Sys/GameSettings/FEIE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEIE01 - City Connection - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEIP01.ini b/Data/Sys/GameSettings/FEIP01.ini deleted file mode 100644 index 224ac7b0f..000000000 --- a/Data/Sys/GameSettings/FEIP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEIP01 - City Connection - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEQ.ini b/Data/Sys/GameSettings/FEQ.ini new file mode 100644 index 000000000..0ef9fe4d2 --- /dev/null +++ b/Data/Sys/GameSettings/FEQ.ini @@ -0,0 +1,33 @@ +# FEQE01, FEQJ01, FEQP01 - Castlevania III + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEQE01.ini b/Data/Sys/GameSettings/FEQE01.ini deleted file mode 100644 index 5c14daa96..000000000 --- a/Data/Sys/GameSettings/FEQE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEQE01 - Castlevania III - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEQJ01.ini b/Data/Sys/GameSettings/FEQJ01.ini deleted file mode 100644 index d5c7fa05d..000000000 --- a/Data/Sys/GameSettings/FEQJ01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEQJ01 - Castlevania III - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEQP01.ini b/Data/Sys/GameSettings/FEQP01.ini deleted file mode 100644 index 727211019..000000000 --- a/Data/Sys/GameSettings/FEQP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEQP01 - Castlevania III - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FER.ini b/Data/Sys/GameSettings/FER.ini new file mode 100644 index 000000000..276b06b95 --- /dev/null +++ b/Data/Sys/GameSettings/FER.ini @@ -0,0 +1,33 @@ +# FERE01, FERM01 - StarTropics II + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FERE01.ini b/Data/Sys/GameSettings/FERE01.ini deleted file mode 100644 index d1344bd87..000000000 --- a/Data/Sys/GameSettings/FERE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FERE01 - StarTropics II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FERM01.ini b/Data/Sys/GameSettings/FERM01.ini deleted file mode 100644 index 917f07fd9..000000000 --- a/Data/Sys/GameSettings/FERM01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FERM01 - StarTropics II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FA6E01.ini b/Data/Sys/GameSettings/FES.ini similarity index 95% rename from Data/Sys/GameSettings/FA6E01.ini rename to Data/Sys/GameSettings/FES.ini index 79d10feed..c6e1f9e77 100644 --- a/Data/Sys/GameSettings/FA6E01.ini +++ b/Data/Sys/GameSettings/FES.ini @@ -1,12 +1,12 @@ -# FA6E01 - Donkey Kong Jr. Math +# FESE01, FESP01 - Clu Clu Land [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/FESE01.ini b/Data/Sys/GameSettings/FESE01.ini deleted file mode 100644 index 316ea598b..000000000 --- a/Data/Sys/GameSettings/FESE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FESE01 - Clu Clu Land - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FESP01.ini b/Data/Sys/GameSettings/FESP01.ini deleted file mode 100644 index 36667e282..000000000 --- a/Data/Sys/GameSettings/FESP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FESP01 - Clu Clu Land - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEU.ini b/Data/Sys/GameSettings/FEU.ini new file mode 100644 index 000000000..f2dfafae4 --- /dev/null +++ b/Data/Sys/GameSettings/FEU.ini @@ -0,0 +1,33 @@ +# FEUE01, FEUP01 - Donkey Kong 3 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEUE01.ini b/Data/Sys/GameSettings/FEUE01.ini deleted file mode 100644 index 0e18db663..000000000 --- a/Data/Sys/GameSettings/FEUE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEUE01 - Donkey Kong 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FEUP01.ini b/Data/Sys/GameSettings/FEUP01.ini deleted file mode 100644 index 247569c87..000000000 --- a/Data/Sys/GameSettings/FEUP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FEUP01 - Donkey Kong 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFA.ini b/Data/Sys/GameSettings/FFA.ini new file mode 100644 index 000000000..857f2c1b6 --- /dev/null +++ b/Data/Sys/GameSettings/FFA.ini @@ -0,0 +1,33 @@ +# FFAE01, FFAM01 - Final Fantasy + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFAE01.ini b/Data/Sys/GameSettings/FFAE01.ini deleted file mode 100644 index c4d9bed49..000000000 --- a/Data/Sys/GameSettings/FFAE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFAE01 - Final Fantasy - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFAM01.ini b/Data/Sys/GameSettings/FFAM01.ini deleted file mode 100644 index d2929c86c..000000000 --- a/Data/Sys/GameSettings/FFAM01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFAM01 - Final Fantasy - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFE.ini b/Data/Sys/GameSettings/FFE.ini new file mode 100644 index 000000000..4f59af1c1 --- /dev/null +++ b/Data/Sys/GameSettings/FFE.ini @@ -0,0 +1,33 @@ +# FFEE01, FFEP01 - A Boy and His Blob + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFEE01.ini b/Data/Sys/GameSettings/FFEE01.ini deleted file mode 100644 index 01bab05ac..000000000 --- a/Data/Sys/GameSettings/FFEE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFEE01 - A Boy and His Blob - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFEP01.ini b/Data/Sys/GameSettings/FFEP01.ini deleted file mode 100644 index 42f7a9059..000000000 --- a/Data/Sys/GameSettings/FFEP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFEP01 - A Boy and His Blob - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFM.ini b/Data/Sys/GameSettings/FFM.ini new file mode 100644 index 000000000..1e90ce876 --- /dev/null +++ b/Data/Sys/GameSettings/FFM.ini @@ -0,0 +1,33 @@ +# FFME01, FFMP01 - Blaster Master + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFME01.ini b/Data/Sys/GameSettings/FFME01.ini deleted file mode 100644 index b19fab64d..000000000 --- a/Data/Sys/GameSettings/FFME01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFME01 - Blaster Master - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFMP01.ini b/Data/Sys/GameSettings/FFMP01.ini deleted file mode 100644 index 5aa7d2f5c..000000000 --- a/Data/Sys/GameSettings/FFMP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFMP01 - Blaster Master - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFN.ini b/Data/Sys/GameSettings/FFN.ini new file mode 100644 index 000000000..4d945c366 --- /dev/null +++ b/Data/Sys/GameSettings/FFN.ini @@ -0,0 +1,33 @@ +# FFNE01, FFNJ01, FFNP01 - Mega Man 4 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFNE01.ini b/Data/Sys/GameSettings/FFNE01.ini deleted file mode 100644 index 2ab15c79d..000000000 --- a/Data/Sys/GameSettings/FFNE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFNE01 - Mega Man 4 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFNJ01.ini b/Data/Sys/GameSettings/FFNJ01.ini deleted file mode 100644 index b59af5af2..000000000 --- a/Data/Sys/GameSettings/FFNJ01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFNJ01 - Mega Man 4 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFNP01.ini b/Data/Sys/GameSettings/FFNP01.ini deleted file mode 100644 index 3f562c300..000000000 --- a/Data/Sys/GameSettings/FFNP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFNP01 - Mega Man 4 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFQ.ini b/Data/Sys/GameSettings/FFQ.ini new file mode 100644 index 000000000..4e2efa999 --- /dev/null +++ b/Data/Sys/GameSettings/FFQ.ini @@ -0,0 +1,33 @@ +# FFQE01, FFQM01 - Shadow of the Ninja + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Texture filtering will cause glitches. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +EFBScale = 2 + +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True + +[Video_Enhancements] +MaxAnisotropy = 0 +ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFQE01.ini b/Data/Sys/GameSettings/FFQE01.ini deleted file mode 100644 index 8906ccd6c..000000000 --- a/Data/Sys/GameSettings/FFQE01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFQE01 - Shadow of the Ninja - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/FFQM01.ini b/Data/Sys/GameSettings/FFQM01.ini deleted file mode 100644 index 4bb87e0bb..000000000 --- a/Data/Sys/GameSettings/FFQM01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# FFQM01 - Shadow of the Ninja - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Texture filtering will cause glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/G6TE5G.ini b/Data/Sys/GameSettings/G2O.ini similarity index 95% rename from Data/Sys/GameSettings/G6TE5G.ini rename to Data/Sys/GameSettings/G2O.ini index 1d03726cf..e35825ff8 100644 --- a/Data/Sys/GameSettings/G6TE5G.ini +++ b/Data/Sys/GameSettings/G2O.ini @@ -1,4 +1,4 @@ -# G6TE5G - Teen Titans +# G2OE41, G2OP41 - PoP:WW [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G2TE52.ini b/Data/Sys/GameSettings/G2T.ini similarity index 90% rename from Data/Sys/GameSettings/G2TE52.ini rename to Data/Sys/GameSettings/G2T.ini index 9802ca585..79272325e 100644 --- a/Data/Sys/GameSettings/G2TE52.ini +++ b/Data/Sys/GameSettings/G2T.ini @@ -1,4 +1,4 @@ -# G2TE52 - Tony Hawk's Underground 2 +# G2TE52, G2TP52 - Tony Hawk's Underground 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G2TP52.ini b/Data/Sys/GameSettings/G2TP52.ini deleted file mode 100644 index 6cbe0cab6..000000000 --- a/Data/Sys/GameSettings/G2TP52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# G2TP52 - Tony Hawk's Underground 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/G2VE08.ini b/Data/Sys/GameSettings/G2V.ini similarity index 93% rename from Data/Sys/GameSettings/G2VE08.ini rename to Data/Sys/GameSettings/G2V.ini index edc895001..9e8b2b575 100644 --- a/Data/Sys/GameSettings/G2VE08.ini +++ b/Data/Sys/GameSettings/G2V.ini @@ -1,4 +1,4 @@ -# G2VE08 - Viewtiful Joe 2 +# G2VE08, G2VP08 - Viewtiful Joe 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G2VP08.ini b/Data/Sys/GameSettings/G2VP08.ini deleted file mode 100644 index ebe59cdf0..000000000 --- a/Data/Sys/GameSettings/G2VP08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# G2VP08 - Viewtiful Joe 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs xfb real for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/G2XE8P.ini b/Data/Sys/GameSettings/G2X.ini similarity index 93% rename from Data/Sys/GameSettings/G2XE8P.ini rename to Data/Sys/GameSettings/G2X.ini index e9c7554bf..fa7883e77 100644 --- a/Data/Sys/GameSettings/G2XE8P.ini +++ b/Data/Sys/GameSettings/G2X.ini @@ -1,4 +1,4 @@ -# G2XE8P - SONIC GEMS COLLECTION +# G2XE8P, G2XP8P - SONIC GEMS COLLECTION [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G2XP8P.ini b/Data/Sys/GameSettings/G2XP8P.ini deleted file mode 100644 index dfaf672bb..000000000 --- a/Data/Sys/GameSettings/G2XP8P.ini +++ /dev/null @@ -1,32 +0,0 @@ -# G2XP8P - SONIC GEMS COLLECTION - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Everything playable with minor glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/G3AP69.ini b/Data/Sys/GameSettings/G3A.ini similarity index 87% rename from Data/Sys/GameSettings/G3AP69.ini rename to Data/Sys/GameSettings/G3A.ini index b69ce26b8..1ddd3a3ff 100644 --- a/Data/Sys/GameSettings/G3AP69.ini +++ b/Data/Sys/GameSettings/G3A.ini @@ -1,4 +1,4 @@ -# G3AP69 - The Lord of the Rings, The Third Age +# G3AD69, G3AE69, G3AF69, G3AP69 - The Lord of the Rings, The Third Age [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G3AE69.ini b/Data/Sys/GameSettings/G3AE69.ini deleted file mode 100644 index 69054e48c..000000000 --- a/Data/Sys/GameSettings/G3AE69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G3AE69 - The Lord of the Rings, The Third Age - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/G3BP9G.ini b/Data/Sys/GameSettings/G3B.ini similarity index 90% rename from Data/Sys/GameSettings/G3BP9G.ini rename to Data/Sys/GameSettings/G3B.ini index 9fd3e79f3..42ff93ec7 100644 --- a/Data/Sys/GameSettings/G3BP9G.ini +++ b/Data/Sys/GameSettings/G3B.ini @@ -1,4 +1,4 @@ -# G3BP9G - Serious Sam: Next Encounter +# G3BE9G, G3BP54, G3BP9G - Serious Sam: Next Encounter [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G3BE9G.ini b/Data/Sys/GameSettings/G3BE9G.ini deleted file mode 100644 index c11e01c7d..000000000 --- a/Data/Sys/GameSettings/G3BE9G.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G3BE9G - Serious Sam: Next Encounter - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs EFB to Ram for transition scenes. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/G3BP54.ini b/Data/Sys/GameSettings/G3BP54.ini deleted file mode 100644 index 53a40028d..000000000 --- a/Data/Sys/GameSettings/G3BP54.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G3BP54 - Serious Sam: Next Encounter - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs EFB to Ram for transition scenes. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GRVEA4.ini b/Data/Sys/GameSettings/G3D.ini similarity index 90% rename from Data/Sys/GameSettings/GRVEA4.ini rename to Data/Sys/GameSettings/G3D.ini index fe8a448e4..2effb128b 100644 --- a/Data/Sys/GameSettings/GRVEA4.ini +++ b/Data/Sys/GameSettings/G3D.ini @@ -1,4 +1,4 @@ -# GRVEA4 - RAVE MASTER +# G3DE6L, G3DX6L - Carmen Sandiego [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G3FE69.ini b/Data/Sys/GameSettings/G3F.ini similarity index 89% rename from Data/Sys/GameSettings/G3FE69.ini rename to Data/Sys/GameSettings/G3F.ini index 0c0fcae7b..9223796d6 100644 --- a/Data/Sys/GameSettings/G3FE69.ini +++ b/Data/Sys/GameSettings/G3F.ini @@ -1,4 +1,4 @@ -# G3FE69 - TimeSplitters Future Perfect +# G3FE69, G3FP69 - TimeSplitters Future Perfect [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/G3FP69.ini b/Data/Sys/GameSettings/G3FP69.ini deleted file mode 100644 index 8dca42f64..000000000 --- a/Data/Sys/GameSettings/G3FP69.ini +++ /dev/null @@ -1,22 +0,0 @@ -# G3FP69 - TimeSplitters Future Perfect - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] diff --git a/Data/Sys/GameSettings/G3RE52.ini b/Data/Sys/GameSettings/G3R.ini similarity index 92% rename from Data/Sys/GameSettings/G3RE52.ini rename to Data/Sys/GameSettings/G3R.ini index 8f93095bd..b6b3771a9 100644 --- a/Data/Sys/GameSettings/G3RE52.ini +++ b/Data/Sys/GameSettings/G3R.ini @@ -1,4 +1,4 @@ -# G3RE52 - Shrek 2 +# G3RD52, G3RE52, G3RF52, G3RP52 - Shrek 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G3RD52.ini b/Data/Sys/GameSettings/G3RD52.ini deleted file mode 100644 index 9fcfa09dd..000000000 --- a/Data/Sys/GameSettings/G3RD52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G3RD52 - Shrek 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/G3RF52.ini b/Data/Sys/GameSettings/G3RF52.ini deleted file mode 100644 index 7316dd99b..000000000 --- a/Data/Sys/GameSettings/G3RF52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G3RF52 - Shrek 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/G3RP52.ini b/Data/Sys/GameSettings/G3RP52.ini deleted file mode 100644 index 00be94269..000000000 --- a/Data/Sys/GameSettings/G3RP52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G3RP52 - Shrek 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/G3DX6L.ini b/Data/Sys/GameSettings/G3V.ini similarity index 90% rename from Data/Sys/GameSettings/G3DX6L.ini rename to Data/Sys/GameSettings/G3V.ini index c6e10acda..813b2ec78 100644 --- a/Data/Sys/GameSettings/G3DX6L.ini +++ b/Data/Sys/GameSettings/G3V.ini @@ -1,8 +1,9 @@ -# G3DX6L - Carmen Sandiego +# G3VE69, G3VP69 - NBA STREET V3 [Core] # Values set here will override the main dolphin settings. + [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/G3VE69.ini b/Data/Sys/GameSettings/G3VE69.ini deleted file mode 100644 index 7d0f00a23..000000000 --- a/Data/Sys/GameSettings/G3VE69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# G3VE69 - NBA STREET V3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/G3VP69.ini b/Data/Sys/GameSettings/G3VP69.ini deleted file mode 100644 index 6646fe812..000000000 --- a/Data/Sys/GameSettings/G3VP69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# G3VP69 - NBA STREET V3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/G3XE52.ini b/Data/Sys/GameSettings/G3X.ini similarity index 92% rename from Data/Sys/GameSettings/G3XE52.ini rename to Data/Sys/GameSettings/G3X.ini index 958b1767e..c3b9b315e 100644 --- a/Data/Sys/GameSettings/G3XE52.ini +++ b/Data/Sys/GameSettings/G3X.ini @@ -1,4 +1,4 @@ -# G3XE52 - X-Men: The Official Game +# G3XE52, G3XP52 - X-Men: The Official Game [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G4BP08.ini b/Data/Sys/GameSettings/G4B.ini similarity index 89% rename from Data/Sys/GameSettings/G4BP08.ini rename to Data/Sys/GameSettings/G4B.ini index 235331f53..30d547a72 100644 --- a/Data/Sys/GameSettings/G4BP08.ini +++ b/Data/Sys/GameSettings/G4B.ini @@ -1,4 +1,4 @@ -# G4BP08 - resident evil 4 game disc 1 +# G4BE08, G4BP08 - resident evil 4 game disc 1 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G4CE54.ini b/Data/Sys/GameSettings/G4C.ini similarity index 89% rename from Data/Sys/GameSettings/G4CE54.ini rename to Data/Sys/GameSettings/G4C.ini index 4787b540d..027c1fc95 100644 --- a/Data/Sys/GameSettings/G4CE54.ini +++ b/Data/Sys/GameSettings/G4C.ini @@ -1,4 +1,4 @@ -# G4CE54 - Charlie and The Chocolate Factory +# G4CE54, G4CP54 - Charlie and The Chocolate Factory [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G4CP54.ini b/Data/Sys/GameSettings/G4CP54.ini deleted file mode 100644 index c31772dfc..000000000 --- a/Data/Sys/GameSettings/G4CP54.ini +++ /dev/null @@ -1,22 +0,0 @@ -# G4CP54 - Charlie and The Chocolate Factory - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/G4F.ini b/Data/Sys/GameSettings/G4F.ini new file mode 100644 index 000000000..4e6ced540 --- /dev/null +++ b/Data/Sys/GameSettings/G4F.ini @@ -0,0 +1,27 @@ +# G4FD69, G4FE69, G4FF69, G4FE69 - FIFA 07 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/G4ME69.ini b/Data/Sys/GameSettings/G4M.ini similarity index 91% rename from Data/Sys/GameSettings/G4ME69.ini rename to Data/Sys/GameSettings/G4M.ini index 3b7b51d02..9f426b636 100644 --- a/Data/Sys/GameSettings/G4ME69.ini +++ b/Data/Sys/GameSettings/G4M.ini @@ -1,4 +1,4 @@ -# G4ME69 - The Sims: Bustin Out GameCube +# G4ME69, G4MP69 - The Sims: Bustin Out GameCube [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GL7E64.ini b/Data/Sys/GameSettings/G4O.ini similarity index 91% rename from Data/Sys/GameSettings/GL7E64.ini rename to Data/Sys/GameSettings/G4O.ini index 426b08d03..ef4cb07fc 100644 --- a/Data/Sys/GameSettings/GL7E64.ini +++ b/Data/Sys/GameSettings/G4O.ini @@ -1,4 +1,4 @@ -# GL7E64 - StarWars Lego 2 +# G4OE69, G4OP69 - The Sims 2 Pets [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G4ZE69.ini b/Data/Sys/GameSettings/G4Z.ini similarity index 90% rename from Data/Sys/GameSettings/G4ZE69.ini rename to Data/Sys/GameSettings/G4Z.ini index 76c445213..a6edad2c9 100644 --- a/Data/Sys/GameSettings/G4ZE69.ini +++ b/Data/Sys/GameSettings/G4Z.ini @@ -1,4 +1,4 @@ -# G4ZE69 - The Sims 2 GameCube +# G4ZE69, G4ZP69 - The Sims 2 GameCube [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/G4ZP69.ini b/Data/Sys/GameSettings/G4ZP69.ini deleted file mode 100644 index 453fdc8be..000000000 --- a/Data/Sys/GameSettings/G4ZP69.ini +++ /dev/null @@ -1,19 +0,0 @@ -# G4ZP69 - The Sims 2 GameCube -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/G5DP78.ini b/Data/Sys/GameSettings/G5D.ini similarity index 91% rename from Data/Sys/GameSettings/G5DP78.ini rename to Data/Sys/GameSettings/G5D.ini index c8ffebb5d..189009b4a 100644 --- a/Data/Sys/GameSettings/G5DP78.ini +++ b/Data/Sys/GameSettings/G5D.ini @@ -1,4 +1,4 @@ -# G5DP78 - Scooby-Doo! Unmasked +# G5DE78, G5DP78 - Scooby-Doo! Unmasked [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G5NEAF.ini b/Data/Sys/GameSettings/G5N.ini similarity index 91% rename from Data/Sys/GameSettings/G5NEAF.ini rename to Data/Sys/GameSettings/G5N.ini index b8c392bcd..1fdf57484 100644 --- a/Data/Sys/GameSettings/G5NEAF.ini +++ b/Data/Sys/GameSettings/G5N.ini @@ -1,4 +1,4 @@ -# G5NEAF - Namco Museum 50th Anniversary +# G5NEAF, G5NP69 - Namco Museum 50th Anniversary [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G5NP69.ini b/Data/Sys/GameSettings/G5NP69.ini deleted file mode 100644 index 775070cc3..000000000 --- a/Data/Sys/GameSettings/G5NP69.ini +++ /dev/null @@ -1,31 +0,0 @@ -# G5NP69 - Namco Museum 50th Anniversary - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/G5SP7D.ini b/Data/Sys/GameSettings/G5S.ini similarity index 95% rename from Data/Sys/GameSettings/G5SP7D.ini rename to Data/Sys/GameSettings/G5S.ini index b2f061548..096e46036 100644 --- a/Data/Sys/GameSettings/G5SP7D.ini +++ b/Data/Sys/GameSettings/G5S.ini @@ -1,4 +1,4 @@ -# G5SP7D - Spyro +# G5SE7D, G5SP7D - Spyro [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G5SE7D.ini b/Data/Sys/GameSettings/G5SE7D.ini deleted file mode 100644 index bf87146c7..000000000 --- a/Data/Sys/GameSettings/G5SE7D.ini +++ /dev/null @@ -1,31 +0,0 @@ -# G5SE7D - Spyro - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Needs efb to Ram for proper lighting. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/G5TE69.ini b/Data/Sys/GameSettings/G5T.ini similarity index 92% rename from Data/Sys/GameSettings/G5TE69.ini rename to Data/Sys/GameSettings/G5T.ini index b0dd5c7e1..b3b619b46 100644 --- a/Data/Sys/GameSettings/G5TE69.ini +++ b/Data/Sys/GameSettings/G5T.ini @@ -1,4 +1,4 @@ -# G5TE69 - Tiger Woods PGA TOUR 2005 +# G5TE69, G5TP69 - Tiger Woods PGA TOUR 2005 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G5TP69.ini b/Data/Sys/GameSettings/G5TP69.ini deleted file mode 100644 index 8991fcee3..000000000 --- a/Data/Sys/GameSettings/G5TP69.ini +++ /dev/null @@ -1,33 +0,0 @@ -# G5TP69 - Tiger Woods PGA TOUR 2005 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/G6FE69.ini b/Data/Sys/GameSettings/G6F.ini similarity index 86% rename from Data/Sys/GameSettings/G6FE69.ini rename to Data/Sys/GameSettings/G6F.ini index d6a1f5657..42079f2af 100644 --- a/Data/Sys/GameSettings/G6FE69.ini +++ b/Data/Sys/GameSettings/G6F.ini @@ -1,4 +1,4 @@ -# G6FE69 - 2006 FIFA World Cup +# G6FD69, G6FE69, G6FF69, G6FP69 - 2006 FIFA World Cup [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G6FF69.ini b/Data/Sys/GameSettings/G6FF69.ini deleted file mode 100644 index 12ea2fec3..000000000 --- a/Data/Sys/GameSettings/G6FF69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# G6FF69 - 2006 FIFA World Cup - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. diff --git a/Data/Sys/GameSettings/G6FP69.ini b/Data/Sys/GameSettings/G6FP69.ini deleted file mode 100644 index 37dc967e6..000000000 --- a/Data/Sys/GameSettings/G6FP69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# G6FP69 - 2006 FIFA World Cup - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. diff --git a/Data/Sys/GameSettings/G6ME69.ini b/Data/Sys/GameSettings/G6M.ini similarity index 92% rename from Data/Sys/GameSettings/G6ME69.ini rename to Data/Sys/GameSettings/G6M.ini index 8d5b8c076..7cf073d45 100644 --- a/Data/Sys/GameSettings/G6ME69.ini +++ b/Data/Sys/GameSettings/G6M.ini @@ -1,4 +1,4 @@ -# G6ME69 - Madden NFL 06 +# G6ME69, G6MP69 - Madden NFL 06 [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/G6MP69.ini b/Data/Sys/GameSettings/G6MP69.ini deleted file mode 100644 index cc6e8751f..000000000 --- a/Data/Sys/GameSettings/G6MP69.ini +++ /dev/null @@ -1,20 +0,0 @@ -# G6MP69 - Madden NFL 06 - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for a couple of videos with logos during intro. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] diff --git a/Data/Sys/GameSettings/G4FP69.ini b/Data/Sys/GameSettings/G6N.ini similarity index 93% rename from Data/Sys/GameSettings/G4FP69.ini rename to Data/Sys/GameSettings/G6N.ini index af1ee0d4e..d67d211ba 100644 --- a/Data/Sys/GameSettings/G4FP69.ini +++ b/Data/Sys/GameSettings/G6N.ini @@ -1,12 +1,12 @@ -# G4FE69 - FIFA 07 +# G6NE69, G6NP69 - NBA LIVE 06 [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/G6NE69.ini b/Data/Sys/GameSettings/G6NE69.ini deleted file mode 100644 index b93a8a2dd..000000000 --- a/Data/Sys/GameSettings/G6NE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# G6NE69 - NBA LIVE 06 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/G6NP69.ini b/Data/Sys/GameSettings/G6NP69.ini deleted file mode 100644 index c8f28c376..000000000 --- a/Data/Sys/GameSettings/G6NP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# G6NP69 - NBA LIVE 06 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/G6TP5G.ini b/Data/Sys/GameSettings/G6T.ini similarity index 94% rename from Data/Sys/GameSettings/G6TP5G.ini rename to Data/Sys/GameSettings/G6T.ini index 442ba0958..d79092b93 100644 --- a/Data/Sys/GameSettings/G6TP5G.ini +++ b/Data/Sys/GameSettings/G6T.ini @@ -1,4 +1,4 @@ -# G6TP5G - Teen Titans +# G6TE5G, G6TP5G - Teen Titans [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G6WE69.ini b/Data/Sys/GameSettings/G6W.ini similarity index 92% rename from Data/Sys/GameSettings/G6WE69.ini rename to Data/Sys/GameSettings/G6W.ini index a9f9cef7e..b7b7c3ffd 100644 --- a/Data/Sys/GameSettings/G6WE69.ini +++ b/Data/Sys/GameSettings/G6W.ini @@ -1,4 +1,4 @@ -# G6WE69 - Tiger Woods PGA TOUR 06 +# G6WE69, G6WP69 - Tiger Woods PGA TOUR 06 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G6WP69.ini b/Data/Sys/GameSettings/G6WP69.ini deleted file mode 100644 index 6aacb6c76..000000000 --- a/Data/Sys/GameSettings/G6WP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G6WP69 - Tiger Woods PGA TOUR 06 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/G9RD7D.ini b/Data/Sys/GameSettings/G9R.ini similarity index 87% rename from Data/Sys/GameSettings/G9RD7D.ini rename to Data/Sys/GameSettings/G9R.ini index 93848f746..729cb62f2 100644 --- a/Data/Sys/GameSettings/G9RD7D.ini +++ b/Data/Sys/GameSettings/G9R.ini @@ -1,4 +1,4 @@ -# G9RD7D - Crash Tag Team Racing +# G9RD7D, G9RE7D, G9RF7D, G9RP7D - Crash Tag Team Racing [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G9RE7D.ini b/Data/Sys/GameSettings/G9RE7D.ini deleted file mode 100644 index 1c5542c5c..000000000 --- a/Data/Sys/GameSettings/G9RE7D.ini +++ /dev/null @@ -1,20 +0,0 @@ -# G9RE7D - Crash Tag Team Racing - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Idle skipping can cause speed issues. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/G9RF7D.ini b/Data/Sys/GameSettings/G9RF7D.ini deleted file mode 100644 index 9e8b3ff39..000000000 --- a/Data/Sys/GameSettings/G9RF7D.ini +++ /dev/null @@ -1,20 +0,0 @@ -# G9RF7D - Crash Tag Team Racing - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Idle skipping can cause speed issues. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/G9RP7D.ini b/Data/Sys/GameSettings/G9RP7D.ini deleted file mode 100644 index 4e36a423c..000000000 --- a/Data/Sys/GameSettings/G9RP7D.ini +++ /dev/null @@ -1,20 +0,0 @@ -# G9RP7D - Crash Tag Team Racing - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Idle skipping can cause speed issues. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/G9SE8P.ini b/Data/Sys/GameSettings/G9S.ini similarity index 93% rename from Data/Sys/GameSettings/G9SE8P.ini rename to Data/Sys/GameSettings/G9S.ini index a31485b3a..8e49ac239 100644 --- a/Data/Sys/GameSettings/G9SE8P.ini +++ b/Data/Sys/GameSettings/G9S.ini @@ -1,4 +1,4 @@ -# G9SE8P - SONIC HEROES +# G9SE8P, G9SJ8P, G9SP8P - SONIC HEROES [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G9SJ8P.ini b/Data/Sys/GameSettings/G9SJ8P.ini deleted file mode 100644 index 959ed384d..000000000 --- a/Data/Sys/GameSettings/G9SJ8P.ini +++ /dev/null @@ -1,31 +0,0 @@ -# G9SJ8P - SONIC HEROES - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - diff --git a/Data/Sys/GameSettings/G9SP8P.ini b/Data/Sys/GameSettings/G9SP8P.ini deleted file mode 100644 index dcadf7dda..000000000 --- a/Data/Sys/GameSettings/G9SP8P.ini +++ /dev/null @@ -1,31 +0,0 @@ -# G9SP8P - SONIC HEROES - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -EFBScale = 2 - diff --git a/Data/Sys/GameSettings/G9TD52.ini b/Data/Sys/GameSettings/G9T.ini similarity index 90% rename from Data/Sys/GameSettings/G9TD52.ini rename to Data/Sys/GameSettings/G9T.ini index fa32aa255..707135fa1 100644 --- a/Data/Sys/GameSettings/G9TD52.ini +++ b/Data/Sys/GameSettings/G9T.ini @@ -1,4 +1,4 @@ -# G9TD52 - Shark Tale +# G9TD52, G9TE52, G9TF52, G9TI52, G9TP52 - Shark Tale [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G9TE52.ini b/Data/Sys/GameSettings/G9TE52.ini deleted file mode 100644 index d85ea87ac..000000000 --- a/Data/Sys/GameSettings/G9TE52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G9TE52 - Shark Tale - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/G9TF52.ini b/Data/Sys/GameSettings/G9TF52.ini deleted file mode 100644 index e85c2dd88..000000000 --- a/Data/Sys/GameSettings/G9TF52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G9TF52 - Shark Tale - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/G9TI52.ini b/Data/Sys/GameSettings/G9TI52.ini deleted file mode 100644 index 98761ff48..000000000 --- a/Data/Sys/GameSettings/G9TI52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G9TI52 - Shark Tale - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/G9TP52.ini b/Data/Sys/GameSettings/G9TP52.ini deleted file mode 100644 index af130717a..000000000 --- a/Data/Sys/GameSettings/G9TP52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# G9TP52 - Shark Tale - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/GAZ.ini b/Data/Sys/GameSettings/GAZ.ini new file mode 100644 index 000000000..3be4cc510 --- /dev/null +++ b/Data/Sys/GameSettings/GAZ.ini @@ -0,0 +1,27 @@ +# GAZD69, GAZE69, GAZF69, GAZH69, GAZI69, GAZJ69, GAZM69, GAZP69, GAZS69 - Harry Potter : POA + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GAZD69.ini b/Data/Sys/GameSettings/GAZD69.ini deleted file mode 100644 index b64e63570..000000000 --- a/Data/Sys/GameSettings/GAZD69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZD69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZE69.ini b/Data/Sys/GameSettings/GAZE69.ini deleted file mode 100644 index fbb520f09..000000000 --- a/Data/Sys/GameSettings/GAZE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZE69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZF69.ini b/Data/Sys/GameSettings/GAZF69.ini deleted file mode 100644 index 92cda0bd0..000000000 --- a/Data/Sys/GameSettings/GAZF69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZF69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZH69.ini b/Data/Sys/GameSettings/GAZH69.ini deleted file mode 100644 index fda202822..000000000 --- a/Data/Sys/GameSettings/GAZH69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZH69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZI69.ini b/Data/Sys/GameSettings/GAZI69.ini deleted file mode 100644 index 26c477a89..000000000 --- a/Data/Sys/GameSettings/GAZI69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZI69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZJ69.ini b/Data/Sys/GameSettings/GAZJ69.ini deleted file mode 100644 index 1b13322c6..000000000 --- a/Data/Sys/GameSettings/GAZJ69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZJ69 - Harry Potter to Azkaban no Shuujin - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZM69.ini b/Data/Sys/GameSettings/GAZM69.ini deleted file mode 100644 index bcaf8599b..000000000 --- a/Data/Sys/GameSettings/GAZM69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZM69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZP69.ini b/Data/Sys/GameSettings/GAZP69.ini deleted file mode 100644 index d1657c78e..000000000 --- a/Data/Sys/GameSettings/GAZP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZP69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GAZS69.ini b/Data/Sys/GameSettings/GAZS69.ini deleted file mode 100644 index b8c463b4a..000000000 --- a/Data/Sys/GameSettings/GAZS69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GAZS69 - Harry Potter : POA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GB3E51.ini b/Data/Sys/GameSettings/GB3.ini similarity index 93% rename from Data/Sys/GameSettings/GB3E51.ini rename to Data/Sys/GameSettings/GB3.ini index 6163ac2a0..f44105898 100644 --- a/Data/Sys/GameSettings/GB3E51.ini +++ b/Data/Sys/GameSettings/GB3.ini @@ -1,4 +1,4 @@ -# GB3E51 - BMX XXX +# GB3E51, GB3P51 - BMX XXX [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GB3P51.ini b/Data/Sys/GameSettings/GB3P51.ini deleted file mode 100644 index f2ad2de94..000000000 --- a/Data/Sys/GameSettings/GB3P51.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GB3P51 - BMX XXX - -[Core] -# Values set here will override the main dolphin settings. -DSPHLE = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Slow audio with HLE. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[DSP] -EnableJIT = True diff --git a/Data/Sys/GameSettings/GBHDC8.ini b/Data/Sys/GameSettings/GBH.ini similarity index 92% rename from Data/Sys/GameSettings/GBHDC8.ini rename to Data/Sys/GameSettings/GBH.ini index 95458c33d..bdc31df8b 100644 --- a/Data/Sys/GameSettings/GBHDC8.ini +++ b/Data/Sys/GameSettings/GBH.ini @@ -1,4 +1,4 @@ -# GBHDC8 - Mystic Heroes +# GBHDC8, GBHFC8, GBHPC8 - Mystic Heroes [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GBHFC8.ini b/Data/Sys/GameSettings/GBHFC8.ini deleted file mode 100644 index b7da5c8cc..000000000 --- a/Data/Sys/GameSettings/GBHFC8.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GBHFC8 - Mystic Heroes - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GBHPC8.ini b/Data/Sys/GameSettings/GBHPC8.ini deleted file mode 100644 index fa41fa473..000000000 --- a/Data/Sys/GameSettings/GBHPC8.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GBHPC8 - Mystic Heroes - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/RDZP01.ini b/Data/Sys/GameSettings/GBI.ini similarity index 93% rename from Data/Sys/GameSettings/RDZP01.ini rename to Data/Sys/GameSettings/GBI.ini index 3e0379640..5f2f30392 100644 --- a/Data/Sys/GameSettings/RDZP01.ini +++ b/Data/Sys/GameSettings/GBI.ini @@ -1,4 +1,4 @@ -# RDZP01 - Disaster +# GBIE08, GBIP08 - Resident Evil [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GBSE8P.ini b/Data/Sys/GameSettings/GBS.ini similarity index 93% rename from Data/Sys/GameSettings/GBSE8P.ini rename to Data/Sys/GameSettings/GBS.ini index 1c7e346d8..739b5f24f 100644 --- a/Data/Sys/GameSettings/GBSE8P.ini +++ b/Data/Sys/GameSettings/GBS.ini @@ -1,4 +1,4 @@ -# GBSE8P - BEACH SPIKERS +# GBSE8P, GBSP8P - BEACH SPIKERS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GBSP8P.ini b/Data/Sys/GameSettings/GBSP8P.ini deleted file mode 100644 index 6bbdbbfba..000000000 --- a/Data/Sys/GameSettings/GBSP8P.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GBSP8P - BEACH SPIKERS - -[Core] -# Values set here will override the main dolphin settings. -FPRF = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -FastDepthCalc = False - diff --git a/Data/Sys/GameSettings/GBWF64.ini b/Data/Sys/GameSettings/GBW.ini similarity index 90% rename from Data/Sys/GameSettings/GBWF64.ini rename to Data/Sys/GameSettings/GBW.ini index dd17170e8..c34a9aa88 100644 --- a/Data/Sys/GameSettings/GBWF64.ini +++ b/Data/Sys/GameSettings/GBW.ini @@ -1,4 +1,4 @@ -# GBWF64 - Star Wars Bounty Hunter +# GBWD64, GBWE64, GBWF64, GBWP64 - Star Wars Bounty Hunter [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GBWP64.ini b/Data/Sys/GameSettings/GBWP64.ini deleted file mode 100644 index 86388351d..000000000 --- a/Data/Sys/GameSettings/GBWP64.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GBWP64 - Star Wars Bounty Hunter - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GBXE51.ini b/Data/Sys/GameSettings/GBX.ini similarity index 90% rename from Data/Sys/GameSettings/GBXE51.ini rename to Data/Sys/GameSettings/GBX.ini index 9931df5fa..ec8e29758 100644 --- a/Data/Sys/GameSettings/GBXE51.ini +++ b/Data/Sys/GameSettings/GBX.ini @@ -1,4 +1,4 @@ -# GBXE51 - Dave Mirra Freestyle Bmx2 +# GBXE51, GBXP51 - Dave Mirra Freestyle Bmx2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GBXP51.ini b/Data/Sys/GameSettings/GBXP51.ini deleted file mode 100644 index f206ca1c9..000000000 --- a/Data/Sys/GameSettings/GBXP51.ini +++ /dev/null @@ -1,23 +0,0 @@ -# GBXP51 - Dave Mirra Freestyle Bmx2 - -[Core] -# Values set here will override the main dolphin settings. -DSPHLE = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Slow audio with HLE. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[DSP] -EnableJIT = True - diff --git a/Data/Sys/GameSettings/GC3.ini b/Data/Sys/GameSettings/GC3.ini new file mode 100644 index 000000000..abe959796 --- /dev/null +++ b/Data/Sys/GameSettings/GC3.ini @@ -0,0 +1,27 @@ +# GC3D78, GC3E78, GC3F78, GC3P78 - Scooby-Doo!(tm) Mystery Mayhem + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GC3D78.ini b/Data/Sys/GameSettings/GC3D78.ini deleted file mode 100644 index 38354503c..000000000 --- a/Data/Sys/GameSettings/GC3D78.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GC3D78 - Scooby-Doo!(tm) Mystery Mayhem - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GC3E78.ini b/Data/Sys/GameSettings/GC3E78.ini deleted file mode 100644 index 0c2e24cfc..000000000 --- a/Data/Sys/GameSettings/GC3E78.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GC3E78 - Scooby-Doo!(tm) Mystery Mayhem - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GC3F78.ini b/Data/Sys/GameSettings/GC3F78.ini deleted file mode 100644 index ecbafd4d5..000000000 --- a/Data/Sys/GameSettings/GC3F78.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GC3F78 - Scooby-Doo!(tm) Mystery Mayhem - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GC3P78.ini b/Data/Sys/GameSettings/GC3P78.ini deleted file mode 100644 index 1fa8eb8ca..000000000 --- a/Data/Sys/GameSettings/GC3P78.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GC3P78 - Scooby-Doo!(tm) Mystery Mayhem - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GC6E01.ini b/Data/Sys/GameSettings/GC6.ini similarity index 93% rename from Data/Sys/GameSettings/GC6E01.ini rename to Data/Sys/GameSettings/GC6.ini index 9509c4561..8dcf94f26 100644 --- a/Data/Sys/GameSettings/GC6E01.ini +++ b/Data/Sys/GameSettings/GC6.ini @@ -1,4 +1,4 @@ -# GC6E01 - Pokemon Colosseum +# GC6E01, GC6P01 - Pokemon Colosseum [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GC6P01.ini b/Data/Sys/GameSettings/GC6P01.ini deleted file mode 100644 index d1d9e3075..000000000 --- a/Data/Sys/GameSettings/GC6P01.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GC6P01 - Pokemon Colosseum - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = If EFB scale is not integral, serious texture glitches occur. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 - -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/GCDP08.ini b/Data/Sys/GameSettings/GCD.ini similarity index 92% rename from Data/Sys/GameSettings/GCDP08.ini rename to Data/Sys/GameSettings/GCD.ini index c5ce39cdd..a9b8030d9 100644 --- a/Data/Sys/GameSettings/GCDP08.ini +++ b/Data/Sys/GameSettings/GCD.ini @@ -1,4 +1,4 @@ -# GCDP08 - RESIDENT EVIL CVX +# GCDE08, GCDJ08, GCDP08 - RESIDENT EVIL CVX [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GCDE08.ini b/Data/Sys/GameSettings/GCDE08.ini deleted file mode 100644 index a4a19a33f..000000000 --- a/Data/Sys/GameSettings/GCDE08.ini +++ /dev/null @@ -1,26 +0,0 @@ -# GCDE08 - RESIDENT EVIL CVX - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Per pixel lighting creates some lighting issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EnablePixelLighting = False diff --git a/Data/Sys/GameSettings/GCDJ08.ini b/Data/Sys/GameSettings/GCDJ08.ini deleted file mode 100644 index 2c5909a40..000000000 --- a/Data/Sys/GameSettings/GCDJ08.ini +++ /dev/null @@ -1,26 +0,0 @@ -# GCDJ08 - Biohazard: Code Veronica - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Per pixel lighting creates some lighting issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EnablePixelLighting = False diff --git a/Data/Sys/GameSettings/GCEE41.ini b/Data/Sys/GameSettings/GCE.ini similarity index 85% rename from Data/Sys/GameSettings/GCEE41.ini rename to Data/Sys/GameSettings/GCE.ini index eaec8d4ed..c082da635 100644 --- a/Data/Sys/GameSettings/GCEE41.ini +++ b/Data/Sys/GameSettings/GCE.ini @@ -1,4 +1,4 @@ -# GCEE41 - Tom Clancy's Splinter Cell +# GCEE41, GCEP41 - Tom Clancy's Splinter Cell [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/GCEP41.ini b/Data/Sys/GameSettings/GCEP41.ini deleted file mode 100644 index fa0e6a37b..000000000 --- a/Data/Sys/GameSettings/GCEP41.ini +++ /dev/null @@ -1,17 +0,0 @@ -# GCEP41 - Tom Clancy's Splinter Cell -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GCIE69.ini b/Data/Sys/GameSettings/GCI.ini similarity index 89% rename from Data/Sys/GameSettings/GCIE69.ini rename to Data/Sys/GameSettings/GCI.ini index f2ac2b7cf..1c715ddb5 100644 --- a/Data/Sys/GameSettings/GCIE69.ini +++ b/Data/Sys/GameSettings/GCI.ini @@ -1,4 +1,4 @@ -# GCIE69 - The Sims +# GCIE69, GCIP69 - The Sims [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/GCJE41.ini b/Data/Sys/GameSettings/GCJ.ini similarity index 75% rename from Data/Sys/GameSettings/GCJE41.ini rename to Data/Sys/GameSettings/GCJ.ini index 3a857f3a5..3ab624e79 100644 --- a/Data/Sys/GameSettings/GCJE41.ini +++ b/Data/Sys/GameSettings/GCJ.ini @@ -1,4 +1,4 @@ -# GCJE41 - Tom Clancy's Splinter Cell Chaos Theory +# GCJE41, GCJP41 - Tom Clancy's Splinter Cell Chaos Theory [Core] [EmuState] EmulationStateId = 3 diff --git a/Data/Sys/GameSettings/GCJP41.ini b/Data/Sys/GameSettings/GCJP41.ini deleted file mode 100644 index 700be3097..000000000 --- a/Data/Sys/GameSettings/GCJP41.ini +++ /dev/null @@ -1,15 +0,0 @@ -# GCJP41 - Tom Clancy's Splinter Cell Chaos Theory -[Core] -[EmuState] -EmulationStateId = 3 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GCPE6S.ini b/Data/Sys/GameSettings/GCP.ini similarity index 95% rename from Data/Sys/GameSettings/GCPE6S.ini rename to Data/Sys/GameSettings/GCP.ini index 52d4b867d..f9764a934 100644 --- a/Data/Sys/GameSettings/GCPE6S.ini +++ b/Data/Sys/GameSettings/GCP.ini @@ -1,4 +1,4 @@ -# GCPE6S - CASPER +# GCPE6S, GCPP6S - CASPER [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GCPP6S.ini b/Data/Sys/GameSettings/GCPP6S.ini deleted file mode 100644 index 9de08ce44..000000000 --- a/Data/Sys/GameSettings/GCPP6S.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GCPP6S - Casper Spirit Dimensions - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to appear. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/GCZE69.ini b/Data/Sys/GameSettings/GCZ.ini similarity index 94% rename from Data/Sys/GameSettings/GCZE69.ini rename to Data/Sys/GameSettings/GCZ.ini index b8145ed73..6a2373124 100644 --- a/Data/Sys/GameSettings/GCZE69.ini +++ b/Data/Sys/GameSettings/GCZ.ini @@ -1,4 +1,4 @@ -# GCZE69 - CATWOMAN +# GCZE69, GCZP69 - CATWOMAN [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GCZP69.ini b/Data/Sys/GameSettings/GCZP69.ini deleted file mode 100644 index 28139fdec..000000000 --- a/Data/Sys/GameSettings/GCZP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GCZP69 - CATWOMAN - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GDGE7H.ini b/Data/Sys/GameSettings/GDG.ini similarity index 93% rename from Data/Sys/GameSettings/GDGE7H.ini rename to Data/Sys/GameSettings/GDG.ini index 89b5a3fe3..79a12f672 100644 --- a/Data/Sys/GameSettings/GDGE7H.ini +++ b/Data/Sys/GameSettings/GDG.ini @@ -1,4 +1,4 @@ -# GDGE7H - Dragon's Lair 3D +# GDGE7H, GDGP78 - Dragon's Lair 3D [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GDGP78.ini b/Data/Sys/GameSettings/GDGP78.ini deleted file mode 100644 index cc7d5761a..000000000 --- a/Data/Sys/GameSettings/GDGP78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GDGP78 - Dragon's Lair 3D - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GDKEA4.ini b/Data/Sys/GameSettings/GDK.ini similarity index 91% rename from Data/Sys/GameSettings/GDKEA4.ini rename to Data/Sys/GameSettings/GDK.ini index 51dd69d58..f3bc24cef 100644 --- a/Data/Sys/GameSettings/GDKEA4.ini +++ b/Data/Sys/GameSettings/GDK.ini @@ -1,4 +1,4 @@ -# GDKEA4 - Disney Sports: Soccer +# GDKEA4, GDKJA4, GDKEA4 - Disney Sports: Soccer [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GDKJA4.ini b/Data/Sys/GameSettings/GDKJA4.ini deleted file mode 100644 index d4081aed6..000000000 --- a/Data/Sys/GameSettings/GDKJA4.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GDKJA4 - Disney Sports: Soccer - -[Core] -# Values set here will override the main dolphin settings. -# This game does not work properly with large memorycards, use a 251 block card -# see http://www.nintendo.com/consumer/memorycard1019.jsp -MemoryCard251 = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Need Projection Before R945 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GDKPA4.ini b/Data/Sys/GameSettings/GDKPA4.ini deleted file mode 100644 index 2468e3453..000000000 --- a/Data/Sys/GameSettings/GDKPA4.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GDKEA4 - Disney Sports: Football (Soccer) - -[Core] -# Values set here will override the main dolphin settings. -# This game does not work properly with large memorycards, use a 251 block card -# see http://www.nintendo.com/consumer/memorycard1019.jsp -MemoryCard251 = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Need Projection Before R945 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GDME01.ini b/Data/Sys/GameSettings/GDM.ini similarity index 82% rename from Data/Sys/GameSettings/GDME01.ini rename to Data/Sys/GameSettings/GDM.ini index df46e9ea4..76d42bdb3 100644 --- a/Data/Sys/GameSettings/GDME01.ini +++ b/Data/Sys/GameSettings/GDM.ini @@ -1,4 +1,4 @@ -# GDME01 - Disney's Magical Mirror starring Mickey Mouse +# GDME01, GDMJ01, GDMP01 - Disney's Magical Mirror starring Mickey Mouse [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GDMJ01.ini b/Data/Sys/GameSettings/GDMJ01.ini deleted file mode 100644 index b47afdf53..000000000 --- a/Data/Sys/GameSettings/GDMJ01.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GDMJ01 - Disney's Mickey Mouse no Fushigi na Kagami - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GDMP01.ini b/Data/Sys/GameSettings/GDMP01.ini deleted file mode 100644 index c8028e4c6..000000000 --- a/Data/Sys/GameSettings/GDMP01.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GDMP01 - Disney's Magical Mirror starring Mickey Mouse - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GDQP6S.ini b/Data/Sys/GameSettings/GDQ.ini similarity index 93% rename from Data/Sys/GameSettings/GDQP6S.ini rename to Data/Sys/GameSettings/GDQ.ini index 4361c5f20..af58b1703 100644 --- a/Data/Sys/GameSettings/GDQP6S.ini +++ b/Data/Sys/GameSettings/GDQ.ini @@ -1,4 +1,4 @@ -# GDQP6S - Darkened Skye +# GDQE6S, GDQP6S - Darkened Skye [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GDQE6S.ini b/Data/Sys/GameSettings/GDQE6S.ini deleted file mode 100644 index f40cb5c4b..000000000 --- a/Data/Sys/GameSettings/GDQE6S.ini +++ /dev/null @@ -1,21 +0,0 @@ -# GDQE6S - Darkened Skye - -[Core] -# Values set here will override the main dolphin settings. -# This game does not work properly with large memorycards, use a 251 block card -# see http://www.nintendo.com/consumer/memorycard1019.jsp -MemoryCard251 = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GDSE78.ini b/Data/Sys/GameSettings/GDS.ini similarity index 94% rename from Data/Sys/GameSettings/GDSE78.ini rename to Data/Sys/GameSettings/GDS.ini index 0a0d7d0cc..8f27016ad 100644 --- a/Data/Sys/GameSettings/GDSE78.ini +++ b/Data/Sys/GameSettings/GDS.ini @@ -1,4 +1,4 @@ -# GDSE78 - Dark Summit +# GDSE78, GDSP78 - Dark Summit [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GDXEA4.ini b/Data/Sys/GameSettings/GDX.ini similarity index 85% rename from Data/Sys/GameSettings/GDXEA4.ini rename to Data/Sys/GameSettings/GDX.ini index f14521a10..cfa4b12e8 100644 --- a/Data/Sys/GameSettings/GDXEA4.ini +++ b/Data/Sys/GameSettings/GDX.ini @@ -1,4 +1,4 @@ -# GDXEA4 - Disney Sports Skateboarding +# GDXEA4, GDXJA4, GDXPA4 - Disney Sports Skateboarding [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GDXJA4.ini b/Data/Sys/GameSettings/GDXJA4.ini deleted file mode 100644 index 813fc9f09..000000000 --- a/Data/Sys/GameSettings/GDXJA4.ini +++ /dev/null @@ -1,10 +0,0 @@ -# GDXJA4 - Disney Sports Skateboarding - -[Core] -# Values set here will override the main Dolphin settings. -MemoryCard251 = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = -EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp diff --git a/Data/Sys/GameSettings/GDXPA4.ini b/Data/Sys/GameSettings/GDXPA4.ini deleted file mode 100644 index 95429b8e4..000000000 --- a/Data/Sys/GameSettings/GDXPA4.ini +++ /dev/null @@ -1,10 +0,0 @@ -# GDXPA4 - Disney Sports Skateboarding - -[Core] -# Values set here will override the main Dolphin settings. -MemoryCard251 = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = -EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp diff --git a/Data/Sys/GameSettings/GEAE8P.ini b/Data/Sys/GameSettings/GEA.ini similarity index 92% rename from Data/Sys/GameSettings/GEAE8P.ini rename to Data/Sys/GameSettings/GEA.ini index 327d9974a..296ae178d 100644 --- a/Data/Sys/GameSettings/GEAE8P.ini +++ b/Data/Sys/GameSettings/GEA.ini @@ -1,4 +1,4 @@ -# GEAE8P - Skies of Arcadia Legends +# GEAE8P, GEAP8P - Skies of Arcadia Legends [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GEAP8P.ini b/Data/Sys/GameSettings/GEAP8P.ini deleted file mode 100644 index 3ad9bc241..000000000 --- a/Data/Sys/GameSettings/GEAP8P.ini +++ /dev/null @@ -1,34 +0,0 @@ -# GEAP8P - Skies of Arcadia Legends - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GEDE01.ini b/Data/Sys/GameSettings/GED.ini similarity index 93% rename from Data/Sys/GameSettings/GEDE01.ini rename to Data/Sys/GameSettings/GED.ini index 752ec4c63..dc5e9f4e2 100644 --- a/Data/Sys/GameSettings/GEDE01.ini +++ b/Data/Sys/GameSettings/GED.ini @@ -1,4 +1,4 @@ -# GEDE01 - Eternal Darkness +# GEDE01, GEDP01 - Eternal Darkness [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GEN.ini b/Data/Sys/GameSettings/GEN.ini new file mode 100644 index 000000000..8df3db7f5 --- /dev/null +++ b/Data/Sys/GameSettings/GEN.ini @@ -0,0 +1,30 @@ +# GEND69, GENE69, GENP69, GENS69 - 007: Everything or Nothing + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/GEND69.ini b/Data/Sys/GameSettings/GEND69.ini deleted file mode 100644 index 927ae7c83..000000000 --- a/Data/Sys/GameSettings/GEND69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GEND69 - 007: Everything or Nothing - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GENE69.ini b/Data/Sys/GameSettings/GENE69.ini deleted file mode 100644 index 3be6ef440..000000000 --- a/Data/Sys/GameSettings/GENE69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GENE69 - 007: Everything or Nothing - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GENP69.ini b/Data/Sys/GameSettings/GENP69.ini deleted file mode 100644 index 65edd97f7..000000000 --- a/Data/Sys/GameSettings/GENP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GENP69 - 007: Everything or Nothing - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GENS69.ini b/Data/Sys/GameSettings/GENS69.ini deleted file mode 100644 index fdb751f11..000000000 --- a/Data/Sys/GameSettings/GENS69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GENS69 - 007: Everything or Nothing - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GEOE08.ini b/Data/Sys/GameSettings/GEO.ini similarity index 93% rename from Data/Sys/GameSettings/GEOE08.ini rename to Data/Sys/GameSettings/GEO.ini index 1cc77cd5d..23a69615e 100644 --- a/Data/Sys/GameSettings/GEOE08.ini +++ b/Data/Sys/GameSettings/GEO.ini @@ -1,4 +1,4 @@ -# GEOE08 - CAPCOM VS. SNK 2 EO +# GEOE08, GEOP08 - CAPCOM VS. SNK 2 EO [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GEOP08.ini b/Data/Sys/GameSettings/GEOP08.ini deleted file mode 100644 index 566d1a979..000000000 --- a/Data/Sys/GameSettings/GEOP08.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GEOP08 - CAPCOM VS. SNK 2 EO - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 512 -EFBScale = -1 diff --git a/Data/Sys/GameSettings/G2OE41.ini b/Data/Sys/GameSettings/GEZ.ini similarity index 94% rename from Data/Sys/GameSettings/G2OE41.ini rename to Data/Sys/GameSettings/GEZ.ini index 92dba2c5a..a2026d189 100644 --- a/Data/Sys/GameSettings/G2OE41.ini +++ b/Data/Sys/GameSettings/GEZ.ini @@ -1,12 +1,12 @@ -# G2OE41 - PoP:WW +# GEZE8P, GEZP8P - BillyHatcher [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/GEZE8P.ini b/Data/Sys/GameSettings/GEZE8P.ini deleted file mode 100644 index dd4a2cacf..000000000 --- a/Data/Sys/GameSettings/GEZE8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GEZE8P - BillyHatcher - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GEZP8P.ini b/Data/Sys/GameSettings/GEZP8P.ini deleted file mode 100644 index 579f69129..000000000 --- a/Data/Sys/GameSettings/GEZP8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GEZP8P - BillyHatcher - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GFDD69.ini b/Data/Sys/GameSettings/GF4.ini similarity index 92% rename from Data/Sys/GameSettings/GFDD69.ini rename to Data/Sys/GameSettings/GF4.ini index 2ce4c7abc..9aa894705 100644 --- a/Data/Sys/GameSettings/GFDD69.ini +++ b/Data/Sys/GameSettings/GF4.ini @@ -1,12 +1,12 @@ -# GFDD69 - Freedom Fighters +# GF4E52, GF4F52, GF4P52 - Fantastic Four [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = EmulationStateId = 4 +EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/G4FE69.ini b/Data/Sys/GameSettings/GF6.ini similarity index 94% rename from Data/Sys/GameSettings/G4FE69.ini rename to Data/Sys/GameSettings/GF6.ini index af1ee0d4e..7dac806b0 100644 --- a/Data/Sys/GameSettings/G4FE69.ini +++ b/Data/Sys/GameSettings/GF6.ini @@ -1,4 +1,4 @@ -# G4FE69 - FIFA 07 +# GF6E69, GF6F69 - FIFA 06 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GF6E69.ini b/Data/Sys/GameSettings/GF6E69.ini deleted file mode 100644 index a96e25211..000000000 --- a/Data/Sys/GameSettings/GF6E69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GF6E69 - FIFA 06 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GF6F69.ini b/Data/Sys/GameSettings/GF6F69.ini deleted file mode 100644 index 61eaf02a1..000000000 --- a/Data/Sys/GameSettings/GF6F69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GF6F69 - FIFA 06 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GFA.ini b/Data/Sys/GameSettings/GFA.ini new file mode 100644 index 000000000..312d56ae0 --- /dev/null +++ b/Data/Sys/GameSettings/GFA.ini @@ -0,0 +1,27 @@ +# GFAD69, GFAE69, GFAP69, GFAS69 - FIFA 2003 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GFAD69.ini b/Data/Sys/GameSettings/GFAD69.ini deleted file mode 100644 index 704aa1915..000000000 --- a/Data/Sys/GameSettings/GFAD69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GFAD69 - FIFA 2003 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GFAE69.ini b/Data/Sys/GameSettings/GFAE69.ini deleted file mode 100644 index 0e25264f5..000000000 --- a/Data/Sys/GameSettings/GFAE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GFAE69 - FIFA 2003 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GFAP69.ini b/Data/Sys/GameSettings/GFAP69.ini deleted file mode 100644 index 5199999b4..000000000 --- a/Data/Sys/GameSettings/GFAP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GFAP69 - FIFA 2003 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GFAS69.ini b/Data/Sys/GameSettings/GFAS69.ini deleted file mode 100644 index ccb54c89a..000000000 --- a/Data/Sys/GameSettings/GFAS69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GFAS69 - FIFA 2003 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GF4F52.ini b/Data/Sys/GameSettings/GFD.ini similarity index 93% rename from Data/Sys/GameSettings/GF4F52.ini rename to Data/Sys/GameSettings/GFD.ini index 780e06676..fc4e01c58 100644 --- a/Data/Sys/GameSettings/GF4F52.ini +++ b/Data/Sys/GameSettings/GFD.ini @@ -1,12 +1,12 @@ -# GF4F52 - Fantastic Four +# GFDD69, GFDE69 - Freedom Fighters [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/GFDE69.ini b/Data/Sys/GameSettings/GFDE69.ini deleted file mode 100644 index 2159035b2..000000000 --- a/Data/Sys/GameSettings/GFDE69.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GFDE69 - Freedom Fighters - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/GFGEA4.ini b/Data/Sys/GameSettings/GFG.ini similarity index 93% rename from Data/Sys/GameSettings/GFGEA4.ini rename to Data/Sys/GameSettings/GFG.ini index ad0106cd3..0f8a20c08 100644 --- a/Data/Sys/GameSettings/GFGEA4.ini +++ b/Data/Sys/GameSettings/GFG.ini @@ -1,4 +1,4 @@ -# GFGEA4 - Frogger Beyond +# GFGEA4, GFGPA4 - Frogger Beyond [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GFGPA4.ini b/Data/Sys/GameSettings/GFGPA4.ini deleted file mode 100644 index a92a668ec..000000000 --- a/Data/Sys/GameSettings/GFGPA4.ini +++ /dev/null @@ -1,26 +0,0 @@ -# GFGPA4 - Frogger Beyond - -[Core] -# Values set here will override the main Dolphin settings. -DSPHLE = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[DSP] -EnableJIT = True - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGEE41.ini b/Data/Sys/GameSettings/GGE.ini similarity index 91% rename from Data/Sys/GameSettings/GGEE41.ini rename to Data/Sys/GameSettings/GGE.ini index 70c3635a3..d94009908 100644 --- a/Data/Sys/GameSettings/GGEE41.ini +++ b/Data/Sys/GameSettings/GGE.ini @@ -1,4 +1,4 @@ -# GGEE41 - Beyond Good and Evil +# GGEE41, GGEP41, GGEY41 - Beyond Good and Evil [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GGEP41.ini b/Data/Sys/GameSettings/GGEP41.ini deleted file mode 100644 index 0c60e996c..000000000 --- a/Data/Sys/GameSettings/GGEP41.ini +++ /dev/null @@ -1,34 +0,0 @@ -# GGEP41 - Beyond Good and Evil - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBAccessEnable = True - diff --git a/Data/Sys/GameSettings/GGEY41.ini b/Data/Sys/GameSettings/GGEY41.ini deleted file mode 100644 index e5a698aac..000000000 --- a/Data/Sys/GameSettings/GGEY41.ini +++ /dev/null @@ -1,34 +0,0 @@ -# GGEY41 - Beyond Good and Evil - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBAccessEnable = True - diff --git a/Data/Sys/GameSettings/GGPE01.ini b/Data/Sys/GameSettings/GGP.ini similarity index 93% rename from Data/Sys/GameSettings/GGPE01.ini rename to Data/Sys/GameSettings/GGP.ini index 83efda95c..533a8fe8b 100644 --- a/Data/Sys/GameSettings/GGPE01.ini +++ b/Data/Sys/GameSettings/GGP.ini @@ -1,4 +1,4 @@ -# GGPE01 - Mario Kart GP +# GGPE01, GGPE02 - Mario Kart GP [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GGVP78.ini b/Data/Sys/GameSettings/GGV.ini similarity index 80% rename from Data/Sys/GameSettings/GGVP78.ini rename to Data/Sys/GameSettings/GGV.ini index 13b6e320c..1e4da96fd 100644 --- a/Data/Sys/GameSettings/GGVP78.ini +++ b/Data/Sys/GameSettings/GGV.ini @@ -1,4 +1,4 @@ -# GGVP78 - The SpongeBob SquarePants Movie +# GGVD78, GGVE78, GGVP78, GGVX78 - The SpongeBob SquarePants Movie [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/GGVD78.ini b/Data/Sys/GameSettings/GGVD78.ini deleted file mode 100644 index afa39b5ff..000000000 --- a/Data/Sys/GameSettings/GGVD78.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GGVD78 - The SpongeBob SquarePants Movie -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGVE78.ini b/Data/Sys/GameSettings/GGVE78.ini deleted file mode 100644 index 116dd30fe..000000000 --- a/Data/Sys/GameSettings/GGVE78.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GGVE78 - The SpongeBob SquarePants Movie -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGVX78.ini b/Data/Sys/GameSettings/GGVX78.ini deleted file mode 100644 index 0c04afc3a..000000000 --- a/Data/Sys/GameSettings/GGVX78.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GGVX78 - The SpongeBob SquarePants Movie -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGYE41.ini b/Data/Sys/GameSettings/GGY.ini similarity index 95% rename from Data/Sys/GameSettings/GGYE41.ini rename to Data/Sys/GameSettings/GGY.ini index 279e6db50..729ec852a 100644 --- a/Data/Sys/GameSettings/GGYE41.ini +++ b/Data/Sys/GameSettings/GGY.ini @@ -1,4 +1,4 @@ -# GGYE41 - GR2GC +# GGYE41, GGYP41 - GR2GC [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GGYP41.ini b/Data/Sys/GameSettings/GGYP41.ini deleted file mode 100644 index 2699c3a60..000000000 --- a/Data/Sys/GameSettings/GGYP41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GGYP41 - GR2GC - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs Real XFB for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GGZE52.ini b/Data/Sys/GameSettings/GGZ.ini similarity index 94% rename from Data/Sys/GameSettings/GGZE52.ini rename to Data/Sys/GameSettings/GGZ.ini index 086790a1b..73f34d678 100644 --- a/Data/Sys/GameSettings/GGZE52.ini +++ b/Data/Sys/GameSettings/GGZ.ini @@ -1,4 +1,4 @@ -# GGZE52 - Madagascar +# GGZE52, GGZX52 - Madagascar [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GGZX52.ini b/Data/Sys/GameSettings/GGZX52.ini deleted file mode 100644 index 28c7c1836..000000000 --- a/Data/Sys/GameSettings/GGZX52.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GGZX52 - Madagascar - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = GFX glitches. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False - diff --git a/Data/Sys/GameSettings/GH2P69.ini b/Data/Sys/GameSettings/GH2.ini similarity index 94% rename from Data/Sys/GameSettings/GH2P69.ini rename to Data/Sys/GameSettings/GH2.ini index 4c0759520..260158d33 100644 --- a/Data/Sys/GameSettings/GH2P69.ini +++ b/Data/Sys/GameSettings/GH2.ini @@ -1,4 +1,4 @@ -# GH2P69 - NFS: HP2 +# GH2E69, GH2P69 - NFS: HP2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GH2E69.ini b/Data/Sys/GameSettings/GH2E69.ini deleted file mode 100644 index 2fc717611..000000000 --- a/Data/Sys/GameSettings/GH2E69.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GH2E69 - NFS: HP2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = The game is slow. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/G3AD69.ini b/Data/Sys/GameSettings/GH4.ini similarity index 80% rename from Data/Sys/GameSettings/G3AD69.ini rename to Data/Sys/GameSettings/GH4.ini index cf4b9acdd..0841856b3 100644 --- a/Data/Sys/GameSettings/G3AD69.ini +++ b/Data/Sys/GameSettings/GH4.ini @@ -1,4 +1,4 @@ -# G3AD69 - The Lord of the Rings, The Third Age +# GH4D69, GH4E69, GH4F69, GH4H69, GH4I69, GH4J69, GH4M69, GH4P69, GH4S69 - Harry Potter and the Goblet of Fire [Core] # Values set here will override the main dolphin settings. @@ -25,6 +25,3 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/GH4D69.ini b/Data/Sys/GameSettings/GH4D69.ini deleted file mode 100644 index de5c9f1b9..000000000 --- a/Data/Sys/GameSettings/GH4D69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4D69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4E69.ini b/Data/Sys/GameSettings/GH4E69.ini deleted file mode 100644 index 5938d2efb..000000000 --- a/Data/Sys/GameSettings/GH4E69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4E69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4F69.ini b/Data/Sys/GameSettings/GH4F69.ini deleted file mode 100644 index 1a2fa86a5..000000000 --- a/Data/Sys/GameSettings/GH4F69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4F69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4H69.ini b/Data/Sys/GameSettings/GH4H69.ini deleted file mode 100644 index 0e88b167a..000000000 --- a/Data/Sys/GameSettings/GH4H69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4H69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4I69.ini b/Data/Sys/GameSettings/GH4I69.ini deleted file mode 100644 index c4834b3b4..000000000 --- a/Data/Sys/GameSettings/GH4I69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4I69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4J69.ini b/Data/Sys/GameSettings/GH4J69.ini deleted file mode 100644 index 3a92bec42..000000000 --- a/Data/Sys/GameSettings/GH4J69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4J69 - Harry Potter to Honoo no Goblet - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4M69.ini b/Data/Sys/GameSettings/GH4M69.ini deleted file mode 100644 index 6e81a26b2..000000000 --- a/Data/Sys/GameSettings/GH4M69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4M69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4P69.ini b/Data/Sys/GameSettings/GH4P69.ini deleted file mode 100644 index 892fd355a..000000000 --- a/Data/Sys/GameSettings/GH4P69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4P69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH4S69.ini b/Data/Sys/GameSettings/GH4S69.ini deleted file mode 100644 index cc2344b32..000000000 --- a/Data/Sys/GameSettings/GH4S69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GH4S69 - Harry Potter and the Goblet of Fire - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GH5F52.ini b/Data/Sys/GameSettings/GH5.ini similarity index 87% rename from Data/Sys/GameSettings/GH5F52.ini rename to Data/Sys/GameSettings/GH5.ini index 33a85233a..6e9ce1199 100644 --- a/Data/Sys/GameSettings/GH5F52.ini +++ b/Data/Sys/GameSettings/GH5.ini @@ -1,4 +1,4 @@ -# GH5F52 - Over The Hedge +# GH5D52, GH5E52, GH5F52, GH5P52 - Over The Hedge [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/GH5D52.ini b/Data/Sys/GameSettings/GH5D52.ini deleted file mode 100644 index bc8057d07..000000000 --- a/Data/Sys/GameSettings/GH5D52.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GH5D52 - Over The Hedge -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GH5E52.ini b/Data/Sys/GameSettings/GH5E52.ini deleted file mode 100644 index 2da1efd0c..000000000 --- a/Data/Sys/GameSettings/GH5E52.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GH5E52 - Over The Hedge -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GN6P69.ini b/Data/Sys/GameSettings/GHB.ini similarity index 93% rename from Data/Sys/GameSettings/GN6P69.ini rename to Data/Sys/GameSettings/GHB.ini index 851faff22..ce9270b6a 100644 --- a/Data/Sys/GameSettings/GN6P69.ini +++ b/Data/Sys/GameSettings/GHB.ini @@ -1,4 +1,4 @@ -# GN6P69 - NHL06 +# GHBE7D, GHBP7D - The Hobbit [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GHBE7D.ini b/Data/Sys/GameSettings/GHBE7D.ini deleted file mode 100644 index 2aecdfb88..000000000 --- a/Data/Sys/GameSettings/GHBE7D.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHBE7D - The Hobbit - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHBP7D.ini b/Data/Sys/GameSettings/GHBP7D.ini deleted file mode 100644 index 543f57c6a..000000000 --- a/Data/Sys/GameSettings/GHBP7D.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHBP7D - The Hobbit - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHCE4Q.ini b/Data/Sys/GameSettings/GHC.ini similarity index 92% rename from Data/Sys/GameSettings/GHCE4Q.ini rename to Data/Sys/GameSettings/GHC.ini index a7091afae..eca0e1d03 100644 --- a/Data/Sys/GameSettings/GHCE4Q.ini +++ b/Data/Sys/GameSettings/GHC.ini @@ -1,4 +1,4 @@ -# GHCE4Q - Chicken Little +# GHCE4Q, GHCF4Q - Chicken Little [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GHKF7D.ini b/Data/Sys/GameSettings/GHK.ini similarity index 87% rename from Data/Sys/GameSettings/GHKF7D.ini rename to Data/Sys/GameSettings/GHK.ini index db9d0be91..cce753a3f 100644 --- a/Data/Sys/GameSettings/GHKF7D.ini +++ b/Data/Sys/GameSettings/GHK.ini @@ -1,4 +1,4 @@ -# GHKF7D - The Hulk +# GHKD7D, GHKE7D, GHKF7D, GHKP7D, GHKS7D - The Hulk [Core] # Values set here will override the main dolphin settings. SkipIdle = 0 diff --git a/Data/Sys/GameSettings/GHKD7D.ini b/Data/Sys/GameSettings/GHKD7D.ini deleted file mode 100644 index b4455ba7a..000000000 --- a/Data/Sys/GameSettings/GHKD7D.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GHKD7D - The Hulk -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GHKE7D.ini b/Data/Sys/GameSettings/GHKE7D.ini deleted file mode 100644 index f05ed77d3..000000000 --- a/Data/Sys/GameSettings/GHKE7D.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GHKE7D - The Hulk -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GHKP7D.ini b/Data/Sys/GameSettings/GHKP7D.ini deleted file mode 100644 index 7a65532cb..000000000 --- a/Data/Sys/GameSettings/GHKP7D.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GHKP7D - The Hulk -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GHKS7D.ini b/Data/Sys/GameSettings/GHKS7D.ini deleted file mode 100644 index 5e420e686..000000000 --- a/Data/Sys/GameSettings/GHKS7D.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GHKS7D - The Hulk -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GHL.ini b/Data/Sys/GameSettings/GHL.ini new file mode 100644 index 000000000..65a09f983 --- /dev/null +++ b/Data/Sys/GameSettings/GHL.ini @@ -0,0 +1,27 @@ +# GHLE69, GHLJ69, GHLP69, GHLX69, GHLY69, GHLZ69 - Harry Potter and the Sorcerer's Stone + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GHLE69.ini b/Data/Sys/GameSettings/GHLE69.ini deleted file mode 100644 index 588d2cdbf..000000000 --- a/Data/Sys/GameSettings/GHLE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHLE69 - Harry Potter and the Sorcerer's Stone - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHLJ69.ini b/Data/Sys/GameSettings/GHLJ69.ini deleted file mode 100644 index b766ab468..000000000 --- a/Data/Sys/GameSettings/GHLJ69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHLJ69 - Harry Potter to Kenja no Ishi - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHLP69.ini b/Data/Sys/GameSettings/GHLP69.ini deleted file mode 100644 index 3213e59fa..000000000 --- a/Data/Sys/GameSettings/GHLP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHLP69 - Harry Potter and the Philosopher's Stone - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHLX69.ini b/Data/Sys/GameSettings/GHLX69.ini deleted file mode 100644 index 8831460f1..000000000 --- a/Data/Sys/GameSettings/GHLX69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHLX69 - Harry Potter and the Sorcerer's Stone - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHLY69.ini b/Data/Sys/GameSettings/GHLY69.ini deleted file mode 100644 index facc48766..000000000 --- a/Data/Sys/GameSettings/GHLY69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHLY69 - Harry Potter and the Sorcerer's Stone - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHLZ69.ini b/Data/Sys/GameSettings/GHLZ69.ini deleted file mode 100644 index 5500c0e11..000000000 --- a/Data/Sys/GameSettings/GHLZ69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHLZ69 - Harry Potter and the Sorcerer's Stone - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GHMD4F.ini b/Data/Sys/GameSettings/GHM.ini similarity index 89% rename from Data/Sys/GameSettings/GHMD4F.ini rename to Data/Sys/GameSettings/GHM.ini index 0f860071f..3ea2a68b7 100644 --- a/Data/Sys/GameSettings/GHMD4F.ini +++ b/Data/Sys/GameSettings/GHM.ini @@ -1,4 +1,4 @@ -# GHMD4F - Hitman 2: Silent Assassin +# GHMD4F, GHMF4F, GHMP4F - Hitman 2: Silent Assassin [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GHMP4F.ini b/Data/Sys/GameSettings/GHMP4F.ini deleted file mode 100644 index 2b1e11723..000000000 --- a/Data/Sys/GameSettings/GHMP4F.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GHMP4F - Hitman 2: Silent Assassin - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GNED78.ini b/Data/Sys/GameSettings/GHN.ini similarity index 91% rename from Data/Sys/GameSettings/GNED78.ini rename to Data/Sys/GameSettings/GHN.ini index 317761c12..50798f515 100644 --- a/Data/Sys/GameSettings/GNED78.ini +++ b/Data/Sys/GameSettings/GHN.ini @@ -1,4 +1,4 @@ -# GNED78 - Finding Nemo +# GHNE71, GHNX71 - Hunter: The Reckoning [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GHNE71.ini b/Data/Sys/GameSettings/GHNE71.ini deleted file mode 100644 index fa603507d..000000000 --- a/Data/Sys/GameSettings/GHNE71.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GHNE71 - Hunter: The Reckoning - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GHNX71.ini b/Data/Sys/GameSettings/GHNX71.ini deleted file mode 100644 index 33084f79e..000000000 --- a/Data/Sys/GameSettings/GHNX71.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GHNX71 - Hunter: The Reckoning - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GHQ.ini b/Data/Sys/GameSettings/GHQ.ini new file mode 100644 index 000000000..89fb89263 --- /dev/null +++ b/Data/Sys/GameSettings/GHQ.ini @@ -0,0 +1,31 @@ +# GHQE7D, GHQP7D - The Simpsons Hit & Run + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = False + diff --git a/Data/Sys/GameSettings/GHQE7D.ini b/Data/Sys/GameSettings/GHQE7D.ini deleted file mode 100644 index 0ebe5db87..000000000 --- a/Data/Sys/GameSettings/GHQE7D.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GHQE7D - The Simpsons Hit & Run - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/GHQP7D.ini b/Data/Sys/GameSettings/GHQP7D.ini deleted file mode 100644 index e4e84a967..000000000 --- a/Data/Sys/GameSettings/GHQP7D.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GHQP7D - The Simpsons Hit & Run - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/GHSE69.ini b/Data/Sys/GameSettings/GHS.ini similarity index 89% rename from Data/Sys/GameSettings/GHSE69.ini rename to Data/Sys/GameSettings/GHS.ini index 98fca29d1..a2dad8e0a 100644 --- a/Data/Sys/GameSettings/GHSE69.ini +++ b/Data/Sys/GameSettings/GHS.ini @@ -1,4 +1,4 @@ -# GHSE69 - Harry Potter COS +# GHSE69, GHSJ69, GHSP69, GHSX69, GHSY69 - Harry Potter COS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GHSJ69.ini b/Data/Sys/GameSettings/GHSJ69.ini deleted file mode 100644 index a1691782a..000000000 --- a/Data/Sys/GameSettings/GHSJ69.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GHSJ69 - Harry Potter to Himitsu no Heya - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GHSP69.ini b/Data/Sys/GameSettings/GHSP69.ini deleted file mode 100644 index 9b81e723c..000000000 --- a/Data/Sys/GameSettings/GHSP69.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GHSP69 - Harry Potter: Chamber Of Secrets - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GHSX69.ini b/Data/Sys/GameSettings/GHSX69.ini deleted file mode 100644 index fd8578f1d..000000000 --- a/Data/Sys/GameSettings/GHSX69.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GHSX69 - Harry Potter: Chamber Of Secrets - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GHSY69.ini b/Data/Sys/GameSettings/GHSY69.ini deleted file mode 100644 index c2d54fd34..000000000 --- a/Data/Sys/GameSettings/GHSY69.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GHSY69 - Harry Potter COS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GHU.ini b/Data/Sys/GameSettings/GHU.ini new file mode 100644 index 000000000..e498461db --- /dev/null +++ b/Data/Sys/GameSettings/GHU.ini @@ -0,0 +1,20 @@ +# GHUE7D, GHUF7D, GHUP7D - The Incredible Hulk:Ultimate Destruction + +[Core] +# Values set here will override the main dolphin settings. + + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + diff --git a/Data/Sys/GameSettings/GHUE7D.ini b/Data/Sys/GameSettings/GHUE7D.ini deleted file mode 100644 index 1f9058530..000000000 --- a/Data/Sys/GameSettings/GHUE7D.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GHUE7D - The Incredible Hulk:Ultimate Destruction - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GHUF7D.ini b/Data/Sys/GameSettings/GHUF7D.ini deleted file mode 100644 index 6e6bb71b7..000000000 --- a/Data/Sys/GameSettings/GHUF7D.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GHUF7D - The Incredible Hulk:Ultimate Destruction - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GHUP7D.ini b/Data/Sys/GameSettings/GHUP7D.ini deleted file mode 100644 index cbb6d37fc..000000000 --- a/Data/Sys/GameSettings/GHUP7D.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GHUP7D - The Incredible Hulk:Ultimate Destruction - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GT4D52.ini b/Data/Sys/GameSettings/GIA.ini similarity index 90% rename from Data/Sys/GameSettings/GT4D52.ini rename to Data/Sys/GameSettings/GIA.ini index 25e55b1d9..095a987ec 100644 --- a/Data/Sys/GameSettings/GT4D52.ini +++ b/Data/Sys/GameSettings/GIA.ini @@ -1,4 +1,4 @@ -# GT4D52 - Tony Hawk's Pro Skater 4 +# GIAE7D, GIAP7D - Ice Age 2 The Meltdown [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GIAP7D.ini b/Data/Sys/GameSettings/GIAP7D.ini deleted file mode 100644 index 286780ac4..000000000 --- a/Data/Sys/GameSettings/GIAP7D.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GIAP7D - Ice Age 2 The Meltdown - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GICJG9.ini b/Data/Sys/GameSettings/GIC.ini similarity index 88% rename from Data/Sys/GameSettings/GICJG9.ini rename to Data/Sys/GameSettings/GIC.ini index 9287ba536..a81e59cc8 100644 --- a/Data/Sys/GameSettings/GICJG9.ini +++ b/Data/Sys/GameSettings/GIC.ini @@ -1,4 +1,4 @@ -# GICJG9 - The Incredibles +# GICD78, GICF78, GICJG9, GICP78 - The Incredibles [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GICD78.ini b/Data/Sys/GameSettings/GICD78.ini deleted file mode 100644 index 6c47ce9c7..000000000 --- a/Data/Sys/GameSettings/GICD78.ini +++ /dev/null @@ -1,21 +0,0 @@ -# GICD78 - The Incredibles - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GICF78.ini b/Data/Sys/GameSettings/GICF78.ini deleted file mode 100644 index f7bb7b598..000000000 --- a/Data/Sys/GameSettings/GICF78.ini +++ /dev/null @@ -1,21 +0,0 @@ -# GICF78 - The Incredibles - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GICP78.ini b/Data/Sys/GameSettings/GICP78.ini deleted file mode 100644 index d14bdabbf..000000000 --- a/Data/Sys/GameSettings/GICP78.ini +++ /dev/null @@ -1,21 +0,0 @@ -# GICP78 - The Incredibles - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GILE51.ini b/Data/Sys/GameSettings/GIL.ini similarity index 93% rename from Data/Sys/GameSettings/GILE51.ini rename to Data/Sys/GameSettings/GIL.ini index fc6c7ed72..762435466 100644 --- a/Data/Sys/GameSettings/GILE51.ini +++ b/Data/Sys/GameSettings/GIL.ini @@ -1,4 +1,4 @@ -# GILE51 - Aggressive Inline +# GILE51, GILP51 - Aggressive Inline [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GILP51.ini b/Data/Sys/GameSettings/GILP51.ini deleted file mode 100644 index 91032c387..000000000 --- a/Data/Sys/GameSettings/GILP51.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GILP51 - Aggressive Inline - -[Core] -# Values set here will override the main dolphin settings. -DSPHLE = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Slow audio with HLE. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[DSP] -EnableJIT = True diff --git a/Data/Sys/GameSettings/GISE36.ini b/Data/Sys/GameSettings/GIS.ini similarity index 92% rename from Data/Sys/GameSettings/GISE36.ini rename to Data/Sys/GameSettings/GIS.ini index e8fe98fb8..741ded311 100644 --- a/Data/Sys/GameSettings/GISE36.ini +++ b/Data/Sys/GameSettings/GIS.ini @@ -1,4 +1,4 @@ -# GISE36 - Second Sight +# GISE36, GISP36 - Second Sight [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RTNE41.ini b/Data/Sys/GameSettings/GIT.ini similarity index 94% rename from Data/Sys/GameSettings/RTNE41.ini rename to Data/Sys/GameSettings/GIT.ini index 9ed00b8e6..81267f765 100644 --- a/Data/Sys/GameSettings/RTNE41.ini +++ b/Data/Sys/GameSettings/GIT.ini @@ -1,12 +1,12 @@ -# RTNE41 - Tenchu +# GITE01, GITP01 - Geist [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 EmulationIssues = +EmulationStateId = 3 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/GITE01.ini b/Data/Sys/GameSettings/GITE01.ini deleted file mode 100644 index 05b7ce08d..000000000 --- a/Data/Sys/GameSettings/GITE01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GITE01 - Geist - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GITP01.ini b/Data/Sys/GameSettings/GITP01.ini deleted file mode 100644 index dfbea8c94..000000000 --- a/Data/Sys/GameSettings/GITP01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GITP01 - Geist - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GJKD52.ini b/Data/Sys/GameSettings/GJK.ini similarity index 85% rename from Data/Sys/GameSettings/GJKD52.ini rename to Data/Sys/GameSettings/GJK.ini index 0007f5b1c..9a2a1dfc6 100644 --- a/Data/Sys/GameSettings/GJKD52.ini +++ b/Data/Sys/GameSettings/GJK.ini @@ -1,4 +1,4 @@ -# GJKD52 - Jedi Knight II: Jedi Outcast +# GJKD52, GJKE52, GJKF52, GJKP52 - Jedi Knight II: Jedi Outcast [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GJKE52.ini b/Data/Sys/GameSettings/GJKE52.ini deleted file mode 100644 index ecabf3348..000000000 --- a/Data/Sys/GameSettings/GJKE52.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GJKE52 - Jedi Knight II: Jedi Outcast - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/GJKF52.ini b/Data/Sys/GameSettings/GJKF52.ini deleted file mode 100644 index 021607d30..000000000 --- a/Data/Sys/GameSettings/GJKF52.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GJKF52 - Jedi Knight II: Jedi Outcast - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/GJKP52.ini b/Data/Sys/GameSettings/GJKP52.ini deleted file mode 100644 index 42e8bd5fe..000000000 --- a/Data/Sys/GameSettings/GJKP52.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GJKP52 - Jedi Knight II: Jedi Outcast - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/GJUF78.ini b/Data/Sys/GameSettings/GJU.ini similarity index 89% rename from Data/Sys/GameSettings/GJUF78.ini rename to Data/Sys/GameSettings/GJU.ini index dcbc8cce5..0a35dc34b 100644 --- a/Data/Sys/GameSettings/GJUF78.ini +++ b/Data/Sys/GameSettings/GJU.ini @@ -1,4 +1,4 @@ -# GJUF78 - Tak and the Power of Juju +# GJUD78, GJUF78 - Tak and the Power of Juju [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G4FD69.ini b/Data/Sys/GameSettings/GJX.ini similarity index 94% rename from Data/Sys/GameSettings/G4FD69.ini rename to Data/Sys/GameSettings/GJX.ini index 18e964b9c..446927d55 100644 --- a/Data/Sys/GameSettings/G4FD69.ini +++ b/Data/Sys/GameSettings/GJX.ini @@ -1,4 +1,4 @@ -# G4FD69 - FIFA 07 +# GJXE51, GJXP51 - Vexx [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GJXE51.ini b/Data/Sys/GameSettings/GJXE51.ini deleted file mode 100644 index e0196e706..000000000 --- a/Data/Sys/GameSettings/GJXE51.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GJXE51 - Vexx - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GJXP51.ini b/Data/Sys/GameSettings/GJXP51.ini deleted file mode 100644 index 380b210ce..000000000 --- a/Data/Sys/GameSettings/GJXP51.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GJXP51 - Vexx - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GK2F52.ini b/Data/Sys/GameSettings/GK2.ini similarity index 81% rename from Data/Sys/GameSettings/GK2F52.ini rename to Data/Sys/GameSettings/GK2.ini index c0f6096a6..9bf214024 100644 --- a/Data/Sys/GameSettings/GK2F52.ini +++ b/Data/Sys/GameSettings/GK2.ini @@ -1,4 +1,4 @@ -# GK2F52 - Spider-Man 2 +# GK2D52, GK2E52, GK2F52, GK2I52, GK2P52 - Spider-Man 2 [Core] MMU = 1 diff --git a/Data/Sys/GameSettings/GK2D52.ini b/Data/Sys/GameSettings/GK2D52.ini deleted file mode 100644 index f218396de..000000000 --- a/Data/Sys/GameSettings/GK2D52.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GK2D52 - Spider-Man 2 - -[Core] -MMU = 1 - -[EmuState] -EmulationStateId = 4 -EmulationIssues = - -[OnFrame] - -[ActionReplay] - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GK2E52.ini b/Data/Sys/GameSettings/GK2E52.ini deleted file mode 100644 index 367d91810..000000000 --- a/Data/Sys/GameSettings/GK2E52.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GK2E52 - Spider-Man 2 - -[Core] -MMU = 1 - -[EmuState] -EmulationStateId = 4 -EmulationIssues = - -[OnFrame] - -[ActionReplay] - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GK2I52.ini b/Data/Sys/GameSettings/GK2I52.ini deleted file mode 100644 index b5123fe79..000000000 --- a/Data/Sys/GameSettings/GK2I52.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GK2I52 - Spider-Man 2 - -[Core] -MMU = 1 - -[EmuState] -EmulationStateId = 4 -EmulationIssues = - -[OnFrame] - -[ActionReplay] - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GK2P52.ini b/Data/Sys/GameSettings/GK2P52.ini deleted file mode 100644 index f2931b170..000000000 --- a/Data/Sys/GameSettings/GK2P52.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GK2P52 - Spider-Man 2 - -[Core] -MMU = 1 - -[EmuState] -EmulationStateId = 4 -EmulationIssues = - -[OnFrame] - -[ActionReplay] - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/G2OP41.ini b/Data/Sys/GameSettings/GK5.ini similarity index 93% rename from Data/Sys/GameSettings/G2OP41.ini rename to Data/Sys/GameSettings/GK5.ini index 49c1bab98..5e2f2c679 100644 --- a/Data/Sys/GameSettings/G2OP41.ini +++ b/Data/Sys/GameSettings/GK5.ini @@ -1,4 +1,4 @@ -# G2OP41 - PoP:WW +# GK5E78, GK5X78 - Monster House [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GK5E78.ini b/Data/Sys/GameSettings/GK5E78.ini deleted file mode 100644 index 7fd5ed3c0..000000000 --- a/Data/Sys/GameSettings/GK5E78.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GK5E78 - Monster House - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GK5X78.ini b/Data/Sys/GameSettings/GK5X78.ini deleted file mode 100644 index 1ea3a2d7f..000000000 --- a/Data/Sys/GameSettings/GK5X78.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GK5X78 - Monster House - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GK7E08.ini b/Data/Sys/GameSettings/GK7.ini similarity index 93% rename from Data/Sys/GameSettings/GK7E08.ini rename to Data/Sys/GameSettings/GK7.ini index ea2a96fe7..7941a579b 100644 --- a/Data/Sys/GameSettings/GK7E08.ini +++ b/Data/Sys/GameSettings/GK7.ini @@ -1,4 +1,4 @@ -# GK7E08 - Killer7 Disk1 +# GK7E08, GK7P08 - Killer7 Disk1 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GK7P08.ini b/Data/Sys/GameSettings/GK7P08.ini deleted file mode 100644 index afed097df..000000000 --- a/Data/Sys/GameSettings/GK7P08.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GK7P08 - Killer7 Disk1 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Tested with (r6801) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBAccessEnable = True - diff --git a/Data/Sys/GameSettings/GKHEA4.ini b/Data/Sys/GameSettings/GKH.ini similarity index 93% rename from Data/Sys/GameSettings/GKHEA4.ini rename to Data/Sys/GameSettings/GKH.ini index 3a4e8993d..eadc6d925 100644 --- a/Data/Sys/GameSettings/GKHEA4.ini +++ b/Data/Sys/GameSettings/GKH.ini @@ -1,4 +1,4 @@ -# GKHEA4 - King Arthur +# GKHEA4, GKHPA4 - King Arthur [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GKHPA4.ini b/Data/Sys/GameSettings/GKHPA4.ini deleted file mode 100644 index 7166e588d..000000000 --- a/Data/Sys/GameSettings/GKHPA4.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GKHPA4 - King Arthur - -[Core] -# Values set here will override the main Dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/G3XP52.ini b/Data/Sys/GameSettings/GKL.ini similarity index 82% rename from Data/Sys/GameSettings/G3XP52.ini rename to Data/Sys/GameSettings/GKL.ini index 3d901f684..995b08871 100644 --- a/Data/Sys/GameSettings/G3XP52.ini +++ b/Data/Sys/GameSettings/GKL.ini @@ -1,8 +1,7 @@ -# G3XP52 - X-Men: The Official Game +# GKLD69, GKLE69, GKLF69, GKLI69, GKLJ69, GKLP69, GKLS69 - The Lord of the Rings; The Return of the King [Core] # Values set here will override the main dolphin settings. -MMU = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GKLD69.ini b/Data/Sys/GameSettings/GKLD69.ini deleted file mode 100644 index fa46fc6ef..000000000 --- a/Data/Sys/GameSettings/GKLD69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GKLD69 - The Lord of the Rings; The Return of the King - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKLE69.ini b/Data/Sys/GameSettings/GKLE69.ini deleted file mode 100644 index c30cdfc98..000000000 --- a/Data/Sys/GameSettings/GKLE69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GKLE69 - The Lord of the Rings; The Return of the King - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKLF69.ini b/Data/Sys/GameSettings/GKLF69.ini deleted file mode 100644 index a00f76420..000000000 --- a/Data/Sys/GameSettings/GKLF69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GKLF69 - The Lord of the Rings; The Return of the King - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKLI69.ini b/Data/Sys/GameSettings/GKLI69.ini deleted file mode 100644 index ae6e52d94..000000000 --- a/Data/Sys/GameSettings/GKLI69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GKLI69 - The Lord of the Rings; The Return of the King - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKLJ69.ini b/Data/Sys/GameSettings/GKLJ69.ini deleted file mode 100644 index f7ae9a5c0..000000000 --- a/Data/Sys/GameSettings/GKLJ69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GKLJ69 - The Lord of the Rings; The Return of the King - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKLP69.ini b/Data/Sys/GameSettings/GKLP69.ini deleted file mode 100644 index 9e44c3581..000000000 --- a/Data/Sys/GameSettings/GKLP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GKLP69 - The Lord of the Rings; The Return of the King - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKLS69.ini b/Data/Sys/GameSettings/GKLS69.ini deleted file mode 100644 index a115fb135..000000000 --- a/Data/Sys/GameSettings/GKLS69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GKLS69 - The Lord of the Rings; The Return of the King - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKMP41.ini b/Data/Sys/GameSettings/GKM.ini similarity index 89% rename from Data/Sys/GameSettings/GKMP41.ini rename to Data/Sys/GameSettings/GKM.ini index 80807c8c5..a6965a013 100644 --- a/Data/Sys/GameSettings/GKMP41.ini +++ b/Data/Sys/GameSettings/GKM.ini @@ -1,4 +1,4 @@ -# GKMP41 - Prince of Persia The Two Thrones +# GKME41, GKMP41 - Prince of Persia The Two Thrones [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GKME41.ini b/Data/Sys/GameSettings/GKO.ini similarity index 90% rename from Data/Sys/GameSettings/GKME41.ini rename to Data/Sys/GameSettings/GKO.ini index 190f35ce1..0b5c01d5a 100644 --- a/Data/Sys/GameSettings/GKME41.ini +++ b/Data/Sys/GameSettings/GKO.ini @@ -1,4 +1,4 @@ -# GKME41 - Prince of Persia The Two Thrones +# GKOE70, GKOP6V, GKOP70 - Kao the kangaroo [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GKYJ01.ini b/Data/Sys/GameSettings/GKY.ini similarity index 92% rename from Data/Sys/GameSettings/GKYJ01.ini rename to Data/Sys/GameSettings/GKY.ini index a69ec033a..ea91b0577 100644 --- a/Data/Sys/GameSettings/GKYJ01.ini +++ b/Data/Sys/GameSettings/GKY.ini @@ -1,4 +1,4 @@ -# GKYJ01 - Kirby Air Ride +# GKYE01, GKYJ01, GKYP01 - Kirby Air Ride [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GKZD9G.ini b/Data/Sys/GameSettings/GKZ.ini similarity index 88% rename from Data/Sys/GameSettings/GKZD9G.ini rename to Data/Sys/GameSettings/GKZ.ini index 4bcd28da5..c66744f37 100644 --- a/Data/Sys/GameSettings/GKZD9G.ini +++ b/Data/Sys/GameSettings/GKZ.ini @@ -1,4 +1,4 @@ -# GKZD9G - Codename: Kids Next Door +# GKZD9G, GKZE9G, GKZF9G, GKZP54 - Codename: Kids Next Door [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GKZE9G.ini b/Data/Sys/GameSettings/GKZE9G.ini deleted file mode 100644 index f5e8b8765..000000000 --- a/Data/Sys/GameSettings/GKZE9G.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GKZE9G - Codename: Kids Next Door - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs real xfb for the videos to work. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GKZF9G.ini b/Data/Sys/GameSettings/GKZF9G.ini deleted file mode 100644 index 55258d2ed..000000000 --- a/Data/Sys/GameSettings/GKZF9G.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GKZF9G - Codename: Kids Next Door - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs real xfb for the videos to work. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GKZP54.ini b/Data/Sys/GameSettings/GKZP54.ini deleted file mode 100644 index 7400b8113..000000000 --- a/Data/Sys/GameSettings/GKZP54.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GKZP54 - Codename: Kids Next Door - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs real xfb for the videos to work. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GL7P64.ini b/Data/Sys/GameSettings/GL7.ini similarity index 91% rename from Data/Sys/GameSettings/GL7P64.ini rename to Data/Sys/GameSettings/GL7.ini index cd71aaaf5..3d3c62e2e 100644 --- a/Data/Sys/GameSettings/GL7P64.ini +++ b/Data/Sys/GameSettings/GL7.ini @@ -1,4 +1,4 @@ -# GL7P64 - StarWars Lego 2 +# GL7E64, GL7P64 - StarWars Lego 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GL8E4F.ini b/Data/Sys/GameSettings/GL8.ini similarity index 92% rename from Data/Sys/GameSettings/GL8E4F.ini rename to Data/Sys/GameSettings/GL8.ini index 75a0bf3f1..7e8da7a1d 100644 --- a/Data/Sys/GameSettings/GL8E4F.ini +++ b/Data/Sys/GameSettings/GL8.ini @@ -1,4 +1,4 @@ -# GL8E4F - Tomb Raider: Legend +# GL8E4F, GL8F4F - Tomb Raider: Legend [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GL8F4F.ini b/Data/Sys/GameSettings/GL8F4F.ini deleted file mode 100644 index 28317f5e3..000000000 --- a/Data/Sys/GameSettings/GL8F4F.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GL8F4F - Tomb Raider: Legend - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound little crappy - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GLCE52.ini b/Data/Sys/GameSettings/GLC.ini similarity index 95% rename from Data/Sys/GameSettings/GLCE52.ini rename to Data/Sys/GameSettings/GLC.ini index 827d71a70..46e46da0a 100644 --- a/Data/Sys/GameSettings/GLCE52.ini +++ b/Data/Sys/GameSettings/GLC.ini @@ -1,4 +1,4 @@ -# GLCE52 - Lemony Snicket +# GLCE52, GLCF52 - Lemony Snicket [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GLCF52.ini b/Data/Sys/GameSettings/GLCF52.ini deleted file mode 100644 index a726e5ab2..000000000 --- a/Data/Sys/GameSettings/GLCF52.ini +++ /dev/null @@ -1,37 +0,0 @@ -# GLCF52 - Lemony Snicket - -[Core] -# Values set here will override the main dolphin settings. -CPUThread = 1 -SkipIdle = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Still encountering slowdowns, but no major issues so far. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -DstAlphaPass = True - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = True - diff --git a/Data/Sys/GameSettings/GLRD64.ini b/Data/Sys/GameSettings/GLR.ini similarity index 86% rename from Data/Sys/GameSettings/GLRD64.ini rename to Data/Sys/GameSettings/GLR.ini index b651c8f3d..7881b06f5 100644 --- a/Data/Sys/GameSettings/GLRD64.ini +++ b/Data/Sys/GameSettings/GLR.ini @@ -1,4 +1,4 @@ -# GLRD64 - Star Wars - Rogue Squadron III - Rebel Strike +# GLRD64, GLRF64, GLRJ13, GLRP64 - Star Wars - Rogue Squadron III - Rebel Strike [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GLRF64.ini b/Data/Sys/GameSettings/GLRF64.ini deleted file mode 100644 index 22172e5cd..000000000 --- a/Data/Sys/GameSettings/GLRF64.ini +++ /dev/null @@ -1,29 +0,0 @@ -# GLRF64 - Star Wars - Rogue Squadron III - Rebel Strike - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GLRJ13.ini b/Data/Sys/GameSettings/GLRJ13.ini deleted file mode 100644 index a9f2bedd8..000000000 --- a/Data/Sys/GameSettings/GLRJ13.ini +++ /dev/null @@ -1,29 +0,0 @@ -# GLRJ13 - Star Wars - Rogue Squadron III - Rebel Strike - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GLRP64.ini b/Data/Sys/GameSettings/GLRP64.ini deleted file mode 100644 index abd39266e..000000000 --- a/Data/Sys/GameSettings/GLRP64.ini +++ /dev/null @@ -1,29 +0,0 @@ -# GLRP64 - Star Wars - Rogue Squadron III - Rebel Strike - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GLSD64.ini b/Data/Sys/GameSettings/GLS.ini similarity index 91% rename from Data/Sys/GameSettings/GLSD64.ini rename to Data/Sys/GameSettings/GLS.ini index edb99f2b8..c43684959 100644 --- a/Data/Sys/GameSettings/GLSD64.ini +++ b/Data/Sys/GameSettings/GLS.ini @@ -1,4 +1,4 @@ -# GLSD64 - LucasArts Gladius +# GLSD64, GLSE64, GLSF64, GLSP64 - LucasArts Gladius [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GLSE64.ini b/Data/Sys/GameSettings/GLSE64.ini deleted file mode 100644 index ac031aee3..000000000 --- a/Data/Sys/GameSettings/GLSE64.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GLSE64 - LucasArts Gladius - -[Core] -# Values set here will override the main dolphin settings. -SyncGPU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GLSF64.ini b/Data/Sys/GameSettings/GLSF64.ini deleted file mode 100644 index f3adbca97..000000000 --- a/Data/Sys/GameSettings/GLSF64.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GLSF64 - LucasArts Gladius - -[Core] -# Values set here will override the main dolphin settings. -SyncGPU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GLSP64.ini b/Data/Sys/GameSettings/GLSP64.ini deleted file mode 100644 index 4da5e9e78..000000000 --- a/Data/Sys/GameSettings/GLSP64.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GLSP64 - LucasArts Gladius - -[Core] -# Values set here will override the main dolphin settings. -SyncGPU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GLY.ini b/Data/Sys/GameSettings/GLY.ini new file mode 100644 index 000000000..79e99c850 --- /dev/null +++ b/Data/Sys/GameSettings/GLY.ini @@ -0,0 +1,27 @@ +# GLYE69, GLYP69 - NBA LIVE 2005 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GLYE69.ini b/Data/Sys/GameSettings/GLYE69.ini deleted file mode 100644 index 8f8141f0d..000000000 --- a/Data/Sys/GameSettings/GLYE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GLYE69 - NBA LIVE 2005 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GLYP69.ini b/Data/Sys/GameSettings/GLYP69.ini deleted file mode 100644 index bfcfaa971..000000000 --- a/Data/Sys/GameSettings/GLYP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GLYP69 - NBA LIVE 2005 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/G4OP69.ini b/Data/Sys/GameSettings/GLZ.ini similarity index 88% rename from Data/Sys/GameSettings/G4OP69.ini rename to Data/Sys/GameSettings/GLZ.ini index bbb4d4d48..29747e5c7 100644 --- a/Data/Sys/GameSettings/G4OP69.ini +++ b/Data/Sys/GameSettings/GLZ.ini @@ -1,4 +1,4 @@ -# G4OP69 - The Sims 2 Pets +# GLZE69, GLZF69 - 007 From Russia With Love [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GLZE69.ini b/Data/Sys/GameSettings/GLZE69.ini deleted file mode 100644 index 7d3d25b7c..000000000 --- a/Data/Sys/GameSettings/GLZE69.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GLZE69 - 007 From Russia With Love - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GLZF69.ini b/Data/Sys/GameSettings/GLZF69.ini deleted file mode 100644 index 6faa3b4ef..000000000 --- a/Data/Sys/GameSettings/GLZF69.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GLZF69 - 007 From Russia With Love - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GM2E8P.ini b/Data/Sys/GameSettings/GM2.ini similarity index 91% rename from Data/Sys/GameSettings/GM2E8P.ini rename to Data/Sys/GameSettings/GM2.ini index f30e42467..c668b1cf9 100644 --- a/Data/Sys/GameSettings/GM2E8P.ini +++ b/Data/Sys/GameSettings/GM2.ini @@ -1,4 +1,4 @@ -# GM2E8P - SUPER MONKEY BALL 2 +# GM2E8P, GM2J8P, GM2P8P - SUPER MONKEY BALL 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GM2J8P.ini b/Data/Sys/GameSettings/GM2J8P.ini deleted file mode 100644 index c91f18480..000000000 --- a/Data/Sys/GameSettings/GM2J8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GM2J8P - SUPER MONKEY BALL 2 - -[Core] -# Values set here will override the main dolphin settings. -FPRF = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Shadows need fast depth enabled. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -FastDepthCalc = True diff --git a/Data/Sys/GameSettings/GM2P8P.ini b/Data/Sys/GameSettings/GM2P8P.ini deleted file mode 100644 index 20f56a849..000000000 --- a/Data/Sys/GameSettings/GM2P8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GM2P8P - SUPER MONKEY BALL 2 - -[Core] -# Values set here will override the main dolphin settings. -FPRF = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Shadows need fast depth enabled. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -FastDepthCalc = True diff --git a/Data/Sys/GameSettings/GM3E69.ini b/Data/Sys/GameSettings/GM3.ini similarity index 93% rename from Data/Sys/GameSettings/GM3E69.ini rename to Data/Sys/GameSettings/GM3.ini index 7d1581fc0..db9e8474b 100644 --- a/Data/Sys/GameSettings/GM3E69.ini +++ b/Data/Sys/GameSettings/GM3.ini @@ -1,4 +1,4 @@ -# GM3E69 - Madden NFL 2003 +# GM3E69, GM3P69 - Madden NFL 2003 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GM5.ini b/Data/Sys/GameSettings/GM5.ini new file mode 100644 index 000000000..48b204518 --- /dev/null +++ b/Data/Sys/GameSettings/GM5.ini @@ -0,0 +1,30 @@ +# GM5E7D, GM5F7D, GM5P7D - Metal Arms: Glitch in the System + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/GM5E7D.ini b/Data/Sys/GameSettings/GM5E7D.ini deleted file mode 100644 index bb9b0213c..000000000 --- a/Data/Sys/GameSettings/GM5E7D.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GM5E7D - Metal Arms: Glitch in the System - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GM5F7D.ini b/Data/Sys/GameSettings/GM5F7D.ini deleted file mode 100644 index e0d32653a..000000000 --- a/Data/Sys/GameSettings/GM5F7D.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GM5F7D - Metal Arms: Glitch in the System - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GM5P7D.ini b/Data/Sys/GameSettings/GM5P7D.ini deleted file mode 100644 index 7b54fa13c..000000000 --- a/Data/Sys/GameSettings/GM5P7D.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GM5P7D - Metal Arms: Glitch in the System - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GM6EE9.ini b/Data/Sys/GameSettings/GM6.ini similarity index 90% rename from Data/Sys/GameSettings/GM6EE9.ini rename to Data/Sys/GameSettings/GM6.ini index dd5928768..c3c48410b 100644 --- a/Data/Sys/GameSettings/GM6EE9.ini +++ b/Data/Sys/GameSettings/GM6.ini @@ -1,4 +1,4 @@ -# GM6EE9 - Medabots Infinity 4th Submission +# GM6EE9, GM6PE9 - Medabots Infinity 4th Submission [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GM6PE9.ini b/Data/Sys/GameSettings/GM6PE9.ini deleted file mode 100644 index 6c11c8762..000000000 --- a/Data/Sys/GameSettings/GM6PE9.ini +++ /dev/null @@ -1,29 +0,0 @@ -# GM6PE9 - Medabots Infinity 4th Submission - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/GMHE52.ini b/Data/Sys/GameSettings/GMH.ini similarity index 91% rename from Data/Sys/GameSettings/GMHE52.ini rename to Data/Sys/GameSettings/GMH.ini index ae7a15783..5fccc32ca 100644 --- a/Data/Sys/GameSettings/GMHE52.ini +++ b/Data/Sys/GameSettings/GMH.ini @@ -1,4 +1,4 @@ -# GMHE52 - Mat Hoffman's Pro BMX 2 +# GMHE52, GMHF52, GMHP52 - Mat Hoffman's Pro BMX 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GMHF52.ini b/Data/Sys/GameSettings/GMHF52.ini deleted file mode 100644 index 310520006..000000000 --- a/Data/Sys/GameSettings/GMHF52.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GMHF52 - Mat Hoffman's Pro BMX 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real Xfb for videos to show up (r6945) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GMHP52.ini b/Data/Sys/GameSettings/GMHP52.ini deleted file mode 100644 index b362a4fc8..000000000 --- a/Data/Sys/GameSettings/GMHP52.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GMHP52 - Mat Hoffman's Pro BMX 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real Xfb for videos to show up (r6945) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GMIE70.ini b/Data/Sys/GameSettings/GMI.ini similarity index 91% rename from Data/Sys/GameSettings/GMIE70.ini rename to Data/Sys/GameSettings/GMI.ini index 7913cc604..0d338ce5e 100644 --- a/Data/Sys/GameSettings/GMIE70.ini +++ b/Data/Sys/GameSettings/GMI.ini @@ -1,4 +1,4 @@ -# GMIE70 - Mission: Impossible Operation Surma +# GMIE70, GMIP70 - Mission: Impossible Operation Surma [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GMIP70.ini b/Data/Sys/GameSettings/GMIP70.ini deleted file mode 100644 index f0b53a061..000000000 --- a/Data/Sys/GameSettings/GMIP70.ini +++ /dev/null @@ -1,35 +0,0 @@ -# GMIP70 - Mission: Impossible Operation Surma - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs Efb to Ram for Sonic Imager (gadgets). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False - diff --git a/Data/Sys/GameSettings/GMNE78.ini b/Data/Sys/GameSettings/GMN.ini similarity index 92% rename from Data/Sys/GameSettings/GMNE78.ini rename to Data/Sys/GameSettings/GMN.ini index c4f119dfd..c500b0ed2 100644 --- a/Data/Sys/GameSettings/GMNE78.ini +++ b/Data/Sys/GameSettings/GMN.ini @@ -1,4 +1,4 @@ -# GMNE78 - Monsters, Inc. Scream Arena +# GMNE78, GMNP78 - Monsters, Inc. Scream Arena [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GMNP78.ini b/Data/Sys/GameSettings/GMNP78.ini deleted file mode 100644 index 44bfe5910..000000000 --- a/Data/Sys/GameSettings/GMNP78.ini +++ /dev/null @@ -1,34 +0,0 @@ -# GMNP78 - Monsters, Inc. Scream Arena - -[Core] -# Values set here will override the main dolphin settings. -DSPHLE = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Videos require real XFB, slow audio with HLE. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - -[DSP] -EnableJIT = True diff --git a/Data/Sys/GameSettings/GN6E69.ini b/Data/Sys/GameSettings/GN6.ini similarity index 94% rename from Data/Sys/GameSettings/GN6E69.ini rename to Data/Sys/GameSettings/GN6.ini index fa18b55b1..89d853d11 100644 --- a/Data/Sys/GameSettings/GN6E69.ini +++ b/Data/Sys/GameSettings/GN6.ini @@ -1,4 +1,4 @@ -# GN6E69 - NHL06 +# GN6E69, GN6P69 - NHL06 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GN7E69.ini b/Data/Sys/GameSettings/GN7.ini similarity index 93% rename from Data/Sys/GameSettings/GN7E69.ini rename to Data/Sys/GameSettings/GN7.ini index 95691de8a..78011bddf 100644 --- a/Data/Sys/GameSettings/GN7E69.ini +++ b/Data/Sys/GameSettings/GN7.ini @@ -1,4 +1,4 @@ -# GN7E69 - NFL STREET 2 +# GN7E69, GN7P69 - NFL STREET 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GN7P69.ini b/Data/Sys/GameSettings/GN7P69.ini deleted file mode 100644 index 321033cf8..000000000 --- a/Data/Sys/GameSettings/GN7P69.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GN7P69 - NFL STREET 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GN8.ini b/Data/Sys/GameSettings/GN8.ini new file mode 100644 index 000000000..30276477d --- /dev/null +++ b/Data/Sys/GameSettings/GN8.ini @@ -0,0 +1,27 @@ +# GN8E69, GN8P69 - NBA LIVE 2004 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GN8E69.ini b/Data/Sys/GameSettings/GN8E69.ini deleted file mode 100644 index 86e86ed4a..000000000 --- a/Data/Sys/GameSettings/GN8E69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GN8E69 - NBA LIVE 2004 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GN8P69.ini b/Data/Sys/GameSettings/GN8P69.ini deleted file mode 100644 index 5d38912db..000000000 --- a/Data/Sys/GameSettings/GN8P69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GN8P69 - NBA LIVE 2004 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GNEE78.ini b/Data/Sys/GameSettings/GNE.ini similarity index 88% rename from Data/Sys/GameSettings/GNEE78.ini rename to Data/Sys/GameSettings/GNE.ini index af49d7e66..6c1645631 100644 --- a/Data/Sys/GameSettings/GNEE78.ini +++ b/Data/Sys/GameSettings/GNE.ini @@ -1,4 +1,4 @@ -# GNEE78 - Finding Nemo +# GNED78, GNEE78, GNEF78, GNEP78, GNES78 - Finding Nemo [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GNEF78.ini b/Data/Sys/GameSettings/GNEF78.ini deleted file mode 100644 index b0303ea9c..000000000 --- a/Data/Sys/GameSettings/GNEF78.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GNEF78 - Finding Nemo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GNEP78.ini b/Data/Sys/GameSettings/GNEP78.ini deleted file mode 100644 index 5bf28ebd0..000000000 --- a/Data/Sys/GameSettings/GNEP78.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GNEP78 - Finding Nemo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GNES78.ini b/Data/Sys/GameSettings/GNES78.ini deleted file mode 100644 index b29379ab2..000000000 --- a/Data/Sys/GameSettings/GNES78.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GNES78 - Finding Nemo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GNIEA4.ini b/Data/Sys/GameSettings/GNI.ini similarity index 88% rename from Data/Sys/GameSettings/GNIEA4.ini rename to Data/Sys/GameSettings/GNI.ini index ee567f0d2..dd21acd0d 100644 --- a/Data/Sys/GameSettings/GNIEA4.ini +++ b/Data/Sys/GameSettings/GNI.ini @@ -1,4 +1,4 @@ -# GNIEA4 - TMNT2 +# GNIEA4, GNIPA4 - TMNT2 [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/GNIPA4.ini b/Data/Sys/GameSettings/GNIPA4.ini deleted file mode 100644 index 0a19f7478..000000000 --- a/Data/Sys/GameSettings/GNIPA4.ini +++ /dev/null @@ -1,15 +0,0 @@ -# GNIPA4 - TMNT2 -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GNNE69.ini b/Data/Sys/GameSettings/GNN.ini similarity index 94% rename from Data/Sys/GameSettings/GNNE69.ini rename to Data/Sys/GameSettings/GNN.ini index f1bb8d9c7..304145ef6 100644 --- a/Data/Sys/GameSettings/GNNE69.ini +++ b/Data/Sys/GameSettings/GNN.ini @@ -1,4 +1,4 @@ -# GNNE69 - NFL Street +# GNNE69, GNNP69 - NFL Street [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GNNP69.ini b/Data/Sys/GameSettings/GNNP69.ini deleted file mode 100644 index 74fe73380..000000000 --- a/Data/Sys/GameSettings/GNNP69.ini +++ /dev/null @@ -1,26 +0,0 @@ -# GNNP69 - NFL Street - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GNZE69.ini b/Data/Sys/GameSettings/GNZ.ini similarity index 91% rename from Data/Sys/GameSettings/GNZE69.ini rename to Data/Sys/GameSettings/GNZ.ini index a63f112ba..c60b52bdd 100644 --- a/Data/Sys/GameSettings/GNZE69.ini +++ b/Data/Sys/GameSettings/GNZ.ini @@ -1,4 +1,4 @@ -# GNZE69 - NBA STREET Vol.2 +# GNZE69, GNZP69 - NBA STREET Vol.2 [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GNZP69.ini b/Data/Sys/GameSettings/GNZP69.ini deleted file mode 100644 index 0a2dfbaeb..000000000 --- a/Data/Sys/GameSettings/GNZP69.ini +++ /dev/null @@ -1,20 +0,0 @@ -# GNZP69 - NBA STREET Vol.2 - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] diff --git a/Data/Sys/GameSettings/GO2F4F.ini b/Data/Sys/GameSettings/GO2.ini similarity index 92% rename from Data/Sys/GameSettings/GO2F4F.ini rename to Data/Sys/GameSettings/GO2.ini index f0e9a8478..3935cc895 100644 --- a/Data/Sys/GameSettings/GO2F4F.ini +++ b/Data/Sys/GameSettings/GO2.ini @@ -1,4 +1,4 @@ -# GO2F4F - Blood Omen 2 +# GO2D4F, GO2E4F, GO2F4F, GO2P4F - Blood Omen 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GO2D4F.ini b/Data/Sys/GameSettings/GO2D4F.ini deleted file mode 100644 index 85fd9126f..000000000 --- a/Data/Sys/GameSettings/GO2D4F.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GO2D4F - Blood Omen 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs Real Xfb for the videos to display.Sky texture issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GO2E4F.ini b/Data/Sys/GameSettings/GO2E4F.ini deleted file mode 100644 index 27d20a6fb..000000000 --- a/Data/Sys/GameSettings/GO2E4F.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GO2E4F - Blood Omen 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs Real Xfb for the videos to display.Sky texture issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GO2P4F.ini b/Data/Sys/GameSettings/GO2P4F.ini deleted file mode 100644 index 012818a89..000000000 --- a/Data/Sys/GameSettings/GO2P4F.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GO2P4F - Blood Omen 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs Real Xfb for the videos to display.Sky texture issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GOBE4Z.ini b/Data/Sys/GameSettings/GOB.ini similarity index 90% rename from Data/Sys/GameSettings/GOBE4Z.ini rename to Data/Sys/GameSettings/GOB.ini index 08f323109..884d70852 100644 --- a/Data/Sys/GameSettings/GOBE4Z.ini +++ b/Data/Sys/GameSettings/GOB.ini @@ -1,4 +1,4 @@ -# GOBE4Z - Bad Boys Miami Takedown +# GOBE4Z, GOBP7N - Bad Boys Miami Takedown [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GOBP7N.ini b/Data/Sys/GameSettings/GOBP7N.ini deleted file mode 100644 index 38b5d441b..000000000 --- a/Data/Sys/GameSettings/GOBP7N.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GOBP7N - Bad Boys II - -[Core] -# Values set here will override the main Dolphin settings. -DSPHLE = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Slow audio with HLE. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[DSP] -EnableJIT = True diff --git a/Data/Sys/GameSettings/GOSE41.ini b/Data/Sys/GameSettings/GOS.ini similarity index 92% rename from Data/Sys/GameSettings/GOSE41.ini rename to Data/Sys/GameSettings/GOS.ini index 029aa1601..dcdde5ba6 100644 --- a/Data/Sys/GameSettings/GOSE41.ini +++ b/Data/Sys/GameSettings/GOS.ini @@ -1,4 +1,4 @@ -# GOSE41 - Open Season +# GOSE41, GOSP41, GOSX41 - Open Season [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GOSX41.ini b/Data/Sys/GameSettings/GOSX41.ini deleted file mode 100644 index b4f1a3539..000000000 --- a/Data/Sys/GameSettings/GOSX41.ini +++ /dev/null @@ -1,29 +0,0 @@ -# GOSX41 - Open Season - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GOSP41.ini b/Data/Sys/GameSettings/GOW.ini similarity index 88% rename from Data/Sys/GameSettings/GOSP41.ini rename to Data/Sys/GameSettings/GOW.ini index b5a16d1fe..7fb3ce8aa 100644 --- a/Data/Sys/GameSettings/GOSP41.ini +++ b/Data/Sys/GameSettings/GOW.ini @@ -1,9 +1,8 @@ -# GOSP41 - Open Season +# GOWD69, GOWE69, GOWF69, GOWJ69, GOWP69 - NFS Most Wanted [Core] # Values set here will override the main Dolphin settings. MMU = 1 -BlockMerging = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GOWD69.ini b/Data/Sys/GameSettings/GOWD69.ini deleted file mode 100644 index 160e4db18..000000000 --- a/Data/Sys/GameSettings/GOWD69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GOWD69 - NFS Most Wanted - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GOWE69.ini b/Data/Sys/GameSettings/GOWE69.ini deleted file mode 100644 index e667efaa7..000000000 --- a/Data/Sys/GameSettings/GOWE69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GOWE69 - NFS Most Wanted - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GOWF69.ini b/Data/Sys/GameSettings/GOWF69.ini deleted file mode 100644 index d858f9d87..000000000 --- a/Data/Sys/GameSettings/GOWF69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GOWF69 - NFS Most Wanted - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GOWJ69.ini b/Data/Sys/GameSettings/GOWJ69.ini deleted file mode 100644 index 0c28cdc3a..000000000 --- a/Data/Sys/GameSettings/GOWJ69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GOWJ69 - NFS Most Wanted - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GOWP69.ini b/Data/Sys/GameSettings/GOWP69.ini deleted file mode 100644 index e556de51a..000000000 --- a/Data/Sys/GameSettings/GOWP69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GOWP69 - NFS Most Wanted - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GOYD69.ini b/Data/Sys/GameSettings/GOY.ini similarity index 89% rename from Data/Sys/GameSettings/GOYD69.ini rename to Data/Sys/GameSettings/GOY.ini index 2f12d10da..85d8407ef 100644 --- a/Data/Sys/GameSettings/GOYD69.ini +++ b/Data/Sys/GameSettings/GOY.ini @@ -1,4 +1,4 @@ -# GOYD69 - GoldenEye Rogue Agent +# GOYD69, GOYF69, GOYP69, GOYS69 - GoldenEye Rogue Agent [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GOYF69.ini b/Data/Sys/GameSettings/GOYF69.ini deleted file mode 100644 index 3407b414f..000000000 --- a/Data/Sys/GameSettings/GOYF69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GOYF69 - GoldenEye Rogue Agent - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GOYP69.ini b/Data/Sys/GameSettings/GOYP69.ini deleted file mode 100644 index 8c6b42738..000000000 --- a/Data/Sys/GameSettings/GOYP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GOYP69 - GoldenEye Rogue Agent - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GOYS69.ini b/Data/Sys/GameSettings/GOYS69.ini deleted file mode 100644 index 7d388f2ba..000000000 --- a/Data/Sys/GameSettings/GOYS69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GOYS69 - GoldenEye Rogue Agent - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GP2E82.ini b/Data/Sys/GameSettings/GP2.ini similarity index 93% rename from Data/Sys/GameSettings/GP2E82.ini rename to Data/Sys/GameSettings/GP2.ini index 55980e457..f19d1e099 100644 --- a/Data/Sys/GameSettings/GP2E82.ini +++ b/Data/Sys/GameSettings/GP2.ini @@ -1,4 +1,4 @@ -# GP2E82 - Pac-Man World 2 +# GP2E82, GP2EAF - Pac-Man World 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GP2EAF.ini b/Data/Sys/GameSettings/GP2EAF.ini deleted file mode 100644 index d6877bdea..000000000 --- a/Data/Sys/GameSettings/GP2EAF.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GP2EAF - Pac-Man World 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real xfb for the videos to show up(r6651) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GP6J01.ini b/Data/Sys/GameSettings/GP6.ini similarity index 93% rename from Data/Sys/GameSettings/GP6J01.ini rename to Data/Sys/GameSettings/GP6.ini index 31ba302fc..8a1a36ec8 100644 --- a/Data/Sys/GameSettings/GP6J01.ini +++ b/Data/Sys/GameSettings/GP6.ini @@ -1,4 +1,4 @@ -# GP6J01 - Mario Party 6 +# GP6E01, GP6J01, GP6P01 - Mario Party 6 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GP6E01.ini b/Data/Sys/GameSettings/GP6E01.ini deleted file mode 100644 index 51c566f38..000000000 --- a/Data/Sys/GameSettings/GP6E01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GP6E01 - Mario Party 6 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Mini games tour bus needs emulate format changes to preview the mini games. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/GP6P01.ini b/Data/Sys/GameSettings/GP6P01.ini deleted file mode 100644 index 3a5837a6c..000000000 --- a/Data/Sys/GameSettings/GP6P01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GP6P01 - Mario Party 6 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Mini games tour bus needs emulate format changes to preview the mini games. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/GPAE01.ini b/Data/Sys/GameSettings/GPA.ini similarity index 90% rename from Data/Sys/GameSettings/GPAE01.ini rename to Data/Sys/GameSettings/GPA.ini index cb4481549..cbb17fabd 100644 --- a/Data/Sys/GameSettings/GPAE01.ini +++ b/Data/Sys/GameSettings/GPA.ini @@ -1,4 +1,4 @@ -# GPAE01 - PokemonChannelMainDisk +# GPAE01, GPAJ01, GPAP01, GPAU01 - PokemonChannelMainDisk [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GPAJ01.ini b/Data/Sys/GameSettings/GPAJ01.ini deleted file mode 100644 index 93f929b07..000000000 --- a/Data/Sys/GameSettings/GPAJ01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GPAJ01 - PokemonChannelMainDisk - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb to Ram for painting. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GPAP01.ini b/Data/Sys/GameSettings/GPAP01.ini deleted file mode 100644 index 7cd8c8835..000000000 --- a/Data/Sys/GameSettings/GPAP01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GPAP01 - PokemonChannelMainDisk - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb to Ram for painting. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GPAU01.ini b/Data/Sys/GameSettings/GPAU01.ini deleted file mode 100644 index f7b8fa23b..000000000 --- a/Data/Sys/GameSettings/GPAU01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GPAU01 - PokemonChannelMainDisk - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb to Ram for painting. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GPH.ini b/Data/Sys/GameSettings/GPH.ini new file mode 100644 index 000000000..2a01e4252 --- /dev/null +++ b/Data/Sys/GameSettings/GPH.ini @@ -0,0 +1,25 @@ +# GPHD52, GPHE52, GPHP52 - Pitfall: The Lost Expedition + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/GPHD52.ini b/Data/Sys/GameSettings/GPHD52.ini deleted file mode 100644 index 044d2a54c..000000000 --- a/Data/Sys/GameSettings/GPHD52.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GPHD52 - Pitfall: The Lost Expedition - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GPHE52.ini b/Data/Sys/GameSettings/GPHE52.ini deleted file mode 100644 index 5944837ee..000000000 --- a/Data/Sys/GameSettings/GPHE52.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GPHE52 - Pitfall: The Lost Expedition - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GPHP52.ini b/Data/Sys/GameSettings/GPHP52.ini deleted file mode 100644 index 298a0905f..000000000 --- a/Data/Sys/GameSettings/GPHP52.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GPHP52 - Pitfall: The Lost Expedition - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GPTE41.ini b/Data/Sys/GameSettings/GPT.ini similarity index 90% rename from Data/Sys/GameSettings/GPTE41.ini rename to Data/Sys/GameSettings/GPT.ini index 545085121..9d492cef5 100644 --- a/Data/Sys/GameSettings/GPTE41.ini +++ b/Data/Sys/GameSettings/GPT.ini @@ -1,4 +1,4 @@ -# GPTE41 - Prince of Persia : The Sands of Time +# GPTE41, GPTP41 - Prince of Persia : The Sands of Time [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GPTP41.ini b/Data/Sys/GameSettings/GPTP41.ini deleted file mode 100644 index f722cfb78..000000000 --- a/Data/Sys/GameSettings/GPTP41.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GPTP41 - Prince of Persia : The Sands of Time - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real Xfb for videos to show up(r6898) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GPXE01.ini b/Data/Sys/GameSettings/GPX.ini similarity index 88% rename from Data/Sys/GameSettings/GPXE01.ini rename to Data/Sys/GameSettings/GPX.ini index 9a0e2421b..e6ecd5984 100644 --- a/Data/Sys/GameSettings/GPXE01.ini +++ b/Data/Sys/GameSettings/GPX.ini @@ -1,4 +1,4 @@ -# GPXE01 - POKeMON BOX RUBY&SAPPHIRE +# GPXE01, GPXP01 - POKeMON BOX RUBY&SAPPHIRE [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GPXP01.ini b/Data/Sys/GameSettings/GPXP01.ini deleted file mode 100644 index e1c0fa2e1..000000000 --- a/Data/Sys/GameSettings/GPXP01.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GPXP01 - POKeMON BOX RUBY&SAPPHIRE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GQCD52.ini b/Data/Sys/GameSettings/GQC.ini similarity index 84% rename from Data/Sys/GameSettings/GQCD52.ini rename to Data/Sys/GameSettings/GQC.ini index e69adf6d1..24ed6c290 100644 --- a/Data/Sys/GameSettings/GQCD52.ini +++ b/Data/Sys/GameSettings/GQC.ini @@ -1,4 +1,4 @@ -# GQCD52 - Call of Duty 2: Big Red One +# GQCD52, GQCE52, GQCF52, GQCP52, GQCS52 - Call of Duty 2: Big Red One [Core] # Values set here will override the main dolphin settings. MMU = 1 diff --git a/Data/Sys/GameSettings/GQCE52.ini b/Data/Sys/GameSettings/GQCE52.ini deleted file mode 100644 index 8f3452a59..000000000 --- a/Data/Sys/GameSettings/GQCE52.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GQCE52 - Call of Duty 2: Big Red One -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Slow because it needs mmu to run. -EmulationStateId = 4 -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GQCF52.ini b/Data/Sys/GameSettings/GQCF52.ini deleted file mode 100644 index da55f72b9..000000000 --- a/Data/Sys/GameSettings/GQCF52.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GQCF52 - Call of Duty 2: Big Red One -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Slow because it needs mmu to run. -EmulationStateId = 4 -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GQCP52.ini b/Data/Sys/GameSettings/GQCP52.ini deleted file mode 100644 index 6c8850c4f..000000000 --- a/Data/Sys/GameSettings/GQCP52.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GQCP52 - Call of Duty 2: Big Red One -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Slow because it needs mmu to run. -EmulationStateId = 4 -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GQCS52.ini b/Data/Sys/GameSettings/GQCS52.ini deleted file mode 100644 index 1da24daea..000000000 --- a/Data/Sys/GameSettings/GQCS52.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GQCS52 - Call of Duty 2: Big Red One -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Slow because it needs mmu to run. -EmulationStateId = 4 -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GCIP69.ini b/Data/Sys/GameSettings/GQQ.ini similarity index 71% rename from Data/Sys/GameSettings/GCIP69.ini rename to Data/Sys/GameSettings/GQQ.ini index 0f69c3638..a9d3e0927 100644 --- a/Data/Sys/GameSettings/GCIP69.ini +++ b/Data/Sys/GameSettings/GQQ.ini @@ -1,4 +1,4 @@ -# GCIP69 - The Sims +# GQQD78, GQQE78, GQQF78, GQQH78, GQQP78 - SpongeBob Lights, Camera, PANTS [Core] [EmuState] EmulationStateId = 4 @@ -13,5 +13,3 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/GQQD78.ini b/Data/Sys/GameSettings/GQQD78.ini deleted file mode 100644 index d3a1d42b8..000000000 --- a/Data/Sys/GameSettings/GQQD78.ini +++ /dev/null @@ -1,15 +0,0 @@ -# GQQD78 - SpongeBob Lights, Camera, PANTS -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GQQE78.ini b/Data/Sys/GameSettings/GQQE78.ini deleted file mode 100644 index 8a6627d68..000000000 --- a/Data/Sys/GameSettings/GQQE78.ini +++ /dev/null @@ -1,15 +0,0 @@ -# GQQE78 - SpongeBob Lights, Camera, PANTS -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GQQF78.ini b/Data/Sys/GameSettings/GQQF78.ini deleted file mode 100644 index 1de632ae8..000000000 --- a/Data/Sys/GameSettings/GQQF78.ini +++ /dev/null @@ -1,15 +0,0 @@ -# GQQF78 - SpongeBob Lights, Camera, PANTS -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GQQH78.ini b/Data/Sys/GameSettings/GQQH78.ini deleted file mode 100644 index 13875ac01..000000000 --- a/Data/Sys/GameSettings/GQQH78.ini +++ /dev/null @@ -1,15 +0,0 @@ -# GQQH78 - SpongeBob Lights, Camera, PANTS -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GQQP78.ini b/Data/Sys/GameSettings/GQQP78.ini deleted file mode 100644 index 6d1583f10..000000000 --- a/Data/Sys/GameSettings/GQQP78.ini +++ /dev/null @@ -1,15 +0,0 @@ -# GQQP78 - SpongeBob Lights, Camera, PANTS -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameSettings/GQSDAF.ini b/Data/Sys/GameSettings/GQS.ini similarity index 91% rename from Data/Sys/GameSettings/GQSDAF.ini rename to Data/Sys/GameSettings/GQS.ini index 141d2521d..1af03fc1e 100644 --- a/Data/Sys/GameSettings/GQSDAF.ini +++ b/Data/Sys/GameSettings/GQS.ini @@ -1,4 +1,4 @@ -# GQSDAF - TALES OF SYMPHONIA +# GQSDAF, GQSFAF, GQSPAF - TALES OF SYMPHONIA [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GQSFAF.ini b/Data/Sys/GameSettings/GQSFAF.ini deleted file mode 100644 index 2e98d59b5..000000000 --- a/Data/Sys/GameSettings/GQSFAF.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GQSFAF - TALES OF SYMPHONIA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = 0.5 -PH_ZFar = 1 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/GQSPAF.ini b/Data/Sys/GameSettings/GQSPAF.ini deleted file mode 100644 index 230f6eb43..000000000 --- a/Data/Sys/GameSettings/GQSPAF.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GQSPAF - TALES OF SYMPHONIA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = 0.5 -PH_ZFar = 1 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/GQW.ini b/Data/Sys/GameSettings/GQW.ini new file mode 100644 index 000000000..2f31ad6ff --- /dev/null +++ b/Data/Sys/GameSettings/GQW.ini @@ -0,0 +1,27 @@ +# GQWE69, GQWJ69, GQWP69, GQWX69 - Quidditch World Cup + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GQWE69.ini b/Data/Sys/GameSettings/GQWE69.ini deleted file mode 100644 index ebcb4f5c3..000000000 --- a/Data/Sys/GameSettings/GQWE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GQWE69 - Quidditch World Cup - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GQWJ69.ini b/Data/Sys/GameSettings/GQWJ69.ini deleted file mode 100644 index c0c3f9b40..000000000 --- a/Data/Sys/GameSettings/GQWJ69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GQWJ69 - Quidditch World Cup - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GQWP69.ini b/Data/Sys/GameSettings/GQWP69.ini deleted file mode 100644 index cd4c8bbc3..000000000 --- a/Data/Sys/GameSettings/GQWP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GQWP69 - Quidditch World Cup - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GQWX69.ini b/Data/Sys/GameSettings/GQWX69.ini deleted file mode 100644 index 9c57e1b0c..000000000 --- a/Data/Sys/GameSettings/GQWX69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GQWX69 - Quidditch World Cup - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GM3P69.ini b/Data/Sys/GameSettings/GQX.ini similarity index 93% rename from Data/Sys/GameSettings/GM3P69.ini rename to Data/Sys/GameSettings/GQX.ini index c3cc688f8..9619970f6 100644 --- a/Data/Sys/GameSettings/GM3P69.ini +++ b/Data/Sys/GameSettings/GQX.ini @@ -1,4 +1,4 @@ -# GM3P69 - Madden NFL 2003 +# GQXE69, GQXP69 - Madden NFL 2004 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GQXE69.ini b/Data/Sys/GameSettings/GQXE69.ini deleted file mode 100644 index 12d0453ff..000000000 --- a/Data/Sys/GameSettings/GQXE69.ini +++ /dev/null @@ -1,23 +0,0 @@ -# GQXE69 - Madden NFL 2004 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D). -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True -FastDepthCalc = False diff --git a/Data/Sys/GameSettings/GQXP69.ini b/Data/Sys/GameSettings/GQXP69.ini deleted file mode 100644 index fb32ffad7..000000000 --- a/Data/Sys/GameSettings/GQXP69.ini +++ /dev/null @@ -1,23 +0,0 @@ -# GQXP69 - Madden NFL 2004 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D). -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = True -FastDepthCalc = False diff --git a/Data/Sys/GameSettings/GH5P52.ini b/Data/Sys/GameSettings/GR8.ini similarity index 83% rename from Data/Sys/GameSettings/GH5P52.ini rename to Data/Sys/GameSettings/GR8.ini index ede9dd2af..6afaacfdc 100644 --- a/Data/Sys/GameSettings/GH5P52.ini +++ b/Data/Sys/GameSettings/GR8.ini @@ -1,4 +1,4 @@ -# GH5P52 - Over The Hedge +# GR8D69, GR8E69, GR8F69, GR8J69, GR8P69 - Medal of Honor Rising Sun [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/GR8D69.ini b/Data/Sys/GameSettings/GR8D69.ini deleted file mode 100644 index ef77bb6a5..000000000 --- a/Data/Sys/GameSettings/GR8D69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GR8D69 - Medal of Honor Rising Sun -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GR8E69.ini b/Data/Sys/GameSettings/GR8E69.ini deleted file mode 100644 index deab146a7..000000000 --- a/Data/Sys/GameSettings/GR8E69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GR8E69 - Medal of Honor Rising Sun -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GR8F69.ini b/Data/Sys/GameSettings/GR8F69.ini deleted file mode 100644 index bae3e7bdf..000000000 --- a/Data/Sys/GameSettings/GR8F69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GR8F69 - Medal of Honor Rising Sun -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GR8J69.ini b/Data/Sys/GameSettings/GR8J69.ini deleted file mode 100644 index 8df229141..000000000 --- a/Data/Sys/GameSettings/GR8J69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GR8J69 - Medal of Honor Rising Sun -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GR8P69.ini b/Data/Sys/GameSettings/GR8P69.ini deleted file mode 100644 index 842f6c13e..000000000 --- a/Data/Sys/GameSettings/GR8P69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GR8P69 - Medal of Honor Rising Sun -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = diff --git a/Data/Sys/GameSettings/GDSP78.ini b/Data/Sys/GameSettings/GRB.ini similarity index 93% rename from Data/Sys/GameSettings/GDSP78.ini rename to Data/Sys/GameSettings/GRB.ini index 1305670fa..d5846d8a9 100644 --- a/Data/Sys/GameSettings/GDSP78.ini +++ b/Data/Sys/GameSettings/GRB.ini @@ -1,4 +1,4 @@ -# GDSP78 - Dark Summit +# GRBE6S, GRBP6S - Robotech: Battlecry [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GRBP6S.ini b/Data/Sys/GameSettings/GRBP6S.ini deleted file mode 100644 index aa2904c6e..000000000 --- a/Data/Sys/GameSettings/GRBP6S.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GRBP6S - Robotech: Battlecry - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GRJP69.ini b/Data/Sys/GameSettings/GRJ.ini similarity index 91% rename from Data/Sys/GameSettings/GRJP69.ini rename to Data/Sys/GameSettings/GRJ.ini index 9a8be97e5..9355f98fc 100644 --- a/Data/Sys/GameSettings/GRJP69.ini +++ b/Data/Sys/GameSettings/GRJ.ini @@ -1,4 +1,4 @@ -# GRJP69 - R:RACING EVOLUTION +# GRJEAF, GRJJAF, GRJP69 - R:RACING EVOLUTION [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GRJEAF.ini b/Data/Sys/GameSettings/GRJEAF.ini deleted file mode 100644 index 674377262..000000000 --- a/Data/Sys/GameSettings/GRJEAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GRJEAF - R:RACING EVOLUTION - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Efb to Ram is needed for video cutscenes. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GRJJAF.ini b/Data/Sys/GameSettings/GRJJAF.ini deleted file mode 100644 index 21a785428..000000000 --- a/Data/Sys/GameSettings/GRJJAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GRJJAF - R:Racing Evolution: Life in the Fast Lane - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Efb to Ram is needed for video cutscenes. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GRKE41.ini b/Data/Sys/GameSettings/GRK.ini similarity index 95% rename from Data/Sys/GameSettings/GRKE41.ini rename to Data/Sys/GameSettings/GRK.ini index 8bd0cc95a..96e35cd19 100644 --- a/Data/Sys/GameSettings/GRKE41.ini +++ b/Data/Sys/GameSettings/GRK.ini @@ -1,4 +1,4 @@ -# GRKE41 - Rocky +# GRKE41, GRKP7G - Rocky [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GRKP7G.ini b/Data/Sys/GameSettings/GRKP7G.ini deleted file mode 100644 index 512f479e3..000000000 --- a/Data/Sys/GameSettings/GRKP7G.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GRKP7G - Rocky - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use Directx11 plugin (r6651) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True - -UseRealXFB = False -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/G3DE6L.ini b/Data/Sys/GameSettings/GRV.ini similarity index 91% rename from Data/Sys/GameSettings/G3DE6L.ini rename to Data/Sys/GameSettings/GRV.ini index 724b3dcee..c0a0bbb77 100644 --- a/Data/Sys/GameSettings/G3DE6L.ini +++ b/Data/Sys/GameSettings/GRV.ini @@ -1,4 +1,4 @@ -# G3DE6L - Carmen Sandiego +# GRVEA4, GRVJA4 - RAVE MASTER [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GRVJA4.ini b/Data/Sys/GameSettings/GRVJA4.ini deleted file mode 100644 index f776bec5f..000000000 --- a/Data/Sys/GameSettings/GRVJA4.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GRVJA4 - GROOVE ADVENTURE RAVE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GS2D78.ini b/Data/Sys/GameSettings/GS2.ini similarity index 92% rename from Data/Sys/GameSettings/GS2D78.ini rename to Data/Sys/GameSettings/GS2.ini index 0a61f6ab1..e30987ca9 100644 --- a/Data/Sys/GameSettings/GS2D78.ini +++ b/Data/Sys/GameSettings/GS2.ini @@ -1,4 +1,4 @@ -# GS2D78 - Summoner 2 +# GS2D78, GS2E78, GS2F78, GS2P78 - Summoner 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GS2E78.ini b/Data/Sys/GameSettings/GS2E78.ini deleted file mode 100644 index 92e103e91..000000000 --- a/Data/Sys/GameSettings/GS2E78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GS2E78 - Summoner 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GS2F78.ini b/Data/Sys/GameSettings/GS2F78.ini deleted file mode 100644 index 12482fd18..000000000 --- a/Data/Sys/GameSettings/GS2F78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GS2F78 - Summoner 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GS2P78.ini b/Data/Sys/GameSettings/GS2P78.ini deleted file mode 100644 index 90e9fe37b..000000000 --- a/Data/Sys/GameSettings/GS2P78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GS2P78 - Summoner 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GSAE01.ini b/Data/Sys/GameSettings/GSA.ini similarity index 92% rename from Data/Sys/GameSettings/GSAE01.ini rename to Data/Sys/GameSettings/GSA.ini index 03e40f9c6..713c30760 100644 --- a/Data/Sys/GameSettings/GSAE01.ini +++ b/Data/Sys/GameSettings/GSA.ini @@ -1,4 +1,4 @@ -# GSAE01 - Star Fox Adventures +# GSAE01, GSAJ01 - Star Fox Adventures [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GSAJ01.ini b/Data/Sys/GameSettings/GSAJ01.ini deleted file mode 100644 index aa18628e4..000000000 --- a/Data/Sys/GameSettings/GSAJ01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GSAJ01 - Star Fox Adventures - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Use dx11 plugin(r6477) -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GSMD52.ini b/Data/Sys/GameSettings/GSM.ini similarity index 90% rename from Data/Sys/GameSettings/GSMD52.ini rename to Data/Sys/GameSettings/GSM.ini index fdb0f1b11..3b317e640 100644 --- a/Data/Sys/GameSettings/GSMD52.ini +++ b/Data/Sys/GameSettings/GSM.ini @@ -1,4 +1,4 @@ -# GSMD52 - Spider-Man +# GSMD52, GSME52, GSMF52, GSMP52 - Spider-Man [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GSME52.ini b/Data/Sys/GameSettings/GSME52.ini deleted file mode 100644 index e18c7012f..000000000 --- a/Data/Sys/GameSettings/GSME52.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GSME52 - Spider-Man - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GSMF52.ini b/Data/Sys/GameSettings/GSMF52.ini deleted file mode 100644 index b0646ebc3..000000000 --- a/Data/Sys/GameSettings/GSMF52.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GSMF52 - Spider-Man - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GSMP52.ini b/Data/Sys/GameSettings/GSMP52.ini deleted file mode 100644 index 74ae88803..000000000 --- a/Data/Sys/GameSettings/GSMP52.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GSMP52 - Spider-Man - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GSOE8P.ini b/Data/Sys/GameSettings/GSO.ini similarity index 92% rename from Data/Sys/GameSettings/GSOE8P.ini rename to Data/Sys/GameSettings/GSO.ini index bbcfd76fb..52dbb9a83 100644 --- a/Data/Sys/GameSettings/GSOE8P.ini +++ b/Data/Sys/GameSettings/GSO.ini @@ -1,4 +1,4 @@ -# GSOE8P - Sonic Mega Collection (US) +# GSOE8P, GSOP8P - Sonic Mega Collection (US) [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GSOP8P.ini b/Data/Sys/GameSettings/GSOP8P.ini deleted file mode 100644 index 92aa4c0e0..000000000 --- a/Data/Sys/GameSettings/GSOP8P.ini +++ /dev/null @@ -1,32 +0,0 @@ -# GSOP8P - Sonic Mega Collection (EU) - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GSQE78.ini b/Data/Sys/GameSettings/GSQ.ini similarity index 85% rename from Data/Sys/GameSettings/GSQE78.ini rename to Data/Sys/GameSettings/GSQ.ini index 69c2a8722..aead7ac81 100644 --- a/Data/Sys/GameSettings/GSQE78.ini +++ b/Data/Sys/GameSettings/GSQ.ini @@ -1,4 +1,4 @@ -# GSQE78 - SpongeBob SquarePants ROTFD +# GSQE78, GSQP78 - SpongeBob SquarePants ROTFD [Core] [EmuState] EmulationStateId = 3 diff --git a/Data/Sys/GameSettings/GSQP78.ini b/Data/Sys/GameSettings/GSQP78.ini deleted file mode 100644 index cc74ae979..000000000 --- a/Data/Sys/GameSettings/GSQP78.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GSQP78 - SpongeBob SquarePants ROTFD -[Core] -[EmuState] -EmulationStateId = 3 -EmulationIssues = Needs real xfb for the videos to display. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GSWD64.ini b/Data/Sys/GameSettings/GSW.ini similarity index 86% rename from Data/Sys/GameSettings/GSWD64.ini rename to Data/Sys/GameSettings/GSW.ini index eaec75180..05bda152a 100644 --- a/Data/Sys/GameSettings/GSWD64.ini +++ b/Data/Sys/GameSettings/GSW.ini @@ -1,4 +1,4 @@ -# GSWD64 - Star Wars: Rogue Leader +# GSWD64, GSWE64, GSWF64, GSWI64, GSWJ64, GSWP64, GSWS64 - Star Wars: Rogue Leader [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GSWE64.ini b/Data/Sys/GameSettings/GSWE64.ini deleted file mode 100644 index 8adfd5be0..000000000 --- a/Data/Sys/GameSettings/GSWE64.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GSWE64 - Star Wars: Rogue Leader - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GSWF64.ini b/Data/Sys/GameSettings/GSWF64.ini deleted file mode 100644 index b44f7a4f2..000000000 --- a/Data/Sys/GameSettings/GSWF64.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GSWF64 - Star Wars: Rogue Leader - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GSWI64.ini b/Data/Sys/GameSettings/GSWI64.ini deleted file mode 100644 index 7cb58750b..000000000 --- a/Data/Sys/GameSettings/GSWI64.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GSWI64 - Star Wars: Rogue Leader - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GSWJ64.ini b/Data/Sys/GameSettings/GSWJ64.ini deleted file mode 100644 index 970bd1398..000000000 --- a/Data/Sys/GameSettings/GSWJ64.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GSWJ64 - Star Wars: Rogue Leader - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GSWP64.ini b/Data/Sys/GameSettings/GSWP64.ini deleted file mode 100644 index de78f111d..000000000 --- a/Data/Sys/GameSettings/GSWP64.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GSWP64 - Star Wars: Rogue Leader - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GSWS64.ini b/Data/Sys/GameSettings/GSWS64.ini deleted file mode 100644 index 73af58e40..000000000 --- a/Data/Sys/GameSettings/GSWS64.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GSWS64 - Star Wars: Rogue Leader - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs LLE audio for proper sound. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GT3J52.ini b/Data/Sys/GameSettings/GT3.ini similarity index 92% rename from Data/Sys/GameSettings/GT3J52.ini rename to Data/Sys/GameSettings/GT3.ini index ecb1071e7..c8305d27d 100644 --- a/Data/Sys/GameSettings/GT3J52.ini +++ b/Data/Sys/GameSettings/GT3.ini @@ -1,4 +1,4 @@ -# GT3J52 - Tony Hawk's Pro Skater 3 +# GT3D52, GT3E52, GT3J52 - Tony Hawk's Pro Skater 3 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GT3D52.ini b/Data/Sys/GameSettings/GT3D52.ini deleted file mode 100644 index fb3f545f8..000000000 --- a/Data/Sys/GameSettings/GT3D52.ini +++ /dev/null @@ -1,34 +0,0 @@ -# GT3D52 - Tony Hawk's Pro Skater 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to display and Efb to RAM for proper shadows. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GT3E52.ini b/Data/Sys/GameSettings/GT3E52.ini deleted file mode 100644 index 3b927ea6c..000000000 --- a/Data/Sys/GameSettings/GT3E52.ini +++ /dev/null @@ -1,34 +0,0 @@ -# GT3E52 - Tony Hawk's Pro Skater 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to display and Efb to RAM for proper shadows. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GT4E52.ini b/Data/Sys/GameSettings/GT4.ini similarity index 87% rename from Data/Sys/GameSettings/GT4E52.ini rename to Data/Sys/GameSettings/GT4.ini index 4c3d48335..11fa3d20c 100644 --- a/Data/Sys/GameSettings/GT4E52.ini +++ b/Data/Sys/GameSettings/GT4.ini @@ -1,4 +1,4 @@ -# GT4E52 - Tony Hawk's Pro Skater 4 +# GT4D52, GT4E52, GT4F52, GT4P52 - Tony Hawk's Pro Skater 4 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GT4F52.ini b/Data/Sys/GameSettings/GT4F52.ini deleted file mode 100644 index c30970c8f..000000000 --- a/Data/Sys/GameSettings/GT4F52.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GT4F52 - Tony Hawk's Pro Skater 4 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GT4P52.ini b/Data/Sys/GameSettings/GT4P52.ini deleted file mode 100644 index 2a7e1958f..000000000 --- a/Data/Sys/GameSettings/GT4P52.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GT4P52 - Tony Hawk's Pro Skater 4 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GT7X41.ini b/Data/Sys/GameSettings/GT7.ini similarity index 89% rename from Data/Sys/GameSettings/GT7X41.ini rename to Data/Sys/GameSettings/GT7.ini index 478189966..507278441 100644 --- a/Data/Sys/GameSettings/GT7X41.ini +++ b/Data/Sys/GameSettings/GT7.ini @@ -1,4 +1,4 @@ -# GT7X41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW +# GT7E41, GT7P41, GT7X41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GT7E41.ini b/Data/Sys/GameSettings/GT7E41.ini deleted file mode 100644 index 674fa5198..000000000 --- a/Data/Sys/GameSettings/GT7E41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GT7E41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Videos need real XFB to show up and loading screens show garbage. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GT7P41.ini b/Data/Sys/GameSettings/GT7P41.ini deleted file mode 100644 index 08133cd37..000000000 --- a/Data/Sys/GameSettings/GT7P41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GT7P41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Videos need real XFB to show up and loading screens show garbage. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GTK.ini b/Data/Sys/GameSettings/GTK.ini new file mode 100644 index 000000000..70d271352 --- /dev/null +++ b/Data/Sys/GameSettings/GTK.ini @@ -0,0 +1,30 @@ +# GTKE51, GTKP51 - Turok: Evolution + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/GTKE51.ini b/Data/Sys/GameSettings/GTKE51.ini deleted file mode 100644 index 20bfb411c..000000000 --- a/Data/Sys/GameSettings/GTKE51.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GTKE51 - Turok: Evolution - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GTKP51.ini b/Data/Sys/GameSettings/GTKP51.ini deleted file mode 100644 index 1e84af4a7..000000000 --- a/Data/Sys/GameSettings/GTKP51.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GTKP51 - Turok: Evolution - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GTLE52.ini b/Data/Sys/GameSettings/GTL.ini similarity index 92% rename from Data/Sys/GameSettings/GTLE52.ini rename to Data/Sys/GameSettings/GTL.ini index 028754f00..3aaa4f904 100644 --- a/Data/Sys/GameSettings/GTLE52.ini +++ b/Data/Sys/GameSettings/GTL.ini @@ -1,4 +1,4 @@ -# GTLE52 - True Crime +# GTLE52, GTLP52, GTLX52 - True Crime [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GTLP52.ini b/Data/Sys/GameSettings/GTLP52.ini deleted file mode 100644 index 555b08ace..000000000 --- a/Data/Sys/GameSettings/GTLP52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GTLP52 - True Crime - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GTLX52.ini b/Data/Sys/GameSettings/GTLX52.ini deleted file mode 100644 index 1d276f5a5..000000000 --- a/Data/Sys/GameSettings/GTLX52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GTLX52 - True Crime - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GTRE78.ini b/Data/Sys/GameSettings/GTR.ini similarity index 89% rename from Data/Sys/GameSettings/GTRE78.ini rename to Data/Sys/GameSettings/GTR.ini index e9b1cb259..bfbaa47e6 100644 --- a/Data/Sys/GameSettings/GTRE78.ini +++ b/Data/Sys/GameSettings/GTR.ini @@ -1,4 +1,4 @@ -# GTRE78 - Tetris Worlds +# GTRE78, GTRP78 - Tetris Worlds [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/GTRP78.ini b/Data/Sys/GameSettings/GTRP78.ini deleted file mode 100644 index 172271037..000000000 --- a/Data/Sys/GameSettings/GTRP78.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GTRP78 - Tetris Worlds -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Settings] -UseXFB = True -UseRealXFB = True -[Gecko] diff --git a/Data/Sys/GameSettings/GTWE70.ini b/Data/Sys/GameSettings/GTW.ini similarity index 94% rename from Data/Sys/GameSettings/GTWE70.ini rename to Data/Sys/GameSettings/GTW.ini index 30f0b4503..47b6ce59d 100644 --- a/Data/Sys/GameSettings/GTWE70.ini +++ b/Data/Sys/GameSettings/GTW.ini @@ -1,4 +1,4 @@ -# GTWE70 - Taz Wanted +# GTWE70, GTWP70 - Taz Wanted [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GTWP70.ini b/Data/Sys/GameSettings/GTWP70.ini deleted file mode 100644 index df15619aa..000000000 --- a/Data/Sys/GameSettings/GTWP70.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GTWP70 - Taz Wanted - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GBIP08.ini b/Data/Sys/GameSettings/GTY.ini similarity index 91% rename from Data/Sys/GameSettings/GBIP08.ini rename to Data/Sys/GameSettings/GTY.ini index d5b9d2a68..1bb5a66c1 100644 --- a/Data/Sys/GameSettings/GBIP08.ini +++ b/Data/Sys/GameSettings/GTY.ini @@ -1,4 +1,4 @@ -# GBIP08 - Resident Evil +# GTYE69, GTYP69 - TY the Tasmanian Tiger [Core] # Values set here will override the main dolphin settings. @@ -25,5 +25,3 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/GTYE69.ini b/Data/Sys/GameSettings/GTYE69.ini deleted file mode 100644 index ec3e2e315..000000000 --- a/Data/Sys/GameSettings/GTYE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GTYE69 - TY the Tasmanian Tiger - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GTYP69.ini b/Data/Sys/GameSettings/GTYP69.ini deleted file mode 100644 index 641b5a47d..000000000 --- a/Data/Sys/GameSettings/GTYP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GTYP69 - TY the Tasmanian Tiger - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GTZE41.ini b/Data/Sys/GameSettings/GTZ.ini similarity index 93% rename from Data/Sys/GameSettings/GTZE41.ini rename to Data/Sys/GameSettings/GTZ.ini index 27c823c9e..a57c6c936 100644 --- a/Data/Sys/GameSettings/GTZE41.ini +++ b/Data/Sys/GameSettings/GTZ.ini @@ -1,4 +1,4 @@ -# GTZE41 - DISNEY'S TARZAN +# GTZE41, GTZP41 - DISNEY'S TARZAN [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GTZP41.ini b/Data/Sys/GameSettings/GTZP41.ini deleted file mode 100644 index f4076e160..000000000 --- a/Data/Sys/GameSettings/GTZP41.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GTZP41 - DISNEY'S TARZAN - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real Xfb for videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GUB.ini b/Data/Sys/GameSettings/GUB.ini new file mode 100644 index 000000000..8018da2d7 --- /dev/null +++ b/Data/Sys/GameSettings/GUB.ini @@ -0,0 +1,30 @@ +# GUBE69, GUBP69 - The Urbz GameCube + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/GUBE69.ini b/Data/Sys/GameSettings/GUBE69.ini deleted file mode 100644 index 7ce1f69ad..000000000 --- a/Data/Sys/GameSettings/GUBE69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GUBE69 - The Urbz GameCube - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GUBP69.ini b/Data/Sys/GameSettings/GUBP69.ini deleted file mode 100644 index 6ad90bccb..000000000 --- a/Data/Sys/GameSettings/GUBP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GUBP69 - The Urbz GameCube - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GUME52.ini b/Data/Sys/GameSettings/GUM.ini similarity index 95% rename from Data/Sys/GameSettings/GUME52.ini rename to Data/Sys/GameSettings/GUM.ini index 978ca77ac..4956cacd5 100644 --- a/Data/Sys/GameSettings/GUME52.ini +++ b/Data/Sys/GameSettings/GUM.ini @@ -1,4 +1,4 @@ -# GUME52 - Gun +# GUME52, GUMP52 - Gun [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GUMP52.ini b/Data/Sys/GameSettings/GUMP52.ini deleted file mode 100644 index 67e0bdd3d..000000000 --- a/Data/Sys/GameSettings/GUMP52.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GUMP52 - Gun - -[Core] -# Values set here will override the main Dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GUPP8P.ini b/Data/Sys/GameSettings/GUP.ini similarity index 91% rename from Data/Sys/GameSettings/GUPP8P.ini rename to Data/Sys/GameSettings/GUP.ini index ad786bb97..61ddebe3d 100644 --- a/Data/Sys/GameSettings/GUPP8P.ini +++ b/Data/Sys/GameSettings/GUP.ini @@ -1,4 +1,4 @@ -# GUPP8P - SHADOW THE HEDGEHOG +# GUPE8P, GUPJ8P, GUPP8P - SHADOW THE HEDGEHOG [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GUPE8P.ini b/Data/Sys/GameSettings/GUPE8P.ini deleted file mode 100644 index 042dc50d6..000000000 --- a/Data/Sys/GameSettings/GUPE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GUPE8P - SHADOW THE HEDGEHOG - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = 2P mode is playable only with EFB to RAM. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GUPJ8P.ini b/Data/Sys/GameSettings/GUPJ8P.ini deleted file mode 100644 index aaa4944a5..000000000 --- a/Data/Sys/GameSettings/GUPJ8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GUPJ8P - SHADOW THE HEDGEHOG - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = 2P mode is playable only with EFB to RAM. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False diff --git a/Data/Sys/GameSettings/GUTD52.ini b/Data/Sys/GameSettings/GUT.ini similarity index 87% rename from Data/Sys/GameSettings/GUTD52.ini rename to Data/Sys/GameSettings/GUT.ini index 3f5dedc27..f52348b0a 100644 --- a/Data/Sys/GameSettings/GUTD52.ini +++ b/Data/Sys/GameSettings/GUT.ini @@ -1,4 +1,4 @@ -# GUTD52 - Ultimate Spider-Man +# GUTD52, GUTF52, GUTI52, GUTJC0, GUTP52, GUTS52 - Ultimate Spider-Man [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GUTF52.ini b/Data/Sys/GameSettings/GUTF52.ini deleted file mode 100644 index 360b02e51..000000000 --- a/Data/Sys/GameSettings/GUTF52.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GUTF52 - Ultimate Spider-Man - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTI52.ini b/Data/Sys/GameSettings/GUTI52.ini deleted file mode 100644 index db1860968..000000000 --- a/Data/Sys/GameSettings/GUTI52.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GUTI52 - Ultimate Spider-Man - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTJC0.ini b/Data/Sys/GameSettings/GUTJC0.ini deleted file mode 100644 index c863b6928..000000000 --- a/Data/Sys/GameSettings/GUTJC0.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GUTJC0 - Ultimate Spider-Man - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTP52.ini b/Data/Sys/GameSettings/GUTP52.ini deleted file mode 100644 index b4fc80fc0..000000000 --- a/Data/Sys/GameSettings/GUTP52.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GUTP52 - Ultimate Spider-Man - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTS52.ini b/Data/Sys/GameSettings/GUTS52.ini deleted file mode 100644 index ee3bcdab6..000000000 --- a/Data/Sys/GameSettings/GUTS52.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GUTS52 - Ultimate Spider-Man - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUZE41.ini b/Data/Sys/GameSettings/GUZ.ini similarity index 92% rename from Data/Sys/GameSettings/GUZE41.ini rename to Data/Sys/GameSettings/GUZ.ini index 924360c11..f5634142c 100644 --- a/Data/Sys/GameSettings/GUZE41.ini +++ b/Data/Sys/GameSettings/GUZ.ini @@ -1,4 +1,4 @@ -# GUZE41 - Batman: Rise of Sin Tzu +# GUZE41, GUZP41 - Batman: Rise of Sin Tzu [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GUZP41.ini b/Data/Sys/GameSettings/GUZP41.ini deleted file mode 100644 index 8124787eb..000000000 --- a/Data/Sys/GameSettings/GUZP41.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GUZP41 - Batman: Rise of Sin Tzu - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real XFB for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseRealXFB = True -UseXFB = True - diff --git a/Data/Sys/GameSettings/GBWE64.ini b/Data/Sys/GameSettings/GVC.ini similarity index 91% rename from Data/Sys/GameSettings/GBWE64.ini rename to Data/Sys/GameSettings/GVC.ini index 38dcf080d..289c8c450 100644 --- a/Data/Sys/GameSettings/GBWE64.ini +++ b/Data/Sys/GameSettings/GVC.ini @@ -1,4 +1,4 @@ -# GBWE64 - Star Wars Bounty Hunter +# GVCE08, GVCP08 - Viewtiful Joe Red Hot Rumble [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GVCE08.ini b/Data/Sys/GameSettings/GVCE08.ini deleted file mode 100644 index 9c3d05e57..000000000 --- a/Data/Sys/GameSettings/GVCE08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GVCE08 - Viewtiful Joe Red Hot Rumble - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GVCP08.ini b/Data/Sys/GameSettings/GVCP08.ini deleted file mode 100644 index a19c671f6..000000000 --- a/Data/Sys/GameSettings/GVCP08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GVCP08 - Viewtiful Joe Red Hot Rumble - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GBWD64.ini b/Data/Sys/GameSettings/GVJ.ini similarity index 92% rename from Data/Sys/GameSettings/GBWD64.ini rename to Data/Sys/GameSettings/GVJ.ini index f24a73d46..237ce571c 100644 --- a/Data/Sys/GameSettings/GBWD64.ini +++ b/Data/Sys/GameSettings/GVJ.ini @@ -1,4 +1,4 @@ -# GBWD64 - Star Wars Bounty Hunter +# GVJE08, GVJJ08, GVJP08 - VIEWTIFUL JOE [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GVJJ08.ini b/Data/Sys/GameSettings/GVJJ08.ini deleted file mode 100644 index 983f0009b..000000000 --- a/Data/Sys/GameSettings/GVJJ08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GVJJ08 - VIEWTIFUL JOE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GVJP08.ini b/Data/Sys/GameSettings/GVJP08.ini deleted file mode 100644 index 8d7898fe9..000000000 --- a/Data/Sys/GameSettings/GVJP08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GVJP08 - VIEWTIFUL JOE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GVLD69.ini b/Data/Sys/GameSettings/GVL.ini similarity index 87% rename from Data/Sys/GameSettings/GVLD69.ini rename to Data/Sys/GameSettings/GVL.ini index 459a85240..c2c2bbba5 100644 --- a/Data/Sys/GameSettings/GVLD69.ini +++ b/Data/Sys/GameSettings/GVL.ini @@ -1,4 +1,4 @@ -# GVLD69 - Marvel Nemesis: Rise of the Imperfects +# GVLD69, GVLE69, GVLF69, GVLE69 - Marvel Nemesis: Rise of the Imperfects [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GVLE69.ini b/Data/Sys/GameSettings/GVLE69.ini deleted file mode 100644 index 0e9ae1523..000000000 --- a/Data/Sys/GameSettings/GVLE69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GVLE69 - Marvel Nemesis: Rise of the Imperfects - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Idleskipping if enabled will cause speed issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GVLF69.ini b/Data/Sys/GameSettings/GVLF69.ini deleted file mode 100644 index ae97ff9c8..000000000 --- a/Data/Sys/GameSettings/GVLF69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GVLF69 - Marvel Nemesis: Rise of the Imperfects - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Idleskipping if enabled will cause speed issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GVLP69.ini b/Data/Sys/GameSettings/GVLP69.ini deleted file mode 100644 index 0e9ae1523..000000000 --- a/Data/Sys/GameSettings/GVLP69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GVLE69 - Marvel Nemesis: Rise of the Imperfects - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Idleskipping if enabled will cause speed issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GVJE08.ini b/Data/Sys/GameSettings/GVO.ini similarity index 95% rename from Data/Sys/GameSettings/GVJE08.ini rename to Data/Sys/GameSettings/GVO.ini index b89ac5f95..282f3d827 100644 --- a/Data/Sys/GameSettings/GVJE08.ini +++ b/Data/Sys/GameSettings/GVO.ini @@ -1,4 +1,4 @@ -# GVJE08 - VIEWTIFUL JOE +# GVOE69, GVOP69 - BIONICLE [Core] # Values set here will override the main dolphin settings. @@ -28,4 +28,3 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GVOE69.ini b/Data/Sys/GameSettings/GVOE69.ini deleted file mode 100644 index 096704a70..000000000 --- a/Data/Sys/GameSettings/GVOE69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GVOE69 - BIONICLE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GVOP69.ini b/Data/Sys/GameSettings/GVOP69.ini deleted file mode 100644 index d8ae26fd1..000000000 --- a/Data/Sys/GameSettings/GVOP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GVOP69 - BIONICLE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGPE02.ini b/Data/Sys/GameSettings/GVS.ini similarity index 89% rename from Data/Sys/GameSettings/GGPE02.ini rename to Data/Sys/GameSettings/GVS.ini index efb6e7499..096735e89 100644 --- a/Data/Sys/GameSettings/GGPE02.ini +++ b/Data/Sys/GameSettings/GVS.ini @@ -1,4 +1,4 @@ -# GGPE02 - Mario Kart GP 2 +# GVS46E, GVS46J - Virtua Striker 4 Ver. 2006 (Export) [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GVS46E.ini b/Data/Sys/GameSettings/GVS46E.ini deleted file mode 100644 index 36cdea121..000000000 --- a/Data/Sys/GameSettings/GVS46E.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GVS46E - Virtua Striker 4 Ver. 2006 (Export) - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = Crashes on startup (Triforce game) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -# Add memory patches to be applied every frame here. - -[Video_Settings] - diff --git a/Data/Sys/GameSettings/GVS46J.ini b/Data/Sys/GameSettings/GVS46J.ini deleted file mode 100644 index f45ffca59..000000000 --- a/Data/Sys/GameSettings/GVS46J.ini +++ /dev/null @@ -1,24 +0,0 @@ -# GVS46J - Virtua Striker 4 Ver. 2006 (Japan) - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = Crashes on startup (Triforce game) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -# Add memory patches to be applied every frame here. - -[Video_Settings] - diff --git a/Data/Sys/GameSettings/GW2E78.ini b/Data/Sys/GameSettings/GW2.ini similarity index 92% rename from Data/Sys/GameSettings/GW2E78.ini rename to Data/Sys/GameSettings/GW2.ini index 69950343a..5af9f4324 100644 --- a/Data/Sys/GameSettings/GW2E78.ini +++ b/Data/Sys/GameSettings/GW2.ini @@ -1,4 +1,4 @@ -# GW2E78 - WWE Day of Reckoning 2 +# GW2E78, GW2P78 - WWE Day of Reckoning 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/G4OE69.ini b/Data/Sys/GameSettings/GW3.ini similarity index 90% rename from Data/Sys/GameSettings/G4OE69.ini rename to Data/Sys/GameSettings/GW3.ini index ac040041b..171e0c06a 100644 --- a/Data/Sys/GameSettings/G4OE69.ini +++ b/Data/Sys/GameSettings/GW3.ini @@ -1,4 +1,4 @@ -# G4OE69 - The Sims 2 Pets +# GW3E78, GW3P78 - WRESTLE MANIA X8 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GW3E78.ini b/Data/Sys/GameSettings/GW3E78.ini deleted file mode 100644 index 26a355a20..000000000 --- a/Data/Sys/GameSettings/GW3E78.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GW3E78 - WRESTLE MANIA X8 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GW3P78.ini b/Data/Sys/GameSettings/GW3P78.ini deleted file mode 100644 index c273f4a88..000000000 --- a/Data/Sys/GameSettings/GW3P78.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GW3P78 - WRESTLE MANIA X8 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GW5.ini b/Data/Sys/GameSettings/GW5.ini new file mode 100644 index 000000000..24cb91521 --- /dev/null +++ b/Data/Sys/GameSettings/GW5.ini @@ -0,0 +1,19 @@ +# GW5D69, GW5E69, GW5F69, GW5P69 - Need For Speed Carbon + +[Core] +# Values set here will override the main dolphin settings. + + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + diff --git a/Data/Sys/GameSettings/GW5D69.ini b/Data/Sys/GameSettings/GW5D69.ini deleted file mode 100644 index 95b6829be..000000000 --- a/Data/Sys/GameSettings/GW5D69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GW5D69 - Need For Speed Carbon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GW5E69.ini b/Data/Sys/GameSettings/GW5E69.ini deleted file mode 100644 index 9f0faa8d4..000000000 --- a/Data/Sys/GameSettings/GW5E69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GW5E69 - Need For Speed Carbon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GW5F69.ini b/Data/Sys/GameSettings/GW5F69.ini deleted file mode 100644 index 5ba5314b1..000000000 --- a/Data/Sys/GameSettings/GW5F69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GW5F69 - Need For Speed Carbon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GW5P69.ini b/Data/Sys/GameSettings/GW5P69.ini deleted file mode 100644 index 49ad483ca..000000000 --- a/Data/Sys/GameSettings/GW5P69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GW5P69 - Need For Speed Carbon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GW7D69.ini b/Data/Sys/GameSettings/GW7.ini similarity index 88% rename from Data/Sys/GameSettings/GW7D69.ini rename to Data/Sys/GameSettings/GW7.ini index 3e5d64225..c52369ced 100644 --- a/Data/Sys/GameSettings/GW7D69.ini +++ b/Data/Sys/GameSettings/GW7.ini @@ -1,4 +1,4 @@ -# GW7D69 - 007: Agent Under Fire (tm) +# GW7D69, GW7E69, GW7F69, GW7P69 - 007: Agent Under Fire (tm) [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GW7E69.ini b/Data/Sys/GameSettings/GW7E69.ini deleted file mode 100644 index 4984afe3b..000000000 --- a/Data/Sys/GameSettings/GW7E69.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GW7E69 - 007: Agent Under Fire (tm) - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the video cutscenes to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GW7P69.ini b/Data/Sys/GameSettings/GW7P69.ini deleted file mode 100644 index 1b649999f..000000000 --- a/Data/Sys/GameSettings/GW7P69.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GW7P69 - 007: Agent Under Fire (tm) - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the video cutscenes to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GWA.ini b/Data/Sys/GameSettings/GWA.ini new file mode 100644 index 000000000..001bcb3a9 --- /dev/null +++ b/Data/Sys/GameSettings/GWA.ini @@ -0,0 +1,27 @@ +# GWAE8P, GWAF8P, GWAP8P - Spartan: Total Warrior + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GWAE8P.ini b/Data/Sys/GameSettings/GWAE8P.ini deleted file mode 100644 index 3849803f6..000000000 --- a/Data/Sys/GameSettings/GWAE8P.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GWAE8P - Spartan: Total Warrior - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GWAF8P.ini b/Data/Sys/GameSettings/GWAF8P.ini deleted file mode 100644 index 0540f6a10..000000000 --- a/Data/Sys/GameSettings/GWAF8P.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GWAF8P - Spartan: Total Warrior - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GWAP8P.ini b/Data/Sys/GameSettings/GWAP8P.ini deleted file mode 100644 index 534bd98e3..000000000 --- a/Data/Sys/GameSettings/GWAP8P.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GWAP8P - Spartan : Total Warrior (TM) - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GWEE51.ini b/Data/Sys/GameSettings/GWE.ini similarity index 92% rename from Data/Sys/GameSettings/GWEE51.ini rename to Data/Sys/GameSettings/GWE.ini index 718d310be..564a4debc 100644 --- a/Data/Sys/GameSettings/GWEE51.ini +++ b/Data/Sys/GameSettings/GWE.ini @@ -1,4 +1,4 @@ -# GWEE51 - 18 Wheeler +# GWEE51, GWEJB0 - 18 Wheeler [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GWEJB0.ini b/Data/Sys/GameSettings/GWEJB0.ini deleted file mode 100644 index b0e180457..000000000 --- a/Data/Sys/GameSettings/GWEJB0.ini +++ /dev/null @@ -1,19 +0,0 @@ -# GWEJB0 - 18 Wheeler - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Bad sound - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GW2P78.ini b/Data/Sys/GameSettings/GWP.ini similarity index 91% rename from Data/Sys/GameSettings/GW2P78.ini rename to Data/Sys/GameSettings/GWP.ini index 4face38d6..e1683c337 100644 --- a/Data/Sys/GameSettings/GW2P78.ini +++ b/Data/Sys/GameSettings/GWP.ini @@ -1,4 +1,4 @@ -# GW2P78 - WWE Day of Reckoning 2 +# GWPE78, GWPJG2, GWPP78 - WWE Day of Reckoning [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GWPE78.ini b/Data/Sys/GameSettings/GWPE78.ini deleted file mode 100644 index 97fcb54d0..000000000 --- a/Data/Sys/GameSettings/GWPE78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GWPE78 - WWE Day of Reckoning - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb to Ram for created fighters. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GWPJG2.ini b/Data/Sys/GameSettings/GWPJG2.ini deleted file mode 100644 index 766630e61..000000000 --- a/Data/Sys/GameSettings/GWPJG2.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GWPJG2 - WWE Day of Reckoning - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb to Ram for created fighters. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GWPP78.ini b/Data/Sys/GameSettings/GWPP78.ini deleted file mode 100644 index 9e437ee48..000000000 --- a/Data/Sys/GameSettings/GWPP78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GWPP78 - WWE Day of Reckoning - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb to Ram for created fighters. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GWTEA4.ini b/Data/Sys/GameSettings/GWT.ini similarity index 92% rename from Data/Sys/GameSettings/GWTEA4.ini rename to Data/Sys/GameSettings/GWT.ini index 6dc4be578..c10dbb460 100644 --- a/Data/Sys/GameSettings/GWTEA4.ini +++ b/Data/Sys/GameSettings/GWT.ini @@ -1,4 +1,4 @@ -# GWTEA4 - WTA Tour Tennis +# GWTEA4, GWTJA4, GWTPA4 - WTA Tour Tennis [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GWTJA4.ini b/Data/Sys/GameSettings/GWTJA4.ini deleted file mode 100644 index e1bdab174..000000000 --- a/Data/Sys/GameSettings/GWTJA4.ini +++ /dev/null @@ -1,21 +0,0 @@ -# GWTJA4 - WTA Tour Tennis - -[Core] -# Values set here will override the main dolphin settings. -# This game does not work properly with large memorycards, use a 251 block card -# see http://www.nintendo.com/consumer/memorycard1019.jsp -MemoryCard251 = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GWTPA4.ini b/Data/Sys/GameSettings/GWTPA4.ini deleted file mode 100644 index 4378a747a..000000000 --- a/Data/Sys/GameSettings/GWTPA4.ini +++ /dev/null @@ -1,21 +0,0 @@ -# GWTPA4 - WTA Tour Tennis - -[Core] -# Values set here will override the main dolphin settings. -# This game does not work properly with large memorycards, use a 251 block card -# see http://www.nintendo.com/consumer/memorycard1019.jsp -MemoryCard251 = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/GWV.ini b/Data/Sys/GameSettings/GWV.ini new file mode 100644 index 000000000..5eb568ff9 --- /dev/null +++ b/Data/Sys/GameSettings/GWV.ini @@ -0,0 +1,22 @@ +# GWVE52, GWVP52, GWVX52 - X2 Wolverine's Revenge + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + diff --git a/Data/Sys/GameSettings/GWVE52.ini b/Data/Sys/GameSettings/GWVE52.ini deleted file mode 100644 index 6ab1de75c..000000000 --- a/Data/Sys/GameSettings/GWVE52.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GWVE52 - X2 Wolverine's Revenge - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/GWVP52.ini b/Data/Sys/GameSettings/GWVP52.ini deleted file mode 100644 index 85160215a..000000000 --- a/Data/Sys/GameSettings/GWVP52.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GWVP52 - X-Men 2 Wolverine's Revenge - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/GWVX52.ini b/Data/Sys/GameSettings/GWVX52.ini deleted file mode 100644 index d4cf06d71..000000000 --- a/Data/Sys/GameSettings/GWVX52.ini +++ /dev/null @@ -1,22 +0,0 @@ -# GWVX52 - X-Men 2 Wolverine's Revenge - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/GX2.ini b/Data/Sys/GameSettings/GX2.ini new file mode 100644 index 000000000..8bc5b25cf --- /dev/null +++ b/Data/Sys/GameSettings/GX2.ini @@ -0,0 +1,27 @@ +# GX2E52, GX2P52 - X-Men Legends 2: Rise of Apocalypse + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GX2E52.ini b/Data/Sys/GameSettings/GX2E52.ini deleted file mode 100644 index bf6eebd5c..000000000 --- a/Data/Sys/GameSettings/GX2E52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GX2E52 - X-Men Legends 2: Rise of Apocalypse - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GX2P52.ini b/Data/Sys/GameSettings/GX2P52.ini deleted file mode 100644 index b613875d1..000000000 --- a/Data/Sys/GameSettings/GX2P52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GX2P52 - X-Men Legends 2: Rise of Apocalypse - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GX3E41.ini b/Data/Sys/GameSettings/GX3.ini similarity index 94% rename from Data/Sys/GameSettings/GX3E41.ini rename to Data/Sys/GameSettings/GX3.ini index 615e2d11f..eeed5f01a 100644 --- a/Data/Sys/GameSettings/GX3E41.ini +++ b/Data/Sys/GameSettings/GX3.ini @@ -1,4 +1,4 @@ -# GX3E41 - XIII +# GX3E41, GX3P41, GX3X41 - XIII [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GX3P41.ini b/Data/Sys/GameSettings/GX3P41.ini deleted file mode 100644 index 2c60325a7..000000000 --- a/Data/Sys/GameSettings/GX3P41.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GX3P41 - XIII - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs real xfb for the videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GX3X41.ini b/Data/Sys/GameSettings/GX3X41.ini deleted file mode 100644 index 62e14a4d3..000000000 --- a/Data/Sys/GameSettings/GX3X41.ini +++ /dev/null @@ -1,31 +0,0 @@ -# GX3X41 - XIII - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs real xfb for the videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GXBE69.ini b/Data/Sys/GameSettings/GXB.ini similarity index 95% rename from Data/Sys/GameSettings/GXBE69.ini rename to Data/Sys/GameSettings/GXB.ini index d89da3002..500cc0271 100644 --- a/Data/Sys/GameSettings/GXBE69.ini +++ b/Data/Sys/GameSettings/GXB.ini @@ -1,4 +1,4 @@ -# GXBE69 - SSX3 +# GXBE69, GXBP69 - SSX3 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GXBP69.ini b/Data/Sys/GameSettings/GXBP69.ini deleted file mode 100644 index 9fb46faf5..000000000 --- a/Data/Sys/GameSettings/GXBP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GXBP69 - SSX3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBAccessEnable = False - diff --git a/Data/Sys/GameSettings/G4FF69.ini b/Data/Sys/GameSettings/GXC.ini similarity index 93% rename from Data/Sys/GameSettings/G4FF69.ini rename to Data/Sys/GameSettings/GXC.ini index e79a5ad30..c375e3ed7 100644 --- a/Data/Sys/GameSettings/G4FF69.ini +++ b/Data/Sys/GameSettings/GXC.ini @@ -1,4 +1,4 @@ -# G4FF69 - FIFA 07 +# GXCE01, GXCJ01 - CustomRobo [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GXCE01.ini b/Data/Sys/GameSettings/GXCE01.ini deleted file mode 100644 index 1b40bda6d..000000000 --- a/Data/Sys/GameSettings/GXCE01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GXCE01 - CustomRobo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GXCJ01.ini b/Data/Sys/GameSettings/GXCJ01.ini deleted file mode 100644 index c251b14f5..000000000 --- a/Data/Sys/GameSettings/GXCJ01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GXCJ01 - CustomRobo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/G6FD69.ini b/Data/Sys/GameSettings/GXE.ini similarity index 91% rename from Data/Sys/GameSettings/G6FD69.ini rename to Data/Sys/GameSettings/GXE.ini index 2bc535b9c..de059b892 100644 --- a/Data/Sys/GameSettings/G6FD69.ini +++ b/Data/Sys/GameSettings/GXE.ini @@ -1,12 +1,12 @@ -# G6FD69 - 2006 FIFA World Cup +# GXEE8P, GXEJ8P - Sonic Riders [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/GXEE8P.ini b/Data/Sys/GameSettings/GXEE8P.ini deleted file mode 100644 index 5dd1dcacc..000000000 --- a/Data/Sys/GameSettings/GXEE8P.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GXEE8P - Sonic Riders - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. diff --git a/Data/Sys/GameSettings/GXEJ8P.ini b/Data/Sys/GameSettings/GXEJ8P.ini deleted file mode 100644 index 64b2d648e..000000000 --- a/Data/Sys/GameSettings/GXEJ8P.ini +++ /dev/null @@ -1,18 +0,0 @@ -# GXEJ8P - Sonic Riders - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. diff --git a/Data/Sys/GameSettings/GXF.ini b/Data/Sys/GameSettings/GXF.ini new file mode 100644 index 000000000..4d38dc18b --- /dev/null +++ b/Data/Sys/GameSettings/GXF.ini @@ -0,0 +1,27 @@ +# GXFE69, GXFF69, GXFP69 - FIFA Soccer 2004 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GXFE69.ini b/Data/Sys/GameSettings/GXFE69.ini deleted file mode 100644 index 05ee9244b..000000000 --- a/Data/Sys/GameSettings/GXFE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GXFE69 - FIFA Soccer 2004 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GXFF69.ini b/Data/Sys/GameSettings/GXFF69.ini deleted file mode 100644 index 22757183d..000000000 --- a/Data/Sys/GameSettings/GXFF69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GXFF69 - FIFA Soccer 2004 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GXFP69.ini b/Data/Sys/GameSettings/GXFP69.ini deleted file mode 100644 index 52c754caa..000000000 --- a/Data/Sys/GameSettings/GXFP69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GXFP69 - FIFA Soccer 2004 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GRBE6S.ini b/Data/Sys/GameSettings/GXM.ini similarity index 91% rename from Data/Sys/GameSettings/GRBE6S.ini rename to Data/Sys/GameSettings/GXM.ini index 047f42a1e..ed8fdb3c7 100644 --- a/Data/Sys/GameSettings/GRBE6S.ini +++ b/Data/Sys/GameSettings/GXM.ini @@ -1,4 +1,4 @@ -# GRBE6S - Robotech: Battlecry +# GXME52, GXMF52, GXMP52 - X-Men Next Dimension [Core] # Values set here will override the main dolphin settings. @@ -28,4 +28,3 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = True - diff --git a/Data/Sys/GameSettings/GXME52.ini b/Data/Sys/GameSettings/GXME52.ini deleted file mode 100644 index bdeecff7b..000000000 --- a/Data/Sys/GameSettings/GXME52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GXME52 - X-Men Next Dimension - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GXMF52.ini b/Data/Sys/GameSettings/GXMF52.ini deleted file mode 100644 index 1a5e3185b..000000000 --- a/Data/Sys/GameSettings/GXMF52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GXMF52 - X-Men Next Dimension - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GXMP52.ini b/Data/Sys/GameSettings/GXMP52.ini deleted file mode 100644 index c7b4b99e3..000000000 --- a/Data/Sys/GameSettings/GXMP52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# GXMP52 - X-Men Next Dimension - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/GXO.ini b/Data/Sys/GameSettings/GXO.ini new file mode 100644 index 000000000..6cdeca809 --- /dev/null +++ b/Data/Sys/GameSettings/GXO.ini @@ -0,0 +1,27 @@ +# GXOE69, GXOX69 - SSX On Tour + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GXOE69.ini b/Data/Sys/GameSettings/GXOE69.ini deleted file mode 100644 index aafdf1201..000000000 --- a/Data/Sys/GameSettings/GXOE69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GXOE69 - SSX On Tour - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GXOX69.ini b/Data/Sys/GameSettings/GXOX69.ini deleted file mode 100644 index 89529f876..000000000 --- a/Data/Sys/GameSettings/GXOX69.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GXOX69 - SSX On Tour - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GXSE8P.ini b/Data/Sys/GameSettings/GXS.ini similarity index 92% rename from Data/Sys/GameSettings/GXSE8P.ini rename to Data/Sys/GameSettings/GXS.ini index a0397cb21..8dc7f856d 100644 --- a/Data/Sys/GameSettings/GXSE8P.ini +++ b/Data/Sys/GameSettings/GXS.ini @@ -1,4 +1,4 @@ -# GXSE8P - Sonic Adventure DX +# GXSE8P, GXSP6W - Sonic Adventure DX [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GXSP6W.ini b/Data/Sys/GameSettings/GXSP6W.ini deleted file mode 100644 index b83ab2b1d..000000000 --- a/Data/Sys/GameSettings/GXSP6W.ini +++ /dev/null @@ -1,25 +0,0 @@ -# GXSP6W - Sonic Adventure DX - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/GXXE01.ini b/Data/Sys/GameSettings/GXX.ini similarity index 95% rename from Data/Sys/GameSettings/GXXE01.ini rename to Data/Sys/GameSettings/GXX.ini index 258d114a9..8b2fca960 100644 --- a/Data/Sys/GameSettings/GXXE01.ini +++ b/Data/Sys/GameSettings/GXX.ini @@ -1,4 +1,4 @@ -# GXXE01 - POKeMON XD +# GXXE01, GXXP01 - POKeMON XD [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GXXP01.ini b/Data/Sys/GameSettings/GXXP01.ini deleted file mode 100644 index 047d81dca..000000000 --- a/Data/Sys/GameSettings/GXXP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GXXP01 - POKeMON XD - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = HLE music fades in and out. If EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 - -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/GYQE01.ini b/Data/Sys/GameSettings/GYQ.ini similarity index 92% rename from Data/Sys/GameSettings/GYQE01.ini rename to Data/Sys/GameSettings/GYQ.ini index f2eeac981..af3f0e3f2 100644 --- a/Data/Sys/GameSettings/GYQE01.ini +++ b/Data/Sys/GameSettings/GYQ.ini @@ -1,4 +1,4 @@ -# GYQE01 - Mario Superstar Baseball +# GYQE01, GYQJ01, GYQP01 - Mario Superstar Baseball [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GYQJ01.ini b/Data/Sys/GameSettings/GYQJ01.ini deleted file mode 100644 index 2241ed691..000000000 --- a/Data/Sys/GameSettings/GYQJ01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GYQJ01 - Super Mario Stadium for JP - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Player's shadow needs efb to ram and texture cache set to safe to appear properly. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GYQP01.ini b/Data/Sys/GameSettings/GYQP01.ini deleted file mode 100644 index bbbe591b0..000000000 --- a/Data/Sys/GameSettings/GYQP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GYQP01 - MARIO SUPERSTAR BASEBALL - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Player's shadow needs efb to ram and texture cache set to safe to appear properly. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GYTE69.ini b/Data/Sys/GameSettings/GYT.ini similarity index 91% rename from Data/Sys/GameSettings/GYTE69.ini rename to Data/Sys/GameSettings/GYT.ini index 16c744a9a..c0730dbb2 100644 --- a/Data/Sys/GameSettings/GYTE69.ini +++ b/Data/Sys/GameSettings/GYT.ini @@ -1,4 +1,4 @@ -# GYTE69 - TY the Tasmanian Tiger 2 +# GYTE69, GYTP69 - TY the Tasmanian Tiger 2 [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/GYTP69.ini b/Data/Sys/GameSettings/GYTP69.ini deleted file mode 100644 index 52ccd66a5..000000000 --- a/Data/Sys/GameSettings/GYTP69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# GYTP69 - TY the Tasmanian Tiger 2 - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/GYW.ini b/Data/Sys/GameSettings/GYW.ini new file mode 100644 index 000000000..1c1b7abb8 --- /dev/null +++ b/Data/Sys/GameSettings/GYW.ini @@ -0,0 +1,27 @@ +# GYWD41, GYWEE9, GYWP41 - Harvest Moon: A Wonderful Life + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/GYWD41.ini b/Data/Sys/GameSettings/GYWD41.ini deleted file mode 100644 index b6d17de52..000000000 --- a/Data/Sys/GameSettings/GYWD41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GYWD41 - Harvest Moon: A Wonderful Life - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GYWEE9.ini b/Data/Sys/GameSettings/GYWEE9.ini deleted file mode 100644 index 7c1b84e34..000000000 --- a/Data/Sys/GameSettings/GYWEE9.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GYWEE9 - Harvest Moon: A Wonderful Life - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GYWP41.ini b/Data/Sys/GameSettings/GYWP41.ini deleted file mode 100644 index f95bd02d4..000000000 --- a/Data/Sys/GameSettings/GYWP41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# GYWP41 - Harvest Moon: A Wonderful Life - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GZDE70.ini b/Data/Sys/GameSettings/GZD.ini similarity index 86% rename from Data/Sys/GameSettings/GZDE70.ini rename to Data/Sys/GameSettings/GZD.ini index 5fa7e9a21..dcdec75c2 100644 --- a/Data/Sys/GameSettings/GZDE70.ini +++ b/Data/Sys/GameSettings/GZD.ini @@ -1,4 +1,4 @@ -# GZDE70 - Godzilla +# GZDE70, GZDJ70, GZDP70 - Godzilla [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/GZDJ70.ini b/Data/Sys/GameSettings/GZDJ70.ini deleted file mode 100644 index c2498a893..000000000 --- a/Data/Sys/GameSettings/GZDJ70.ini +++ /dev/null @@ -1,17 +0,0 @@ -# GZDJ70 - Godzilla: Kaijuu Dairantou -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GZDP70.ini b/Data/Sys/GameSettings/GZDP70.ini deleted file mode 100644 index 4408fe60f..000000000 --- a/Data/Sys/GameSettings/GZDP70.ini +++ /dev/null @@ -1,17 +0,0 @@ -# GZDP70 - Godzilla -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/GZWE01.ini b/Data/Sys/GameSettings/GZW.ini similarity index 90% rename from Data/Sys/GameSettings/GZWE01.ini rename to Data/Sys/GameSettings/GZW.ini index 0d31a025e..8313ce34a 100644 --- a/Data/Sys/GameSettings/GZWE01.ini +++ b/Data/Sys/GameSettings/GZW.ini @@ -1,4 +1,4 @@ -# GZWE01 - WarioWare, Inc. Mega Party Games +# GZWE01, GZWJ01, GZWP01 - WarioWare, Inc. Mega Party Games [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GZWJ01.ini b/Data/Sys/GameSettings/GZWJ01.ini deleted file mode 100644 index e63f702a2..000000000 --- a/Data/Sys/GameSettings/GZWJ01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GZWJ01 - Atumare!! made in wario - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = -1 - -[Video_Enhancements] -ForceFiltering = False diff --git a/Data/Sys/GameSettings/GZWP01.ini b/Data/Sys/GameSettings/GZWP01.ini deleted file mode 100644 index e632a5f83..000000000 --- a/Data/Sys/GameSettings/GZWP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# GZWP01 - WarioWare, Inc. Mega Party Games - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -EFBScale = -1 - -[Video_Enhancements] -ForceFiltering = False diff --git a/Data/Sys/GameSettings/HABA01.ini b/Data/Sys/GameSettings/HAB.ini similarity index 92% rename from Data/Sys/GameSettings/HABA01.ini rename to Data/Sys/GameSettings/HAB.ini index 3bf145aaa..1ee9ac045 100644 --- a/Data/Sys/GameSettings/HABA01.ini +++ b/Data/Sys/GameSettings/HAB.ini @@ -1,4 +1,4 @@ -# HABA01 - Wii Shop Channel +# HABA01, HABK01 - Wii Shop Channel [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/HABK01.ini b/Data/Sys/GameSettings/HABK01.ini deleted file mode 100644 index 11f33e524..000000000 --- a/Data/Sys/GameSettings/HABK01.ini +++ /dev/null @@ -1,22 +0,0 @@ -# HABK01 - Wii Shop Channel - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Will not connect. Uses WiiConnect24. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] diff --git a/Data/Sys/GameSettings/LABE8P.ini b/Data/Sys/GameSettings/LAB.ini similarity index 93% rename from Data/Sys/GameSettings/LABE8P.ini rename to Data/Sys/GameSettings/LAB.ini index ca7648884..2e99ed8a8 100644 --- a/Data/Sys/GameSettings/LABE8P.ini +++ b/Data/Sys/GameSettings/LAB.ini @@ -1,4 +1,4 @@ -# LABE8P - Fantasy Zone +# LABE8P, LABP8P - Fantasy Zone [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/LAC.ini b/Data/Sys/GameSettings/LAC.ini new file mode 100644 index 000000000..a8bda8658 --- /dev/null +++ b/Data/Sys/GameSettings/LAC.ini @@ -0,0 +1,24 @@ +# LACE8P, LACJ8P, LACP8P - Wonder Boy + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LACP8P.ini b/Data/Sys/GameSettings/LACP8P.ini deleted file mode 100644 index 8bf72dbd7..000000000 --- a/Data/Sys/GameSettings/LACP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LACP8P - Wonder Boy - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAD.ini b/Data/Sys/GameSettings/LAD.ini new file mode 100644 index 000000000..9f7b0a036 --- /dev/null +++ b/Data/Sys/GameSettings/LAD.ini @@ -0,0 +1,26 @@ +# LADE8P, LADJ8P, LADP8P - Phantasy Star + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +UseXFB = True +UseRealXFB = False diff --git a/Data/Sys/GameSettings/LACE8P.ini b/Data/Sys/GameSettings/LAE.ini similarity index 93% rename from Data/Sys/GameSettings/LACE8P.ini rename to Data/Sys/GameSettings/LAE.ini index 8c8e6a193..941d7db07 100644 --- a/Data/Sys/GameSettings/LACE8P.ini +++ b/Data/Sys/GameSettings/LAE.ini @@ -1,4 +1,4 @@ -# LACE8P - Wonder Boy +# LAEE8P, LAEP8P - Alex Kidd [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/LAEE8P.ini b/Data/Sys/GameSettings/LAEE8P.ini deleted file mode 100644 index 5c900b079..000000000 --- a/Data/Sys/GameSettings/LAEE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAEE8P - Alex Kidd - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAEP8P.ini b/Data/Sys/GameSettings/LAEP8P.ini deleted file mode 100644 index 886ad5767..000000000 --- a/Data/Sys/GameSettings/LAEP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAEP8P - Alex Kidd - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LADJ8P.ini b/Data/Sys/GameSettings/LAF.ini similarity index 93% rename from Data/Sys/GameSettings/LADJ8P.ini rename to Data/Sys/GameSettings/LAF.ini index ef3df8459..18b094d90 100644 --- a/Data/Sys/GameSettings/LADJ8P.ini +++ b/Data/Sys/GameSettings/LAF.ini @@ -1,4 +1,4 @@ -# LADJ8P - Phantasy Star +# LAFN8P, LAFP8P - Secret Command [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/LAFP8P.ini b/Data/Sys/GameSettings/LAFP8P.ini deleted file mode 100644 index deddd7fec..000000000 --- a/Data/Sys/GameSettings/LAFP8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAFP8P - Secret Command - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAG.ini b/Data/Sys/GameSettings/LAG.ini new file mode 100644 index 000000000..6a1a4c38d --- /dev/null +++ b/Data/Sys/GameSettings/LAG.ini @@ -0,0 +1,24 @@ +# LAGE8P, LAGJ8P, LAGP8P - Sonic The Hedgehog + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAGE8P.ini b/Data/Sys/GameSettings/LAGE8P.ini deleted file mode 100644 index ef514b717..000000000 --- a/Data/Sys/GameSettings/LAGE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAGE8P - Sonic The Hedgehog - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAGJ8P.ini b/Data/Sys/GameSettings/LAGJ8P.ini deleted file mode 100644 index bb93f7c9f..000000000 --- a/Data/Sys/GameSettings/LAGJ8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAGJ8P - Sonic The Hedgehog - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAGP8P.ini b/Data/Sys/GameSettings/LAGP8P.ini deleted file mode 100644 index 87909a98c..000000000 --- a/Data/Sys/GameSettings/LAGP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAGP8P - Sonic The Hedgehog - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LABP8P.ini b/Data/Sys/GameSettings/LAI.ini similarity index 93% rename from Data/Sys/GameSettings/LABP8P.ini rename to Data/Sys/GameSettings/LAI.ini index e3b6ad3c3..277ad8480 100644 --- a/Data/Sys/GameSettings/LABP8P.ini +++ b/Data/Sys/GameSettings/LAI.ini @@ -1,4 +1,4 @@ -# LABP8P - Fantasy Zone +# LAIE8P, LAIP8P - Enduro Racer [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/LAIE8P.ini b/Data/Sys/GameSettings/LAIE8P.ini deleted file mode 100644 index e529d100d..000000000 --- a/Data/Sys/GameSettings/LAIE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAIE8P - Enduro Racer - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAIP8P.ini b/Data/Sys/GameSettings/LAIP8P.ini deleted file mode 100644 index c40ad3a37..000000000 --- a/Data/Sys/GameSettings/LAIP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAIP8P - Enduro Racer - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAJ.ini b/Data/Sys/GameSettings/LAJ.ini new file mode 100644 index 000000000..d276f93fc --- /dev/null +++ b/Data/Sys/GameSettings/LAJ.ini @@ -0,0 +1,24 @@ +# LAJE8P, LAJJ8P, LAJP8P - Sonic The Hedgehog 2 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAJE8P.ini b/Data/Sys/GameSettings/LAJE8P.ini deleted file mode 100644 index 6f338547b..000000000 --- a/Data/Sys/GameSettings/LAJE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAJE8P - Sonic The Hedgehog 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAJJ8P.ini b/Data/Sys/GameSettings/LAJJ8P.ini deleted file mode 100644 index 3576c06ef..000000000 --- a/Data/Sys/GameSettings/LAJJ8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAJJ8P - Sonic The Hedgehog 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAJP8P.ini b/Data/Sys/GameSettings/LAJP8P.ini deleted file mode 100644 index 5b317ce94..000000000 --- a/Data/Sys/GameSettings/LAJP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAJP8P - Sonic The Hedgehog 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAK.ini b/Data/Sys/GameSettings/LAK.ini new file mode 100644 index 000000000..64fd22009 --- /dev/null +++ b/Data/Sys/GameSettings/LAK.ini @@ -0,0 +1,26 @@ +# LAKE8P, LAKJ8P, LAKP8P - Wonder Boy II + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +UseXFB = True +UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAKE8P.ini b/Data/Sys/GameSettings/LAKE8P.ini deleted file mode 100644 index 269bc74d8..000000000 --- a/Data/Sys/GameSettings/LAKE8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAKE8P - Wonder Boy II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAKJ8P.ini b/Data/Sys/GameSettings/LAKJ8P.ini deleted file mode 100644 index bb9de331e..000000000 --- a/Data/Sys/GameSettings/LAKJ8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAKJ8P - Wonder Boy II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAKP8P.ini b/Data/Sys/GameSettings/LAKP8P.ini deleted file mode 100644 index 388f5bd7f..000000000 --- a/Data/Sys/GameSettings/LAKP8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAKP8P - Wonder Boy II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAL.ini b/Data/Sys/GameSettings/LAL.ini new file mode 100644 index 000000000..952dd53de --- /dev/null +++ b/Data/Sys/GameSettings/LAL.ini @@ -0,0 +1,26 @@ +# LALE8P, LALP8P - Fantasy Zone II + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +UseXFB = True +UseRealXFB = False diff --git a/Data/Sys/GameSettings/LALE8P.ini b/Data/Sys/GameSettings/LALE8P.ini deleted file mode 100644 index 78af618c9..000000000 --- a/Data/Sys/GameSettings/LALE8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LALE8P - Fantasy Zone II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LALP8P.ini b/Data/Sys/GameSettings/LALP8P.ini deleted file mode 100644 index 2078109a4..000000000 --- a/Data/Sys/GameSettings/LALP8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LALP8P - Fantasy Zone II - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAM.ini b/Data/Sys/GameSettings/LAM.ini new file mode 100644 index 000000000..9dc2ca61b --- /dev/null +++ b/Data/Sys/GameSettings/LAM.ini @@ -0,0 +1,24 @@ +# LAME8P, LAMJ8P, LAMP8P - Sonic Chaos + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAME8P.ini b/Data/Sys/GameSettings/LAME8P.ini deleted file mode 100644 index b0f6d1abd..000000000 --- a/Data/Sys/GameSettings/LAME8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAME8P - Sonic Chaos - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAMJ8P.ini b/Data/Sys/GameSettings/LAMJ8P.ini deleted file mode 100644 index 60bcbede0..000000000 --- a/Data/Sys/GameSettings/LAMJ8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAMJ8P - Sonic Chaos - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LAMP8P.ini b/Data/Sys/GameSettings/LAMP8P.ini deleted file mode 100644 index 57798d3ca..000000000 --- a/Data/Sys/GameSettings/LAMP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# LAMP8P - Sonic Chaos - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LADP8P.ini b/Data/Sys/GameSettings/LAN.ini similarity index 93% rename from Data/Sys/GameSettings/LADP8P.ini rename to Data/Sys/GameSettings/LAN.ini index aec72411f..1155e5dc4 100644 --- a/Data/Sys/GameSettings/LADP8P.ini +++ b/Data/Sys/GameSettings/LAN.ini @@ -1,4 +1,4 @@ -# LADP8P - Phantasy Star +# LANE8P, LANP8P - Alex Kidd: TLS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/LANE8P.ini b/Data/Sys/GameSettings/LANE8P.ini deleted file mode 100644 index 75612b6a0..000000000 --- a/Data/Sys/GameSettings/LANE8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LANE8P - Alex Kidd: TLS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LANP8P.ini b/Data/Sys/GameSettings/LANP8P.ini deleted file mode 100644 index 231dcfddb..000000000 --- a/Data/Sys/GameSettings/LANP8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LANP8P - Alex Kidd: TLS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LADE8P.ini b/Data/Sys/GameSettings/LAO.ini similarity index 94% rename from Data/Sys/GameSettings/LADE8P.ini rename to Data/Sys/GameSettings/LAO.ini index c2c43a026..031906b1f 100644 --- a/Data/Sys/GameSettings/LADE8P.ini +++ b/Data/Sys/GameSettings/LAO.ini @@ -1,4 +1,4 @@ -# LADE8P - Phantasy Star +# LAOE8P, LAOP8P - R-TYPE [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/LAOE8P.ini b/Data/Sys/GameSettings/LAOE8P.ini deleted file mode 100644 index d9d3c8bd5..000000000 --- a/Data/Sys/GameSettings/LAOE8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAOE8P - R-TYPE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAOP8P.ini b/Data/Sys/GameSettings/LAOP8P.ini deleted file mode 100644 index 3e9d952ac..000000000 --- a/Data/Sys/GameSettings/LAOP8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAOP8P - R-TYPE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAFN8P.ini b/Data/Sys/GameSettings/LAP.ini similarity index 93% rename from Data/Sys/GameSettings/LAFN8P.ini rename to Data/Sys/GameSettings/LAP.ini index d002ac502..978060080 100644 --- a/Data/Sys/GameSettings/LAFN8P.ini +++ b/Data/Sys/GameSettings/LAP.ini @@ -1,4 +1,4 @@ -# LAFN8P - Secret Command +# LAPE8P, LAPP8P - Wonder Boy III [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/LAPE8P.ini b/Data/Sys/GameSettings/LAPE8P.ini deleted file mode 100644 index 0957cc3b4..000000000 --- a/Data/Sys/GameSettings/LAPE8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAPE8P - Wonder Boy III - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAPP8P.ini b/Data/Sys/GameSettings/LAPP8P.ini deleted file mode 100644 index b5fd51e1c..000000000 --- a/Data/Sys/GameSettings/LAPP8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAPP8P - Wonder Boy III - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAQ.ini b/Data/Sys/GameSettings/LAQ.ini new file mode 100644 index 000000000..f2b8773aa --- /dev/null +++ b/Data/Sys/GameSettings/LAQ.ini @@ -0,0 +1,26 @@ +# LAQE8P, LAQP8P - Alex Kidd in SW + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 +UseXFB = True +UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAQE8P.ini b/Data/Sys/GameSettings/LAQE8P.ini deleted file mode 100644 index dcd3af54c..000000000 --- a/Data/Sys/GameSettings/LAQE8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAQE8P - Alex Kidd in SW - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/LAQP8P.ini b/Data/Sys/GameSettings/LAQP8P.ini deleted file mode 100644 index ea1604aac..000000000 --- a/Data/Sys/GameSettings/LAQP8P.ini +++ /dev/null @@ -1,26 +0,0 @@ -# LAQP8P - Alex Kidd in SW - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/MA6.ini b/Data/Sys/GameSettings/MA6.ini new file mode 100644 index 000000000..7da5ebefe --- /dev/null +++ b/Data/Sys/GameSettings/MA6.ini @@ -0,0 +1,25 @@ +# MA6E8P, MA6P8P - Streets of Rage 2 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MA8.ini b/Data/Sys/GameSettings/MA8.ini new file mode 100644 index 000000000..f2c4e996a --- /dev/null +++ b/Data/Sys/GameSettings/MA8.ini @@ -0,0 +1,25 @@ +# MA8E8P, MA8P8P - Ecco the Dolphin 2 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAD.ini b/Data/Sys/GameSettings/MAD.ini new file mode 100644 index 000000000..1c836cad4 --- /dev/null +++ b/Data/Sys/GameSettings/MAD.ini @@ -0,0 +1,24 @@ +# MADE8P, MADP8P - Ecco the Dolphin + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MADE8P.ini b/Data/Sys/GameSettings/MADE8P.ini deleted file mode 100644 index afe96106f..000000000 --- a/Data/Sys/GameSettings/MADE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MADE8P - Ecco the Dolphin - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MADP8P.ini b/Data/Sys/GameSettings/MADP8P.ini deleted file mode 100644 index 766a4c894..000000000 --- a/Data/Sys/GameSettings/MADP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MADP8P - Ecco the Dolphin - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/LACJ8P.ini b/Data/Sys/GameSettings/MAE.ini similarity index 93% rename from Data/Sys/GameSettings/LACJ8P.ini rename to Data/Sys/GameSettings/MAE.ini index 69a25822c..d8df7536c 100644 --- a/Data/Sys/GameSettings/LACJ8P.ini +++ b/Data/Sys/GameSettings/MAE.ini @@ -1,12 +1,12 @@ -# LACJ8P - Wonder Boy +# MAEE8P, MAEP8P - Golden Axe [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 EmulationIssues = +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/MAEE8P.ini b/Data/Sys/GameSettings/MAEE8P.ini deleted file mode 100644 index 28a342273..000000000 --- a/Data/Sys/GameSettings/MAEE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MAEE8P - Golden Axe - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAEP8P.ini b/Data/Sys/GameSettings/MAEP8P.ini deleted file mode 100644 index 71d43d6f7..000000000 --- a/Data/Sys/GameSettings/MAEP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MAEP8P - Golden Axe - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAL.ini b/Data/Sys/GameSettings/MAL.ini new file mode 100644 index 000000000..d728ec28e --- /dev/null +++ b/Data/Sys/GameSettings/MAL.ini @@ -0,0 +1,24 @@ +# MALE8P, MALP8P - Bonanza Bros. + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MALE8P.ini b/Data/Sys/GameSettings/MALE8P.ini deleted file mode 100644 index ec805b6bd..000000000 --- a/Data/Sys/GameSettings/MALE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MALE8P - Bonanza Bros. - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MALP8P.ini b/Data/Sys/GameSettings/MALP8P.ini deleted file mode 100644 index 0a78f5d31..000000000 --- a/Data/Sys/GameSettings/MALP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MALP8P - Bonanza Bros. - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAM.ini b/Data/Sys/GameSettings/MAM.ini new file mode 100644 index 000000000..f1c1069d8 --- /dev/null +++ b/Data/Sys/GameSettings/MAM.ini @@ -0,0 +1,25 @@ +# MAME8P, MAMP8P - Sword of Vermilion + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAME8P.ini b/Data/Sys/GameSettings/MAME8P.ini deleted file mode 100644 index a774bd45b..000000000 --- a/Data/Sys/GameSettings/MAME8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAME8P - Sword of Vermilion - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAMP8P.ini b/Data/Sys/GameSettings/MAMP8P.ini deleted file mode 100644 index a595c39ec..000000000 --- a/Data/Sys/GameSettings/MAMP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAMP8P - Sword of Vermilion - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MA6P8P.ini b/Data/Sys/GameSettings/MAN.ini similarity index 93% rename from Data/Sys/GameSettings/MA6P8P.ini rename to Data/Sys/GameSettings/MAN.ini index 0a2909833..e1e7f9088 100644 --- a/Data/Sys/GameSettings/MA6P8P.ini +++ b/Data/Sys/GameSettings/MAN.ini @@ -1,4 +1,4 @@ -# MA6P8P - Streets of Rage 2 +# MANE8P, MANP8P - Gain Ground [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/MANE8P.ini b/Data/Sys/GameSettings/MANE8P.ini deleted file mode 100644 index 94e3a1993..000000000 --- a/Data/Sys/GameSettings/MANE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MANE8P - Gain Ground - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MANP8P.ini b/Data/Sys/GameSettings/MANP8P.ini deleted file mode 100644 index 6b19c3317..000000000 --- a/Data/Sys/GameSettings/MANP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MANP8P - Gain Ground - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAO.ini b/Data/Sys/GameSettings/MAO.ini new file mode 100644 index 000000000..d51deebf0 --- /dev/null +++ b/Data/Sys/GameSettings/MAO.ini @@ -0,0 +1,25 @@ +# MAOE8P, MAOP8P - Bio-Hazard Battle + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAOE8P.ini b/Data/Sys/GameSettings/MAOE8P.ini deleted file mode 100644 index c580f48c2..000000000 --- a/Data/Sys/GameSettings/MAOE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAOE8P - Bio-Hazard Battle - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAOP8P.ini b/Data/Sys/GameSettings/MAOP8P.ini deleted file mode 100644 index ca0139d78..000000000 --- a/Data/Sys/GameSettings/MAOP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAOP8P - Bio-Hazard Battle - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAQ.ini b/Data/Sys/GameSettings/MAQ.ini new file mode 100644 index 000000000..b8594d990 --- /dev/null +++ b/Data/Sys/GameSettings/MAQ.ini @@ -0,0 +1,25 @@ +# MAQE8P, MAQP8P - Streets of Rage + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAQE8P.ini b/Data/Sys/GameSettings/MAQE8P.ini deleted file mode 100644 index bd47828e2..000000000 --- a/Data/Sys/GameSettings/MAQE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAQE8P - Streets of Rage - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAQP8P.ini b/Data/Sys/GameSettings/MAQP8P.ini deleted file mode 100644 index 1e517bc5d..000000000 --- a/Data/Sys/GameSettings/MAQP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAQP8P - Streets of Rage - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAR.ini b/Data/Sys/GameSettings/MAR.ini new file mode 100644 index 000000000..7b1055619 --- /dev/null +++ b/Data/Sys/GameSettings/MAR.ini @@ -0,0 +1,25 @@ +# MARE8P, MARP8P - Beyond Oasis + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MARE8P.ini b/Data/Sys/GameSettings/MARE8P.ini deleted file mode 100644 index 05ba51132..000000000 --- a/Data/Sys/GameSettings/MARE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MARE8P - Beyond Oasis - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MARP8P.ini b/Data/Sys/GameSettings/MARP8P.ini deleted file mode 100644 index b59517056..000000000 --- a/Data/Sys/GameSettings/MARP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MARP8P - The Story of Thor - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MA6E8P.ini b/Data/Sys/GameSettings/MAS.ini similarity index 94% rename from Data/Sys/GameSettings/MA6E8P.ini rename to Data/Sys/GameSettings/MAS.ini index 0555a2062..e9e92d5fd 100644 --- a/Data/Sys/GameSettings/MA6E8P.ini +++ b/Data/Sys/GameSettings/MAS.ini @@ -1,4 +1,4 @@ -# MA6E8P - Streets of Rage 2 +# MASE8P, MASP8P - Vectorman [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/MASE8P.ini b/Data/Sys/GameSettings/MASE8P.ini deleted file mode 100644 index 4f6ad6d8b..000000000 --- a/Data/Sys/GameSettings/MASE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MASE8P - Vectorman - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MASP8P.ini b/Data/Sys/GameSettings/MASP8P.ini deleted file mode 100644 index 14686ab5e..000000000 --- a/Data/Sys/GameSettings/MASP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MASP8P - Vectorman - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAT.ini b/Data/Sys/GameSettings/MAT.ini new file mode 100644 index 000000000..2dfb3cb5a --- /dev/null +++ b/Data/Sys/GameSettings/MAT.ini @@ -0,0 +1,25 @@ +# MATE8P, MATP8P - Sonic Spinball + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MATE8P.ini b/Data/Sys/GameSettings/MATE8P.ini deleted file mode 100644 index 171f92bb8..000000000 --- a/Data/Sys/GameSettings/MATE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MATE8P - Sonic Spinball - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MATP8P.ini b/Data/Sys/GameSettings/MATP8P.ini deleted file mode 100644 index ba38756b7..000000000 --- a/Data/Sys/GameSettings/MATP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MATP8P - Sonic Spinball - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAV.ini b/Data/Sys/GameSettings/MAV.ini new file mode 100644 index 000000000..91fbf3364 --- /dev/null +++ b/Data/Sys/GameSettings/MAV.ini @@ -0,0 +1,24 @@ +# MAVE8P, MAVP8P - Wonder Boy in MW + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAVE8P.ini b/Data/Sys/GameSettings/MAVE8P.ini deleted file mode 100644 index 1296f5e0e..000000000 --- a/Data/Sys/GameSettings/MAVE8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MAVE8P - Wonder Boy in MW - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAVP8P.ini b/Data/Sys/GameSettings/MAVP8P.ini deleted file mode 100644 index 3a3538b7f..000000000 --- a/Data/Sys/GameSettings/MAVP8P.ini +++ /dev/null @@ -1,24 +0,0 @@ -# MAVP8P - Wonder Boy in MW - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAW.ini b/Data/Sys/GameSettings/MAW.ini new file mode 100644 index 000000000..f2b2e23f6 --- /dev/null +++ b/Data/Sys/GameSettings/MAW.ini @@ -0,0 +1,25 @@ +# MAWE8P, MAWP8P - Virtua Fighter 2 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAWE8P.ini b/Data/Sys/GameSettings/MAWE8P.ini deleted file mode 100644 index e40d718b9..000000000 --- a/Data/Sys/GameSettings/MAWE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAWE8P - Virtua Fighter 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAWP8P.ini b/Data/Sys/GameSettings/MAWP8P.ini deleted file mode 100644 index 19bff5a6e..000000000 --- a/Data/Sys/GameSettings/MAWP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAWP8P - Virtua Fighter 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MA8E8P.ini b/Data/Sys/GameSettings/MAY.ini similarity index 93% rename from Data/Sys/GameSettings/MA8E8P.ini rename to Data/Sys/GameSettings/MAY.ini index 7fa0a5dff..5d8dc3cc2 100644 --- a/Data/Sys/GameSettings/MA8E8P.ini +++ b/Data/Sys/GameSettings/MAY.ini @@ -1,4 +1,4 @@ -# MA8E8P - Ecco the Dolphin 2 +# MAYE8P, MAYP8P - Alien Storm [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/MAYE8P.ini b/Data/Sys/GameSettings/MAYE8P.ini deleted file mode 100644 index d72d14d13..000000000 --- a/Data/Sys/GameSettings/MAYE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAYE8P - Alien Storm - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAYP8P.ini b/Data/Sys/GameSettings/MAYP8P.ini deleted file mode 100644 index 46399829f..000000000 --- a/Data/Sys/GameSettings/MAYP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAYP8P - Alien Storm - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAZ.ini b/Data/Sys/GameSettings/MAZ.ini new file mode 100644 index 000000000..ee4b2dbf7 --- /dev/null +++ b/Data/Sys/GameSettings/MAZ.ini @@ -0,0 +1,25 @@ +# MAZE8P, MAZP8P - ToeJam & Earl 2 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAZE8P.ini b/Data/Sys/GameSettings/MAZE8P.ini deleted file mode 100644 index a037f48a4..000000000 --- a/Data/Sys/GameSettings/MAZE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAZE8P - ToeJam & Earl 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MAZP8P.ini b/Data/Sys/GameSettings/MAZP8P.ini deleted file mode 100644 index fafcef6ce..000000000 --- a/Data/Sys/GameSettings/MAZP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MAZP8P - ToeJam & Earl 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MB8.ini b/Data/Sys/GameSettings/MB8.ini new file mode 100644 index 000000000..cd73bfcfd --- /dev/null +++ b/Data/Sys/GameSettings/MB8.ini @@ -0,0 +1,25 @@ +# MB8E8P, MB8P8P - Phantasy Star II + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MB8E8P.ini b/Data/Sys/GameSettings/MB8E8P.ini deleted file mode 100644 index 686ee62d7..000000000 --- a/Data/Sys/GameSettings/MB8E8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MB8E8P - Phantasy Star II - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MB8P8P.ini b/Data/Sys/GameSettings/MB8P8P.ini deleted file mode 100644 index 7031adaae..000000000 --- a/Data/Sys/GameSettings/MB8P8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MB8P8P - Phantasy Star II - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBB.ini b/Data/Sys/GameSettings/MBB.ini new file mode 100644 index 000000000..42f1a37cb --- /dev/null +++ b/Data/Sys/GameSettings/MBB.ini @@ -0,0 +1,25 @@ +# MBBE8P, MBBP8P - Sonic the Hedgehog 2 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBBE8P.ini b/Data/Sys/GameSettings/MBBE8P.ini deleted file mode 100644 index 6545df463..000000000 --- a/Data/Sys/GameSettings/MBBE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBBE8P - Sonic the Hedgehog 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBBP8P.ini b/Data/Sys/GameSettings/MBBP8P.ini deleted file mode 100644 index ccf597631..000000000 --- a/Data/Sys/GameSettings/MBBP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBBP8P - Sonic the Hedgehog 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBC.ini b/Data/Sys/GameSettings/MBC.ini new file mode 100644 index 000000000..342ac0b85 --- /dev/null +++ b/Data/Sys/GameSettings/MBC.ini @@ -0,0 +1,25 @@ +# MBCE8P, MBCP8P - Kid Chameleon + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBCE8P.ini b/Data/Sys/GameSettings/MBCE8P.ini deleted file mode 100644 index 7faa2c77b..000000000 --- a/Data/Sys/GameSettings/MBCE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBCE8P - Kid Chameleon - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBCP8P.ini b/Data/Sys/GameSettings/MBCP8P.ini deleted file mode 100644 index 6ac2ec59f..000000000 --- a/Data/Sys/GameSettings/MBCP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBCP8P - Kid Chameleon - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBD.ini b/Data/Sys/GameSettings/MBD.ini new file mode 100644 index 000000000..022ce9e59 --- /dev/null +++ b/Data/Sys/GameSettings/MBD.ini @@ -0,0 +1,25 @@ +# MBDE8P, MBDP8P - Golden Axe II + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBDE8P.ini b/Data/Sys/GameSettings/MBDE8P.ini deleted file mode 100644 index d4fb7209b..000000000 --- a/Data/Sys/GameSettings/MBDE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBDE8P - Golden Axe II - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBDP8P.ini b/Data/Sys/GameSettings/MBDP8P.ini deleted file mode 100644 index b9c3ce1c7..000000000 --- a/Data/Sys/GameSettings/MBDP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBDP8P - Golden Axe II - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBE.ini b/Data/Sys/GameSettings/MBE.ini new file mode 100644 index 000000000..e55a754f0 --- /dev/null +++ b/Data/Sys/GameSettings/MBE.ini @@ -0,0 +1,25 @@ +# MBEE8P, MBEP8P - Shining Force + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBEE8P.ini b/Data/Sys/GameSettings/MBEE8P.ini deleted file mode 100644 index 63d656582..000000000 --- a/Data/Sys/GameSettings/MBEE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBEE8P - Shining Force - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBEP8P.ini b/Data/Sys/GameSettings/MBEP8P.ini deleted file mode 100644 index ebfeef70b..000000000 --- a/Data/Sys/GameSettings/MBEP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBEP8P - Shining Force - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MA8P8P.ini b/Data/Sys/GameSettings/MBF.ini similarity index 93% rename from Data/Sys/GameSettings/MA8P8P.ini rename to Data/Sys/GameSettings/MBF.ini index 6bee220cf..51bfc6193 100644 --- a/Data/Sys/GameSettings/MA8P8P.ini +++ b/Data/Sys/GameSettings/MBF.ini @@ -1,4 +1,4 @@ -# MA8P8P - Ecco the Dolphin 2 +# MBFE8P, MBFP8P - Shinobi III [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/MBFE8P.ini b/Data/Sys/GameSettings/MBFE8P.ini deleted file mode 100644 index f2d29d8da..000000000 --- a/Data/Sys/GameSettings/MBFE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBFE8P - Shinobi III - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBFP8P.ini b/Data/Sys/GameSettings/MBFP8P.ini deleted file mode 100644 index 4d957f436..000000000 --- a/Data/Sys/GameSettings/MBFP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBFP8P - Shinobi III - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBG.ini b/Data/Sys/GameSettings/MBG.ini new file mode 100644 index 000000000..56f2c7a7f --- /dev/null +++ b/Data/Sys/GameSettings/MBG.ini @@ -0,0 +1,25 @@ +# MBGE8P, MBGP8P - Dynamite Headdy + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBGE8P.ini b/Data/Sys/GameSettings/MBGE8P.ini deleted file mode 100644 index c12e9210a..000000000 --- a/Data/Sys/GameSettings/MBGE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBGE8P - Dynamite Headdy - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBGP8P.ini b/Data/Sys/GameSettings/MBGP8P.ini deleted file mode 100644 index 508cfb98f..000000000 --- a/Data/Sys/GameSettings/MBGP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBGP8P - Dynamite Headdy - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBI.ini b/Data/Sys/GameSettings/MBI.ini new file mode 100644 index 000000000..7352619da --- /dev/null +++ b/Data/Sys/GameSettings/MBI.ini @@ -0,0 +1,25 @@ +# MBIE8P, MBIP8P - Landstalker + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBIE8P.ini b/Data/Sys/GameSettings/MBIE8P.ini deleted file mode 100644 index e5fa71351..000000000 --- a/Data/Sys/GameSettings/MBIE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBIE8P - Landstalker - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBIP8P.ini b/Data/Sys/GameSettings/MBIP8P.ini deleted file mode 100644 index 1017675d3..000000000 --- a/Data/Sys/GameSettings/MBIP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBIP8P - Landstalker - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBM.ini b/Data/Sys/GameSettings/MBM.ini new file mode 100644 index 000000000..0e9efe1d5 --- /dev/null +++ b/Data/Sys/GameSettings/MBM.ini @@ -0,0 +1,25 @@ +# MBME8P, MBMP8P - Sonic the Hedgehog 3 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBME8P.ini b/Data/Sys/GameSettings/MBME8P.ini deleted file mode 100644 index 2d15a9b1f..000000000 --- a/Data/Sys/GameSettings/MBME8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBME8P - Sonic the Hedgehog 3 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBMP8P.ini b/Data/Sys/GameSettings/MBMP8P.ini deleted file mode 100644 index 1c2b8e8ae..000000000 --- a/Data/Sys/GameSettings/MBMP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBMP8P - Sonic the Hedgehog 3 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBO.ini b/Data/Sys/GameSettings/MBO.ini new file mode 100644 index 000000000..b03a0135a --- /dev/null +++ b/Data/Sys/GameSettings/MBO.ini @@ -0,0 +1,25 @@ +# MBOE8P, MBOP8P - Golden Axe III + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBOE8P.ini b/Data/Sys/GameSettings/MBOE8P.ini deleted file mode 100644 index 436664439..000000000 --- a/Data/Sys/GameSettings/MBOE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBOE8P - Golden Axe III - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBOP8P.ini b/Data/Sys/GameSettings/MBOP8P.ini deleted file mode 100644 index 7c87cbf7e..000000000 --- a/Data/Sys/GameSettings/MBOP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBOP8P - Golden Axe III - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBP.ini b/Data/Sys/GameSettings/MBP.ini new file mode 100644 index 000000000..63b6ef453 --- /dev/null +++ b/Data/Sys/GameSettings/MBP.ini @@ -0,0 +1,25 @@ +# MBPE8P, MBPP8P - Super Thunder Blade + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBPE8P.ini b/Data/Sys/GameSettings/MBPE8P.ini deleted file mode 100644 index 32b12e606..000000000 --- a/Data/Sys/GameSettings/MBPE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBPE8P - Super Thunder Blade - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBPP8P.ini b/Data/Sys/GameSettings/MBPP8P.ini deleted file mode 100644 index 47ab032f1..000000000 --- a/Data/Sys/GameSettings/MBPP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBPP8P - Super Thunder Blade - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBQ.ini b/Data/Sys/GameSettings/MBQ.ini new file mode 100644 index 000000000..963661def --- /dev/null +++ b/Data/Sys/GameSettings/MBQ.ini @@ -0,0 +1,25 @@ +# MBQE8P, MBQP8P - Streets of Rage 3 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBQE8P.ini b/Data/Sys/GameSettings/MBQE8P.ini deleted file mode 100644 index 7172caf52..000000000 --- a/Data/Sys/GameSettings/MBQE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBQE8P - Streets of Rage 3 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBQP8P.ini b/Data/Sys/GameSettings/MBQP8P.ini deleted file mode 100644 index 7c8353b01..000000000 --- a/Data/Sys/GameSettings/MBQP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBQP8P - Streets of Rage 3 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBR.ini b/Data/Sys/GameSettings/MBR.ini new file mode 100644 index 000000000..9750d7e29 --- /dev/null +++ b/Data/Sys/GameSettings/MBR.ini @@ -0,0 +1,25 @@ +# MBRE8P, MBRP8P - Rolling Thunder 2 + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBRE8P.ini b/Data/Sys/GameSettings/MBRE8P.ini deleted file mode 100644 index f474c6693..000000000 --- a/Data/Sys/GameSettings/MBRE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBRE8P - Rolling Thunder 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBRP8P.ini b/Data/Sys/GameSettings/MBRP8P.ini deleted file mode 100644 index 11ee255ea..000000000 --- a/Data/Sys/GameSettings/MBRP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBRP8P - Rolling Thunder 2 - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBT.ini b/Data/Sys/GameSettings/MBT.ini new file mode 100644 index 000000000..8cc1c1a87 --- /dev/null +++ b/Data/Sys/GameSettings/MBT.ini @@ -0,0 +1,25 @@ +# MBTE8P, MBTP8P - Alien Soldier + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBTE8P.ini b/Data/Sys/GameSettings/MBTE8P.ini deleted file mode 100644 index dd90c367b..000000000 --- a/Data/Sys/GameSettings/MBTE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBTE8P - Alien Soldier - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBTP8P.ini b/Data/Sys/GameSettings/MBTP8P.ini deleted file mode 100644 index 8b6499a59..000000000 --- a/Data/Sys/GameSettings/MBTP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBTP8P - Alien Soldier - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBU.ini b/Data/Sys/GameSettings/MBU.ini new file mode 100644 index 000000000..c937caa72 --- /dev/null +++ b/Data/Sys/GameSettings/MBU.ini @@ -0,0 +1,25 @@ +# MBUE8P, MBUP8P - Sonic 3D Blast + +[Core] +# Values set here will override the main dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBUE8P.ini b/Data/Sys/GameSettings/MBUE8P.ini deleted file mode 100644 index 619b436dc..000000000 --- a/Data/Sys/GameSettings/MBUE8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBUE8P - Sonic 3D Blast - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/MBUP8P.ini b/Data/Sys/GameSettings/MBUP8P.ini deleted file mode 100644 index d649ad364..000000000 --- a/Data/Sys/GameSettings/MBUP8P.ini +++ /dev/null @@ -1,25 +0,0 @@ -# MBUP8P - Sonic 3D - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/NAFE01.ini b/Data/Sys/GameSettings/NAF.ini similarity index 94% rename from Data/Sys/GameSettings/NAFE01.ini rename to Data/Sys/GameSettings/NAF.ini index 111c18eb8..e2c6466ff 100644 --- a/Data/Sys/GameSettings/NAFE01.ini +++ b/Data/Sys/GameSettings/NAF.ini @@ -1,4 +1,4 @@ -# NAFE01 - F-Zero X +# NAFE01, NAFP01 - F-Zero X [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/NAFP01.ini b/Data/Sys/GameSettings/NAFP01.ini deleted file mode 100644 index 6ffa91e5f..000000000 --- a/Data/Sys/GameSettings/NAFP01.ini +++ /dev/null @@ -1,25 +0,0 @@ -# NAFP01 - F-Zero X - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs EFB to Ram to fix a bar of stretched pixels at the bottom of the screen. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/NAHE01.ini b/Data/Sys/GameSettings/NAH.ini similarity index 83% rename from Data/Sys/GameSettings/NAHE01.ini rename to Data/Sys/GameSettings/NAH.ini index a7031c296..2c995f693 100644 --- a/Data/Sys/GameSettings/NAHE01.ini +++ b/Data/Sys/GameSettings/NAH.ini @@ -1,4 +1,4 @@ -# NAHE01 - Yoshi's Story +# NAHE01, NAHP01 - Yoshi's Story [Core] diff --git a/Data/Sys/GameSettings/NAHP01.ini b/Data/Sys/GameSettings/NAHP01.ini deleted file mode 100644 index 56ad4b74c..000000000 --- a/Data/Sys/GameSettings/NAHP01.ini +++ /dev/null @@ -1,17 +0,0 @@ -# NAHP01 - Yoshi's Story - -[Core] - -[EmuState] -EmulationStateId = 4 -EmulationIssues = - -[OnFrame] - -[ActionReplay] - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PAG.ini b/Data/Sys/GameSettings/PAG.ini new file mode 100644 index 000000000..39172f72b --- /dev/null +++ b/Data/Sys/GameSettings/PAG.ini @@ -0,0 +1,24 @@ +# PAGL18, PAGN18 - Bomberman'94 + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PAO.ini b/Data/Sys/GameSettings/PAO.ini new file mode 100644 index 000000000..e7ae31466 --- /dev/null +++ b/Data/Sys/GameSettings/PAO.ini @@ -0,0 +1,24 @@ +# PAOL18, PAON18 - Final Soldier + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PAR.ini b/Data/Sys/GameSettings/PAR.ini new file mode 100644 index 000000000..e5357f0fe --- /dev/null +++ b/Data/Sys/GameSettings/PAR.ini @@ -0,0 +1,24 @@ +# PARL18, PARN18 - DETANA TWIN BEE + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PARL18.ini b/Data/Sys/GameSettings/PARL18.ini deleted file mode 100644 index 1101d9b1b..000000000 --- a/Data/Sys/GameSettings/PARL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PARL18 - DETANA TWIN BEE - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PARN18.ini b/Data/Sys/GameSettings/PARN18.ini deleted file mode 100644 index d3471c60b..000000000 --- a/Data/Sys/GameSettings/PARN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PARN18 - DETANA TWIN BEE - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PAGL18.ini b/Data/Sys/GameSettings/PC2.ini similarity index 93% rename from Data/Sys/GameSettings/PAGL18.ini rename to Data/Sys/GameSettings/PC2.ini index 48163e266..d3060117e 100644 --- a/Data/Sys/GameSettings/PAGL18.ini +++ b/Data/Sys/GameSettings/PC2.ini @@ -1,4 +1,4 @@ -# PAGL18 - Bomberman'94 +# PC2E18, PC2P18 - Chase H.Q. [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/PC2E18.ini b/Data/Sys/GameSettings/PC2E18.ini deleted file mode 100644 index af2941e79..000000000 --- a/Data/Sys/GameSettings/PC2E18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PC2E18 - Chase H.Q. - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PC2P18.ini b/Data/Sys/GameSettings/PC2P18.ini deleted file mode 100644 index d896b052f..000000000 --- a/Data/Sys/GameSettings/PC2P18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PC2P18 - Chase H.Q. - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PAGN18.ini b/Data/Sys/GameSettings/PCO.ini similarity index 93% rename from Data/Sys/GameSettings/PAGN18.ini rename to Data/Sys/GameSettings/PCO.ini index dfa7cd807..eaf8047e5 100644 --- a/Data/Sys/GameSettings/PAGN18.ini +++ b/Data/Sys/GameSettings/PCO.ini @@ -1,4 +1,4 @@ -# PAGN18 - Bomberman'94 +# PCOE18, PCOP18 - Psychosis [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/PCOE18.ini b/Data/Sys/GameSettings/PCOE18.ini deleted file mode 100644 index b806b83a8..000000000 --- a/Data/Sys/GameSettings/PCOE18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PCOE18 - Psychosis - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PCOP18.ini b/Data/Sys/GameSettings/PCOP18.ini deleted file mode 100644 index 25fa68974..000000000 --- a/Data/Sys/GameSettings/PCOP18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PCOP18 - Psychosis - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PAON18.ini b/Data/Sys/GameSettings/PCR.ini similarity index 93% rename from Data/Sys/GameSettings/PAON18.ini rename to Data/Sys/GameSettings/PCR.ini index 71ce6d00e..c5f31f013 100644 --- a/Data/Sys/GameSettings/PAON18.ini +++ b/Data/Sys/GameSettings/PCR.ini @@ -1,4 +1,4 @@ -# PAON18 - Final Soldier +# PCRL18, PCRN18 - Break In [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/PCRL18.ini b/Data/Sys/GameSettings/PCRL18.ini deleted file mode 100644 index 30e82df8c..000000000 --- a/Data/Sys/GameSettings/PCRL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PCRL18 - Break In - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PCRN18.ini b/Data/Sys/GameSettings/PCRN18.ini deleted file mode 100644 index 263f94835..000000000 --- a/Data/Sys/GameSettings/PCRN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PCRN18 - Break In - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PCS.ini b/Data/Sys/GameSettings/PCS.ini new file mode 100644 index 000000000..d1a1694ce --- /dev/null +++ b/Data/Sys/GameSettings/PCS.ini @@ -0,0 +1,24 @@ +# PCSL18, PCSN18 - Digital Champ + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PCSL18.ini b/Data/Sys/GameSettings/PCSL18.ini deleted file mode 100644 index 66138070b..000000000 --- a/Data/Sys/GameSettings/PCSL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PCSL18 - Digital Champ - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PCSN18.ini b/Data/Sys/GameSettings/PCSN18.ini deleted file mode 100644 index 7392d9480..000000000 --- a/Data/Sys/GameSettings/PCSN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PCSN18 - Digital Champ - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PDJ.ini b/Data/Sys/GameSettings/PDJ.ini new file mode 100644 index 000000000..107d54b30 --- /dev/null +++ b/Data/Sys/GameSettings/PDJ.ini @@ -0,0 +1,24 @@ +# PDJL18, PDJN18 - Street Fighter II - Champion Edition + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PDJL18.ini b/Data/Sys/GameSettings/PDJL18.ini deleted file mode 100644 index 3a9aa090b..000000000 --- a/Data/Sys/GameSettings/PDJL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PDJL18 - Street Fighter II - Champion Edition - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PDJN18.ini b/Data/Sys/GameSettings/PDJN18.ini deleted file mode 100644 index 50c5ed5b5..000000000 --- a/Data/Sys/GameSettings/PDJN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# PDJN18 - Street Fighter II - Champion Edition - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PZLE01.ini b/Data/Sys/GameSettings/PZL.ini similarity index 90% rename from Data/Sys/GameSettings/PZLE01.ini rename to Data/Sys/GameSettings/PZL.ini index 6437f5844..bcd4a8588 100644 --- a/Data/Sys/GameSettings/PZLE01.ini +++ b/Data/Sys/GameSettings/PZL.ini @@ -1,4 +1,4 @@ -# PZLE01 - The Legend of Zelda: Collector's Edition +# PZLE01, PZLJ01, PZLP01 - The Legend of Zelda: Collector's Edition [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/PZLJ01.ini b/Data/Sys/GameSettings/PZLJ01.ini deleted file mode 100644 index 964bba60a..000000000 --- a/Data/Sys/GameSettings/PZLJ01.ini +++ /dev/null @@ -1,32 +0,0 @@ -# PZLJ01 - The Legend of Zelda: Collector's Edition - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Hold B while booting the game to enable Progressive Scan for NES games. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/PZLP01.ini b/Data/Sys/GameSettings/PZLP01.ini deleted file mode 100644 index 7696d0b6a..000000000 --- a/Data/Sys/GameSettings/PZLP01.ini +++ /dev/null @@ -1,32 +0,0 @@ -# PZLP01 - The Legend of Zelda: Collector's Edition - -[Core] -# Values set here will override the main dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Hold B while booting the game to enable Progressive Scan for NES games. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False diff --git a/Data/Sys/GameSettings/QAA.ini b/Data/Sys/GameSettings/QAA.ini new file mode 100644 index 000000000..46ef58a26 --- /dev/null +++ b/Data/Sys/GameSettings/QAA.ini @@ -0,0 +1,24 @@ +# QAAE18, QAAP18 - Super Air Zonk + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAAE18.ini b/Data/Sys/GameSettings/QAAE18.ini deleted file mode 100644 index d41aa8c49..000000000 --- a/Data/Sys/GameSettings/QAAE18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QAAE18 - Super Air Zonk - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAAP18.ini b/Data/Sys/GameSettings/QAAP18.ini deleted file mode 100644 index dfb82d8cd..000000000 --- a/Data/Sys/GameSettings/QAAP18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QAAP18 - Super Air Zonk - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAB.ini b/Data/Sys/GameSettings/QAB.ini new file mode 100644 index 000000000..e4be804fa --- /dev/null +++ b/Data/Sys/GameSettings/QAB.ini @@ -0,0 +1,24 @@ +# QABE18, QABP18 - Ys Book I & II + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QABE18.ini b/Data/Sys/GameSettings/QABE18.ini deleted file mode 100644 index cfba16d8f..000000000 --- a/Data/Sys/GameSettings/QABE18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QABE18 - Ys Book I & II - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QABP18.ini b/Data/Sys/GameSettings/QABP18.ini deleted file mode 100644 index 34388242b..000000000 --- a/Data/Sys/GameSettings/QABP18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QABP18 - Ys Book I & II - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/PAOL18.ini b/Data/Sys/GameSettings/QAC.ini similarity index 93% rename from Data/Sys/GameSettings/PAOL18.ini rename to Data/Sys/GameSettings/QAC.ini index 4b2c735c6..0e6cd40cd 100644 --- a/Data/Sys/GameSettings/PAOL18.ini +++ b/Data/Sys/GameSettings/QAC.ini @@ -1,4 +1,4 @@ -# PAOL18 - Final Soldier +# QACL18, QACN18 - Cho Aniki [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/QACL18.ini b/Data/Sys/GameSettings/QACL18.ini deleted file mode 100644 index 979f2468c..000000000 --- a/Data/Sys/GameSettings/QACL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QACL18 - Cho Aniki - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QACN18.ini b/Data/Sys/GameSettings/QACN18.ini deleted file mode 100644 index b0aa886c5..000000000 --- a/Data/Sys/GameSettings/QACN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QACN18 - Cho Aniki - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAD.ini b/Data/Sys/GameSettings/QAD.ini new file mode 100644 index 000000000..e0ab873f7 --- /dev/null +++ b/Data/Sys/GameSettings/QAD.ini @@ -0,0 +1,24 @@ +# QADL18, QADN18 - GRADIUS II + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QADL18.ini b/Data/Sys/GameSettings/QADL18.ini deleted file mode 100644 index fa1df1b04..000000000 --- a/Data/Sys/GameSettings/QADL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QADL18 - GRADIUS II - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QADN18.ini b/Data/Sys/GameSettings/QADN18.ini deleted file mode 100644 index 6b63be072..000000000 --- a/Data/Sys/GameSettings/QADN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QADN18 - GRADIUS II - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAP.ini b/Data/Sys/GameSettings/QAP.ini new file mode 100644 index 000000000..191050f42 --- /dev/null +++ b/Data/Sys/GameSettings/QAP.ini @@ -0,0 +1,24 @@ +# QAPL18, QAPN18 - CASTLEVANIA + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAPL18.ini b/Data/Sys/GameSettings/QAPL18.ini deleted file mode 100644 index c1a650290..000000000 --- a/Data/Sys/GameSettings/QAPL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QAPL18 - CASTLEVANIA - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAPN18.ini b/Data/Sys/GameSettings/QAPN18.ini deleted file mode 100644 index c6174449f..000000000 --- a/Data/Sys/GameSettings/QAPN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QAPN18 - CASTLEVANIA - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAW.ini b/Data/Sys/GameSettings/QAW.ini new file mode 100644 index 000000000..50b457de0 --- /dev/null +++ b/Data/Sys/GameSettings/QAW.ini @@ -0,0 +1,24 @@ +# QAWL18, QAWN18 - Star Parodier + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAWL18.ini b/Data/Sys/GameSettings/QAWL18.ini deleted file mode 100644 index de12c5343..000000000 --- a/Data/Sys/GameSettings/QAWL18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QAWL18 - Star Parodier - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QAWN18.ini b/Data/Sys/GameSettings/QAWN18.ini deleted file mode 100644 index 73edf8c24..000000000 --- a/Data/Sys/GameSettings/QAWN18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QAWN18 - Star Parodier - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QBB.ini b/Data/Sys/GameSettings/QBB.ini new file mode 100644 index 000000000..62c3da0e4 --- /dev/null +++ b/Data/Sys/GameSettings/QBB.ini @@ -0,0 +1,24 @@ +# QBBE18, QBBP18 - Fighting Street + +[Core] +# Values set here will override the main Dolphin settings. +ProgressiveScan = True + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] + +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QBBE18.ini b/Data/Sys/GameSettings/QBBE18.ini deleted file mode 100644 index 6b81ee126..000000000 --- a/Data/Sys/GameSettings/QBBE18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QBBE18 - Fighting Street - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/QBBP18.ini b/Data/Sys/GameSettings/QBBP18.ini deleted file mode 100644 index ed7d51f6e..000000000 --- a/Data/Sys/GameSettings/QBBP18.ini +++ /dev/null @@ -1,24 +0,0 @@ -# QBBP18 - Fighting Street - -[Core] -# Values set here will override the main Dolphin settings. -ProgressiveScan = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/R22P01.ini b/Data/Sys/GameSettings/R22.ini similarity index 93% rename from Data/Sys/GameSettings/R22P01.ini rename to Data/Sys/GameSettings/R22.ini index 5d61aff33..293bcc62a 100644 --- a/Data/Sys/GameSettings/R22P01.ini +++ b/Data/Sys/GameSettings/R22.ini @@ -1,4 +1,4 @@ -# R22P01 - FlingSmash +# R22E01, R22J01, R22P01 - FlingSmash [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R22E01.ini b/Data/Sys/GameSettings/R22E01.ini deleted file mode 100644 index 7fb686908..000000000 --- a/Data/Sys/GameSettings/R22E01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# R22E01 - FlingSmash - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/R22J01.ini b/Data/Sys/GameSettings/R22J01.ini deleted file mode 100644 index 14463c566..000000000 --- a/Data/Sys/GameSettings/R22J01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# R22J01 - Tataite Hazumu: Super Smash Ball Plus - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/R2GJAF.ini b/Data/Sys/GameSettings/R2G.ini similarity index 93% rename from Data/Sys/GameSettings/R2GJAF.ini rename to Data/Sys/GameSettings/R2G.ini index 2649bdf1c..cb5dc6716 100644 --- a/Data/Sys/GameSettings/R2GJAF.ini +++ b/Data/Sys/GameSettings/R2G.ini @@ -1,4 +1,4 @@ -# R2GJAF - FRAGILE +# R2GEXJ, R2GJAF, R2GP99 - FRAGILE DREAMS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R2GEXJ.ini b/Data/Sys/GameSettings/R2GEXJ.ini deleted file mode 100644 index b028b67fd..000000000 --- a/Data/Sys/GameSettings/R2GEXJ.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R2GEXJ - FRAGILE DREAMS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Minimap needs emulate format changes to work. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/R2GP99.ini b/Data/Sys/GameSettings/R2GP99.ini deleted file mode 100644 index 6b8a13c13..000000000 --- a/Data/Sys/GameSettings/R2GP99.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R2GP99 - FRAGILE DREAMS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Minimap needs emulate format changes to work. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/R3BE8P.ini b/Data/Sys/GameSettings/R3B.ini similarity index 92% rename from Data/Sys/GameSettings/R3BE8P.ini rename to Data/Sys/GameSettings/R3B.ini index f4d21c664..30a100154 100644 --- a/Data/Sys/GameSettings/R3BE8P.ini +++ b/Data/Sys/GameSettings/R3B.ini @@ -1,4 +1,4 @@ -# R3BE8P - SambaDeAmigo +# R3BE8P, R3BJ8P, R3BP8P - SambaDeAmigo [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R3BJ8P.ini b/Data/Sys/GameSettings/R3BJ8P.ini deleted file mode 100644 index b339e0c3f..000000000 --- a/Data/Sys/GameSettings/R3BJ8P.ini +++ /dev/null @@ -1,31 +0,0 @@ -# R3BJ8P - SambaDeAmigo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/R3DES5.ini b/Data/Sys/GameSettings/R3D.ini similarity index 93% rename from Data/Sys/GameSettings/R3DES5.ini rename to Data/Sys/GameSettings/R3D.ini index 7f795a06d..d5fce8185 100644 --- a/Data/Sys/GameSettings/R3DES5.ini +++ b/Data/Sys/GameSettings/R3D.ini @@ -1,4 +1,4 @@ -# R3DES5 - Dream Pinball 3d +# R3DES5, R3DPS5 - Dream Pinball 3d [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R3DPS5.ini b/Data/Sys/GameSettings/R3DPS5.ini deleted file mode 100644 index f562dd451..000000000 --- a/Data/Sys/GameSettings/R3DPS5.ini +++ /dev/null @@ -1,31 +0,0 @@ -# R3DPS5 - Dream Pinball 3d - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Automatic framelimit is problematic. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/R3ME01.ini b/Data/Sys/GameSettings/R3M.ini similarity index 93% rename from Data/Sys/GameSettings/R3ME01.ini rename to Data/Sys/GameSettings/R3M.ini index a9006f993..8157b4fec 100644 --- a/Data/Sys/GameSettings/R3ME01.ini +++ b/Data/Sys/GameSettings/R3M.ini @@ -1,4 +1,4 @@ -# R3ME01 - Metroid Prime Trilogy +# R3ME01, R3MP01 - Metroid Prime Trilogy [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R3MP01.ini b/Data/Sys/GameSettings/R3MP01.ini deleted file mode 100644 index 755355c2d..000000000 --- a/Data/Sys/GameSettings/R3MP01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# R3MP01 - Metroid Prime Trilogy - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Disable PAL60 (EuRGB60) to avoid a black bar appearing. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GKOP70.ini b/Data/Sys/GameSettings/R3N.ini similarity index 91% rename from Data/Sys/GameSettings/GKOP70.ini rename to Data/Sys/GameSettings/R3N.ini index 8378b910f..7c23965be 100644 --- a/Data/Sys/GameSettings/GKOP70.ini +++ b/Data/Sys/GameSettings/R3N.ini @@ -1,4 +1,4 @@ -# GKOP70 - Kao the kangaroo +# R3NEXS, R3NPH3 - Guilty Gear XX AC Plus [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R3NEXS.ini b/Data/Sys/GameSettings/R3NEXS.ini deleted file mode 100644 index 73752c233..000000000 --- a/Data/Sys/GameSettings/R3NEXS.ini +++ /dev/null @@ -1,25 +0,0 @@ -# R3NEXS - Guilty Gear XX AC Plus - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/R3NPH3.ini b/Data/Sys/GameSettings/R3NPH3.ini deleted file mode 100644 index 969a58dd8..000000000 --- a/Data/Sys/GameSettings/R3NPH3.ini +++ /dev/null @@ -1,25 +0,0 @@ -# R3NPH3 - Guilty Gear XX AC Plus - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/R3OP01.ini b/Data/Sys/GameSettings/R3O.ini similarity index 92% rename from Data/Sys/GameSettings/R3OP01.ini rename to Data/Sys/GameSettings/R3O.ini index b5039bdb2..ed75ecea8 100644 --- a/Data/Sys/GameSettings/R3OP01.ini +++ b/Data/Sys/GameSettings/R3O.ini @@ -1,4 +1,4 @@ -# R3OP01 - Metroid: Other M +# R3OE01, R3OJ01, R3OP01 - Metroid: Other M [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R3OE01.ini b/Data/Sys/GameSettings/R3OE01.ini deleted file mode 100644 index 787db9386..000000000 --- a/Data/Sys/GameSettings/R3OE01.ini +++ /dev/null @@ -1,32 +0,0 @@ -# R3OE01 - Metroid: Other M - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 1 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/R3OJ01.ini b/Data/Sys/GameSettings/R3OJ01.ini deleted file mode 100644 index 9e0e57138..000000000 --- a/Data/Sys/GameSettings/R3OJ01.ini +++ /dev/null @@ -1,32 +0,0 @@ -# R3OJ01 - Metroid: Other M - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 1 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/R3RE8P.ini b/Data/Sys/GameSettings/R3R.ini similarity index 90% rename from Data/Sys/GameSettings/R3RE8P.ini rename to Data/Sys/GameSettings/R3R.ini index 422735bab..b431ea7ff 100644 --- a/Data/Sys/GameSettings/R3RE8P.ini +++ b/Data/Sys/GameSettings/R3R.ini @@ -1,4 +1,4 @@ -# R3RE8P - Sonic & Sega All-Stars Racing +# R3RE8P, R3RP8P - Sonic & Sega All-Stars Racing [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/R3RP8P.ini b/Data/Sys/GameSettings/R3RP8P.ini deleted file mode 100644 index b49762b0f..000000000 --- a/Data/Sys/GameSettings/R3RP8P.ini +++ /dev/null @@ -1,21 +0,0 @@ -# R3RP8P - Sonic & Sega All-Stars Racing -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use direct 3d 11 for less graphic glitches. -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/R4EP01.ini b/Data/Sys/GameSettings/R4E.ini similarity index 90% rename from Data/Sys/GameSettings/R4EP01.ini rename to Data/Sys/GameSettings/R4E.ini index f2458cf1c..224042243 100644 --- a/Data/Sys/GameSettings/R4EP01.ini +++ b/Data/Sys/GameSettings/R4E.ini @@ -1,4 +1,4 @@ -# R4EP01 - Endless Ocean 2 +# R4EE01, R4EJ01, R4EP01 - Endless Ocean Blue World [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R4EJ01.ini b/Data/Sys/GameSettings/R4EJ01.ini deleted file mode 100644 index fc1158f70..000000000 --- a/Data/Sys/GameSettings/R4EJ01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# R4EJ01 - FOREVER BLUE 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GKYE01.ini b/Data/Sys/GameSettings/R4Q.ini similarity index 88% rename from Data/Sys/GameSettings/GKYE01.ini rename to Data/Sys/GameSettings/R4Q.ini index 107c8c7bd..77ca71ff5 100644 --- a/Data/Sys/GameSettings/GKYE01.ini +++ b/Data/Sys/GameSettings/R4Q.ini @@ -1,4 +1,4 @@ -# GKYE01 - Kirby Air Ride +# R4QE01, R4QJ01, R4QK01, R4QP01 - Mario Strikers Charged [Core] # Values set here will override the main dolphin settings. @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/R4QE01.ini b/Data/Sys/GameSettings/R4QE01.ini deleted file mode 100644 index d6eaeb7ce..000000000 --- a/Data/Sys/GameSettings/R4QE01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# R4QE01 - Mario Strikers Charged - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/R5IP4Q.ini b/Data/Sys/GameSettings/R5I.ini similarity index 92% rename from Data/Sys/GameSettings/R5IP4Q.ini rename to Data/Sys/GameSettings/R5I.ini index 5a7152b84..f1771af76 100644 --- a/Data/Sys/GameSettings/R5IP4Q.ini +++ b/Data/Sys/GameSettings/R5I.ini @@ -1,4 +1,4 @@ -# R5IP4Q - Toy Story Mania! +# R5IE4Q, R5IP4Q, R5IX4Q - Toy Story Mania! [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R5IE4Q.ini b/Data/Sys/GameSettings/R5IE4Q.ini deleted file mode 100644 index f9cc87dee..000000000 --- a/Data/Sys/GameSettings/R5IE4Q.ini +++ /dev/null @@ -1,33 +0,0 @@ -# R5IE4Q - Toy Story Mania! - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Enhancements] -ForceFiltering = False - diff --git a/Data/Sys/GameSettings/R5IX4Q.ini b/Data/Sys/GameSettings/R5IX4Q.ini deleted file mode 100644 index cb4375ece..000000000 --- a/Data/Sys/GameSettings/R5IX4Q.ini +++ /dev/null @@ -1,33 +0,0 @@ -# R5IX4Q - Toy Story Mania! - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Enhancements] -ForceFiltering = False - diff --git a/Data/Sys/GameSettings/R5V.ini b/Data/Sys/GameSettings/R5V.ini new file mode 100644 index 000000000..7355fff75 --- /dev/null +++ b/Data/Sys/GameSettings/R5V.ini @@ -0,0 +1,29 @@ +# R5VE41, R5VP41, R5VE41 - James Cameron's AVATAR + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Hacks] + diff --git a/Data/Sys/GameSettings/R5VX41.ini b/Data/Sys/GameSettings/R5VX41.ini deleted file mode 100644 index aede7537b..000000000 --- a/Data/Sys/GameSettings/R5VX41.ini +++ /dev/null @@ -1,29 +0,0 @@ -# R5VE41 - James Cameron's AVATAR - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/R5WEA4.ini b/Data/Sys/GameSettings/R5W.ini similarity index 91% rename from Data/Sys/GameSettings/R5WEA4.ini rename to Data/Sys/GameSettings/R5W.ini index 57979f80e..64deba8a8 100644 --- a/Data/Sys/GameSettings/R5WEA4.ini +++ b/Data/Sys/GameSettings/R5W.ini @@ -1,4 +1,4 @@ -# R5WEA4 - Silent Hill: Shattered Memories +# R5WEA4, R5WJA4 - Silent Hill: Shattered Memories [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R5WJA4.ini b/Data/Sys/GameSettings/R5WJA4.ini deleted file mode 100644 index f714736ff..000000000 --- a/Data/Sys/GameSettings/R5WJA4.ini +++ /dev/null @@ -1,30 +0,0 @@ -# R5WJA4 - Silent Hill: Shattered Memories - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Flashlight glitches (r6521) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/R64J01.ini b/Data/Sys/GameSettings/R64.ini similarity index 90% rename from Data/Sys/GameSettings/R64J01.ini rename to Data/Sys/GameSettings/R64.ini index cff783884..a709d6e23 100644 --- a/Data/Sys/GameSettings/R64J01.ini +++ b/Data/Sys/GameSettings/R64.ini @@ -1,4 +1,4 @@ -# R64J01 - RVL Wii Music +# R64E01, R64J01, R64K01, R64P01 - RVL Wii Music [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R6BJ78.ini b/Data/Sys/GameSettings/R6B.ini similarity index 91% rename from Data/Sys/GameSettings/R6BJ78.ini rename to Data/Sys/GameSettings/R6B.ini index ca9fee658..a674322d1 100644 --- a/Data/Sys/GameSettings/R6BJ78.ini +++ b/Data/Sys/GameSettings/R6B.ini @@ -1,4 +1,4 @@ -# R6BJ78 - Blob Colorful Na Kibou +# R6BE78, R6BJ78, R6BK78, R6BP78, R6BX78 - de Blob [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R6BE78.ini b/Data/Sys/GameSettings/R6BE78.ini deleted file mode 100644 index 93d3ecd1a..000000000 --- a/Data/Sys/GameSettings/R6BE78.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R6BE78 - de Blob - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/R6BK78.ini b/Data/Sys/GameSettings/R6BK78.ini deleted file mode 100644 index daae7f6b7..000000000 --- a/Data/Sys/GameSettings/R6BK78.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R6BK78 - de Blob - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/R6BP78.ini b/Data/Sys/GameSettings/R6BP78.ini deleted file mode 100644 index 6e349f9ff..000000000 --- a/Data/Sys/GameSettings/R6BP78.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R6BP78 - de Blob - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/R6BX78.ini b/Data/Sys/GameSettings/R6BX78.ini deleted file mode 100644 index b9d49a71d..000000000 --- a/Data/Sys/GameSettings/R6BX78.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R6BX78 - de Blob - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/R6TEA4.ini b/Data/Sys/GameSettings/R6T.ini similarity index 93% rename from Data/Sys/GameSettings/R6TEA4.ini rename to Data/Sys/GameSettings/R6T.ini index ac8e216a7..ab18fcb9b 100644 --- a/Data/Sys/GameSettings/R6TEA4.ini +++ b/Data/Sys/GameSettings/R6T.ini @@ -1,4 +1,4 @@ -# R6TEA4 - Tornado Outbreak +# R6TEA4, R6TPA4 - Tornado Outbreak [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R6TPA4.ini b/Data/Sys/GameSettings/R6TPA4.ini deleted file mode 100644 index d6cbb316b..000000000 --- a/Data/Sys/GameSettings/R6TPA4.ini +++ /dev/null @@ -1,24 +0,0 @@ -# R6TPA4 - Tornado Outbreak - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Ending credits and images need normal safe texture cache setting. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/R7F.ini b/Data/Sys/GameSettings/R7F.ini new file mode 100644 index 000000000..fe3ce63ed --- /dev/null +++ b/Data/Sys/GameSettings/R7F.ini @@ -0,0 +1,27 @@ +# R7FEGD, R7FPGD - FINAL FANTASY FABLES: Chocobo's Dungeon + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/R7FEGD.ini b/Data/Sys/GameSettings/R7FEGD.ini deleted file mode 100644 index 9b651d947..000000000 --- a/Data/Sys/GameSettings/R7FEGD.ini +++ /dev/null @@ -1,27 +0,0 @@ -# R7FEGD - FINAL FANTASY FABLES: Chocobo's Dungeon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/R7FPGD.ini b/Data/Sys/GameSettings/R7FPGD.ini deleted file mode 100644 index 64d4354e2..000000000 --- a/Data/Sys/GameSettings/R7FPGD.ini +++ /dev/null @@ -1,27 +0,0 @@ -# R7FPGD - FINAL FANTASY FABLES: Chocobo's Dungeon - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/R7GEAF.ini b/Data/Sys/GameSettings/R7G.ini similarity index 93% rename from Data/Sys/GameSettings/R7GEAF.ini rename to Data/Sys/GameSettings/R7G.ini index 78d169b45..b97fbff75 100644 --- a/Data/Sys/GameSettings/R7GEAF.ini +++ b/Data/Sys/GameSettings/R7G.ini @@ -1,4 +1,4 @@ -# R7GEAF - DragonBall +# R7GEAF, R7GJAF, R7GPAF - DragonBall [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R7GJAF.ini b/Data/Sys/GameSettings/R7GJAF.ini deleted file mode 100644 index 500472ac2..000000000 --- a/Data/Sys/GameSettings/R7GJAF.ini +++ /dev/null @@ -1,31 +0,0 @@ -# R7GJAF - Dragon Ball Tenkaichi Daibouken - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = For a real wiimote to work you need to disable the gamecube controller in the settings. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/R7GPAF.ini b/Data/Sys/GameSettings/R7GPAF.ini deleted file mode 100644 index b838ed2d7..000000000 --- a/Data/Sys/GameSettings/R7GPAF.ini +++ /dev/null @@ -1,31 +0,0 @@ -# R7GPAF - DragonBall - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = For a real wiimote to work you need to disable the gamecube controller in the settings. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/R7XP69.ini b/Data/Sys/GameSettings/R7X.ini similarity index 92% rename from Data/Sys/GameSettings/R7XP69.ini rename to Data/Sys/GameSettings/R7X.ini index f89020907..6ab35fac0 100644 --- a/Data/Sys/GameSettings/R7XP69.ini +++ b/Data/Sys/GameSettings/R7X.ini @@ -1,4 +1,4 @@ -# R7XP69 - Need for Speed: Nitro +# R7XE69, R7XJ13, R7XP69 - Need for Speed: Nitro [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R7XE69.ini b/Data/Sys/GameSettings/R7XE69.ini deleted file mode 100644 index b44362181..000000000 --- a/Data/Sys/GameSettings/R7XE69.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R7XE69 - Need for Speed: Nitro - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/R7XJ13.ini b/Data/Sys/GameSettings/R7XJ13.ini deleted file mode 100644 index 380e90c94..000000000 --- a/Data/Sys/GameSettings/R7XJ13.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R7XJ13 - Need for Speed: Nitro - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/G3AF69.ini b/Data/Sys/GameSettings/R84.ini similarity index 89% rename from Data/Sys/GameSettings/G3AF69.ini rename to Data/Sys/GameSettings/R84.ini index 60a986e71..69b6a1096 100644 --- a/Data/Sys/GameSettings/G3AF69.ini +++ b/Data/Sys/GameSettings/R84.ini @@ -1,4 +1,4 @@ -# G3AF69 - The Lord of the Rings, The Third Age +# R84EE9, R84J99, R84P99 - Harvest Moon Tree Of Tranquility [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R84EE9.ini b/Data/Sys/GameSettings/R84EE9.ini deleted file mode 100644 index f58ab6d2f..000000000 --- a/Data/Sys/GameSettings/R84EE9.ini +++ /dev/null @@ -1,30 +0,0 @@ -# R84EE9 - Harvest Moon Tree Of Tranquility - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/R84P99.ini b/Data/Sys/GameSettings/R84P99.ini deleted file mode 100644 index 7586c1cfc..000000000 --- a/Data/Sys/GameSettings/R84P99.ini +++ /dev/null @@ -1,30 +0,0 @@ -# R84P99 - Harvest Moon Tree Of Tranquility - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/R8AP01.ini b/Data/Sys/GameSettings/R8A.ini similarity index 95% rename from Data/Sys/GameSettings/R8AP01.ini rename to Data/Sys/GameSettings/R8A.ini index 6f0c34374..a09f49628 100644 --- a/Data/Sys/GameSettings/R8AP01.ini +++ b/Data/Sys/GameSettings/R8A.ini @@ -1,4 +1,4 @@ -# R8AP01 - PokePark Wii +# R8AE01, R8AP01 - Pokepark Wii [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R8AE01.ini b/Data/Sys/GameSettings/R8AE01.ini deleted file mode 100644 index 0946f768d..000000000 --- a/Data/Sys/GameSettings/R8AE01.ini +++ /dev/null @@ -1,34 +0,0 @@ -# R8AE01 - Pokepark Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/R8D.ini b/Data/Sys/GameSettings/R8D.ini new file mode 100644 index 000000000..3897f121f --- /dev/null +++ b/Data/Sys/GameSettings/R8D.ini @@ -0,0 +1,27 @@ +# R8DEA4, R8DJA4, R8DPA4 - Yu-Gi-Oh! 5D's: Duel Transer + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/R8DEA4.ini b/Data/Sys/GameSettings/R8DEA4.ini deleted file mode 100644 index dee7ceb6c..000000000 --- a/Data/Sys/GameSettings/R8DEA4.ini +++ /dev/null @@ -1,27 +0,0 @@ -# R8DEA4 - Yu-Gi-Oh! 5D's: Duel Transer - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/R8DJA4.ini b/Data/Sys/GameSettings/R8DJA4.ini deleted file mode 100644 index 607a8ad61..000000000 --- a/Data/Sys/GameSettings/R8DJA4.ini +++ /dev/null @@ -1,27 +0,0 @@ -# R8DJA4 - Yu-Gi-Oh! 5D's: Duel Transer - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/R8DPA4.ini b/Data/Sys/GameSettings/R8DPA4.ini deleted file mode 100644 index e877e7061..000000000 --- a/Data/Sys/GameSettings/R8DPA4.ini +++ /dev/null @@ -1,27 +0,0 @@ -# R8DPA4 - Yugioh Sim EU - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/R8JPWR.ini b/Data/Sys/GameSettings/R8J.ini similarity index 90% rename from Data/Sys/GameSettings/R8JPWR.ini rename to Data/Sys/GameSettings/R8J.ini index 352a56f9c..72533f69d 100644 --- a/Data/Sys/GameSettings/R8JPWR.ini +++ b/Data/Sys/GameSettings/R8J.ini @@ -1,4 +1,4 @@ -# R8JPWR - Lord of the Rings: Aragorn's Quest +# R8JEWR, R8JPWR - Lord of the Rings: Aragorn's Quest [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R8JEWR.ini b/Data/Sys/GameSettings/R8JEWR.ini deleted file mode 100644 index 5beb22c05..000000000 --- a/Data/Sys/GameSettings/R8JEWR.ini +++ /dev/null @@ -1,30 +0,0 @@ -# R8JEWR - Lord of the Rings: Aragorn's Quest - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Idle skipping slows down the game - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/R8LE20.ini b/Data/Sys/GameSettings/R8L.ini similarity index 93% rename from Data/Sys/GameSettings/R8LE20.ini rename to Data/Sys/GameSettings/R8L.ini index 9a872909e..1eb93dc11 100644 --- a/Data/Sys/GameSettings/R8LE20.ini +++ b/Data/Sys/GameSettings/R8L.ini @@ -1,4 +1,4 @@ -# R8LE20 - Chicken Blaster +# R8LE20, R8LP7J - Chicken Blaster [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/R8LP7J.ini b/Data/Sys/GameSettings/R8LP7J.ini deleted file mode 100644 index 4ebae4ce0..000000000 --- a/Data/Sys/GameSettings/R8LP7J.ini +++ /dev/null @@ -1,31 +0,0 @@ -# R8LP7J - Chicken Blaster - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Real XFB in order to be playable. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/RBBP99.ini b/Data/Sys/GameSettings/RBB.ini similarity index 92% rename from Data/Sys/GameSettings/RBBP99.ini rename to Data/Sys/GameSettings/RBB.ini index 147f51ae9..fdf34c8bd 100644 --- a/Data/Sys/GameSettings/RBBP99.ini +++ b/Data/Sys/GameSettings/RBB.ini @@ -1,4 +1,4 @@ -# RBBP99 - Bomberman Land +# RBBE18, RBBJ18, RBBP99 - Bomberman Land [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RBHJ08.ini b/Data/Sys/GameSettings/RBH.ini similarity index 88% rename from Data/Sys/GameSettings/RBHJ08.ini rename to Data/Sys/GameSettings/RBH.ini index 98fb1d96d..f6a37db00 100644 --- a/Data/Sys/GameSettings/RBHJ08.ini +++ b/Data/Sys/GameSettings/RBH.ini @@ -1,4 +1,4 @@ -# RBHJ08 - Biohazard 0 +# RBHE08, RBHJ08, RBHP08 - Resident Evil Archives: Resident Evil Zero [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RBHE08.ini b/Data/Sys/GameSettings/RBHE08.ini deleted file mode 100644 index 69baef053..000000000 --- a/Data/Sys/GameSettings/RBHE08.ini +++ /dev/null @@ -1,33 +0,0 @@ -# RBHE08 - Resident Evil Archives: Resident Evil Zero - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RBHP08.ini b/Data/Sys/GameSettings/RBHP08.ini deleted file mode 100644 index 84aac038e..000000000 --- a/Data/Sys/GameSettings/RBHP08.ini +++ /dev/null @@ -1,33 +0,0 @@ -# RBHP08 - Resident Evil Archives: Resident Evil Zero - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RBI.ini b/Data/Sys/GameSettings/RBI.ini new file mode 100644 index 000000000..8ac7cfbcc --- /dev/null +++ b/Data/Sys/GameSettings/RBI.ini @@ -0,0 +1,29 @@ +# RBIEE9, RBIJ99, RBIP99 - Harvest Moon: Animal Parade + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Hacks] + diff --git a/Data/Sys/GameSettings/RBIEE9.ini b/Data/Sys/GameSettings/RBIEE9.ini deleted file mode 100644 index 54bc917b6..000000000 --- a/Data/Sys/GameSettings/RBIEE9.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RBIEE9 - Harvest Moon: Animal Parade - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RBIJ99.ini b/Data/Sys/GameSettings/RBIJ99.ini deleted file mode 100644 index 06a613ec4..000000000 --- a/Data/Sys/GameSettings/RBIJ99.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RBIJ99 - Bokujou Monogatari Waku Waku Animal March - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RBIP99.ini b/Data/Sys/GameSettings/RBIP99.ini deleted file mode 100644 index 23b5d5c5a..000000000 --- a/Data/Sys/GameSettings/RBIP99.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RBIP99 - Harvest Moon: Animal Parade - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/R3BP8P.ini b/Data/Sys/GameSettings/RBR.ini similarity index 89% rename from Data/Sys/GameSettings/R3BP8P.ini rename to Data/Sys/GameSettings/RBR.ini index 1907b2e97..49db82c27 100644 --- a/Data/Sys/GameSettings/R3BP8P.ini +++ b/Data/Sys/GameSettings/RBR.ini @@ -1,4 +1,4 @@ -# R3BP8P - SambaDeAmigo +# RBRE5G, RBRP5G, RBRX5G - Blast Works Build, Trade, Destroy [Core] # Values set here will override the main dolphin settings. @@ -28,4 +28,3 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False - diff --git a/Data/Sys/GameSettings/RBRE5G.ini b/Data/Sys/GameSettings/RBRE5G.ini deleted file mode 100644 index d5eb26449..000000000 --- a/Data/Sys/GameSettings/RBRE5G.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RBRE5G - Blast Works Build, Trade, Destroy - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/RBRP5G.ini b/Data/Sys/GameSettings/RBRP5G.ini deleted file mode 100644 index 608644813..000000000 --- a/Data/Sys/GameSettings/RBRP5G.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RBRP5G - Blast Works Build, Trade, Destroy - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/RBRX5G.ini b/Data/Sys/GameSettings/RBRX5G.ini deleted file mode 100644 index 213439f6e..000000000 --- a/Data/Sys/GameSettings/RBRX5G.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RBRX5G - Blast Works Build, Trade, Destroy - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/RBWE01.ini b/Data/Sys/GameSettings/RBW.ini similarity index 93% rename from Data/Sys/GameSettings/RBWE01.ini rename to Data/Sys/GameSettings/RBW.ini index fbe5ebfbf..328621d10 100644 --- a/Data/Sys/GameSettings/RBWE01.ini +++ b/Data/Sys/GameSettings/RBW.ini @@ -1,4 +1,4 @@ -# RBWE01 - Battalion Wars 2 +# RBWE01, RBWP01 - Battalion Wars 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RBWP01.ini b/Data/Sys/GameSettings/RBWP01.ini deleted file mode 100644 index 6f0ad1828..000000000 --- a/Data/Sys/GameSettings/RBWP01.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RBWP01 - Battalion Wars 2 - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = False - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Idle skipping slows down the game. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GW7F69.ini b/Data/Sys/GameSettings/RCL.ini similarity index 90% rename from Data/Sys/GameSettings/GW7F69.ini rename to Data/Sys/GameSettings/RCL.ini index 2f4b00258..a4ee3949d 100644 --- a/Data/Sys/GameSettings/GW7F69.ini +++ b/Data/Sys/GameSettings/RCL.ini @@ -1,4 +1,4 @@ -# GW7F69 - 007: Agent Under Fire (tm) +# RCLE4Q, RCLP4Q - Chicken Little: Ace In Action [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RCLE4Q.ini b/Data/Sys/GameSettings/RCLE4Q.ini deleted file mode 100644 index af67df29d..000000000 --- a/Data/Sys/GameSettings/RCLE4Q.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RCLE4Q - Chicken Little: Ace In Action - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the video cutscenes to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/RCLP4Q.ini b/Data/Sys/GameSettings/RCLP4Q.ini deleted file mode 100644 index 04ca653c5..000000000 --- a/Data/Sys/GameSettings/RCLP4Q.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RCLP4Q - Chicken Little: Ace In Action - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for the video cutscenes to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -UseXFB = True -UseRealXFB = True diff --git a/Data/Sys/GameSettings/RD2E41.ini b/Data/Sys/GameSettings/RD2.ini similarity index 89% rename from Data/Sys/GameSettings/RD2E41.ini rename to Data/Sys/GameSettings/RD2.ini index 15f526fbf..0a15ae77d 100644 --- a/Data/Sys/GameSettings/RD2E41.ini +++ b/Data/Sys/GameSettings/RD2.ini @@ -1,4 +1,4 @@ -# RD2E41 - Red Steel 2 +# RD2E41, RD2J41, RD2K41, RD2P41, RD2X41 - Red Steel 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RD2J41.ini b/Data/Sys/GameSettings/RD2J41.ini deleted file mode 100644 index cb9acb033..000000000 --- a/Data/Sys/GameSettings/RD2J41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RD2J41 - Red Steel 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RD2K41.ini b/Data/Sys/GameSettings/RD2K41.ini deleted file mode 100644 index 14bec203f..000000000 --- a/Data/Sys/GameSettings/RD2K41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RD2K41 - Red Steel 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RD2P41.ini b/Data/Sys/GameSettings/RD2P41.ini deleted file mode 100644 index 16d6f8d77..000000000 --- a/Data/Sys/GameSettings/RD2P41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RD2P41 - Red Steel 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RD2X41.ini b/Data/Sys/GameSettings/RD2X41.ini deleted file mode 100644 index 0a69b78ea..000000000 --- a/Data/Sys/GameSettings/RD2X41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RD2X41 - Red Steel 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/GIAE7D.ini b/Data/Sys/GameSettings/RDF.ini similarity index 87% rename from Data/Sys/GameSettings/GIAE7D.ini rename to Data/Sys/GameSettings/RDF.ini index 51bef32bf..01061668d 100644 --- a/Data/Sys/GameSettings/GIAE7D.ini +++ b/Data/Sys/GameSettings/RDF.ini @@ -1,4 +1,4 @@ -# GIAE7D - Ice Age 2 The Meltdown +# RDFE41, RDFP41 - Shaun White Snowboarding: Road Trip [Core] # Values set here will override the main dolphin settings. @@ -6,7 +6,6 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. @@ -18,5 +17,5 @@ EmulationIssues = # Add action replay cheats here. [Video_Hacks] -EFBCopyEnable = True EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RDFE41.ini b/Data/Sys/GameSettings/RDFE41.ini deleted file mode 100644 index 5f3e0370e..000000000 --- a/Data/Sys/GameSettings/RDFE41.ini +++ /dev/null @@ -1,21 +0,0 @@ -# RDFE41 - Shaun White Snowboarding: Road Trip - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RDFP41.ini b/Data/Sys/GameSettings/RDFP41.ini deleted file mode 100644 index 831f22452..000000000 --- a/Data/Sys/GameSettings/RDFP41.ini +++ /dev/null @@ -1,21 +0,0 @@ -# RDFP41 - Shaun White Snowboarding: Road Trip - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RDZJ01.ini b/Data/Sys/GameSettings/RDZ.ini similarity index 94% rename from Data/Sys/GameSettings/RDZJ01.ini rename to Data/Sys/GameSettings/RDZ.ini index 87813ecea..e2df31a69 100644 --- a/Data/Sys/GameSettings/RDZJ01.ini +++ b/Data/Sys/GameSettings/RDZ.ini @@ -1,4 +1,4 @@ -# RDZJ01 - Disaster +# RDZJ01, RDZP01 - Disaster [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/GBIE08.ini b/Data/Sys/GameSettings/RE4.ini similarity index 91% rename from Data/Sys/GameSettings/GBIE08.ini rename to Data/Sys/GameSettings/RE4.ini index b95d8fcf9..963f3da22 100644 --- a/Data/Sys/GameSettings/GBIE08.ini +++ b/Data/Sys/GameSettings/RE4.ini @@ -1,4 +1,4 @@ -# GBIE08 - Resident Evil +# RE4E08, RE4J08, RE4P08 - Resident Evil [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RE4E08.ini b/Data/Sys/GameSettings/RE4E08.ini deleted file mode 100644 index 130d174e7..000000000 --- a/Data/Sys/GameSettings/RE4E08.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RE4E08 - Resident Evil - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RE4J08.ini b/Data/Sys/GameSettings/RE4J08.ini deleted file mode 100644 index 0d184b335..000000000 --- a/Data/Sys/GameSettings/RE4J08.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RE4J08 - Biohazard - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RE4P08.ini b/Data/Sys/GameSettings/RE4P08.ini deleted file mode 100644 index 27f34be12..000000000 --- a/Data/Sys/GameSettings/RE4P08.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RE4P08 - Resident Evil - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/REDE41.ini b/Data/Sys/GameSettings/RED.ini similarity index 92% rename from Data/Sys/GameSettings/REDE41.ini rename to Data/Sys/GameSettings/RED.ini index 882a940a5..1cccda721 100644 --- a/Data/Sys/GameSettings/REDE41.ini +++ b/Data/Sys/GameSettings/RED.ini @@ -1,4 +1,4 @@ -# REDE41 - RedSteel NTSC +# REDE41, REDJ41, REDP41 - RedSteel NTSC [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/REDJ41.ini b/Data/Sys/GameSettings/REDJ41.ini deleted file mode 100644 index 9552ed8b5..000000000 --- a/Data/Sys/GameSettings/REDJ41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# REDJ41 - RedSteel NTSC - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Nunchuk doesn't work (both real and emulated). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/REDP41.ini b/Data/Sys/GameSettings/REDP41.ini deleted file mode 100644 index 2ee6119f4..000000000 --- a/Data/Sys/GameSettings/REDP41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# REDP41 - RedSteel PAL - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Nunchuk doesn't work (both real and emulated). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RENE8P.ini b/Data/Sys/GameSettings/REN.ini similarity index 90% rename from Data/Sys/GameSettings/RENE8P.ini rename to Data/Sys/GameSettings/REN.ini index 91122bff4..cc96dac8e 100644 --- a/Data/Sys/GameSettings/RENE8P.ini +++ b/Data/Sys/GameSettings/REN.ini @@ -1,4 +1,4 @@ -# RENE8P - Sonic and the Black Knight +# RENE8P, RENJ8P - Sonic and the Black Knight [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RENJ8P.ini b/Data/Sys/GameSettings/RENJ8P.ini deleted file mode 100644 index 56b7619a4..000000000 --- a/Data/Sys/GameSettings/RENJ8P.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RENJ8P - Sonic and the Black Knight - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RFBE01.ini b/Data/Sys/GameSettings/RFB.ini similarity index 93% rename from Data/Sys/GameSettings/RFBE01.ini rename to Data/Sys/GameSettings/RFB.ini index 9f6b8264d..a244a93cf 100644 --- a/Data/Sys/GameSettings/RFBE01.ini +++ b/Data/Sys/GameSettings/RFB.ini @@ -1,4 +1,4 @@ -# RFBE01 - ENDLESS OCEAN +# RFBE01, RFBJ01, RFBP01 - ENDLESS OCEAN [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RFBJ01.ini b/Data/Sys/GameSettings/RFBJ01.ini deleted file mode 100644 index 13bbae286..000000000 --- a/Data/Sys/GameSettings/RFBJ01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RFBJ01 - Forever Blue - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs efb to ram for photos to be developed. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/RFBP01.ini b/Data/Sys/GameSettings/RFBP01.ini deleted file mode 100644 index 5ad891515..000000000 --- a/Data/Sys/GameSettings/RFBP01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RFBP01 - ENDLESS OCEAN - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs efb to ram for photos to be developed. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/RFCJGD.ini b/Data/Sys/GameSettings/RFC.ini similarity index 91% rename from Data/Sys/GameSettings/RFCJGD.ini rename to Data/Sys/GameSettings/RFC.ini index 9426d843b..b521ac440 100644 --- a/Data/Sys/GameSettings/RFCJGD.ini +++ b/Data/Sys/GameSettings/RFC.ini @@ -1,4 +1,4 @@ -# RFCJGD - FFCC THE CRYSTAL BEARERS +# RFCEGD, RFCJGD, RFCPGD - FFCC THE CRYSTAL BEARERS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RFCEGD.ini b/Data/Sys/GameSettings/RFCEGD.ini deleted file mode 100644 index 12bf95800..000000000 --- a/Data/Sys/GameSettings/RFCEGD.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RFCEGD - FFCC THE CRYSTAL BEARERS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Turn off "use panic handlers". Water glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RFCPGD.ini b/Data/Sys/GameSettings/RFCPGD.ini deleted file mode 100644 index 0905224f1..000000000 --- a/Data/Sys/GameSettings/RFCPGD.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RFCPGD - FFCC THE CRYSTAL BEARERS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Turn off "use panic handlers". Water glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RFEE01.ini b/Data/Sys/GameSettings/RFE.ini similarity index 93% rename from Data/Sys/GameSettings/RFEE01.ini rename to Data/Sys/GameSettings/RFE.ini index 088b09e10..527343907 100644 --- a/Data/Sys/GameSettings/RFEE01.ini +++ b/Data/Sys/GameSettings/RFE.ini @@ -1,4 +1,4 @@ -# RFEE01 - FIRE EMBLEM 10 USA +# RFEE01, RFEJ01 - FIRE EMBLEM 10 USA [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RFEJ01.ini b/Data/Sys/GameSettings/RFEJ01.ini deleted file mode 100644 index db81c6cfa..000000000 --- a/Data/Sys/GameSettings/RFEJ01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RFEJ01 - Fire Emblem Akatsuki No Megami - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Disable gamecube controller or wiimote to not have conflicts. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RFFJGD.ini b/Data/Sys/GameSettings/RFF.ini similarity index 94% rename from Data/Sys/GameSettings/RFFJGD.ini rename to Data/Sys/GameSettings/RFF.ini index 76c522738..2bde08d5a 100644 --- a/Data/Sys/GameSettings/RFFJGD.ini +++ b/Data/Sys/GameSettings/RFF.ini @@ -1,4 +1,4 @@ -# RFFJGD - FFCC EOT +# RFFEGD, RFFJGD, RFFPGD - FFCC EOT [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RFFEGD.ini b/Data/Sys/GameSettings/RFFEGD.ini deleted file mode 100644 index 1a01e6afc..000000000 --- a/Data/Sys/GameSettings/RFFEGD.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RFFEGD - FFCC EOT - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs integral scaling for the black lines to disappear. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RFFPGD.ini b/Data/Sys/GameSettings/RFFPGD.ini deleted file mode 100644 index 1227196af..000000000 --- a/Data/Sys/GameSettings/RFFPGD.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RFFPGD - FFCC EOT - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs integral scaling for the black lines to disappear. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RFSEEB.ini b/Data/Sys/GameSettings/RFS.ini similarity index 92% rename from Data/Sys/GameSettings/RFSEEB.ini rename to Data/Sys/GameSettings/RFS.ini index f6f108702..ba649df7e 100644 --- a/Data/Sys/GameSettings/RFSEEB.ini +++ b/Data/Sys/GameSettings/RFS.ini @@ -1,4 +1,4 @@ -# RFSEEB - Shiren The Wanderer +# RFSEEB, RFSJ8P - Shiren The Wanderer [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RFSJ8P.ini b/Data/Sys/GameSettings/RFSJ8P.ini deleted file mode 100644 index 93f06a4bf..000000000 --- a/Data/Sys/GameSettings/RFSJ8P.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RFSJ8P - Fushigi No Dungeon: Furai No Shiren 3 - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RGWE41.ini b/Data/Sys/GameSettings/RGW.ini similarity index 91% rename from Data/Sys/GameSettings/RGWE41.ini rename to Data/Sys/GameSettings/RGW.ini index e6e6f593b..9ddb02d1e 100644 --- a/Data/Sys/GameSettings/RGWE41.ini +++ b/Data/Sys/GameSettings/RGW.ini @@ -1,4 +1,4 @@ -# RGWE41 - Rabbids Go Home +# RGWE41, RGWJ41, RGWP41, RGWX41 - Rabbids Go Home [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/RGWJ41.ini b/Data/Sys/GameSettings/RGWJ41.ini deleted file mode 100644 index 83cb6f1e9..000000000 --- a/Data/Sys/GameSettings/RGWJ41.ini +++ /dev/null @@ -1,23 +0,0 @@ -# RGWJ41 - Rabbids Go Home - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Efb to ram is needed for certain ingame functions but it will give a big speed hit. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RGWP41.ini b/Data/Sys/GameSettings/RGWP41.ini deleted file mode 100644 index 410147d10..000000000 --- a/Data/Sys/GameSettings/RGWP41.ini +++ /dev/null @@ -1,23 +0,0 @@ -# RGWP41 - Rabbids Go Home - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Efb to ram is needed for certain ingame functions but it will give a big speed hit. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RGWX41.ini b/Data/Sys/GameSettings/RGWX41.ini deleted file mode 100644 index 970c24ae7..000000000 --- a/Data/Sys/GameSettings/RGWX41.ini +++ /dev/null @@ -1,23 +0,0 @@ -# RGWX41 - Rabbids Go Home - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Efb to ram is needed for certain ingame functions but it will give a big speed hit. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RH8E4F.ini b/Data/Sys/GameSettings/RH8.ini similarity index 90% rename from Data/Sys/GameSettings/RH8E4F.ini rename to Data/Sys/GameSettings/RH8.ini index 972bdb721..62791a084 100644 --- a/Data/Sys/GameSettings/RH8E4F.ini +++ b/Data/Sys/GameSettings/RH8.ini @@ -1,4 +1,4 @@ -# RH8E4F - Tomb Raider Underworld +# RH8E4F, RH8JEL, RH8P4F, RH8X4F - Tomb Raider Underworld [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RH8JEL.ini b/Data/Sys/GameSettings/RH8JEL.ini deleted file mode 100644 index 9fd16df9b..000000000 --- a/Data/Sys/GameSettings/RH8JEL.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RH8JEL - Tomb Raider Underworld - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real Xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/RH8P4F.ini b/Data/Sys/GameSettings/RH8P4F.ini deleted file mode 100644 index 1e8b87c2e..000000000 --- a/Data/Sys/GameSettings/RH8P4F.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RH8P4F - Tomb Raider Underworld - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real Xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/RH8X4F.ini b/Data/Sys/GameSettings/RH8X4F.ini deleted file mode 100644 index ea5f00661..000000000 --- a/Data/Sys/GameSettings/RH8X4F.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RH8X4F - Tomb Raider Underworld - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real Xfb for the videos to display. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/R4QK01.ini b/Data/Sys/GameSettings/RHA.ini similarity index 89% rename from Data/Sys/GameSettings/R4QK01.ini rename to Data/Sys/GameSettings/RHA.ini index 8b315f3d1..1cb4f5c91 100644 --- a/Data/Sys/GameSettings/R4QK01.ini +++ b/Data/Sys/GameSettings/RHA.ini @@ -1,4 +1,4 @@ -# R4QK01 - Mario Power Soccer +# RHAE01, RHAJ01, RHAK01, RHAP01, RHAW01 - Wii Play [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RHAE01.ini b/Data/Sys/GameSettings/RHAE01.ini deleted file mode 100644 index c75bab0dd..000000000 --- a/Data/Sys/GameSettings/RHAE01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RHAE01 - Wii Play - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RHAJ01.ini b/Data/Sys/GameSettings/RHAJ01.ini deleted file mode 100644 index 0e9a5fc2a..000000000 --- a/Data/Sys/GameSettings/RHAJ01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RHAJ01 - Hajimete No Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RHAK01.ini b/Data/Sys/GameSettings/RHAK01.ini deleted file mode 100644 index 3be9e72d0..000000000 --- a/Data/Sys/GameSettings/RHAK01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RHAK01 - Wii Play - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RHAP01.ini b/Data/Sys/GameSettings/RHAP01.ini deleted file mode 100644 index 432ddc508..000000000 --- a/Data/Sys/GameSettings/RHAP01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RHAP01 - PARTY PACK for REVOLUTION - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RHAW01.ini b/Data/Sys/GameSettings/RHAW01.ini deleted file mode 100644 index fc7d8a495..000000000 --- a/Data/Sys/GameSettings/RHAW01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RHAW01 - Wii Play - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/R4QJ01.ini b/Data/Sys/GameSettings/RHM.ini similarity index 90% rename from Data/Sys/GameSettings/R4QJ01.ini rename to Data/Sys/GameSettings/RHM.ini index 35b740440..ccbe72b6a 100644 --- a/Data/Sys/GameSettings/R4QJ01.ini +++ b/Data/Sys/GameSettings/RHM.ini @@ -1,4 +1,4 @@ -# R4QJ01 - Mario Strikers Charged +# RHMEE9, RHMP99 - Harvest Moon: Magical Melody [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RHMEE9.ini b/Data/Sys/GameSettings/RHMEE9.ini deleted file mode 100644 index 56a3c5f01..000000000 --- a/Data/Sys/GameSettings/RHMEE9.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RHMEE9 - Harvest Moon: Magical Melody - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RHMP99.ini b/Data/Sys/GameSettings/RHMP99.ini deleted file mode 100644 index f1c618ecf..000000000 --- a/Data/Sys/GameSettings/RHMP99.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RHMP99 - Harvest Moon: Magical Melody - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RHOE8P.ini b/Data/Sys/GameSettings/RHO.ini similarity index 88% rename from Data/Sys/GameSettings/RHOE8P.ini rename to Data/Sys/GameSettings/RHO.ini index 8d8190877..0b577226e 100644 --- a/Data/Sys/GameSettings/RHOE8P.ini +++ b/Data/Sys/GameSettings/RHO.ini @@ -1,4 +1,4 @@ -# RHOE8P - House Of The Dead: OVERKILL +# RHOE8P, RHOJ8P, RHOP8P - House Of The Dead: OVERKILL [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/RHOJ8P.ini b/Data/Sys/GameSettings/RHOJ8P.ini deleted file mode 100644 index bdef300dd..000000000 --- a/Data/Sys/GameSettings/RHOJ8P.ini +++ /dev/null @@ -1,20 +0,0 @@ -# RHOJ8P - House Of The Dead: OVERKILL -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/RHOP8P.ini b/Data/Sys/GameSettings/RHOP8P.ini deleted file mode 100644 index fa314e84e..000000000 --- a/Data/Sys/GameSettings/RHOP8P.ini +++ /dev/null @@ -1,20 +0,0 @@ -# RHOP8P - House Of The Dead: OVERKILL -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/RIP.ini b/Data/Sys/GameSettings/RIP.ini new file mode 100644 index 000000000..632feb1b8 --- /dev/null +++ b/Data/Sys/GameSettings/RIP.ini @@ -0,0 +1,25 @@ +# RIPEAF, RIPJAF, RIPPAF - ONEPIECE UNLIMITED ADVENTURE + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/RIPEAF.ini b/Data/Sys/GameSettings/RIPEAF.ini deleted file mode 100644 index 94542525e..000000000 --- a/Data/Sys/GameSettings/RIPEAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RIPEAF - ONEPIECE UNLIMITED ADVENTURE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RIPJAF.ini b/Data/Sys/GameSettings/RIPJAF.ini deleted file mode 100644 index 166bbb719..000000000 --- a/Data/Sys/GameSettings/RIPJAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RIPJAF - ONEPIECE UNLIMITED ADVENTURE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RIPPAF.ini b/Data/Sys/GameSettings/RIPPAF.ini deleted file mode 100644 index f03e75294..000000000 --- a/Data/Sys/GameSettings/RIPPAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RIPPAF - ONEPIECE UNLIMITED ADVENTURE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKOE70.ini b/Data/Sys/GameSettings/RIU.ini similarity index 88% rename from Data/Sys/GameSettings/GKOE70.ini rename to Data/Sys/GameSettings/RIU.ini index afab7d064..eb296c145 100644 --- a/Data/Sys/GameSettings/GKOE70.ini +++ b/Data/Sys/GameSettings/RIU.ini @@ -1,4 +1,4 @@ -# GKOE70 - Kao the kangaroo +# RIUJAF, RIUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RIUJAF.ini b/Data/Sys/GameSettings/RIUJAF.ini deleted file mode 100644 index 2d2b657b0..000000000 --- a/Data/Sys/GameSettings/RIUJAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RIUJAF - ONEPIECE UNLIMITED CRUISE EPISODE 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RIUPAF.ini b/Data/Sys/GameSettings/RIUPAF.ini deleted file mode 100644 index d963186f7..000000000 --- a/Data/Sys/GameSettings/RIUPAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RIUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RKDEEB.ini b/Data/Sys/GameSettings/RK2.ini similarity index 89% rename from Data/Sys/GameSettings/RKDEEB.ini rename to Data/Sys/GameSettings/RK2.ini index 9bf02681e..38cf1bc24 100644 --- a/Data/Sys/GameSettings/RKDEEB.ini +++ b/Data/Sys/GameSettings/RK2.ini @@ -1,4 +1,4 @@ -# RKDEEB - Trauma Center SO +# RK2EEB, RK2JEB, RK2P01 - TRAUMA CENTER NEW BLOOD [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RK2EEB.ini b/Data/Sys/GameSettings/RK2EEB.ini deleted file mode 100644 index d5cea3b07..000000000 --- a/Data/Sys/GameSettings/RK2EEB.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RK2EEB - TRAUMA CENTER NEW BLOOD - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RK2JEB.ini b/Data/Sys/GameSettings/RK2JEB.ini deleted file mode 100644 index 43838bb93..000000000 --- a/Data/Sys/GameSettings/RK2JEB.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RK2JEB - TRAUMA CENTER NEW BLOOD - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RK2P01.ini b/Data/Sys/GameSettings/RKD.ini similarity index 90% rename from Data/Sys/GameSettings/RK2P01.ini rename to Data/Sys/GameSettings/RKD.ini index 00d58611c..48d81a0db 100644 --- a/Data/Sys/GameSettings/RK2P01.ini +++ b/Data/Sys/GameSettings/RKD.ini @@ -1,4 +1,4 @@ -# RK2P01 - TRAUMA CENTER NEW BLOOD +# RKDEEB, RKDJEB, RKDPEB - Trauma Center SO [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RKDJEB.ini b/Data/Sys/GameSettings/RKDJEB.ini deleted file mode 100644 index 7d30b0cb9..000000000 --- a/Data/Sys/GameSettings/RKDJEB.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RKDJEB - Trauma Center SO - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RKDPEB.ini b/Data/Sys/GameSettings/RKDPEB.ini deleted file mode 100644 index d2fae09fb..000000000 --- a/Data/Sys/GameSettings/RKDPEB.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RKDPEB - Trauma Center SO - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GHMF4F.ini b/Data/Sys/GameSettings/RLG.ini similarity index 88% rename from Data/Sys/GameSettings/GHMF4F.ini rename to Data/Sys/GameSettings/RLG.ini index 3354795f4..853b18113 100644 --- a/Data/Sys/GameSettings/GHMF4F.ini +++ b/Data/Sys/GameSettings/RLG.ini @@ -1,12 +1,12 @@ -# GHMF4F - Hitman 2: Silent Assassin +# RLGE64, RLGJ52, RLGP64 - LEGO Star Wars The Complete Saga [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = EmulationStateId = 5 +EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/RLGE64.ini b/Data/Sys/GameSettings/RLGE64.ini deleted file mode 100644 index 897b993ee..000000000 --- a/Data/Sys/GameSettings/RLGE64.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RLGE64 - LEGO Star Wars The Complete Saga - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RLGJ52.ini b/Data/Sys/GameSettings/RLGJ52.ini deleted file mode 100644 index 5eb7a5744..000000000 --- a/Data/Sys/GameSettings/RLGJ52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RLGJ52 - LEGO Star Wars The Complete Saga - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RLGP64.ini b/Data/Sys/GameSettings/RLGP64.ini deleted file mode 100644 index a0c73dfd0..000000000 --- a/Data/Sys/GameSettings/RLGP64.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RLGP64 - LEGO Star Wars The Complete Saga - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RM3E01.ini b/Data/Sys/GameSettings/RM3.ini similarity index 90% rename from Data/Sys/GameSettings/RM3E01.ini rename to Data/Sys/GameSettings/RM3.ini index c95b3d00d..9d460a397 100644 --- a/Data/Sys/GameSettings/RM3E01.ini +++ b/Data/Sys/GameSettings/RM3.ini @@ -1,4 +1,4 @@ -# RM3E01 - Metroid Prime 3: Corruption +# RM3E01, RM3J01 - Metroid Prime 3: Corruption [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/RM3J01.ini b/Data/Sys/GameSettings/RM3J01.ini deleted file mode 100644 index 2e06a5b0b..000000000 --- a/Data/Sys/GameSettings/RM3J01.ini +++ /dev/null @@ -1,23 +0,0 @@ -# RM3J01 - Metroid Prime 3: Corruption -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Settings] -SafeTextureCacheColorSamples = 512 -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RM8K01.ini b/Data/Sys/GameSettings/RM8.ini similarity index 90% rename from Data/Sys/GameSettings/RM8K01.ini rename to Data/Sys/GameSettings/RM8.ini index 4081abf01..831545dc7 100644 --- a/Data/Sys/GameSettings/RM8K01.ini +++ b/Data/Sys/GameSettings/RM8.ini @@ -1,4 +1,4 @@ -# RM8K01 - Mario Party 8 +# RM8E01, RM8J01, RM8K01, RM8P01 - Mario Party 8 [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/RM8E01.ini b/Data/Sys/GameSettings/RM8E01.ini deleted file mode 100644 index 9a3fb4940..000000000 --- a/Data/Sys/GameSettings/RM8E01.ini +++ /dev/null @@ -1,23 +0,0 @@ -# RM8E01 - Mario Party 8 -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Enhancements] -ForceFiltering = False -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RM8J01.ini b/Data/Sys/GameSettings/RM8J01.ini deleted file mode 100644 index 5345cd96c..000000000 --- a/Data/Sys/GameSettings/RM8J01.ini +++ /dev/null @@ -1,23 +0,0 @@ -# RM8J01 - Mario Party 8 -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Enhancements] -ForceFiltering = False -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RM8P01.ini b/Data/Sys/GameSettings/RM8P01.ini deleted file mode 100644 index 755b487e5..000000000 --- a/Data/Sys/GameSettings/RM8P01.ini +++ /dev/null @@ -1,23 +0,0 @@ -# RM8P01 - Mario Party 8 -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Enhancements] -ForceFiltering = False -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/R64E01.ini b/Data/Sys/GameSettings/RMC.ini similarity index 90% rename from Data/Sys/GameSettings/R64E01.ini rename to Data/Sys/GameSettings/RMC.ini index d9cfe8f54..ce7f8f444 100644 --- a/Data/Sys/GameSettings/R64E01.ini +++ b/Data/Sys/GameSettings/RMC.ini @@ -1,4 +1,4 @@ -# R64E01 - RVL Wii Music +# RMCE01, RMCJ01, RMCK01, RMCP01 - Mario Kart Wii [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RMCE01.ini b/Data/Sys/GameSettings/RMCE01.ini deleted file mode 100644 index 282bb9385..000000000 --- a/Data/Sys/GameSettings/RMCE01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RMCE01 - Mario Kart Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RMCJ01.ini b/Data/Sys/GameSettings/RMCJ01.ini deleted file mode 100644 index d16270c91..000000000 --- a/Data/Sys/GameSettings/RMCJ01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RMCJ01 - Mario Kart Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RMCK01.ini b/Data/Sys/GameSettings/RMCK01.ini deleted file mode 100644 index a3395b206..000000000 --- a/Data/Sys/GameSettings/RMCK01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RMCK01 - Mario Kart Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RMCP01.ini b/Data/Sys/GameSettings/RMCP01.ini deleted file mode 100644 index c2240f996..000000000 --- a/Data/Sys/GameSettings/RMCP01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RMCP01 - Mario Kart Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RMGK01.ini b/Data/Sys/GameSettings/RMG.ini similarity index 90% rename from Data/Sys/GameSettings/RMGK01.ini rename to Data/Sys/GameSettings/RMG.ini index 641656cb2..ada303120 100644 --- a/Data/Sys/GameSettings/RMGK01.ini +++ b/Data/Sys/GameSettings/RMG.ini @@ -1,4 +1,4 @@ -# RMGK01 - SUPER MARIO GALAXY +# RMGE01, RMGJ01, RMGK01, RMGP01 - SUPER MARIO GALAXY [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RMGE01.ini b/Data/Sys/GameSettings/RMGE01.ini deleted file mode 100644 index 25f30423b..000000000 --- a/Data/Sys/GameSettings/RMGE01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RMGE01 - SUPER MARIO GALAXY - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb Access from CPU. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBAccessEnable = True diff --git a/Data/Sys/GameSettings/RMGJ01.ini b/Data/Sys/GameSettings/RMGJ01.ini deleted file mode 100644 index 14996d623..000000000 --- a/Data/Sys/GameSettings/RMGJ01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RMGJ01 - SUPER MARIO GALAXY - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb Access from CPU. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBAccessEnable = True diff --git a/Data/Sys/GameSettings/RMGP01.ini b/Data/Sys/GameSettings/RMGP01.ini deleted file mode 100644 index 11151133e..000000000 --- a/Data/Sys/GameSettings/RMGP01.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RMGP01 - SUPER MARIO GALAXY - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Efb Access from CPU. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBAccessEnable = True diff --git a/Data/Sys/GameSettings/RMKE01.ini b/Data/Sys/GameSettings/RMK.ini similarity index 90% rename from Data/Sys/GameSettings/RMKE01.ini rename to Data/Sys/GameSettings/RMK.ini index 7486ccb7e..ac6f8ad74 100644 --- a/Data/Sys/GameSettings/RMKE01.ini +++ b/Data/Sys/GameSettings/RMK.ini @@ -1,4 +1,4 @@ -# RMKE01 - MARIO SPORTS MIX +# RMKE01, RMKJ01, RMKP01 - MARIO SPORTS MIX [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RMKJ01.ini b/Data/Sys/GameSettings/RMKJ01.ini deleted file mode 100644 index 0780e20b3..000000000 --- a/Data/Sys/GameSettings/RMKJ01.ini +++ /dev/null @@ -1,24 +0,0 @@ -# RMKJ01 - MARIO SPORTS MIX - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/RMKP01.ini b/Data/Sys/GameSettings/RMKP01.ini deleted file mode 100644 index 1eee5258d..000000000 --- a/Data/Sys/GameSettings/RMKP01.ini +++ /dev/null @@ -1,24 +0,0 @@ -# RMKP01 - MARIO SPORTS MIX - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/RNEEDA.ini b/Data/Sys/GameSettings/RNE.ini similarity index 85% rename from Data/Sys/GameSettings/RNEEDA.ini rename to Data/Sys/GameSettings/RNE.ini index 002db3888..9e83223ba 100644 --- a/Data/Sys/GameSettings/RNEEDA.ini +++ b/Data/Sys/GameSettings/RNE.ini @@ -1,4 +1,4 @@ -# RNEEDA - NARUTO: Clash of Ninja Revolution 3 +# RNEEDA, RNEJDA, RNEPDA - NARUTO: Clash of Ninja Revolution 3 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RNEJDA.ini b/Data/Sys/GameSettings/RNEJDA.ini deleted file mode 100644 index 84cbb82fd..000000000 --- a/Data/Sys/GameSettings/RNEJDA.ini +++ /dev/null @@ -1,22 +0,0 @@ -# RNEJDA - NARUTO GEKITOHNINJATAISEN EX3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/RNEPDA.ini b/Data/Sys/GameSettings/RNEPDA.ini deleted file mode 100644 index 22869e6df..000000000 --- a/Data/Sys/GameSettings/RNEPDA.ini +++ /dev/null @@ -1,22 +0,0 @@ -# RNEPDA - NARUTO: Clash of Ninja Revolution 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/RNJE4F.ini b/Data/Sys/GameSettings/RNJ.ini similarity index 92% rename from Data/Sys/GameSettings/RNJE4F.ini rename to Data/Sys/GameSettings/RNJ.ini index 0bf5cb6c3..d4aee0e3d 100644 --- a/Data/Sys/GameSettings/RNJE4F.ini +++ b/Data/Sys/GameSettings/RNJ.ini @@ -1,4 +1,4 @@ -# RNJE4F - Mini Ninjas +# RNJE4F, RNJP4F - Mini Ninjas [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RNJP4F.ini b/Data/Sys/GameSettings/RNJP4F.ini deleted file mode 100644 index f40908585..000000000 --- a/Data/Sys/GameSettings/RNJP4F.ini +++ /dev/null @@ -1,21 +0,0 @@ -# RNJP4F - Mini Ninjas - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -FastDepthCalc = False diff --git a/Data/Sys/GameSettings/RNOP01.ini b/Data/Sys/GameSettings/RNO.ini similarity index 92% rename from Data/Sys/GameSettings/RNOP01.ini rename to Data/Sys/GameSettings/RNO.ini index 99cd73ec1..2e5b145cb 100644 --- a/Data/Sys/GameSettings/RNOP01.ini +++ b/Data/Sys/GameSettings/RNO.ini @@ -1,4 +1,4 @@ -# RNOP01 - Another Code:R +# RNOJ01, RNOP01 - Another Code R Kioku no Tobira [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RNOJ01.ini b/Data/Sys/GameSettings/RNOJ01.ini deleted file mode 100644 index 7db84b83e..000000000 --- a/Data/Sys/GameSettings/RNOJ01.ini +++ /dev/null @@ -1,35 +0,0 @@ -# RNOJ01 - Another Code R Kioku no Tobira - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Efb to Ram is needed for proper scene transition effect. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/GF4E52.ini b/Data/Sys/GameSettings/RO9.ini similarity index 94% rename from Data/Sys/GameSettings/GF4E52.ini rename to Data/Sys/GameSettings/RO9.ini index 73e9c49ce..b412c98a9 100644 --- a/Data/Sys/GameSettings/GF4E52.ini +++ b/Data/Sys/GameSettings/RO9.ini @@ -1,4 +1,4 @@ -# GF4E52 - Fantastic Four +# RO9EFS, RO9PNK - Aqua Panic [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RO9EFS.ini b/Data/Sys/GameSettings/RO9EFS.ini deleted file mode 100644 index 1f7363765..000000000 --- a/Data/Sys/GameSettings/RO9EFS.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RO9EFS - Aqua Panic - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/RO9PNK.ini b/Data/Sys/GameSettings/RO9PNK.ini deleted file mode 100644 index 4300ade71..000000000 --- a/Data/Sys/GameSettings/RO9PNK.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RO9PNK - Aqua Panic - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/ROAE36.ini b/Data/Sys/GameSettings/ROA.ini similarity index 93% rename from Data/Sys/GameSettings/ROAE36.ini rename to Data/Sys/GameSettings/ROA.ini index 6e7278c5d..01f0b93e4 100644 --- a/Data/Sys/GameSettings/ROAE36.ini +++ b/Data/Sys/GameSettings/ROA.ini @@ -1,4 +1,4 @@ -# ROAE36 - Overlord: Dark Legend +# ROAE36, ROAP36 - Overlord: Dark Legend [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/ROAP36.ini b/Data/Sys/GameSettings/ROAP36.ini deleted file mode 100644 index 2960d51fb..000000000 --- a/Data/Sys/GameSettings/ROAP36.ini +++ /dev/null @@ -1,30 +0,0 @@ -# ROAP36 - Overlord: Dark Legend - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Accessing the map will crash the game (see issue 3953). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/GKYP01.ini b/Data/Sys/GameSettings/ROD.ini similarity index 89% rename from Data/Sys/GameSettings/GKYP01.ini rename to Data/Sys/GameSettings/ROD.ini index 6b385b18d..e09924f1f 100644 --- a/Data/Sys/GameSettings/GKYP01.ini +++ b/Data/Sys/GameSettings/ROD.ini @@ -1,4 +1,4 @@ -# GKYP01 - Kirby Air Ride +# RODE01, RODJ01, RODK01, RODP01 - WarioWare: Smooth Moves [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RODE01.ini b/Data/Sys/GameSettings/RODE01.ini deleted file mode 100644 index cbcb99321..000000000 --- a/Data/Sys/GameSettings/RODE01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RODE01 - WarioWare: Smooth Moves - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RODJ01.ini b/Data/Sys/GameSettings/RODJ01.ini deleted file mode 100644 index 050259730..000000000 --- a/Data/Sys/GameSettings/RODJ01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RODJ01 - WarioWare: Smooth Moves - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RODK01.ini b/Data/Sys/GameSettings/RODK01.ini deleted file mode 100644 index e12d378e0..000000000 --- a/Data/Sys/GameSettings/RODK01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RODK01 - WarioWare: Smooth Moves - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RODP01.ini b/Data/Sys/GameSettings/RODP01.ini deleted file mode 100644 index 963f91bf9..000000000 --- a/Data/Sys/GameSettings/RODP01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RODP01 - WarioWare: Smooth Moves - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/GEDP01.ini b/Data/Sys/GameSettings/ROL.ini similarity index 86% rename from Data/Sys/GameSettings/GEDP01.ini rename to Data/Sys/GameSettings/ROL.ini index 6b7e9f15a..a0cec6ddd 100644 --- a/Data/Sys/GameSettings/GEDP01.ini +++ b/Data/Sys/GameSettings/ROL.ini @@ -1,4 +1,4 @@ -# GEDP01 - Eternal Darkness +# ROLE8P, ROLJ01, ROLK01, ROLP8P - Mario & Sonic at the Olympic Winter Games [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/ROLE8P.ini b/Data/Sys/GameSettings/ROLE8P.ini deleted file mode 100644 index 0c31b0489..000000000 --- a/Data/Sys/GameSettings/ROLE8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# ROLE8P - Mario & Sonic at the Olympic Winter Games - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/ROLJ01.ini b/Data/Sys/GameSettings/ROLJ01.ini deleted file mode 100644 index c35e8e8a9..000000000 --- a/Data/Sys/GameSettings/ROLJ01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# ROLJ01 - Mario & Sonic at the Olympic Winter Games - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/ROLK01.ini b/Data/Sys/GameSettings/ROLK01.ini deleted file mode 100644 index f8755bbcd..000000000 --- a/Data/Sys/GameSettings/ROLK01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# ROLK01 - Mario & Sonic at the Olympic Winter Games - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/ROLP8P.ini b/Data/Sys/GameSettings/ROLP8P.ini deleted file mode 100644 index abffb166b..000000000 --- a/Data/Sys/GameSettings/ROLP8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# ROLP8P - Mario & Sonic at the Olympic Winter Games - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/R64P01.ini b/Data/Sys/GameSettings/RON.ini similarity index 88% rename from Data/Sys/GameSettings/R64P01.ini rename to Data/Sys/GameSettings/RON.ini index fe5d4f09c..9640dcaa5 100644 --- a/Data/Sys/GameSettings/R64P01.ini +++ b/Data/Sys/GameSettings/RON.ini @@ -1,4 +1,4 @@ -# R64P01 - RVL Wii Music +# RONEG9, RONJG9, RONPG9 - Onechanbara: Bikini Zombie Slayers [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RONEG9.ini b/Data/Sys/GameSettings/RONEG9.ini deleted file mode 100644 index 084aa1bef..000000000 --- a/Data/Sys/GameSettings/RONEG9.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RONEG9 - Onechanbara: Bikini Zombie Slayers - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RONJG9.ini b/Data/Sys/GameSettings/RONJG9.ini deleted file mode 100644 index 495f7ef30..000000000 --- a/Data/Sys/GameSettings/RONJG9.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RONJG9 - Onechanbara Revolution - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RONPG9.ini b/Data/Sys/GameSettings/RONPG9.ini deleted file mode 100644 index 957cc0ce9..000000000 --- a/Data/Sys/GameSettings/RONPG9.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RONPG9 - Onechanbara: Bikini Zombie Slayers - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/GKOP6V.ini b/Data/Sys/GameSettings/ROU.ini similarity index 88% rename from Data/Sys/GameSettings/GKOP6V.ini rename to Data/Sys/GameSettings/ROU.ini index 488e15daf..1e591e1e9 100644 --- a/Data/Sys/GameSettings/GKOP6V.ini +++ b/Data/Sys/GameSettings/ROU.ini @@ -1,4 +1,4 @@ -# GKOP6V - Kao the kangaroo +# ROUJAF, ROUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/ROUJAF.ini b/Data/Sys/GameSettings/ROUJAF.ini deleted file mode 100644 index 05fb7caa6..000000000 --- a/Data/Sys/GameSettings/ROUJAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# ROUJAF - ONEPIECE UNLIMITED CRUISE EPISODE 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/ROUPAF.ini b/Data/Sys/GameSettings/ROUPAF.ini deleted file mode 100644 index 668ee3e37..000000000 --- a/Data/Sys/GameSettings/ROUPAF.ini +++ /dev/null @@ -1,25 +0,0 @@ -# ROUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RPBE01.ini b/Data/Sys/GameSettings/RPB.ini similarity index 91% rename from Data/Sys/GameSettings/RPBE01.ini rename to Data/Sys/GameSettings/RPB.ini index eb8b54de0..bdae6cedc 100644 --- a/Data/Sys/GameSettings/RPBE01.ini +++ b/Data/Sys/GameSettings/RPB.ini @@ -1,4 +1,4 @@ -# RPBE01 - Pokemon Battle Revolution +# RPBE01, RPBJ01, RPBP01 - Pokemon Battle Revolution [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RPBJ01.ini b/Data/Sys/GameSettings/RPBJ01.ini deleted file mode 100644 index cc365fa65..000000000 --- a/Data/Sys/GameSettings/RPBJ01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RPBJ01 - Pokemon Battle Revolution - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs texture cache set to "Safe"(r6906). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/RPBP01.ini b/Data/Sys/GameSettings/RPBP01.ini deleted file mode 100644 index a3194cd9e..000000000 --- a/Data/Sys/GameSettings/RPBP01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RPBP01 - Pokemon Battle Revolution - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs texture cache set to "Safe"(r6906). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/RPJE7U.ini b/Data/Sys/GameSettings/RPJ.ini similarity index 93% rename from Data/Sys/GameSettings/RPJE7U.ini rename to Data/Sys/GameSettings/RPJ.ini index 43b29cf6a..0f1307d3e 100644 --- a/Data/Sys/GameSettings/RPJE7U.ini +++ b/Data/Sys/GameSettings/RPJ.ini @@ -1,4 +1,4 @@ -# RPJE7U - ARC RISE FANTASIA +# RPJE7U, RPJJ99 - ARC RISE FANTASIA [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RPJJ99.ini b/Data/Sys/GameSettings/RPJJ99.ini deleted file mode 100644 index 22c655b05..000000000 --- a/Data/Sys/GameSettings/RPJJ99.ini +++ /dev/null @@ -1,32 +0,0 @@ -# RPJJ99 - ARC RISE FANTASIA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RPOPC8.ini b/Data/Sys/GameSettings/RPO.ini similarity index 94% rename from Data/Sys/GameSettings/RPOPC8.ini rename to Data/Sys/GameSettings/RPO.ini index 1b2863ef9..479d793dd 100644 --- a/Data/Sys/GameSettings/RPOPC8.ini +++ b/Data/Sys/GameSettings/RPO.ini @@ -1,4 +1,4 @@ -# RPOPC8 - Opoona +# RPOEC8, RPOJC8, RPOPC8 - Opoona [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RPOEC8.ini b/Data/Sys/GameSettings/RPOEC8.ini deleted file mode 100644 index 936bd7f8d..000000000 --- a/Data/Sys/GameSettings/RPOEC8.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RPOEC8 - Opoona - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Jerky videos need safe cache. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RPOJC8.ini b/Data/Sys/GameSettings/RPOJC8.ini deleted file mode 100644 index e74c35385..000000000 --- a/Data/Sys/GameSettings/RPOJC8.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RPOJC8 - Opoona - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Jerky videos need safe cache. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RPWX41.ini b/Data/Sys/GameSettings/RPW.ini similarity index 91% rename from Data/Sys/GameSettings/RPWX41.ini rename to Data/Sys/GameSettings/RPW.ini index d592f3ad7..891221ef4 100644 --- a/Data/Sys/GameSettings/RPWX41.ini +++ b/Data/Sys/GameSettings/RPW.ini @@ -1,4 +1,4 @@ -# RPWX41 - Prince of Persia Forgotten Sands +# RPWX41, RPWZ41 - Prince of Persia Forgotten Sands [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RPWZ41.ini b/Data/Sys/GameSettings/RPWZ41.ini deleted file mode 100644 index aa5ba41a1..000000000 --- a/Data/Sys/GameSettings/RPWZ41.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RPWZ41 - Prince of Persia Forgotten Sands - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = EFB to Ram is needed for proper shadows. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RQ6EJJ.ini b/Data/Sys/GameSettings/RQ6.ini similarity index 92% rename from Data/Sys/GameSettings/RQ6EJJ.ini rename to Data/Sys/GameSettings/RQ6.ini index 8b57337ee..fcc583851 100644 --- a/Data/Sys/GameSettings/RQ6EJJ.ini +++ b/Data/Sys/GameSettings/RQ6.ini @@ -1,4 +1,4 @@ -# RQ6EJJ - Cursed Mountain +# RQ6EJJ, RQ6PKM, RQ6XKM - Cursed Mountain [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RQ6PKM.ini b/Data/Sys/GameSettings/RQ6PKM.ini deleted file mode 100644 index 6ece88837..000000000 --- a/Data/Sys/GameSettings/RQ6PKM.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RQ6PKM - Cursed Mountain - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Use direct 3d 11 for less glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -MaxAnisotropy = 0 - diff --git a/Data/Sys/GameSettings/RQ6XKM.ini b/Data/Sys/GameSettings/RQ6XKM.ini deleted file mode 100644 index 154861057..000000000 --- a/Data/Sys/GameSettings/RQ6XKM.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RQ6XKM - Cursed Mountain - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Use direct 3d 11 for less glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -MaxAnisotropy = 0 - diff --git a/Data/Sys/GameSettings/RQREXJ.ini b/Data/Sys/GameSettings/RQR.ini similarity index 91% rename from Data/Sys/GameSettings/RQREXJ.ini rename to Data/Sys/GameSettings/RQR.ini index f2a575caf..b7b999d65 100644 --- a/Data/Sys/GameSettings/RQREXJ.ini +++ b/Data/Sys/GameSettings/RQR.ini @@ -1,4 +1,4 @@ -# RQREXJ - The Sky Crawlers +# RQREXJ, RQRJAF, RQRPAF - The Sky Crawlers [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RQRJAF.ini b/Data/Sys/GameSettings/RQRJAF.ini deleted file mode 100644 index fe37b3a66..000000000 --- a/Data/Sys/GameSettings/RQRJAF.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RQRJAF - The Sky Crawlers - -[Core] -# Values set here will override the main dolphin settings. -CPUThread = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs single core to run properly(r7436). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RQRPAF.ini b/Data/Sys/GameSettings/RQRPAF.ini deleted file mode 100644 index 1daed0c83..000000000 --- a/Data/Sys/GameSettings/RQRPAF.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RQRPAF - The Sky Crawlers - -[Core] -# Values set here will override the main dolphin settings. -CPUThread = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs single core to run properly(r7436). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RRBE41.ini b/Data/Sys/GameSettings/RRB.ini similarity index 91% rename from Data/Sys/GameSettings/RRBE41.ini rename to Data/Sys/GameSettings/RRB.ini index 99902d304..47589baa8 100644 --- a/Data/Sys/GameSettings/RRBE41.ini +++ b/Data/Sys/GameSettings/RRB.ini @@ -1,4 +1,4 @@ -# RRBE41 - Rayman Raving Rabbids +# RRBE41, RRBJ41, RRBP41 - Rayman Raving Rabbids [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RRBJ41.ini b/Data/Sys/GameSettings/RRBJ41.ini deleted file mode 100644 index e25ffcfb1..000000000 --- a/Data/Sys/GameSettings/RRBJ41.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RRBJ41 - Rayman Raving Rabbids - -[Core] -# Values set here will override the main dolphin settings. -SyncGPU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RRBP41.ini b/Data/Sys/GameSettings/RRBP41.ini deleted file mode 100644 index 01f06122d..000000000 --- a/Data/Sys/GameSettings/RRBP41.ini +++ /dev/null @@ -1,28 +0,0 @@ -# RRBP41 - Rayman Raving Rabbids - -[Core] -# Values set here will override the main dolphin settings. -SyncGPU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RBBE18.ini b/Data/Sys/GameSettings/RRK.ini similarity index 93% rename from Data/Sys/GameSettings/RBBE18.ini rename to Data/Sys/GameSettings/RRK.ini index df8293a3a..5df03e30c 100644 --- a/Data/Sys/GameSettings/RBBE18.ini +++ b/Data/Sys/GameSettings/RRK.ini @@ -1,4 +1,4 @@ -# RBBE18 - Bomberman Land +# RRKE70, RRKP70 - Alone In The Dark [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RRKE70.ini b/Data/Sys/GameSettings/RRKE70.ini deleted file mode 100644 index 64b63f4aa..000000000 --- a/Data/Sys/GameSettings/RRKE70.ini +++ /dev/null @@ -1,33 +0,0 @@ -# RRKE70 - Alone In The Dark - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RRKP70.ini b/Data/Sys/GameSettings/RRKP70.ini deleted file mode 100644 index 5f38e5fca..000000000 --- a/Data/Sys/GameSettings/RRKP70.ini +++ /dev/null @@ -1,33 +0,0 @@ -# RRKP70 - Alone In The Dark - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/GF4P52.ini b/Data/Sys/GameSettings/RRZ.ini similarity index 92% rename from Data/Sys/GameSettings/GF4P52.ini rename to Data/Sys/GameSettings/RRZ.ini index cbb32a4a9..b4e8f79ba 100644 --- a/Data/Sys/GameSettings/GF4P52.ini +++ b/Data/Sys/GameSettings/RRZ.ini @@ -1,4 +1,4 @@ -# GF4P52 - Fantastic Four +# RRZEGY, RRZPGY - Rubik's Puzzle World [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RRZEGY.ini b/Data/Sys/GameSettings/RRZEGY.ini deleted file mode 100644 index 9fcc05b9a..000000000 --- a/Data/Sys/GameSettings/RRZEGY.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RRZEGY - Rubik's Puzzle World - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/RRZPGY.ini b/Data/Sys/GameSettings/RRZPGY.ini deleted file mode 100644 index 613eeb106..000000000 --- a/Data/Sys/GameSettings/RRZPGY.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RRZPGY - Rubik's Puzzle World - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/R64K01.ini b/Data/Sys/GameSettings/RS5.ini similarity index 90% rename from Data/Sys/GameSettings/R64K01.ini rename to Data/Sys/GameSettings/RS5.ini index 3f913f80e..ed88dd8ce 100644 --- a/Data/Sys/GameSettings/R64K01.ini +++ b/Data/Sys/GameSettings/RS5.ini @@ -1,4 +1,4 @@ -# R64K01 - RVL Wii Music +# RS5EC8, RS5JC8, RS5PC8 - SAMURAI WARRIORS KATANA [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RS5EC8.ini b/Data/Sys/GameSettings/RS5EC8.ini deleted file mode 100644 index a8c73b748..000000000 --- a/Data/Sys/GameSettings/RS5EC8.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RS5EC8 - SAMURAI WARRIORS KATANA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RS5JC8.ini b/Data/Sys/GameSettings/RS5JC8.ini deleted file mode 100644 index c6069b95f..000000000 --- a/Data/Sys/GameSettings/RS5JC8.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RS5JC8 - Sengoku Musou KATANA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RS5PC8.ini b/Data/Sys/GameSettings/RS5PC8.ini deleted file mode 100644 index 23872b8d5..000000000 --- a/Data/Sys/GameSettings/RS5PC8.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RS5PC8 - SAMURAI WARRIORS KATANA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RS9.ini b/Data/Sys/GameSettings/RS9.ini new file mode 100644 index 000000000..6ae85e6be --- /dev/null +++ b/Data/Sys/GameSettings/RS9.ini @@ -0,0 +1,19 @@ +# RS9E8P, RS9P8P - SONIC RIDERS ZERO GRAVITY + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + diff --git a/Data/Sys/GameSettings/RS9E8P.ini b/Data/Sys/GameSettings/RS9E8P.ini deleted file mode 100644 index 5cbe57148..000000000 --- a/Data/Sys/GameSettings/RS9E8P.ini +++ /dev/null @@ -1,19 +0,0 @@ -# RS9E8P - SONIC RIDERS ZERO GRAVITY - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/RS9P8P.ini b/Data/Sys/GameSettings/RS9P8P.ini deleted file mode 100644 index cb6a3afec..000000000 --- a/Data/Sys/GameSettings/RS9P8P.ini +++ /dev/null @@ -1,19 +0,0 @@ -# RS9P8P - SONIC RIDERS ZERO GRAVITY - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/RSBE01.ini b/Data/Sys/GameSettings/RSB.ini similarity index 90% rename from Data/Sys/GameSettings/RSBE01.ini rename to Data/Sys/GameSettings/RSB.ini index bad9e271c..be0a7d8d0 100644 --- a/Data/Sys/GameSettings/RSBE01.ini +++ b/Data/Sys/GameSettings/RSB.ini @@ -1,4 +1,4 @@ -# RSBE01 - Super Smash Bros. Brawl +# RSBE01, RSBJ01, RSBK01 - Super Smash Bros. Brawl [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/RSBJ01.ini b/Data/Sys/GameSettings/RSBJ01.ini deleted file mode 100644 index e9b1cffe0..000000000 --- a/Data/Sys/GameSettings/RSBJ01.ini +++ /dev/null @@ -1,18 +0,0 @@ -# RSBJ01 - Super Smash Bros. Brawl - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Classic mode score report needs real xfb. Nes masterpieces and ingame screnshots need efb to ram, STC is needed too for masterpieces. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RSBK01.ini b/Data/Sys/GameSettings/RSBK01.ini deleted file mode 100644 index 7020e859d..000000000 --- a/Data/Sys/GameSettings/RSBK01.ini +++ /dev/null @@ -1,18 +0,0 @@ -# RSBK01 - Super Smash Bros. Brawl - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Classic mode score report needs real xfb. Nes masterpieces and ingame screnshots need efb to ram, STC is needed too for masterpieces. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RSFE7U.ini b/Data/Sys/GameSettings/RSF.ini similarity index 90% rename from Data/Sys/GameSettings/RSFE7U.ini rename to Data/Sys/GameSettings/RSF.ini index 8e7f0ce4b..bebdc17e1 100644 --- a/Data/Sys/GameSettings/RSFE7U.ini +++ b/Data/Sys/GameSettings/RSF.ini @@ -1,4 +1,4 @@ -# RSFE7U - MURAMASA: THE DEMON BLADE +# RSFE7U, RSFJ99, RSFP99 - MURAMASA: THE DEMON BLADE [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RSFJ99.ini b/Data/Sys/GameSettings/RSFJ99.ini deleted file mode 100644 index 2aed6ff93..000000000 --- a/Data/Sys/GameSettings/RSFJ99.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RSFJ99 - Oboro Muramasa - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 - diff --git a/Data/Sys/GameSettings/RSFP99.ini b/Data/Sys/GameSettings/RSFP99.ini deleted file mode 100644 index ac3998b8e..000000000 --- a/Data/Sys/GameSettings/RSFP99.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RSFP99 - MURAMASA: THE DEMON BLADE - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 - diff --git a/Data/Sys/GameSettings/RSHK69.ini b/Data/Sys/GameSettings/RSH.ini similarity index 90% rename from Data/Sys/GameSettings/RSHK69.ini rename to Data/Sys/GameSettings/RSH.ini index 24ab58a54..c81b95feb 100644 --- a/Data/Sys/GameSettings/RSHK69.ini +++ b/Data/Sys/GameSettings/RSH.ini @@ -1,4 +1,4 @@ -# RSHK69 - MySims Kingdom +# RSHE69, RSHJ13, RSHK69, RSHP69 - MySims Kingdom [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/RSHE69.ini b/Data/Sys/GameSettings/RSHE69.ini deleted file mode 100644 index febf3a1df..000000000 --- a/Data/Sys/GameSettings/RSHE69.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RSHE69 - MySims Kingdom - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 3072 diff --git a/Data/Sys/GameSettings/RSHJ13.ini b/Data/Sys/GameSettings/RSHJ13.ini deleted file mode 100644 index 9f6205bda..000000000 --- a/Data/Sys/GameSettings/RSHJ13.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RSHJ13 - MySims Kingdom - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 3072 diff --git a/Data/Sys/GameSettings/RSHP69.ini b/Data/Sys/GameSettings/RSHP69.ini deleted file mode 100644 index 9b373a8af..000000000 --- a/Data/Sys/GameSettings/RSHP69.ini +++ /dev/null @@ -1,25 +0,0 @@ -# RSHP69 - MySims Kingdom - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 3072 diff --git a/Data/Sys/GameSettings/RSIE69.ini b/Data/Sys/GameSettings/RSI.ini similarity index 94% rename from Data/Sys/GameSettings/RSIE69.ini rename to Data/Sys/GameSettings/RSI.ini index 28ad5e7d6..0ed458dd7 100644 --- a/Data/Sys/GameSettings/RSIE69.ini +++ b/Data/Sys/GameSettings/RSI.ini @@ -1,4 +1,4 @@ -# RSIE69 - MySims +# RSIE69, RSIJ13, RSIP69 - MySims [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RSIJ13.ini b/Data/Sys/GameSettings/RSIJ13.ini deleted file mode 100644 index 70868f133..000000000 --- a/Data/Sys/GameSettings/RSIJ13.ini +++ /dev/null @@ -1,34 +0,0 @@ -# RSIJ13 - Boku To Sim No Machi - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/RSIP69.ini b/Data/Sys/GameSettings/RSIP69.ini deleted file mode 100644 index f9599be63..000000000 --- a/Data/Sys/GameSettings/RSIP69.ini +++ /dev/null @@ -1,34 +0,0 @@ -# RSIP69 - MySims - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/G4MP69.ini b/Data/Sys/GameSettings/RSL.ini similarity index 90% rename from Data/Sys/GameSettings/G4MP69.ini rename to Data/Sys/GameSettings/RSL.ini index b299c43c0..ddefe4841 100644 --- a/Data/Sys/GameSettings/G4MP69.ini +++ b/Data/Sys/GameSettings/RSL.ini @@ -1,4 +1,4 @@ -# G4MP69 - The Sims: Bustin Out GameCube +# RSLEAF, RSLJAF, RSLKAF, RSLPAF - SOULCALIBUR Legends [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RSLEAF.ini b/Data/Sys/GameSettings/RSLEAF.ini deleted file mode 100644 index ab426968f..000000000 --- a/Data/Sys/GameSettings/RSLEAF.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RSLEAF - SOULCALIBUR Legends - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RSLJAF.ini b/Data/Sys/GameSettings/RSLJAF.ini deleted file mode 100644 index 95876f5e6..000000000 --- a/Data/Sys/GameSettings/RSLJAF.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RSLJAF - SOULCALIBUR Legends - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RSLKAF.ini b/Data/Sys/GameSettings/RSLKAF.ini deleted file mode 100644 index 59dd26bc8..000000000 --- a/Data/Sys/GameSettings/RSLKAF.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RSLKAF - SOULCALIBUR Legends - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RSLPAF.ini b/Data/Sys/GameSettings/RSLPAF.ini deleted file mode 100644 index 2b01a5c4d..000000000 --- a/Data/Sys/GameSettings/RSLPAF.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RSLPAF - SOULCALIBUR Legends - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RSMJ8P.ini b/Data/Sys/GameSettings/RSM.ini similarity index 88% rename from Data/Sys/GameSettings/RSMJ8P.ini rename to Data/Sys/GameSettings/RSM.ini index 898dfe57d..14add78ce 100644 --- a/Data/Sys/GameSettings/RSMJ8P.ini +++ b/Data/Sys/GameSettings/RSM.ini @@ -1,4 +1,4 @@ -# RSMJ8P - SUPER MONKEY BALL BANANA BLITZ +# RSME8P, RSMJ8P - SUPER MONKEY BALL BANANA BLITZ [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RSME8P.ini b/Data/Sys/GameSettings/RSME8P.ini deleted file mode 100644 index 9c4ecb6a1..000000000 --- a/Data/Sys/GameSettings/RSME8P.ini +++ /dev/null @@ -1,20 +0,0 @@ -# RSME8P - SUPER MONKEY BALL BANANA BLITZ - -[Core] -# Values set here will override the main dolphin settings. -FPRF = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/RSNF69.ini b/Data/Sys/GameSettings/RSN.ini similarity index 90% rename from Data/Sys/GameSettings/RSNF69.ini rename to Data/Sys/GameSettings/RSN.ini index 278d78d28..a6ece563c 100644 --- a/Data/Sys/GameSettings/RSNF69.ini +++ b/Data/Sys/GameSettings/RSN.ini @@ -1,4 +1,4 @@ -# RSNF69 - The Simpsons Game +# RSND69, RSNE69, RSNF69, RSNP69, RSNX69 - The Simpsons Game [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/RSND69.ini b/Data/Sys/GameSettings/RSND69.ini deleted file mode 100644 index 83c4d0af5..000000000 --- a/Data/Sys/GameSettings/RSND69.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RSND69 - The Simpsons Game - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Unstable with graphical glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RSNE69.ini b/Data/Sys/GameSettings/RSNE69.ini deleted file mode 100644 index e15a41fa0..000000000 --- a/Data/Sys/GameSettings/RSNE69.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RSNE69 - The Simpsons Game - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Unstable with graphical glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RSNP69.ini b/Data/Sys/GameSettings/RSNP69.ini deleted file mode 100644 index 72d64e933..000000000 --- a/Data/Sys/GameSettings/RSNP69.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RSNP69 - The Simpsons Game - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Unstable with graphical glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RSNX69.ini b/Data/Sys/GameSettings/RSNX69.ini deleted file mode 100644 index 981064d27..000000000 --- a/Data/Sys/GameSettings/RSNX69.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RSNX69 - The Simpsons Game - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Unstable with graphical glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Enhancements] -MaxAnisotropy = 0 -ForceFiltering = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/RSPJ01.ini b/Data/Sys/GameSettings/RSP.ini similarity index 90% rename from Data/Sys/GameSettings/RSPJ01.ini rename to Data/Sys/GameSettings/RSP.ini index c36568612..3e8902a16 100644 --- a/Data/Sys/GameSettings/RSPJ01.ini +++ b/Data/Sys/GameSettings/RSP.ini @@ -1,4 +1,4 @@ -# RSPJ01 - SPORTS PACK for REVOLUTION +# RSPE01, RSPJ01, RSPP01 - Wii Sports [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RSPP01.ini b/Data/Sys/GameSettings/RSPP01.ini deleted file mode 100644 index 78d5c78d2..000000000 --- a/Data/Sys/GameSettings/RSPP01.ini +++ /dev/null @@ -1,22 +0,0 @@ -# RSPP01 - SPORTS PACK for REVOLUTION - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/RSXJ13.ini b/Data/Sys/GameSettings/RSX.ini similarity index 93% rename from Data/Sys/GameSettings/RSXJ13.ini rename to Data/Sys/GameSettings/RSX.ini index 11ed8e40e..836022d51 100644 --- a/Data/Sys/GameSettings/RSXJ13.ini +++ b/Data/Sys/GameSettings/RSX.ini @@ -1,4 +1,4 @@ -# RSXJ13 - SSX Blur +# RSXE69, RSXJ13, RSXK69, RSXP69 - SSX Blur [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RSXE69.ini b/Data/Sys/GameSettings/RSXE69.ini deleted file mode 100644 index e4b6061b6..000000000 --- a/Data/Sys/GameSettings/RSXE69.ini +++ /dev/null @@ -1,34 +0,0 @@ -# RSXE69 - SSX Blur - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBAccessEnable = True - diff --git a/Data/Sys/GameSettings/RSXK69.ini b/Data/Sys/GameSettings/RSXK69.ini deleted file mode 100644 index de43814a2..000000000 --- a/Data/Sys/GameSettings/RSXK69.ini +++ /dev/null @@ -1,34 +0,0 @@ -# RSXK69 - SSX Blur - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBAccessEnable = True - diff --git a/Data/Sys/GameSettings/RSXP69.ini b/Data/Sys/GameSettings/RSXP69.ini deleted file mode 100644 index 84904587b..000000000 --- a/Data/Sys/GameSettings/RSXP69.ini +++ /dev/null @@ -1,34 +0,0 @@ -# RSXP69 - SSX Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBAccessEnable = True - diff --git a/Data/Sys/GameSettings/RT3E54.ini b/Data/Sys/GameSettings/RT3.ini similarity index 78% rename from Data/Sys/GameSettings/RT3E54.ini rename to Data/Sys/GameSettings/RT3.ini index 8311ae723..9f87dbdd7 100644 --- a/Data/Sys/GameSettings/RT3E54.ini +++ b/Data/Sys/GameSettings/RT3.ini @@ -1,4 +1,4 @@ -# RT3E54 - Rockstar Games presents Table Tennis +# RT3E54, RT3JEL, RT3P54 - Rockstar Games presents Table Tennis [Core] [EmuState] EmulationStateId = 3 diff --git a/Data/Sys/GameSettings/RT3JEL.ini b/Data/Sys/GameSettings/RT3JEL.ini deleted file mode 100644 index 63007e740..000000000 --- a/Data/Sys/GameSettings/RT3JEL.ini +++ /dev/null @@ -1,17 +0,0 @@ -# RT3JEL - Rockstar Games presents Table Tennis -[Core] -[EmuState] -EmulationStateId = 3 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/RT3P54.ini b/Data/Sys/GameSettings/RT3P54.ini deleted file mode 100644 index 9a4a5c940..000000000 --- a/Data/Sys/GameSettings/RT3P54.ini +++ /dev/null @@ -1,17 +0,0 @@ -# RT3P54 - Rockstar Games presents Table Tennis -[Core] -[EmuState] -EmulationStateId = 3 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/RT4JAF.ini b/Data/Sys/GameSettings/RT4.ini similarity index 88% rename from Data/Sys/GameSettings/RT4JAF.ini rename to Data/Sys/GameSettings/RT4.ini index 40836caa1..5a3ff440e 100644 --- a/Data/Sys/GameSettings/RT4JAF.ini +++ b/Data/Sys/GameSettings/RT4.ini @@ -1,4 +1,4 @@ -# RT4JAF - Tales Of Symphonia Ratatosk no Kishi +# RT4EAF, RT4JAF, RT4PAF - Tales of Symphonia -Dawn of the new world- [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RT4PAF.ini b/Data/Sys/GameSettings/RT4PAF.ini deleted file mode 100644 index cba434f49..000000000 --- a/Data/Sys/GameSettings/RT4PAF.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RT4PAF - Tales of Symphonia -Dawn of the new world- - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs emulating format changes (r6871) -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RTME41.ini b/Data/Sys/GameSettings/RTM.ini similarity index 95% rename from Data/Sys/GameSettings/RTME41.ini rename to Data/Sys/GameSettings/RTM.ini index d844520c7..7ad2c91d3 100644 --- a/Data/Sys/GameSettings/RTME41.ini +++ b/Data/Sys/GameSettings/RTM.ini @@ -1,4 +1,4 @@ -# RTME41 - TMNT +# RTME41, RTMP41 - TMNT [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RTMP41.ini b/Data/Sys/GameSettings/RTMP41.ini deleted file mode 100644 index da324711b..000000000 --- a/Data/Sys/GameSettings/RTMP41.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RTMP41 - TMNT - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Fog emulation creates problems with the game (see issue 4922). - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -DisableFog = True - diff --git a/Data/Sys/GameSettings/GHCF4Q.ini b/Data/Sys/GameSettings/RTN.ini similarity index 92% rename from Data/Sys/GameSettings/GHCF4Q.ini rename to Data/Sys/GameSettings/RTN.ini index c2fbd1b96..686c5ff7a 100644 --- a/Data/Sys/GameSettings/GHCF4Q.ini +++ b/Data/Sys/GameSettings/RTN.ini @@ -1,4 +1,4 @@ -# GHCF4Q - Chicken Little +# RTNE41, RTNJCQ, RTNP41 - Tenchu [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RTNJCQ.ini b/Data/Sys/GameSettings/RTNJCQ.ini deleted file mode 100644 index 8f0dbb34c..000000000 --- a/Data/Sys/GameSettings/RTNJCQ.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RTNJCQ - Tenchu 4 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RTNP41.ini b/Data/Sys/GameSettings/RTNP41.ini deleted file mode 100644 index 01a166ea5..000000000 --- a/Data/Sys/GameSettings/RTNP41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RTNP41 - Tenchu - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RTZ.ini b/Data/Sys/GameSettings/RTZ.ini new file mode 100644 index 000000000..556a43948 --- /dev/null +++ b/Data/Sys/GameSettings/RTZ.ini @@ -0,0 +1,31 @@ +# RTZE08, RTZJ08, RTZK08, RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = False + diff --git a/Data/Sys/GameSettings/RTZE08.ini b/Data/Sys/GameSettings/RTZE08.ini deleted file mode 100644 index 3f2d1662d..000000000 --- a/Data/Sys/GameSettings/RTZE08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RTZE08 - Zack and Wiki: Quest for Barbaros' Treasure - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/RTZJ08.ini b/Data/Sys/GameSettings/RTZJ08.ini deleted file mode 100644 index 187893246..000000000 --- a/Data/Sys/GameSettings/RTZJ08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RTZJ08 - Zack and Wiki: Quest for Barbaros' Treasure - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/RTZK08.ini b/Data/Sys/GameSettings/RTZK08.ini deleted file mode 100644 index e4b9ba288..000000000 --- a/Data/Sys/GameSettings/RTZK08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RTZK08 - Zack and Wiki: Quest for Barbaros' Treasure - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/RTZP08.ini b/Data/Sys/GameSettings/RTZP08.ini deleted file mode 100644 index d32451f26..000000000 --- a/Data/Sys/GameSettings/RTZP08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/RUUE01.ini b/Data/Sys/GameSettings/RUU.ini similarity index 88% rename from Data/Sys/GameSettings/RUUE01.ini rename to Data/Sys/GameSettings/RUU.ini index 1625ea981..92699835b 100644 --- a/Data/Sys/GameSettings/RUUE01.ini +++ b/Data/Sys/GameSettings/RUU.ini @@ -1,4 +1,4 @@ -# RUUE01 - Animal Crossing Wii +# RUUE01, RUUJ01, RUUK01, RUUP01 - Animal Crossing Wii [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/RUUJ01.ini b/Data/Sys/GameSettings/RUUJ01.ini deleted file mode 100644 index 294412f3d..000000000 --- a/Data/Sys/GameSettings/RUUJ01.ini +++ /dev/null @@ -1,21 +0,0 @@ -# RUUJ01 - Animal Crossing Wii -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RUUK01.ini b/Data/Sys/GameSettings/RUUK01.ini deleted file mode 100644 index b12b52cfd..000000000 --- a/Data/Sys/GameSettings/RUUK01.ini +++ /dev/null @@ -1,21 +0,0 @@ -# RUUK01 - Animal Crossing Wii -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RUUP01.ini b/Data/Sys/GameSettings/RUUP01.ini deleted file mode 100644 index b1c4cb4cd..000000000 --- a/Data/Sys/GameSettings/RUUP01.ini +++ /dev/null @@ -1,21 +0,0 @@ -# RUUP01 - Animal Crossing Wii -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RVKEXJ.ini b/Data/Sys/GameSettings/RVK.ini similarity index 91% rename from Data/Sys/GameSettings/RVKEXJ.ini rename to Data/Sys/GameSettings/RVK.ini index ffe181bff..8d4eb9a2e 100644 --- a/Data/Sys/GameSettings/RVKEXJ.ini +++ b/Data/Sys/GameSettings/RVK.ini @@ -1,4 +1,4 @@ -# RVKEXJ - VALHALLA KNIGHTS +# RVKEXJ, RVKP99 - VALHALLA KNIGHTS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RVKP99.ini b/Data/Sys/GameSettings/RVKP99.ini deleted file mode 100644 index c7b63afcb..000000000 --- a/Data/Sys/GameSettings/RVKP99.ini +++ /dev/null @@ -1,22 +0,0 @@ -# RVKP99 - ELDAR SAGA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/R5VP41.ini b/Data/Sys/GameSettings/RWR.ini similarity index 91% rename from Data/Sys/GameSettings/R5VP41.ini rename to Data/Sys/GameSettings/RWR.ini index bee1525b0..cdb07b8ee 100644 --- a/Data/Sys/GameSettings/R5VP41.ini +++ b/Data/Sys/GameSettings/RWR.ini @@ -1,4 +1,4 @@ -# R5VP41 - James Cameron's AVATAR +# RWRE4F, RWRP4F - Wacky Races: Crash & Dash [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RWRE4F.ini b/Data/Sys/GameSettings/RWRE4F.ini deleted file mode 100644 index eb17135e8..000000000 --- a/Data/Sys/GameSettings/RWRE4F.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RWRE4F - Wacky Races: Crash & Dash - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RWRP4F.ini b/Data/Sys/GameSettings/RWRP4F.ini deleted file mode 100644 index 07f774018..000000000 --- a/Data/Sys/GameSettings/RWRP4F.ini +++ /dev/null @@ -1,29 +0,0 @@ -# RWRP4F - Wacky Races: Crash & Dash - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/RT4EAF.ini b/Data/Sys/GameSettings/RWS.ini similarity index 88% rename from Data/Sys/GameSettings/RT4EAF.ini rename to Data/Sys/GameSettings/RWS.ini index d12702207..201e7a69b 100644 --- a/Data/Sys/GameSettings/RT4EAF.ini +++ b/Data/Sys/GameSettings/RWS.ini @@ -1,12 +1,12 @@ -# RT4EAF - Tales of Symphonia -Dawn of the new world- +# RWSE8P, RWSJ01, RWSK01, RWSP8P - MARIO & SONIC At The OlympicGames [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs emulating format changes (r6871) EmulationStateId = 4 +EmulationIssues = Needs emulating format changes (r6871) [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/RWSE8P.ini b/Data/Sys/GameSettings/RWSE8P.ini deleted file mode 100644 index a32dc9f78..000000000 --- a/Data/Sys/GameSettings/RWSE8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RWSE8P - MARIO & SONIC At The OlympicGames - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs emulating format changes (r6871) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RWSJ01.ini b/Data/Sys/GameSettings/RWSJ01.ini deleted file mode 100644 index 655759d26..000000000 --- a/Data/Sys/GameSettings/RWSJ01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RWSJ01 - MARIO & SONIC At The OlympicGames - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs emulating format changes (r6871) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RWSK01.ini b/Data/Sys/GameSettings/RWSK01.ini deleted file mode 100644 index aec34e562..000000000 --- a/Data/Sys/GameSettings/RWSK01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RWSK01 - MARIO & SONIC At The OlympicGames - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs emulating format changes (r6871) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RWSP8P.ini b/Data/Sys/GameSettings/RWSP8P.ini deleted file mode 100644 index a61eab14c..000000000 --- a/Data/Sys/GameSettings/RWSP8P.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RWSP8P - MARIO & SONIC At The OlympicGames - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs emulating format changes (r6871) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RX9.ini b/Data/Sys/GameSettings/RX9.ini new file mode 100644 index 000000000..050953435 --- /dev/null +++ b/Data/Sys/GameSettings/RX9.ini @@ -0,0 +1,18 @@ +# RX9P69, RX9Y69 - Need for Speed(tm) Undercover + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + diff --git a/Data/Sys/GameSettings/RX9P69.ini b/Data/Sys/GameSettings/RX9P69.ini deleted file mode 100644 index 982d65ad4..000000000 --- a/Data/Sys/GameSettings/RX9P69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# RX9P69 - Need for Speed(tm) Undercover - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/RX9Y69.ini b/Data/Sys/GameSettings/RX9Y69.ini deleted file mode 100644 index 3344899a6..000000000 --- a/Data/Sys/GameSettings/RX9Y69.ini +++ /dev/null @@ -1,18 +0,0 @@ -# RX9Y69 - Need for Speed(tm) Undercover - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/RXXE4Q.ini b/Data/Sys/GameSettings/RXX.ini similarity index 92% rename from Data/Sys/GameSettings/RXXE4Q.ini rename to Data/Sys/GameSettings/RXX.ini index 7a910902a..b764b372c 100644 --- a/Data/Sys/GameSettings/RXXE4Q.ini +++ b/Data/Sys/GameSettings/RXX.ini @@ -1,4 +1,4 @@ -# RXXE4Q - Spectrobes Origins +# RXXE4Q, RXXJ4Q, RXXP4Q - Spectrobes Origins [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RXXJ4Q.ini b/Data/Sys/GameSettings/RXXJ4Q.ini deleted file mode 100644 index 32cbc8a69..000000000 --- a/Data/Sys/GameSettings/RXXJ4Q.ini +++ /dev/null @@ -1,34 +0,0 @@ -# RXXJ4Q - Spectrobes Origins - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RXXP4Q.ini b/Data/Sys/GameSettings/RXXP4Q.ini deleted file mode 100644 index e04bea666..000000000 --- a/Data/Sys/GameSettings/RXXP4Q.ini +++ /dev/null @@ -1,34 +0,0 @@ -# RXXP4Q - Spectrobes Origins - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/RZJ.ini b/Data/Sys/GameSettings/RZJ.ini new file mode 100644 index 000000000..d5ec4019c --- /dev/null +++ b/Data/Sys/GameSettings/RZJ.ini @@ -0,0 +1,30 @@ +# RZJD69, RZJE69, RZJJ13 - DeadSpace + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/RZJD69.ini b/Data/Sys/GameSettings/RZJD69.ini deleted file mode 100644 index bb8dac286..000000000 --- a/Data/Sys/GameSettings/RZJD69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RZJD69 - DeadSpace - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RZJE69.ini b/Data/Sys/GameSettings/RZJE69.ini deleted file mode 100644 index 795ad44fc..000000000 --- a/Data/Sys/GameSettings/RZJE69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RZJE69 - DeadSpace - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RZJJ13.ini b/Data/Sys/GameSettings/RZJJ13.ini deleted file mode 100644 index 0fa70d10f..000000000 --- a/Data/Sys/GameSettings/RZJJ13.ini +++ /dev/null @@ -1,30 +0,0 @@ -# RZJJ13 - DeadSpace - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/RZOE78.ini b/Data/Sys/GameSettings/RZO.ini similarity index 94% rename from Data/Sys/GameSettings/RZOE78.ini rename to Data/Sys/GameSettings/RZO.ini index ff2745632..0da731cfd 100644 --- a/Data/Sys/GameSettings/RZOE78.ini +++ b/Data/Sys/GameSettings/RZO.ini @@ -1,4 +1,4 @@ -# RZOE78 - World Of Zoo +# RZOE78, RZOP78 - World Of Zoo [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RZOP78.ini b/Data/Sys/GameSettings/RZOP78.ini deleted file mode 100644 index 609a2332d..000000000 --- a/Data/Sys/GameSettings/RZOP78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# RZOP78 - World Of Zoo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/GJUD78.ini b/Data/Sys/GameSettings/RZP.ini similarity index 89% rename from Data/Sys/GameSettings/GJUD78.ini rename to Data/Sys/GameSettings/RZP.ini index 3c3b3c32f..3f8c51bc7 100644 --- a/Data/Sys/GameSettings/GJUD78.ini +++ b/Data/Sys/GameSettings/RZP.ini @@ -1,12 +1,12 @@ -# GJUD78 - Tak and the Power of Juju +# RZPE01, RZPJ01 - LINKS CROSSBOW TRAINING [Core] # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = EmulationStateId = 5 +EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/RZPE01.ini b/Data/Sys/GameSettings/RZPE01.ini deleted file mode 100644 index f457f9a5e..000000000 --- a/Data/Sys/GameSettings/RZPE01.ini +++ /dev/null @@ -1,22 +0,0 @@ -# RZPE01 - LINKS CROSSBOW TRAINING - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/RZPJ01.ini b/Data/Sys/GameSettings/RZPJ01.ini deleted file mode 100644 index 26fd15000..000000000 --- a/Data/Sys/GameSettings/RZPJ01.ini +++ /dev/null @@ -1,22 +0,0 @@ -# RZPJ01 - LINKS CROSSBOW TRAINING - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/RZTJ01.ini b/Data/Sys/GameSettings/RZT.ini similarity index 87% rename from Data/Sys/GameSettings/RZTJ01.ini rename to Data/Sys/GameSettings/RZT.ini index 5ac0a1430..d4588e1d3 100644 --- a/Data/Sys/GameSettings/RZTJ01.ini +++ b/Data/Sys/GameSettings/RZT.ini @@ -1,4 +1,4 @@ -# RZTJ01 - Wii Sports Resort +# RZTE01, RZTJ01, RZTK01, RZTP01, RZTW01 - Wii Sports Resort [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/RZTE01.ini b/Data/Sys/GameSettings/RZTE01.ini deleted file mode 100644 index 195c944cf..000000000 --- a/Data/Sys/GameSettings/RZTE01.ini +++ /dev/null @@ -1,20 +0,0 @@ -# RZTE01 - Wii Sports Resort -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/RZTK01.ini b/Data/Sys/GameSettings/RZTK01.ini deleted file mode 100644 index 3a0d0e664..000000000 --- a/Data/Sys/GameSettings/RZTK01.ini +++ /dev/null @@ -1,20 +0,0 @@ -# RZTK01 - Wii Sports Resort -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/RZTP01.ini b/Data/Sys/GameSettings/RZTP01.ini deleted file mode 100644 index 461edb24e..000000000 --- a/Data/Sys/GameSettings/RZTP01.ini +++ /dev/null @@ -1,20 +0,0 @@ -# RZTP01 - Wii Sports Resort -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/RZTW01.ini b/Data/Sys/GameSettings/RZTW01.ini deleted file mode 100644 index d62c8f191..000000000 --- a/Data/Sys/GameSettings/RZTW01.ini +++ /dev/null @@ -1,20 +0,0 @@ -# RZTW01 - Wii Sports Resort -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/G5DE78.ini b/Data/Sys/GameSettings/RZZ.ini similarity index 92% rename from Data/Sys/GameSettings/G5DE78.ini rename to Data/Sys/GameSettings/RZZ.ini index 00c2d6466..6b67f20c9 100644 --- a/Data/Sys/GameSettings/G5DE78.ini +++ b/Data/Sys/GameSettings/RZZ.ini @@ -1,4 +1,4 @@ -# G5DE78 - Scooby-Doo! Unmasked +# RZZE8P, RZZJEL, RZZP8P - MADWORLD [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/RZZE8P.ini b/Data/Sys/GameSettings/RZZE8P.ini deleted file mode 100644 index 9ed6cb8f8..000000000 --- a/Data/Sys/GameSettings/RZZE8P.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RZZE8P - MADWORLD - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RZZJEL.ini b/Data/Sys/GameSettings/RZZJEL.ini deleted file mode 100644 index af90b9e60..000000000 --- a/Data/Sys/GameSettings/RZZJEL.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RZZJEL - MADWORLD - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RZZP8P.ini b/Data/Sys/GameSettings/RZZP8P.ini deleted file mode 100644 index a07ab2ab7..000000000 --- a/Data/Sys/GameSettings/RZZP8P.ini +++ /dev/null @@ -1,27 +0,0 @@ -# RZZP8P - MADWORLD - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/S2LE01.ini b/Data/Sys/GameSettings/S2L.ini similarity index 93% rename from Data/Sys/GameSettings/S2LE01.ini rename to Data/Sys/GameSettings/S2L.ini index 2b4782a2d..498901fb6 100644 --- a/Data/Sys/GameSettings/S2LE01.ini +++ b/Data/Sys/GameSettings/S2L.ini @@ -1,4 +1,4 @@ -# S2LE01 - PokePark Wii2 +# S2LE01, S2LJ01, S2LP01 - PokePark Wii2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/S2LJ01.ini b/Data/Sys/GameSettings/S2LJ01.ini deleted file mode 100644 index 879e24b88..000000000 --- a/Data/Sys/GameSettings/S2LJ01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# S2LJ01 - PokePark Wii2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs EFB to Ram to display photographs. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/S2LP01.ini b/Data/Sys/GameSettings/S2LP01.ini deleted file mode 100644 index 34cc82f2d..000000000 --- a/Data/Sys/GameSettings/S2LP01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# S2LP01 - PokePark Wii2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs EFB to Ram to display photographs. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/S2WP78.ini b/Data/Sys/GameSettings/S2W.ini similarity index 94% rename from Data/Sys/GameSettings/S2WP78.ini rename to Data/Sys/GameSettings/S2W.ini index 78a763b4a..81fbd9ab4 100644 --- a/Data/Sys/GameSettings/S2WP78.ini +++ b/Data/Sys/GameSettings/S2W.ini @@ -1,4 +1,4 @@ -# S2WP78 - WWE All Stars +# S2WE78, S2WP78 - WWE All Stars [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/S2WE78.ini b/Data/Sys/GameSettings/S2WE78.ini deleted file mode 100644 index 5ec119c8d..000000000 --- a/Data/Sys/GameSettings/S2WE78.ini +++ /dev/null @@ -1,33 +0,0 @@ -# S2WE78 - WWE All Stars - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use direct 3d 11 for less glitches(r7436) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Enhancements] -MaxAnisotropy = 0 - diff --git a/Data/Sys/GameSettings/S3BEWR.ini b/Data/Sys/GameSettings/S3B.ini similarity index 91% rename from Data/Sys/GameSettings/S3BEWR.ini rename to Data/Sys/GameSettings/S3B.ini index a8f4db033..e6043baa3 100644 --- a/Data/Sys/GameSettings/S3BEWR.ini +++ b/Data/Sys/GameSettings/S3B.ini @@ -1,4 +1,4 @@ -# S3BEWR - Batman: The Brave and the Bold +# S3BEWR, S3BPWR - Batman: The Brave and the Bold [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/S3BPWR.ini b/Data/Sys/GameSettings/S3BPWR.ini deleted file mode 100644 index cc4328ce0..000000000 --- a/Data/Sys/GameSettings/S3BPWR.ini +++ /dev/null @@ -1,32 +0,0 @@ -# S3BPWR - Batman: The Brave and the Bold - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/S59E01.ini b/Data/Sys/GameSettings/S59.ini similarity index 92% rename from Data/Sys/GameSettings/S59E01.ini rename to Data/Sys/GameSettings/S59.ini index 99aa08fb7..aceed179f 100644 --- a/Data/Sys/GameSettings/S59E01.ini +++ b/Data/Sys/GameSettings/S59.ini @@ -1,4 +1,4 @@ -# S59E01 - SAMURAI WARRIORS 3 +# S59E01, S59P01 - SAMURAI WARRIORS 3 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/S59P01.ini b/Data/Sys/GameSettings/S59P01.ini deleted file mode 100644 index 69880a289..000000000 --- a/Data/Sys/GameSettings/S59P01.ini +++ /dev/null @@ -1,26 +0,0 @@ -# S59P01 - SAMURAI WARRIORS 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -FastDepthCalc = False - diff --git a/Data/Sys/GameSettings/S72J01.ini b/Data/Sys/GameSettings/S72.ini similarity index 91% rename from Data/Sys/GameSettings/S72J01.ini rename to Data/Sys/GameSettings/S72.ini index 96ff851e7..df0acd656 100644 --- a/Data/Sys/GameSettings/S72J01.ini +++ b/Data/Sys/GameSettings/S72.ini @@ -1,4 +1,4 @@ -# S72J01 - Hoshi No Kirby: 20th Anniversary Edition +# S72E01, S72J01 - Kirby's Dream Collection Special Edition [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/S72E01.ini b/Data/Sys/GameSettings/S72E01.ini deleted file mode 100644 index 72af94491..000000000 --- a/Data/Sys/GameSettings/S72E01.ini +++ /dev/null @@ -1,36 +0,0 @@ -# S72E01 - Kirby's Dream Collection Special Edition - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 0 -EFBScale = -1 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/SB3E08.ini b/Data/Sys/GameSettings/SB3.ini similarity index 92% rename from Data/Sys/GameSettings/SB3E08.ini rename to Data/Sys/GameSettings/SB3.ini index 12279b1bc..2a7ee99c4 100644 --- a/Data/Sys/GameSettings/SB3E08.ini +++ b/Data/Sys/GameSettings/SB3.ini @@ -1,4 +1,4 @@ -# SB3E08 - Sengoku BASARA +# SB3E08, SB3J08, SB3P08 - Sengoku BASARA [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SB3J08.ini b/Data/Sys/GameSettings/SB3J08.ini deleted file mode 100644 index 8e42713ff..000000000 --- a/Data/Sys/GameSettings/SB3J08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SB3J08 - Sengoku BASARA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/SB3P08.ini b/Data/Sys/GameSettings/SB3P08.ini deleted file mode 100644 index b03062b44..000000000 --- a/Data/Sys/GameSettings/SB3P08.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SB3P08 - Sengoku BASARA - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/SBDJ08.ini b/Data/Sys/GameSettings/SBD.ini similarity index 89% rename from Data/Sys/GameSettings/SBDJ08.ini rename to Data/Sys/GameSettings/SBD.ini index d9de80600..5d18d2afe 100644 --- a/Data/Sys/GameSettings/SBDJ08.ini +++ b/Data/Sys/GameSettings/SBD.ini @@ -1,4 +1,4 @@ -# SBDJ08 - RESIDENT EVIL THE DARKSIDE CHRONICLES +# SBDE08, SBDJ08, SBDK08 - RESIDENT EVIL THE DARKSIDE CHRONICLES [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SBDE08.ini b/Data/Sys/GameSettings/SBDE08.ini deleted file mode 100644 index de0282347..000000000 --- a/Data/Sys/GameSettings/SBDE08.ini +++ /dev/null @@ -1,34 +0,0 @@ -# SBDE08 - RESIDENT EVIL THE DARKSIDE CHRONICLES - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SBDK08.ini b/Data/Sys/GameSettings/SBDK08.ini deleted file mode 100644 index df94feca0..000000000 --- a/Data/Sys/GameSettings/SBDK08.ini +++ /dev/null @@ -1,34 +0,0 @@ -# SBDK08 - RESIDENT EVIL THE DARKSIDE CHRONICLES - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/R4QP01.ini b/Data/Sys/GameSettings/SC4.ini similarity index 89% rename from Data/Sys/GameSettings/R4QP01.ini rename to Data/Sys/GameSettings/SC4.ini index 3ff3624af..d3771408c 100644 --- a/Data/Sys/GameSettings/R4QP01.ini +++ b/Data/Sys/GameSettings/SC4.ini @@ -1,4 +1,4 @@ -# R4QP01 - Mario Strikers Charged +# SC4E64, SC4P64 - LEGO Star Wars III: The Clone Wars [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SC4E64.ini b/Data/Sys/GameSettings/SC4E64.ini deleted file mode 100644 index a44eefca8..000000000 --- a/Data/Sys/GameSettings/SC4E64.ini +++ /dev/null @@ -1,29 +0,0 @@ -# SC4E64 - LEGO Star Wars III: The Clone Wars - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SC4P64.ini b/Data/Sys/GameSettings/SC4P64.ini deleted file mode 100644 index e6ec2487d..000000000 --- a/Data/Sys/GameSettings/SC4P64.ini +++ /dev/null @@ -1,29 +0,0 @@ -# SC4P64 - LEGO Star Wars III: The Clone Wars - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SC7P52.ini b/Data/Sys/GameSettings/SC7.ini similarity index 89% rename from Data/Sys/GameSettings/SC7P52.ini rename to Data/Sys/GameSettings/SC7.ini index e3c422d7f..f3e646a28 100644 --- a/Data/Sys/GameSettings/SC7P52.ini +++ b/Data/Sys/GameSettings/SC7.ini @@ -1,4 +1,4 @@ -# SC7P52 - Call of Duty: Black Ops +# SC7D52, SC7F52, SC7P52, SC7S52 - Call of Duty: Black Ops [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SC7D52.ini b/Data/Sys/GameSettings/SC7D52.ini deleted file mode 100644 index 28edc95fd..000000000 --- a/Data/Sys/GameSettings/SC7D52.ini +++ /dev/null @@ -1,29 +0,0 @@ -# SC7D52 - Call of Duty: Black Ops - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -MaxAnisotropy = 0 diff --git a/Data/Sys/GameSettings/SC7F52.ini b/Data/Sys/GameSettings/SC7F52.ini deleted file mode 100644 index 3238a9550..000000000 --- a/Data/Sys/GameSettings/SC7F52.ini +++ /dev/null @@ -1,29 +0,0 @@ -# SC7F52 - Call of Duty: Black Ops - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -MaxAnisotropy = 0 diff --git a/Data/Sys/GameSettings/SC7S52.ini b/Data/Sys/GameSettings/SC7S52.ini deleted file mode 100644 index 75da19843..000000000 --- a/Data/Sys/GameSettings/SC7S52.ini +++ /dev/null @@ -1,29 +0,0 @@ -# SC7S52 - Call of Duty: Black Ops - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -MaxAnisotropy = 0 diff --git a/Data/Sys/GameSettings/SC8E01.ini b/Data/Sys/GameSettings/SC8.ini similarity index 91% rename from Data/Sys/GameSettings/SC8E01.ini rename to Data/Sys/GameSettings/SC8.ini index b54fef231..2659bfdca 100644 --- a/Data/Sys/GameSettings/SC8E01.ini +++ b/Data/Sys/GameSettings/SC8.ini @@ -1,4 +1,4 @@ -# SC8E01 - Wii Play: Motion +# SC8E01, SC8J01, SC8P01 - Wii Play: Motion [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SC8J01.ini b/Data/Sys/GameSettings/SC8J01.ini deleted file mode 100644 index ce965c265..000000000 --- a/Data/Sys/GameSettings/SC8J01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SC8J01 - Wii Play: Motion - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/SC8P01.ini b/Data/Sys/GameSettings/SC8P01.ini deleted file mode 100644 index cad529e22..000000000 --- a/Data/Sys/GameSettings/SC8P01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SC8P01 - Wii Play: Motion - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/RBBJ18.ini b/Data/Sys/GameSettings/SCA.ini similarity index 93% rename from Data/Sys/GameSettings/RBBJ18.ini rename to Data/Sys/GameSettings/SCA.ini index 1116862b8..92d9d17cb 100644 --- a/Data/Sys/GameSettings/RBBJ18.ini +++ b/Data/Sys/GameSettings/SCA.ini @@ -1,4 +1,4 @@ -# RBBJ18 - Bomberman Land +# SCAE18, SCAJ18, SCAP18 - CALLING [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SCAE18.ini b/Data/Sys/GameSettings/SCAE18.ini deleted file mode 100644 index 453a75404..000000000 --- a/Data/Sys/GameSettings/SCAE18.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SCAE18 - CALLING - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/SCAJ18.ini b/Data/Sys/GameSettings/SCAJ18.ini deleted file mode 100644 index e00617c60..000000000 --- a/Data/Sys/GameSettings/SCAJ18.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SCAJ18 - CALLING Kuroki Chakushin - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/SCAP18.ini b/Data/Sys/GameSettings/SCAP18.ini deleted file mode 100644 index a176ce762..000000000 --- a/Data/Sys/GameSettings/SCAP18.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SCAP18 - CALLING - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/SCYE4Q.ini b/Data/Sys/GameSettings/SCY.ini similarity index 89% rename from Data/Sys/GameSettings/SCYE4Q.ini rename to Data/Sys/GameSettings/SCY.ini index d1a6e36bb..6027d0f25 100644 --- a/Data/Sys/GameSettings/SCYE4Q.ini +++ b/Data/Sys/GameSettings/SCY.ini @@ -1,4 +1,4 @@ -# SCYE4Q - Cars 2 +# SCYE4Q, SCYP4Q, SCYX4Q, SCYY4Q, SCYZ4Q - Cars 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SCYP4Q.ini b/Data/Sys/GameSettings/SCYP4Q.ini deleted file mode 100644 index 217d7da1d..000000000 --- a/Data/Sys/GameSettings/SCYP4Q.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SCYP4Q - Cars 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/SCYX4Q.ini b/Data/Sys/GameSettings/SCYX4Q.ini deleted file mode 100644 index 956afc5a8..000000000 --- a/Data/Sys/GameSettings/SCYX4Q.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SCYX4Q - Cars 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/SCYY4Q.ini b/Data/Sys/GameSettings/SCYY4Q.ini deleted file mode 100644 index 17f535a07..000000000 --- a/Data/Sys/GameSettings/SCYY4Q.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SCYY4Q - Cars 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/SCYZ4Q.ini b/Data/Sys/GameSettings/SCYZ4Q.ini deleted file mode 100644 index 29018bdd1..000000000 --- a/Data/Sys/GameSettings/SCYZ4Q.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SCYZ4Q - Cars 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/SD2J01.ini b/Data/Sys/GameSettings/SD2.ini similarity index 91% rename from Data/Sys/GameSettings/SD2J01.ini rename to Data/Sys/GameSettings/SD2.ini index d131b44b3..8140df3ec 100644 --- a/Data/Sys/GameSettings/SD2J01.ini +++ b/Data/Sys/GameSettings/SD2.ini @@ -1,4 +1,4 @@ -# SD2J01 - Just Dance 2 +# SD2E41, SD2J01, SD2P41, SD2Y41 - Just Dance 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SD2E41.ini b/Data/Sys/GameSettings/SD2E41.ini deleted file mode 100644 index aebd761b8..000000000 --- a/Data/Sys/GameSettings/SD2E41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SD2E41 - Just Dance 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Enhancements] -MaxAnisotropy = 0 - diff --git a/Data/Sys/GameSettings/SD2P41.ini b/Data/Sys/GameSettings/SD2P41.ini deleted file mode 100644 index 990ff3fbb..000000000 --- a/Data/Sys/GameSettings/SD2P41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SD2P41 - Just Dance 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Enhancements] -MaxAnisotropy = 0 - diff --git a/Data/Sys/GameSettings/SD2Y41.ini b/Data/Sys/GameSettings/SD2Y41.ini deleted file mode 100644 index 76d7038c9..000000000 --- a/Data/Sys/GameSettings/SD2Y41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SD2Y41 - Just Dance 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Enhancements] -MaxAnisotropy = 0 - diff --git a/Data/Sys/GameSettings/SDBP78.ini b/Data/Sys/GameSettings/SDB.ini similarity index 94% rename from Data/Sys/GameSettings/SDBP78.ini rename to Data/Sys/GameSettings/SDB.ini index 01cfa0464..527ca5837 100644 --- a/Data/Sys/GameSettings/SDBP78.ini +++ b/Data/Sys/GameSettings/SDB.ini @@ -1,4 +1,4 @@ -# SDBP78 - de Blob 2 +# SDBE78, SDBP78 - de Blob 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SDBE78.ini b/Data/Sys/GameSettings/SDBE78.ini deleted file mode 100644 index df471f4d0..000000000 --- a/Data/Sys/GameSettings/SDBE78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SDBE78 - de Blob 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SG8EG9.ini b/Data/Sys/GameSettings/SDM.ini similarity index 94% rename from Data/Sys/GameSettings/SG8EG9.ini rename to Data/Sys/GameSettings/SDM.ini index 53dc72291..91907867a 100644 --- a/Data/Sys/GameSettings/SG8EG9.ini +++ b/Data/Sys/GameSettings/SDM.ini @@ -1,4 +1,4 @@ -# SG8EG9 - Yogi Bear +# SDMEG9, SDMPAF - Despicable Me [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SDMEG9.ini b/Data/Sys/GameSettings/SDMEG9.ini deleted file mode 100644 index fc93a3e80..000000000 --- a/Data/Sys/GameSettings/SDMEG9.ini +++ /dev/null @@ -1,34 +0,0 @@ -# SDMEG9 - Despicable Me - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/SDNE41.ini b/Data/Sys/GameSettings/SDN.ini similarity index 94% rename from Data/Sys/GameSettings/SDNE41.ini rename to Data/Sys/GameSettings/SDN.ini index 500f76a98..495d0d1fb 100644 --- a/Data/Sys/GameSettings/SDNE41.ini +++ b/Data/Sys/GameSettings/SDN.ini @@ -1,4 +1,4 @@ -# SDNE41 - Just Dance +# SDNE41, SDNP41 - Just Dance [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SDNP41.ini b/Data/Sys/GameSettings/SDNP41.ini deleted file mode 100644 index 8d143dc9c..000000000 --- a/Data/Sys/GameSettings/SDNP41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SDNP41 - Just Dance - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 - -[Video_Enhancements] -MaxAnisotropy = 0 - diff --git a/Data/Sys/GameSettings/SDWE18.ini b/Data/Sys/GameSettings/SDW.ini similarity index 92% rename from Data/Sys/GameSettings/SDWE18.ini rename to Data/Sys/GameSettings/SDW.ini index e93421b86..3e0ce13b8 100644 --- a/Data/Sys/GameSettings/SDWE18.ini +++ b/Data/Sys/GameSettings/SDW.ini @@ -1,4 +1,4 @@ -# SDWE18 - A Shadow's Tale +# SDWE18, SDWJ18, SDWP18 - A Shadow's Tale [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SDWJ18.ini b/Data/Sys/GameSettings/SDWJ18.ini deleted file mode 100644 index 6702f2355..000000000 --- a/Data/Sys/GameSettings/SDWJ18.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SDWJ18 - Kage no Tou - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs efb to ram for proper shadows. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SDWP18.ini b/Data/Sys/GameSettings/SDWP18.ini deleted file mode 100644 index ed3c2ecbc..000000000 --- a/Data/Sys/GameSettings/SDWP18.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SDWP18 - A Shadow's Tale - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs efb to ram for proper shadows. -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SEAE69.ini b/Data/Sys/GameSettings/SEA.ini similarity index 90% rename from Data/Sys/GameSettings/SEAE69.ini rename to Data/Sys/GameSettings/SEA.ini index e8ec4c4a3..8f8f21b39 100644 --- a/Data/Sys/GameSettings/SEAE69.ini +++ b/Data/Sys/GameSettings/SEA.ini @@ -1,4 +1,4 @@ -# SEAE69 - EA Sports Active: More Workouts +# SEAE69, SEAP69 - EA Sports Active: More Workouts [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SEAP69.ini b/Data/Sys/GameSettings/SEAP69.ini deleted file mode 100644 index 918b2cd49..000000000 --- a/Data/Sys/GameSettings/SEAP69.ini +++ /dev/null @@ -1,28 +0,0 @@ -# SEAP69 - EA Sports Active: More Workouts - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - -[Video_Enhancements] -ForceFiltering = False - diff --git a/Data/Sys/GameSettings/SEMP4Q.ini b/Data/Sys/GameSettings/SEM.ini similarity index 89% rename from Data/Sys/GameSettings/SEMP4Q.ini rename to Data/Sys/GameSettings/SEM.ini index 0bf6ba1bd..e67c84396 100644 --- a/Data/Sys/GameSettings/SEMP4Q.ini +++ b/Data/Sys/GameSettings/SEM.ini @@ -1,4 +1,4 @@ -# SEMP4Q - Disney Epic Mickey +# SEME4Q, SEMJ01, SEMP4Q, SEMX4Q, SEMY4Q, SEMZ4Q - Disney Epic Mickey [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SEME4Q.ini b/Data/Sys/GameSettings/SEME4Q.ini deleted file mode 100644 index af28064eb..000000000 --- a/Data/Sys/GameSettings/SEME4Q.ini +++ /dev/null @@ -1,36 +0,0 @@ -# SEME4Q - Disney Epic Mickey - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Enable progressive scan if the game has boot issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 0 - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SEMJ01.ini b/Data/Sys/GameSettings/SEMJ01.ini deleted file mode 100644 index 2d908edcc..000000000 --- a/Data/Sys/GameSettings/SEMJ01.ini +++ /dev/null @@ -1,36 +0,0 @@ -# SEMJ01 - Disney Epic Mickey: Mickey Mouse and the Magic Brush - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Enable progressive scan if the game has boot issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 0 - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SEMX4Q.ini b/Data/Sys/GameSettings/SEMX4Q.ini deleted file mode 100644 index 1bbbc4fca..000000000 --- a/Data/Sys/GameSettings/SEMX4Q.ini +++ /dev/null @@ -1,36 +0,0 @@ -# SEMX4Q - Disney Epic Mickey - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Enable progressive scan if the game has boot issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 0 - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SEMY4Q.ini b/Data/Sys/GameSettings/SEMY4Q.ini deleted file mode 100644 index f76b0accf..000000000 --- a/Data/Sys/GameSettings/SEMY4Q.ini +++ /dev/null @@ -1,36 +0,0 @@ -# SEMY4Q - Disney Epic Mickey - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Enable progressive scan if the game has boot issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 0 - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SEMZ4Q.ini b/Data/Sys/GameSettings/SEMZ4Q.ini deleted file mode 100644 index 1f34b4a0b..000000000 --- a/Data/Sys/GameSettings/SEMZ4Q.ini +++ /dev/null @@ -1,36 +0,0 @@ -# SEMZ4Q - Disney Epic Mickey - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Enable progressive scan if the game has boot issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 0 - -[Video_Enhancements] -ForceFiltering = False - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SERE4Q.ini b/Data/Sys/GameSettings/SER.ini similarity index 89% rename from Data/Sys/GameSettings/SERE4Q.ini rename to Data/Sys/GameSettings/SER.ini index 527c7f4e4..70cfd1914 100644 --- a/Data/Sys/GameSettings/SERE4Q.ini +++ b/Data/Sys/GameSettings/SER.ini @@ -1,4 +1,4 @@ -# SERE4Q - Disney Epic Mickey 2: The Power of 2 +# SERE4Q, SERF4Q, SERP4Q - Disney Epic Mickey 2: The Power of 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SERF4Q.ini b/Data/Sys/GameSettings/SERF4Q.ini deleted file mode 100644 index 35aecc502..000000000 --- a/Data/Sys/GameSettings/SERF4Q.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SERF4Q - Disney Epic Mickey 2: The Power of 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Enable progressive scan if the game has boot issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/SERP4Q.ini b/Data/Sys/GameSettings/SERP4Q.ini deleted file mode 100644 index 9cf8859ec..000000000 --- a/Data/Sys/GameSettings/SERP4Q.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SERP4Q - Disney Epic Mickey 2: The Power of 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Enable progressive scan if the game has boot issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/SF8J01.ini b/Data/Sys/GameSettings/SF8.ini similarity index 91% rename from Data/Sys/GameSettings/SF8J01.ini rename to Data/Sys/GameSettings/SF8.ini index cb0c63a43..460e325c4 100644 --- a/Data/Sys/GameSettings/SF8J01.ini +++ b/Data/Sys/GameSettings/SF8.ini @@ -1,4 +1,4 @@ -# SF8J01 - Donkey Kong Country Returns +# SF8E01, SF8J01, SF8P01 - Donkey Kong Country Returns [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SF8E01.ini b/Data/Sys/GameSettings/SF8E01.ini deleted file mode 100644 index ca73bdf14..000000000 --- a/Data/Sys/GameSettings/SF8E01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SF8E01 - Donkey Kong Country Returns - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound crackling can be fixed by lle audio. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SF8P01.ini b/Data/Sys/GameSettings/SF8P01.ini deleted file mode 100644 index c9cc83b42..000000000 --- a/Data/Sys/GameSettings/SF8P01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SF8P01 - Donkey Kong Country Returns - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound crackling can be fixed by lle audio. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SFIE01.ini b/Data/Sys/GameSettings/SFI.ini similarity index 90% rename from Data/Sys/GameSettings/SFIE01.ini rename to Data/Sys/GameSettings/SFI.ini index 9b4220c76..a222c215f 100644 --- a/Data/Sys/GameSettings/SFIE01.ini +++ b/Data/Sys/GameSettings/SFI.ini @@ -1,4 +1,4 @@ -# SFIE01 - Mystery Case Files: The Malgrave Incident +# SFIE01, SFIP01 - Mystery Case Files: The Malgrave Incident [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SFIP01.ini b/Data/Sys/GameSettings/SFIP01.ini deleted file mode 100644 index 201278d20..000000000 --- a/Data/Sys/GameSettings/SFIP01.ini +++ /dev/null @@ -1,32 +0,0 @@ -# SFIP01 - Mystery Case Files: The Malgrave Incident - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real xfb for videos to show up. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/SDMPAF.ini b/Data/Sys/GameSettings/SG8.ini similarity index 95% rename from Data/Sys/GameSettings/SDMPAF.ini rename to Data/Sys/GameSettings/SG8.ini index 3031f4b50..91d8e1867 100644 --- a/Data/Sys/GameSettings/SDMPAF.ini +++ b/Data/Sys/GameSettings/SG8.ini @@ -1,4 +1,4 @@ -# SDMPAF - Despicable Me +# SG8EG9, SG8PAF - Yogi Bear [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SG8PAF.ini b/Data/Sys/GameSettings/SG8PAF.ini deleted file mode 100644 index 93f5bd5f5..000000000 --- a/Data/Sys/GameSettings/SG8PAF.ini +++ /dev/null @@ -1,34 +0,0 @@ -# SG8PAF - Yogi Bear - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/SILE78.ini b/Data/Sys/GameSettings/SIL.ini similarity index 93% rename from Data/Sys/GameSettings/SILE78.ini rename to Data/Sys/GameSettings/SIL.ini index 43b5426cf..311ef909b 100644 --- a/Data/Sys/GameSettings/SILE78.ini +++ b/Data/Sys/GameSettings/SIL.ini @@ -1,4 +1,4 @@ -# SILE78 - Worms Battle Islands +# SILE78, SILP78 - Worms Battle Islands [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SILP78.ini b/Data/Sys/GameSettings/SILP78.ini deleted file mode 100644 index 7e2d92984..000000000 --- a/Data/Sys/GameSettings/SILP78.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SILP78 - Worms Battle Islands - -[Core] -# Values set here will override the main dolphin settings. -SkipIdle = 0 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Idleskipping causes speed issues(menus,etc.) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SJBE52.ini b/Data/Sys/GameSettings/SJB.ini similarity index 94% rename from Data/Sys/GameSettings/SJBE52.ini rename to Data/Sys/GameSettings/SJB.ini index 52c60579a..41532c0a7 100644 --- a/Data/Sys/GameSettings/SJBE52.ini +++ b/Data/Sys/GameSettings/SJB.ini @@ -1,4 +1,4 @@ -# SJBE52 - GoldenEye007 +# SJBE52, SJBP52 - GoldenEye007 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SJBP52.ini b/Data/Sys/GameSettings/SJBP52.ini deleted file mode 100644 index cca6c14da..000000000 --- a/Data/Sys/GameSettings/SJBP52.ini +++ /dev/null @@ -1,32 +0,0 @@ -# SJBP52 - GoldenEye007 - -[Core] -# Values set here will override the main dolphin settings. -BlockMerging = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False - diff --git a/Data/Sys/GameSettings/SJDZ41.ini b/Data/Sys/GameSettings/SJD.ini similarity index 92% rename from Data/Sys/GameSettings/SJDZ41.ini rename to Data/Sys/GameSettings/SJD.ini index 2c36d6864..d8fd89e9f 100644 --- a/Data/Sys/GameSettings/SJDZ41.ini +++ b/Data/Sys/GameSettings/SJD.ini @@ -1,4 +1,4 @@ -# SJDP41 - Just Dance 3 +# SJDE41, SJDP41 - Just Dance 3 [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/SJDE41.ini b/Data/Sys/GameSettings/SJDE41.ini deleted file mode 100644 index 569690830..000000000 --- a/Data/Sys/GameSettings/SJDE41.ini +++ /dev/null @@ -1,20 +0,0 @@ -# SJDE41 - Just Dance 3 -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Enhancements] -MaxAnisotropy = 0 diff --git a/Data/Sys/GameSettings/SLSJ01.ini b/Data/Sys/GameSettings/SLS.ini similarity index 93% rename from Data/Sys/GameSettings/SLSJ01.ini rename to Data/Sys/GameSettings/SLS.ini index 268b72e37..c7b58561f 100644 --- a/Data/Sys/GameSettings/SLSJ01.ini +++ b/Data/Sys/GameSettings/SLS.ini @@ -1,4 +1,4 @@ -# SLSJ01 - THE LAST STORY +# SLSEXJ, SLSJ01, SLSP01 - THE LAST STORY [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SLSEXJ.ini b/Data/Sys/GameSettings/SLSEXJ.ini deleted file mode 100644 index 85a5ef6b5..000000000 --- a/Data/Sys/GameSettings/SLSEXJ.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SLSEXJ - THE LAST STORY - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/SLSP01.ini b/Data/Sys/GameSettings/SLSP01.ini deleted file mode 100644 index 57c5491c2..000000000 --- a/Data/Sys/GameSettings/SLSP01.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SLSP01 - THE LAST STORY - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/SMBE8P.ini b/Data/Sys/GameSettings/SMB.ini similarity index 89% rename from Data/Sys/GameSettings/SMBE8P.ini rename to Data/Sys/GameSettings/SMB.ini index ede055405..d75477b1d 100644 --- a/Data/Sys/GameSettings/SMBE8P.ini +++ b/Data/Sys/GameSettings/SMB.ini @@ -1,4 +1,4 @@ -# SMBE8P - SUPER MONKEY BALL STEP AND ROLL +# SMBE8P, SMBP8P - SUPER MONKEY BALL STEP AND ROLL [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SMBP8P.ini b/Data/Sys/GameSettings/SMBP8P.ini deleted file mode 100644 index 7069544b7..000000000 --- a/Data/Sys/GameSettings/SMBP8P.ini +++ /dev/null @@ -1,20 +0,0 @@ -# SMBP8P - SUPER MONKEY BALL STEP AND ROLL - -[Core] -# Values set here will override the main dolphin settings. -FPRF = True - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = disable dualcore, if there are (fifo) problems - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - diff --git a/Data/Sys/GameSettings/SMOE41.ini b/Data/Sys/GameSettings/SMO.ini similarity index 87% rename from Data/Sys/GameSettings/SMOE41.ini rename to Data/Sys/GameSettings/SMO.ini index 3b988c552..3d625662e 100644 --- a/Data/Sys/GameSettings/SMOE41.ini +++ b/Data/Sys/GameSettings/SMO.ini @@ -1,4 +1,4 @@ -# SMOE41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION +# SMOE41, SMOP41, SMOX41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SMOP41.ini b/Data/Sys/GameSettings/SMOP41.ini deleted file mode 100644 index 08f392504..000000000 --- a/Data/Sys/GameSettings/SMOP41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SMOP41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -MaxAnisotropy = 0 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/SMOX41.ini b/Data/Sys/GameSettings/SMOX41.ini deleted file mode 100644 index 65fc19612..000000000 --- a/Data/Sys/GameSettings/SMOX41.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SMOX41 - Michael Jackson The Experience: Walmart Edition - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -MaxAnisotropy = 0 - -[Video_Hacks] -EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/SN4.ini b/Data/Sys/GameSettings/SN4.ini new file mode 100644 index 000000000..a2cfe34b0 --- /dev/null +++ b/Data/Sys/GameSettings/SN4.ini @@ -0,0 +1,22 @@ +# SN4EDA, SN4JDA, SN4XGT - NARUTO SHIPPUDEN DRAGON BLADE CHRONICLES + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 + diff --git a/Data/Sys/GameSettings/SN4EDA.ini b/Data/Sys/GameSettings/SN4EDA.ini deleted file mode 100644 index 387881d41..000000000 --- a/Data/Sys/GameSettings/SN4EDA.ini +++ /dev/null @@ -1,22 +0,0 @@ -# SN4EDA - NARUTO SHIPPUDEN DRAGON BLADE CHRONICLES - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/SN4JDA.ini b/Data/Sys/GameSettings/SN4JDA.ini deleted file mode 100644 index 0392eb86c..000000000 --- a/Data/Sys/GameSettings/SN4JDA.ini +++ /dev/null @@ -1,22 +0,0 @@ -# SN4JDA - Naruto Shippuuden Ryujinki - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/SN4XGT.ini b/Data/Sys/GameSettings/SN4XGT.ini deleted file mode 100644 index 26708bc8d..000000000 --- a/Data/Sys/GameSettings/SN4XGT.ini +++ /dev/null @@ -1,22 +0,0 @@ -# SN4XGT - NARUTO SHIPPUDEN DRAGON BLADE CHRONICLES - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/SNCE8P.ini b/Data/Sys/GameSettings/SNC.ini similarity index 93% rename from Data/Sys/GameSettings/SNCE8P.ini rename to Data/Sys/GameSettings/SNC.ini index 69212b2c2..bc50a1971 100644 --- a/Data/Sys/GameSettings/SNCE8P.ini +++ b/Data/Sys/GameSettings/SNC.ini @@ -1,4 +1,4 @@ -# SNCE8P - SONIC COLOURS +# SNCE8P, SNCJ8P, SNCP8P - SONIC COLOURS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SNCJ8P.ini b/Data/Sys/GameSettings/SNCJ8P.ini deleted file mode 100644 index b4f823744..000000000 --- a/Data/Sys/GameSettings/SNCJ8P.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SNCJ8P - SONIC COLOURS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level. -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 - -[Video_Hacks] -EFBAccessEnable = False - diff --git a/Data/Sys/GameSettings/SNCP8P.ini b/Data/Sys/GameSettings/SNCP8P.ini deleted file mode 100644 index ec16ea3fe..000000000 --- a/Data/Sys/GameSettings/SNCP8P.ini +++ /dev/null @@ -1,33 +0,0 @@ -# SNCP8P - SONIC COLOURS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level. -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -EFBScale = -1 - -[Video_Hacks] -EFBAccessEnable = False - diff --git a/Data/Sys/GameSettings/SNYEVZ.ini b/Data/Sys/GameSettings/SNY.ini similarity index 77% rename from Data/Sys/GameSettings/SNYEVZ.ini rename to Data/Sys/GameSettings/SNY.ini index baf1d3011..951ba5b9e 100644 --- a/Data/Sys/GameSettings/SNYEVZ.ini +++ b/Data/Sys/GameSettings/SNY.ini @@ -1,4 +1,4 @@ -# SNYEVZ - Monster High: 13 Wishes +# SNYEVZ, SNYPVZ - Monster High: 13 Wishes [Core] diff --git a/Data/Sys/GameSettings/SNYPVZ.ini b/Data/Sys/GameSettings/SNYPVZ.ini deleted file mode 100644 index 2f5a68910..000000000 --- a/Data/Sys/GameSettings/SNYPVZ.ini +++ /dev/null @@ -1,17 +0,0 @@ -# SNYPVZ - Monster High: 13 Wishes - -[Core] - -[EmuState] -EmulationStateId = 4 -EmulationIssues = - -[OnFrame] - -[ActionReplay] - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/SOJE41.ini b/Data/Sys/GameSettings/SOJ.ini similarity index 92% rename from Data/Sys/GameSettings/SOJE41.ini rename to Data/Sys/GameSettings/SOJ.ini index 26569bc65..f7f61401f 100644 --- a/Data/Sys/GameSettings/SOJE41.ini +++ b/Data/Sys/GameSettings/SOJ.ini @@ -1,4 +1,4 @@ -# SOJE41 - Rayman Origins +# SOJE41, SOJP41 - Rayman Origins [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SOJP41.ini b/Data/Sys/GameSettings/SOJP41.ini deleted file mode 100644 index 1182d621b..000000000 --- a/Data/Sys/GameSettings/SOJP41.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SOJP41 - Rayman Origins - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/SSTEG9.ini b/Data/Sys/GameSettings/SOS.ini similarity index 90% rename from Data/Sys/GameSettings/SSTEG9.ini rename to Data/Sys/GameSettings/SOS.ini index 513d448ab..00d0ea761 100644 --- a/Data/Sys/GameSettings/SSTEG9.ini +++ b/Data/Sys/GameSettings/SOS.ini @@ -1,4 +1,4 @@ -# SSTEG9 - Kid Adventures Sky Captain +# SOSEG9, SOSPAF - Turbo: Super Stunt Squad [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SOSEG9.ini b/Data/Sys/GameSettings/SOSEG9.ini deleted file mode 100644 index 422a99ab9..000000000 --- a/Data/Sys/GameSettings/SOSEG9.ini +++ /dev/null @@ -1,24 +0,0 @@ -# SOSEG9 - Turbo: Super Stunt Squad - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/SOSPAF.ini b/Data/Sys/GameSettings/SOSPAF.ini deleted file mode 100644 index 8e6caa5aa..000000000 --- a/Data/Sys/GameSettings/SOSPAF.ini +++ /dev/null @@ -1,24 +0,0 @@ -# SOSPAF - Turbo: Super Stunt Squad - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/SPDE52.ini b/Data/Sys/GameSettings/SPD.ini similarity index 94% rename from Data/Sys/GameSettings/SPDE52.ini rename to Data/Sys/GameSettings/SPD.ini index bb6d18c46..ba9652262 100644 --- a/Data/Sys/GameSettings/SPDE52.ini +++ b/Data/Sys/GameSettings/SPD.ini @@ -1,4 +1,4 @@ -# SPDE52 - Spider-Man™: SD +# SPDE52, SPDP52 - Spider-Man™: SD [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SPDP52.ini b/Data/Sys/GameSettings/SPDP52.ini deleted file mode 100644 index bc7e3480e..000000000 --- a/Data/Sys/GameSettings/SPDP52.ini +++ /dev/null @@ -1,34 +0,0 @@ -# SPDP52 - Spider-Man™: SD - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Graphic glitches. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 1 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = 0.5 -PH_ZFar = 0.5 - -[Video_Enhancements] -MaxAnisotropy = 0 - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SPV.ini b/Data/Sys/GameSettings/SPV.ini new file mode 100644 index 000000000..1f79044b0 --- /dev/null +++ b/Data/Sys/GameSettings/SPV.ini @@ -0,0 +1,30 @@ +# SPVEA4, SPVPA4, SPVXA4, SPVYA4 - Pro Evolution Soccer 2011 + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +SafeTextureCacheColorSamples = 512 + diff --git a/Data/Sys/GameSettings/SPVEA4.ini b/Data/Sys/GameSettings/SPVEA4.ini deleted file mode 100644 index d8962fe12..000000000 --- a/Data/Sys/GameSettings/SPVEA4.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SPVEA4 - Pro Evolution Soccer 2011 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SPVPA4.ini b/Data/Sys/GameSettings/SPVPA4.ini deleted file mode 100644 index 5c46af099..000000000 --- a/Data/Sys/GameSettings/SPVPA4.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SPVPA4 - Pro Evolution Soccer 2011 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SPVXA4.ini b/Data/Sys/GameSettings/SPVXA4.ini deleted file mode 100644 index 8a7c373c9..000000000 --- a/Data/Sys/GameSettings/SPVXA4.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SPVXA4 - Pro Evolution Soccer 2011 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SPVYA4.ini b/Data/Sys/GameSettings/SPVYA4.ini deleted file mode 100644 index 76c289de2..000000000 --- a/Data/Sys/GameSettings/SPVYA4.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SPVYA4 - Pro Evolution Soccer 2011 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SQM.ini b/Data/Sys/GameSettings/SQM.ini new file mode 100644 index 000000000..03580af83 --- /dev/null +++ b/Data/Sys/GameSettings/SQM.ini @@ -0,0 +1,27 @@ +# SQME52, SQMP52 - Spider-Man: Edge of Time + +[Core] +# Values set here will override the main dolphin settings. + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + diff --git a/Data/Sys/GameSettings/SQME52.ini b/Data/Sys/GameSettings/SQME52.ini deleted file mode 100644 index b56c09676..000000000 --- a/Data/Sys/GameSettings/SQME52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SQME52 - Spider-Man: Edge of Time - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/SQMP52.ini b/Data/Sys/GameSettings/SQMP52.ini deleted file mode 100644 index 4883db1e3..000000000 --- a/Data/Sys/GameSettings/SQMP52.ini +++ /dev/null @@ -1,27 +0,0 @@ -# SQMP52 - Spider-Man: Edge of Time - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/R5VE41.ini b/Data/Sys/GameSettings/SRQ.ini similarity index 93% rename from Data/Sys/GameSettings/R5VE41.ini rename to Data/Sys/GameSettings/SRQ.ini index aede7537b..e00621d10 100644 --- a/Data/Sys/GameSettings/R5VE41.ini +++ b/Data/Sys/GameSettings/SRQ.ini @@ -1,4 +1,4 @@ -# R5VE41 - James Cameron's AVATAR +# SRQE41, SRQP41 - Racquet Sports [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SRQE41.ini b/Data/Sys/GameSettings/SRQE41.ini deleted file mode 100644 index 6cc354013..000000000 --- a/Data/Sys/GameSettings/SRQE41.ini +++ /dev/null @@ -1,29 +0,0 @@ -# SRQE41 - Racquet Sports - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SRQP41.ini b/Data/Sys/GameSettings/SRQP41.ini deleted file mode 100644 index 22108772c..000000000 --- a/Data/Sys/GameSettings/SRQP41.ini +++ /dev/null @@ -1,29 +0,0 @@ -# SRQP41 - Racquet Sports - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] - diff --git a/Data/Sys/GameSettings/SSQP01.ini b/Data/Sys/GameSettings/SSQ.ini similarity index 93% rename from Data/Sys/GameSettings/SSQP01.ini rename to Data/Sys/GameSettings/SSQ.ini index 9fd71d21e..d8b4a813b 100644 --- a/Data/Sys/GameSettings/SSQP01.ini +++ b/Data/Sys/GameSettings/SSQ.ini @@ -1,4 +1,4 @@ -# SSQP01 - Mario Party 9 +# SSQE01, SSQJ01, SSQP01 - Mario Party 9 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SSQE01.ini b/Data/Sys/GameSettings/SSQE01.ini deleted file mode 100644 index 1ea6747e2..000000000 --- a/Data/Sys/GameSettings/SSQE01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SSQE01 - Mario Party 9 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Flinger Painting minigame needs EFB to RAM to function properly. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SSQJ01.ini b/Data/Sys/GameSettings/SSQJ01.ini deleted file mode 100644 index 0a65f7508..000000000 --- a/Data/Sys/GameSettings/SSQJ01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SSQJ01 - Mario Party 9 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = Flinger Painting minigame needs EFB to RAM to function properly. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SSRE20.ini b/Data/Sys/GameSettings/SSR.ini similarity index 92% rename from Data/Sys/GameSettings/SSRE20.ini rename to Data/Sys/GameSettings/SSR.ini index 5b449ff17..3491d7196 100644 --- a/Data/Sys/GameSettings/SSRE20.ini +++ b/Data/Sys/GameSettings/SSR.ini @@ -1,4 +1,4 @@ -# SSRE20 - Wild West Shootout +# SSRE20, SSRPXT - Wild West Shootout [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SSRPXT.ini b/Data/Sys/GameSettings/SSRPXT.ini deleted file mode 100644 index b5d2828d5..000000000 --- a/Data/Sys/GameSettings/SSRPXT.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SSRPXT - Wild West Shootout - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = True - diff --git a/Data/Sys/GameSettings/SSTPY5.ini b/Data/Sys/GameSettings/SST.ini similarity index 90% rename from Data/Sys/GameSettings/SSTPY5.ini rename to Data/Sys/GameSettings/SST.ini index b52daca74..832f97bbe 100644 --- a/Data/Sys/GameSettings/SSTPY5.ini +++ b/Data/Sys/GameSettings/SST.ini @@ -1,4 +1,4 @@ -# SSTPY5 - Stunt Flyer: Hero of the Skies +# SSTEG9, SSTPY5 - Kid Adventures Sky Captain [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/STKE08.ini b/Data/Sys/GameSettings/STK.ini similarity index 86% rename from Data/Sys/GameSettings/STKE08.ini rename to Data/Sys/GameSettings/STK.ini index e7932aeab..f90b1b42f 100644 --- a/Data/Sys/GameSettings/STKE08.ini +++ b/Data/Sys/GameSettings/STK.ini @@ -1,4 +1,4 @@ -# STKE08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS +# STKE08, STKJ08, STKP08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/STKJ08.ini b/Data/Sys/GameSettings/STKJ08.ini deleted file mode 100644 index 215a6747f..000000000 --- a/Data/Sys/GameSettings/STKJ08.ini +++ /dev/null @@ -1,22 +0,0 @@ -# STKJ08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Disable GC controllers if you want to use wiimote(r6590) -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/STKP08.ini b/Data/Sys/GameSettings/STKP08.ini deleted file mode 100644 index d9f404674..000000000 --- a/Data/Sys/GameSettings/STKP08.ini +++ /dev/null @@ -1,22 +0,0 @@ -# STKP08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Disable GC controllers if you want to use wiimote(r6590) -EmulationStateId = 5 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/STSE4Q.ini b/Data/Sys/GameSettings/STS.ini similarity index 88% rename from Data/Sys/GameSettings/STSE4Q.ini rename to Data/Sys/GameSettings/STS.ini index 812578987..685f93123 100644 --- a/Data/Sys/GameSettings/STSE4Q.ini +++ b/Data/Sys/GameSettings/STS.ini @@ -1,4 +1,4 @@ -# STSE4Q - Toy Story 3 +# STSE4Q, STSP4Q, STSX4Q, STSY4Q, STSZ4Q - Toy Story 3 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/STSP4Q.ini b/Data/Sys/GameSettings/STSP4Q.ini deleted file mode 100644 index 19577fd98..000000000 --- a/Data/Sys/GameSettings/STSP4Q.ini +++ /dev/null @@ -1,24 +0,0 @@ -# STSP4Q - Toy Story 3 - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/STSX4Q.ini b/Data/Sys/GameSettings/STSX4Q.ini deleted file mode 100644 index 16b852875..000000000 --- a/Data/Sys/GameSettings/STSX4Q.ini +++ /dev/null @@ -1,24 +0,0 @@ -# STSX4Q - Toy Story 3 - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/STSY4Q.ini b/Data/Sys/GameSettings/STSY4Q.ini deleted file mode 100644 index 60c064eac..000000000 --- a/Data/Sys/GameSettings/STSY4Q.ini +++ /dev/null @@ -1,24 +0,0 @@ -# STSY4Q - Toy Story 3 - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/STSZ4Q.ini b/Data/Sys/GameSettings/STSZ4Q.ini deleted file mode 100644 index 149f1ba06..000000000 --- a/Data/Sys/GameSettings/STSZ4Q.ini +++ /dev/null @@ -1,24 +0,0 @@ -# STSZ4Q - Toy Story 3: Toy Box Special Edition - -[Core] -# Values set here will override the main dolphin settings. -MMU = 1 - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 3 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/SU7PAF.ini b/Data/Sys/GameSettings/SU7.ini similarity index 84% rename from Data/Sys/GameSettings/SU7PAF.ini rename to Data/Sys/GameSettings/SU7.ini index d5186e839..9cb04614f 100644 --- a/Data/Sys/GameSettings/SU7PAF.ini +++ b/Data/Sys/GameSettings/SU7.ini @@ -1,4 +1,4 @@ -# SU7PAF - RISE OF THE GUARDIANS +# SU7EG9, SU7PAF - RISE OF THE GUARDIANS [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/SU7EG9.ini b/Data/Sys/GameSettings/SU7EG9.ini deleted file mode 100644 index 3c376bc0f..000000000 --- a/Data/Sys/GameSettings/SU7EG9.ini +++ /dev/null @@ -1,17 +0,0 @@ -# SU7EG9 - RISE OF THE GUARDIANS -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/SUKE01.ini b/Data/Sys/GameSettings/SUK.ini similarity index 93% rename from Data/Sys/GameSettings/SUKE01.ini rename to Data/Sys/GameSettings/SUK.ini index a49d252c1..fd55d0812 100644 --- a/Data/Sys/GameSettings/SUKE01.ini +++ b/Data/Sys/GameSettings/SUK.ini @@ -1,4 +1,4 @@ -# SUKE01 - Kirby Wii +# SUKE01, SUKJ01, SUKP01 - Kirby Wii [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SUKJ01.ini b/Data/Sys/GameSettings/SUKJ01.ini deleted file mode 100644 index bd2a758de..000000000 --- a/Data/Sys/GameSettings/SUKJ01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SUKJ01 - Hoshi no Kirby Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Some minigames need XFB to work. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/SUKP01.ini b/Data/Sys/GameSettings/SUKP01.ini deleted file mode 100644 index 4f935e080..000000000 --- a/Data/Sys/GameSettings/SUKP01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SUKP01 - Kirby's Adventure Wii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Some minigames need XFB to work. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False - diff --git a/Data/Sys/GameSettings/SVBP52.ini b/Data/Sys/GameSettings/SVB.ini similarity index 94% rename from Data/Sys/GameSettings/SVBP52.ini rename to Data/Sys/GameSettings/SVB.ini index d95eee7ab..b3b119cda 100644 --- a/Data/Sys/GameSettings/SVBP52.ini +++ b/Data/Sys/GameSettings/SVB.ini @@ -1,4 +1,4 @@ -# SVBP52 - Battleship +# SVBE52, SVBP52 - Battleship [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SVBE52.ini b/Data/Sys/GameSettings/SVBE52.ini deleted file mode 100644 index c06b73169..000000000 --- a/Data/Sys/GameSettings/SVBE52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SVBE52 - Battleship - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/R4EE01.ini b/Data/Sys/GameSettings/SVM.ini similarity index 91% rename from Data/Sys/GameSettings/R4EE01.ini rename to Data/Sys/GameSettings/SVM.ini index e57029550..2192bac6a 100644 --- a/Data/Sys/GameSettings/R4EE01.ini +++ b/Data/Sys/GameSettings/SVM.ini @@ -1,4 +1,4 @@ -# R4EE01 - Endless Ocean Blue World +# SVME01, SVMJ01, SVMP01 - super mario collection [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SVME01.ini b/Data/Sys/GameSettings/SVME01.ini deleted file mode 100644 index 24a497758..000000000 --- a/Data/Sys/GameSettings/SVME01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SVME01 - super mario collection - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SVMJ01.ini b/Data/Sys/GameSettings/SVMJ01.ini deleted file mode 100644 index 9dbc817af..000000000 --- a/Data/Sys/GameSettings/SVMJ01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SVMJ01 - super mario collection - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SVMP01.ini b/Data/Sys/GameSettings/SVMP01.ini deleted file mode 100644 index 0d13c2335..000000000 --- a/Data/Sys/GameSettings/SVMP01.ini +++ /dev/null @@ -1,31 +0,0 @@ -# SVMP01 - Super Mario All-Stars : 25th Anniversary Edition - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True - diff --git a/Data/Sys/GameSettings/SVXE52.ini b/Data/Sys/GameSettings/SVX.ini similarity index 88% rename from Data/Sys/GameSettings/SVXE52.ini rename to Data/Sys/GameSettings/SVX.ini index 9919563f7..946267483 100644 --- a/Data/Sys/GameSettings/SVXE52.ini +++ b/Data/Sys/GameSettings/SVX.ini @@ -1,4 +1,4 @@ -# SVXE52 - Skylanders: Swap Force +# SVXE52, SVXF52, SVXI52, SVXP52, SVXY52 - Skylanders: Swap Force [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SVXF52.ini b/Data/Sys/GameSettings/SVXF52.ini deleted file mode 100644 index fa5630a28..000000000 --- a/Data/Sys/GameSettings/SVXF52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SVXF52 - Skylanders: Swap Force - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/SVXI52.ini b/Data/Sys/GameSettings/SVXI52.ini deleted file mode 100644 index 148d4727c..000000000 --- a/Data/Sys/GameSettings/SVXI52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SVXI52 - Skylanders: Swap Force - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/SVXP52.ini b/Data/Sys/GameSettings/SVXP52.ini deleted file mode 100644 index 48c150024..000000000 --- a/Data/Sys/GameSettings/SVXP52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SVXP52 - Skylanders: Swap Force - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/SVXY52.ini b/Data/Sys/GameSettings/SVXY52.ini deleted file mode 100644 index 55a2f3a0f..000000000 --- a/Data/Sys/GameSettings/SVXY52.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SVXY52 - Skylanders: Swap Force - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/SVZPVZ.ini b/Data/Sys/GameSettings/SVZ.ini similarity index 89% rename from Data/Sys/GameSettings/SVZPVZ.ini rename to Data/Sys/GameSettings/SVZ.ini index cf3783bb0..afc023aed 100644 --- a/Data/Sys/GameSettings/SVZPVZ.ini +++ b/Data/Sys/GameSettings/SVZ.ini @@ -1,4 +1,4 @@ -# SVZPVZ - How to Train Your Dragon 2 +# SVZEVZ, SVZPVZ - How to Train Your Dragon 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SVZEVZ.ini b/Data/Sys/GameSettings/SVZEVZ.ini deleted file mode 100644 index ba04d5324..000000000 --- a/Data/Sys/GameSettings/SVZEVZ.ini +++ /dev/null @@ -1,22 +0,0 @@ -# SVZEVZ - How to Train Your Dragon 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video_Settings] -UseXFB = True -UseRealXFB = False diff --git a/Data/Sys/GameSettings/R84J99.ini b/Data/Sys/GameSettings/SX3.ini similarity index 93% rename from Data/Sys/GameSettings/R84J99.ini rename to Data/Sys/GameSettings/SX3.ini index 37e755acd..90d4332da 100644 --- a/Data/Sys/GameSettings/R84J99.ini +++ b/Data/Sys/GameSettings/SX3.ini @@ -1,4 +1,4 @@ -# R84J99 - Bokujo for Wii +# SX3J01, SX3P01 - Pandora s Tower [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SX3J01.ini b/Data/Sys/GameSettings/SX3J01.ini deleted file mode 100644 index 9cf7a276e..000000000 --- a/Data/Sys/GameSettings/SX3J01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SX3J01 - Pandora s Tower - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/SX3P01.ini b/Data/Sys/GameSettings/SX3P01.ini deleted file mode 100644 index df783f97e..000000000 --- a/Data/Sys/GameSettings/SX3P01.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SX3P01 - Pandora s Tower - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -SafeTextureCacheColorSamples = 0 - diff --git a/Data/Sys/GameSettings/SX7E52.ini b/Data/Sys/GameSettings/SX7.ini similarity index 90% rename from Data/Sys/GameSettings/SX7E52.ini rename to Data/Sys/GameSettings/SX7.ini index f6e5901ec..1dea6c236 100644 --- a/Data/Sys/GameSettings/SX7E52.ini +++ b/Data/Sys/GameSettings/SX7.ini @@ -1,4 +1,4 @@ -# SX7E52 - Teenage Mutant Ninja Turtles +# SX7E52, SX7P52 - Teenage Mutant Ninja Turtles [Core] # Values set here will override the main Dolphin settings. diff --git a/Data/Sys/GameSettings/SX7P52.ini b/Data/Sys/GameSettings/SX7P52.ini deleted file mode 100644 index 92760ed04..000000000 --- a/Data/Sys/GameSettings/SX7P52.ini +++ /dev/null @@ -1,25 +0,0 @@ -# SX7P52 - Teenage Mutant Ninja Turtles - -[Core] -# Values set here will override the main Dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] - -[Video_Settings] -UseXFB = True -UseRealXFB = False -SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/SXCE52.ini b/Data/Sys/GameSettings/SXC.ini similarity index 92% rename from Data/Sys/GameSettings/SXCE52.ini rename to Data/Sys/GameSettings/SXC.ini index 1e4f1bd79..a5a074f6e 100644 --- a/Data/Sys/GameSettings/SXCE52.ini +++ b/Data/Sys/GameSettings/SXC.ini @@ -1,4 +1,4 @@ -# SXCE52 - Guitar Hero Smash Hits +# SXCE52, SXCP52 - Guitar Hero Smash Hits [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SXCP52.ini b/Data/Sys/GameSettings/SXCP52.ini deleted file mode 100644 index 052a5bdd9..000000000 --- a/Data/Sys/GameSettings/SXCP52.ini +++ /dev/null @@ -1,25 +0,0 @@ -# SXCP52 - Guitar Hero Smash Hits - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Create a quitar profile and use that for controls instead of wiimote controls(r6575) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - -[Video_Settings] -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/GameSettings/SZAE69.ini b/Data/Sys/GameSettings/SZA.ini similarity index 93% rename from Data/Sys/GameSettings/SZAE69.ini rename to Data/Sys/GameSettings/SZA.ini index 680a8cf26..e652d8401 100644 --- a/Data/Sys/GameSettings/SZAE69.ini +++ b/Data/Sys/GameSettings/SZA.ini @@ -1,4 +1,4 @@ -# SZAE69 - Rock Band 2 +# SZAE69, SZAP69 - Rock Band 2 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SZAP69.ini b/Data/Sys/GameSettings/SZAP69.ini deleted file mode 100644 index 91c013755..000000000 --- a/Data/Sys/GameSettings/SZAP69.ini +++ /dev/null @@ -1,22 +0,0 @@ -# SZAP69 - Rock Band 2 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Config and use the quitar and drums, wiimote asks for a microphone otherwise.(r6575) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/SZBE69.ini b/Data/Sys/GameSettings/SZB.ini similarity index 95% rename from Data/Sys/GameSettings/SZBE69.ini rename to Data/Sys/GameSettings/SZB.ini index bb9e1efc4..b0d5e2562 100644 --- a/Data/Sys/GameSettings/SZBE69.ini +++ b/Data/Sys/GameSettings/SZB.ini @@ -1,4 +1,4 @@ -# SZBE69 - Rock Band 3 +# SZBE69, SZBP69 - Rock Band 3 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/SZBP69.ini b/Data/Sys/GameSettings/SZBP69.ini deleted file mode 100644 index c71298478..000000000 --- a/Data/Sys/GameSettings/SZBP69.ini +++ /dev/null @@ -1,30 +0,0 @@ -# SZBP69 - Rock Band 3 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = If emu is running less than 100% it's EXTREMELY hard to hit notes. No mic, keyboard, or Pro instrument support yet. - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Enhancements] -ForceFiltering = False - diff --git a/Data/Sys/GameSettings/UGPE01.ini b/Data/Sys/GameSettings/UGP.ini similarity index 89% rename from Data/Sys/GameSettings/UGPE01.ini rename to Data/Sys/GameSettings/UGP.ini index 95dcd43c1..f8d90a489 100644 --- a/Data/Sys/GameSettings/UGPE01.ini +++ b/Data/Sys/GameSettings/UGP.ini @@ -1,4 +1,4 @@ -# UGPE01 - Game Boy Player Start-up Disc for US +# UGPE01, UGPP01 - Game Boy Player Start-up Disc for US [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/UGPP01.ini b/Data/Sys/GameSettings/UGPP01.ini deleted file mode 100644 index f5ec6ffb8..000000000 --- a/Data/Sys/GameSettings/UGPP01.ini +++ /dev/null @@ -1,27 +0,0 @@ -# UGPP01 - GAME BOY PLAYER - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = No GameBoy Player Device (r7574) - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/G4BE08.ini b/Data/Sys/GameSettings/WDM.ini similarity index 90% rename from Data/Sys/GameSettings/G4BE08.ini rename to Data/Sys/GameSettings/WDM.ini index cd4bf707e..c71e2ae8b 100644 --- a/Data/Sys/GameSettings/G4BE08.ini +++ b/Data/Sys/GameSettings/WDM.ini @@ -1,4 +1,4 @@ -# G4BE08 - resident evil 4 game disc 1 +# WDME01, WDMP01 - Dr. Mario Online Rx [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/WDME01.ini b/Data/Sys/GameSettings/WDME01.ini deleted file mode 100644 index badf4ea31..000000000 --- a/Data/Sys/GameSettings/WDME01.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WDME01 - Dr. Mario Online Rx - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/WDMP01.ini b/Data/Sys/GameSettings/WDMP01.ini deleted file mode 100644 index 78588cb78..000000000 --- a/Data/Sys/GameSettings/WDMP01.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WDMP01 - Dr. Mario & Germ Buster - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/GISP36.ini b/Data/Sys/GameSettings/WGD.ini similarity index 91% rename from Data/Sys/GameSettings/GISP36.ini rename to Data/Sys/GameSettings/WGD.ini index a2da38262..6a6b59596 100644 --- a/Data/Sys/GameSettings/GISP36.ini +++ b/Data/Sys/GameSettings/WGD.ini @@ -1,8 +1,7 @@ -# GISP36 - Second Sight +# WGDEA4, WGDPA4 - GRADIUS REBIRTH [Core] # Values set here will override the main dolphin settings. -MMU = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/WGDEA4.ini b/Data/Sys/GameSettings/WGDEA4.ini deleted file mode 100644 index 8ab3ece63..000000000 --- a/Data/Sys/GameSettings/WGDEA4.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WGDEA4 - GRADIUS REBIRTH - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/WGDPA4.ini b/Data/Sys/GameSettings/WGDPA4.ini deleted file mode 100644 index b4bbf2f90..000000000 --- a/Data/Sys/GameSettings/WGDPA4.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WGDPA4 - GRADIUS REBIRTH - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/RSPE01.ini b/Data/Sys/GameSettings/WGO.ini similarity index 92% rename from Data/Sys/GameSettings/RSPE01.ini rename to Data/Sys/GameSettings/WGO.ini index 87ee60228..f4ee79439 100644 --- a/Data/Sys/GameSettings/RSPE01.ini +++ b/Data/Sys/GameSettings/WGO.ini @@ -1,4 +1,4 @@ -# RSPE01 - Wii Sports +# WGOEWG, WGOPWG - World of Goo [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/WGOEWG.ini b/Data/Sys/GameSettings/WGOEWG.ini deleted file mode 100644 index 91e3c1cc2..000000000 --- a/Data/Sys/GameSettings/WGOEWG.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WGOEWG - World of Goo - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/WGSE08.ini b/Data/Sys/GameSettings/WGS.ini similarity index 92% rename from Data/Sys/GameSettings/WGSE08.ini rename to Data/Sys/GameSettings/WGS.ini index e6e02e3c4..469dd73e8 100644 --- a/Data/Sys/GameSettings/WGSE08.ini +++ b/Data/Sys/GameSettings/WGS.ini @@ -1,4 +1,4 @@ -# WGSE08 - PWAA Ace Attorney +# WGSE08, WGSP08 - PWAA Ace Attorney [Core] # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/WGSP08.ini b/Data/Sys/GameSettings/WGSP08.ini deleted file mode 100644 index 8bf5201a6..000000000 --- a/Data/Sys/GameSettings/WGSP08.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WGSP08 - PWAA Ace Attorney -[Core] -# Values set here will override the main dolphin settings. -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnLoad] -# Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Hacks] -EFBEmulateFormatChanges = True -[Video_Settings] -SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameSettings/WHWEFJ.ini b/Data/Sys/GameSettings/WHW.ini similarity index 90% rename from Data/Sys/GameSettings/WHWEFJ.ini rename to Data/Sys/GameSettings/WHW.ini index f281b7133..7857ae007 100644 --- a/Data/Sys/GameSettings/WHWEFJ.ini +++ b/Data/Sys/GameSettings/WHW.ini @@ -1,4 +1,4 @@ -# WHWEFJ - HoopWorld +# WHWEFJ, WHWPFJ - HoopWorld [Core] [EmuState] EmulationStateId = 4 diff --git a/Data/Sys/GameSettings/WHWPFJ.ini b/Data/Sys/GameSettings/WHWPFJ.ini deleted file mode 100644 index afaf2267c..000000000 --- a/Data/Sys/GameSettings/WHWPFJ.ini +++ /dev/null @@ -1,19 +0,0 @@ -# WHWPFJ - HoopWorld -[Core] -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Video_Settings] -SafeTextureCacheColorSamples = 0 -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/WGOPWG.ini b/Data/Sys/GameSettings/WKT.ini similarity index 91% rename from Data/Sys/GameSettings/WGOPWG.ini rename to Data/Sys/GameSettings/WKT.ini index d7a1f3d9b..2390984a9 100644 --- a/Data/Sys/GameSettings/WGOPWG.ini +++ b/Data/Sys/GameSettings/WKT.ini @@ -1,4 +1,4 @@ -# WGOPWG - World of Goo +# WKTJA4, WKTPA4 - CONTRA REBIRTH [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/WKTJA4.ini b/Data/Sys/GameSettings/WKTJA4.ini deleted file mode 100644 index cead9f658..000000000 --- a/Data/Sys/GameSettings/WKTJA4.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WKTJA4 - CONTRA REBIRTH - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/WKTPA4.ini b/Data/Sys/GameSettings/WKTPA4.ini deleted file mode 100644 index f2efe775a..000000000 --- a/Data/Sys/GameSettings/WKTPA4.ini +++ /dev/null @@ -1,22 +0,0 @@ -# WKTPA4 - Contra ReBirth - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 - diff --git a/Data/Sys/GameSettings/WPPJJF.ini b/Data/Sys/GameSettings/WPPJJF.ini deleted file mode 100644 index f96286a43..000000000 --- a/Data/Sys/GameSettings/WPPJJF.ini +++ /dev/null @@ -1,27 +0,0 @@ -# WPPJJF - JM‰OÔóÝóWii - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - diff --git a/Data/Sys/GameSettings/WR9E08.ini b/Data/Sys/GameSettings/WR9.ini similarity index 94% rename from Data/Sys/GameSettings/WR9E08.ini rename to Data/Sys/GameSettings/WR9.ini index 9779b2c2a..715462fa5 100644 --- a/Data/Sys/GameSettings/WR9E08.ini +++ b/Data/Sys/GameSettings/WR9.ini @@ -1,4 +1,4 @@ -# WR9E08 - MEGA MAN 9 +# WR9E08, WR9P08 - MEGA MAN 9 [Core] # Values set here will override the main dolphin settings. diff --git a/Data/Sys/GameSettings/WR9P08.ini b/Data/Sys/GameSettings/WR9P08.ini deleted file mode 100644 index d6f7b292f..000000000 --- a/Data/Sys/GameSettings/WR9P08.ini +++ /dev/null @@ -1,34 +0,0 @@ -# WR9P08 - MEGA MAN 9 - -[Core] -# Values set here will override the main dolphin settings. - -[EmuState] -# The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. - -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = - -[Video_Settings] -UseXFB = True -UseRealXFB = False -EFBScale = 2 - -SafeTextureCacheColorSamples = 512 - diff --git a/Data/Sys/Shaders/Anaglyph/dubois.glsl b/Data/Sys/Shaders/Anaglyph/dubois.glsl new file mode 100644 index 000000000..66f9e8382 --- /dev/null +++ b/Data/Sys/Shaders/Anaglyph/dubois.glsl @@ -0,0 +1,18 @@ +// Anaglyph Red-Cyan shader based on Dubois algorithm +// Constants taken from the paper: +// "Conversion of a Stereo Pair to Anaglyph with +// the Least-Squares Projection Method" +// Eric Dubois, March 2009 + +void main() +{ + float4 c0 = SampleLayer(0); + float4 c1 = SampleLayer(1); + mat3 l = mat3( 0.437, 0.449, 0.164, + -0.062,-0.062,-0.024, + -0.048,-0.050,-0.017); + mat3 r = mat3(-0.011,-0.032,-0.007, + 0.377, 0.761, 0.009, + -0.026,-0.093, 1.234); + SetOutput(float4(c0.rgb * l + c1.rgb * r, c0.a)); +} diff --git a/Data/Sys/Shaders/Anaglyph/fullcolor.glsl b/Data/Sys/Shaders/Anaglyph/fullcolor.glsl new file mode 100644 index 000000000..8f033aedf --- /dev/null +++ b/Data/Sys/Shaders/Anaglyph/fullcolor.glsl @@ -0,0 +1,8 @@ +// Anaglyph Red-Cyan shader without compensation + +void main() +{ + float4 c0 = SampleLayer(0); + float4 c1 = SampleLayer(1); + SetOutput(float4(c0.r, c1.gb, c0.a)); +} diff --git a/Data/Sys/Shaders/Anaglyph/grayscale.glsl b/Data/Sys/Shaders/Anaglyph/grayscale.glsl new file mode 100644 index 000000000..a1be73da2 --- /dev/null +++ b/Data/Sys/Shaders/Anaglyph/grayscale.glsl @@ -0,0 +1,10 @@ +// Anaglyph Red-Cyan grayscale shader + +void main() +{ + float4 c0 = SampleLayer(0); + float avg0 = (c0.r + c0.g + c0.b) / 3.0; + float4 c1 = SampleLayer(1); + float avg1 = (c1.r + c1.g + c1.b) / 3.0; + SetOutput(float4(avg0, avg1, avg1, c0.a)); +} diff --git a/Data/Sys/Shaders/Anaglyph/grayscale2.glsl b/Data/Sys/Shaders/Anaglyph/grayscale2.glsl new file mode 100644 index 000000000..1746396fd --- /dev/null +++ b/Data/Sys/Shaders/Anaglyph/grayscale2.glsl @@ -0,0 +1,12 @@ +// Anaglyph Red-Cyan luma grayscale shader +// Info: http://www.oreillynet.com/cs/user/view/cs_msg/8691 + +void main() +{ + float3 luma = float3(0.222, 0.707, 0.071); + float4 c0 = SampleLayer(0); + float avg0 = dot(c0.rgb, luma); + float4 c1 = SampleLayer(1); + float avg1 = dot(c1.rgb, luma); + SetOutput(float4(avg0, avg1, avg1, c0.a)); +} diff --git a/Externals/libusbx/AUTHORS b/Externals/libusb/AUTHORS similarity index 64% rename from Externals/libusbx/AUTHORS rename to Externals/libusb/AUTHORS index 6c29e218f..95b116286 100644 --- a/Externals/libusbx/AUTHORS +++ b/Externals/libusb/AUTHORS @@ -1,23 +1,26 @@ Copyright © 2001 Johannes Erdfelt Copyright © 2007-2009 Daniel Drake Copyright © 2010-2012 Peter Stuge -Copyright © 2008-2011 Nathan Hjelm -Copyright © 2009-2012 Pete Batard -Copyright © 2009-2012 Ludovic Rousseau +Copyright © 2008-2013 Nathan Hjelm +Copyright © 2009-2013 Pete Batard +Copyright © 2009-2013 Ludovic Rousseau Copyright © 2010-2012 Michael Plante -Copyright © 2011-2012 Hans de Goede -Copyright © 2012 Martin Pieuchot +Copyright © 2011-2013 Hans de Goede +Copyright © 2012-2013 Martin Pieuchot Copyright © 2012-2013 Toby Gray Other contributors: Alan Ott Alan Stern Alex Vatchenko +Andrew Fernandes Anthony Clay Artem Egorkine Aurelien Jarno Bastien Nocera +Bei Zhang Benjamin Dobell +Carl Karsten Chris Dickens Colin Walters Dave Camarillo @@ -26,22 +29,36 @@ David Moore Davidlohr Bueso Federico Manzan Felipe Balbi +Florian Albrechtskirchinger Francesco Montorsi +Francisco Facioni Graeme Gill +Gustavo Zacarias Hans Ulrich Niedermann Hector Martin Hoi-Ho Chan Ilya Konstantinov James Hanko +John Sheu +Joshua Blake +Justin Bischoff +Karsten Koenig Konrad Rzepecki +Kuangye Guo +Lars Kanis Lars Wirzenius Luca Longinotti +Markus Heidelberg Martin Koegler Matthias Bolte Mike Frysinger Mikhail Gusarov +Moritz Fischer +Ларионов Даниил Nicholas Corgan +Omri Iluz Orin Eman +Paul Fertser Pekka Nikander Rob Walker Sean McBride @@ -58,3 +75,4 @@ Vitali Lovich Xiaofan Chen Zoltán Kovács Роман Донченко +xantares diff --git a/Externals/libusbx/COPYING b/Externals/libusb/COPYING similarity index 100% rename from Externals/libusbx/COPYING rename to Externals/libusb/COPYING diff --git a/Externals/libusbx/ChangeLog b/Externals/libusb/ChangeLog similarity index 74% rename from Externals/libusbx/ChangeLog rename to Externals/libusb/ChangeLog index a3304a62d..30a346d4c 100644 --- a/Externals/libusbx/ChangeLog +++ b/Externals/libusb/ChangeLog @@ -1,5 +1,42 @@ For detailed information about the changes below, please see the git log or -visit: http://log.libusbx.org +visit: http://log.libusb.info + +2014-05-30: v1.0.19 +* Add support for USB bulk streams on Linux and Mac OS X (#11) +* Windows: Add AMD and Intel USB-3.0 root hub support +* Windows: Fix USB 3.0 speed detection on Windows 8 or later (#10) +* Added Russian translation for libusb_strerror strings +* All: Various small fixes and cleanups +The (#xx) numbers are libusb issue numbers, see ie: +https://github.com/libusb/libusb/issues/11 + +2014-01-25: v1.0.18 +* Fix multiple memory leaks +* Fix a crash when HID transfers return no data on Windows +* Ensure all pending events are consumed +* Improve Android and ucLinux support +* Multiple Windows improvements (error logging, VS2013, VIA xHCI support) +* Multiple OS X improvements (broken compilation, SIGFPE, 64bit support) + +2013-09-06: v1.0.17 +* Hotplug callbacks now always get passed a libusb_context, even if it is + the default context. Previously NULL would be passed for the default context, + but since the first context created is the default context, and most apps + use only 1 context, this meant that apps explicitly creating a context would + still get passed NULL +* Android: Add .mk files to build with the Android NDK +* Darwin: Add Xcode project +* Darwin: Fix crash on unplug (#121) +* Linux: Fix hang (deadlock) on libusb_exit +* Linux: Fix libusb build failure with --disable-udev (#124) +* Linux: Fix libusb_get_device_list() hang with --disable-udev (#130) +* OpenBSD: Update OpenBSD backend with support for control transfers to + non-ugen(4) devices and make get_configuration() no longer generate I/O. + Note that using this libusb version on OpenBSD requires using + OpenBSD 5.3-current or later. Users of older OpenBSD versions are advised + to stay with the libusb shipped with OpenBSD (mpi) +* Windows: fix libusb_dll_2010.vcxproj link errors (#129) +* Various other bug fixes and improvements 2013-07-11: v1.0.16 * Add hotplug support for Darwin and Linux (#9) @@ -40,7 +77,7 @@ https://github.com/libusbx/libusbx/issues/9 * Reverts the previous API change with regards to bMaxPower. If this doesn't matter to you, you are encouraged to keep using v1.0.13, as it will use the same attribute as v2.0, to be released soon. -* Note that LIBUSBX_API_VERSION is *decreased* to 0x010000FF and the previous +* Note that LIBUSB_API_VERSION is *decreased* to 0x010000FF and the previous guidelines with regards to concurrent use of MaxPower/bMaxPower still apply. 2012-09-20: v1.0.13 @@ -51,11 +88,11 @@ https://github.com/libusbx/libusbx/issues/9 * Fix broken support for the 0.1 -> 1.0 libusb-compat layer * Fix unwanted cancellation of pending timeouts as well as major timeout related bugs * Fix handling of HID and composite devices on Windows -* Introduce LIBUSBX_API_VERSION macro +* Introduce LIBUSB_API_VERSION macro * Add Cypress FX/FX2 firmware upload sample, based on fxload from http://linux-hotplug.sourceforge.net * Add libusb0 (libusb-win32) and libusbK driver support on Windows. Note that while - the drivers allow it, isochronous transfers are not supported yet in libusbx. Also + the drivers allow it, isochronous transfers are not supported yet in libusb. Also not supported yet is the use of libusb-win32 filter drivers on composite interfaces * Add support for the new get_capabilities ioctl on Linux and avoid unnecessary splitting of bulk transfers @@ -156,18 +193,18 @@ https://github.com/libusbx/libusbx/issues/9 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ APPENDIX A - How to maintain code compatibility with versions of libusb and -libusbx that use MaxPower: +libusb that use MaxPower: If you must to maintain compatibility with versions of the library that aren't using the bMaxPower attribute in struct libusb_config_descriptor, the -recommended way is to use the new LIBUSBX_API_VERSION macro with an #ifdef. +recommended way is to use the new LIBUSB_API_VERSION macro with an #ifdef. For instance, if your code was written as follows: if (dev->config[0].MaxPower < 250) Then you should modify it to have: -#if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01000100) +#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000100) if (dev->config[0].bMaxPower < 250) #else if (dev->config[0].MaxPower < 250) diff --git a/Externals/libusb/DOLPHIN b/Externals/libusb/DOLPHIN new file mode 100644 index 000000000..785cfff64 --- /dev/null +++ b/Externals/libusb/DOLPHIN @@ -0,0 +1,7 @@ +Dolphin-specific changes (as of 2015-02-12) +------------------------------------------- + +- removed all toplevel directories save msvc/ & libusb/ +- removed all files save AUTHORS, Changelog, COPYING, INSTALL, NEWS, + PORTING, README and TODO +- patched the VS project file to insert dolphin-specific props diff --git a/Externals/libusbx/INSTALL b/Externals/libusb/INSTALL similarity index 100% rename from Externals/libusbx/INSTALL rename to Externals/libusb/INSTALL diff --git a/Externals/libusb/NEWS b/Externals/libusb/NEWS new file mode 100644 index 000000000..4fc85af1e --- /dev/null +++ b/Externals/libusb/NEWS @@ -0,0 +1,2 @@ +For the latest libusb news, please refer to the ChangeLog file, or visit: +http://libusb.info diff --git a/Externals/libusbx/PORTING b/Externals/libusb/PORTING similarity index 75% rename from Externals/libusbx/PORTING rename to Externals/libusb/PORTING index 9185c37f5..fa9ec1e58 100644 --- a/Externals/libusbx/PORTING +++ b/Externals/libusb/PORTING @@ -1,15 +1,15 @@ -PORTING LIBUSBX TO OTHER PLATFORMS +PORTING LIBUSB TO OTHER PLATFORMS Introduction ============ -This document is aimed at developers wishing to port libusbx to unsupported -platforms. I believe the libusbx API is OS-independent, so by supporting +This document is aimed at developers wishing to port libusb to unsupported +platforms. I believe the libusb API is OS-independent, so by supporting multiple operating systems we pave the way for cross-platform USB device drivers. Implementation-wise, the basic idea is that you provide an interface to -libusbx's internal "backend" API, which performs the appropriate operations on +libusb's internal "backend" API, which performs the appropriate operations on your target platform. In terms of USB I/O, your backend provides functionality to submit @@ -27,16 +27,16 @@ e.g. setting configuration, obtaining descriptors, etc. File descriptors for I/O polling ================================ -For libusbx to work, your event handling function obviously needs to be called +For libusb to work, your event handling function obviously needs to be called at various points in time. Your backend must provide a set of file descriptors -which libusbx and its users can pass to poll() or select() to determine when +which libusb and its users can pass to poll() or select() to determine when it is time to call the event handling function. On Linux, this is easy: the usbfs kernel interface exposes a file descriptor which can be passed to poll(). If something similar is not true for your platform, you can emulate this using an internal library thread to reap I/O as necessary, and a pipe() with the main library to raise events. The file -descriptor of the pipe can then be provided to libusbx as an event source. +descriptor of the pipe can then be provided to libusb as an event source. Interface semantics and documentation @@ -46,7 +46,7 @@ Documentation of the backend interface can be found in libusbi.h inside the usbi_os_backend structure definition. Your implementations of these functions will need to call various internal -libusbx functions, prefixed with "usbi_". Documentation for these functions +libusb functions, prefixed with "usbi_". Documentation for these functions can be found in the .c files where they are implemented. You probably want to skim over *all* the documentation before starting your @@ -72,18 +72,18 @@ right usbi_backend for your platform. 4. Produce and test your implementation. -5. Send your implementation to libusbx-devel mailing list. +5. Send your implementation to libusb-devel mailing list. Implementation difficulties? Questions? ======================================= -If you encounter difficulties porting libusbx to your platform, please raise -these issues on the libusbx-devel mailing list. Where possible and sensible, I -am interested in solving problems preventing libusbx from operating on other +If you encounter difficulties porting libusb to your platform, please raise +these issues on the libusb-devel mailing list. Where possible and sensible, I +am interested in solving problems preventing libusb from operating on other platforms. -The libusbx-devel mailing list is also a good place to ask questions and +The libusb-devel mailing list is also a good place to ask questions and make suggestions about the internal API. Hopefully we can produce some better documentation based on your questions and other input. diff --git a/Externals/libusb/README b/Externals/libusb/README new file mode 100644 index 000000000..715c416a3 --- /dev/null +++ b/Externals/libusb/README @@ -0,0 +1,27 @@ +libusb +====== + +libusb is a library for USB device access from Linux, Mac OS X, +Windows and OpenBSD/NetBSD userspace. +It is written in C and licensed under the GNU Lesser General Public +License version 2.1 or, at your option, any later version (see COPYING). + +libusb is abstracted internally in such a way that it can hopefully +be ported to other operating systems. Please see the PORTING file +for more information. + +libusb homepage: +http://libusb.info/ + +Developers will wish to consult the API documentation: +http://api.libusb.info + +Use the mailing list for questions, comments, etc: +http://mailing-list.libusb.info + +- Pete Batard +- Hans de Goede +- Xiaofan Chen +- Ludovic Rousseau +- Nathan Hjelm +(Please use the mailing list rather than mailing developers directly) diff --git a/Externals/libusb/TODO b/Externals/libusb/TODO new file mode 100644 index 000000000..19dd1d0e6 --- /dev/null +++ b/Externals/libusb/TODO @@ -0,0 +1,2 @@ +Please see the libusb roadmap by visiting: +https://github.com/libusb/libusb/issues/milestones?direction=asc&sort=due_date diff --git a/Externals/libusbx/libusb/Makefile.am b/Externals/libusb/libusb/Makefile.am similarity index 88% rename from Externals/libusbx/libusb/Makefile.am rename to Externals/libusb/libusb/Makefile.am index 7f9c1f909..80e3705e5 100644 --- a/Externals/libusbx/libusb/Makefile.am +++ b/Externals/libusb/libusb/Makefile.am @@ -1,16 +1,19 @@ all: libusb-1.0.la libusb-1.0.dll +AUTOMAKE_OPTIONS = subdir-objects + lib_LTLIBRARIES = libusb-1.0.la POSIX_POLL_SRC = os/poll_posix.c LINUX_USBFS_SRC = os/linux_usbfs.c DARWIN_USB_SRC = os/darwin_usb.c OPENBSD_USB_SRC = os/openbsd_usb.c +NETBSD_USB_SRC = os/netbsd_usb.c WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \ - $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \ + $(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \ $(POSIX_POLL_SRC) \ os/threads_posix.c os/threads_windows.c \ os/linux_udev.c os/linux_netlink.c @@ -36,6 +39,10 @@ if OS_OPENBSD OS_SRC = $(OPENBSD_USB_SRC) $(POSIX_POLL_SRC) endif +if OS_NETBSD +OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC) +endif + if OS_WINDOWS OS_SRC = $(WINDOWS_USB_SRC) @@ -45,7 +52,7 @@ OS_SRC = $(WINDOWS_USB_SRC) libusb-1.0.rc: version.h version_nano.h endif -libusb-1.0.dll: libusb-1.0.def +libusb-1.0.dll: libusb-1.0.def libusb-1.0.la if CREATE_IMPORT_LIB # Rebuild the import lib from the .def so that MS and MinGW DLLs can be interchanged $(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a diff --git a/Externals/libusbx/libusb/Makefile.in b/Externals/libusb/libusb/Makefile.in similarity index 73% rename from Externals/libusbx/libusb/Makefile.in rename to Externals/libusb/libusb/Makefile.in index 2461c45a8..0fcff7781 100644 --- a/Externals/libusbx/libusb/Makefile.in +++ b/Externals/libusb/libusb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -129,30 +129,36 @@ am__libusb_1_0_la_SOURCES_DIST = libusbi.h core.c descriptor.c io.c \ os/threads_windows.h os/threads_windows.c os/threads_posix.h \ os/threads_posix.c os/darwin_usb.c os/poll_posix.c \ os/linux_usbfs.c os/linux_netlink.c os/linux_udev.c \ - os/openbsd_usb.c os/poll_windows.c os/windows_usb.c \ - libusb-1.0.rc libusb-1.0.def os/poll_posix.h os/poll_windows.h -@THREADS_POSIX_FALSE@am__objects_1 = libusb_1_0_la-threads_windows.lo -@THREADS_POSIX_TRUE@am__objects_1 = libusb_1_0_la-threads_posix.lo -am__objects_2 = libusb_1_0_la-darwin_usb.lo -am__objects_3 = libusb_1_0_la-poll_posix.lo -am__objects_4 = libusb_1_0_la-linux_usbfs.lo -am__objects_5 = libusb_1_0_la-openbsd_usb.lo -am__objects_6 = libusb_1_0_la-poll_windows.lo \ - libusb_1_0_la-windows_usb.lo libusb-1.0.lo -@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_OPENBSD_FALSE@@OS_WINDOWS_TRUE@am__objects_7 = $(am__objects_6) -@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_OPENBSD_TRUE@am__objects_7 = $(am__objects_5) \ -@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_OPENBSD_TRUE@ $(am__objects_3) -@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@am__objects_7 = $(am__objects_4) \ + os/netbsd_usb.c os/openbsd_usb.c os/poll_windows.c \ + os/windows_usb.c libusb-1.0.rc libusb-1.0.def os/poll_posix.h \ + os/poll_windows.h +am__dirstamp = $(am__leading_dot)dirstamp +@THREADS_POSIX_FALSE@am__objects_1 = \ +@THREADS_POSIX_FALSE@ os/libusb_1_0_la-threads_windows.lo +@THREADS_POSIX_TRUE@am__objects_1 = os/libusb_1_0_la-threads_posix.lo +am__objects_2 = os/libusb_1_0_la-darwin_usb.lo +am__objects_3 = os/libusb_1_0_la-poll_posix.lo +am__objects_4 = os/libusb_1_0_la-linux_usbfs.lo +am__objects_5 = os/libusb_1_0_la-netbsd_usb.lo +am__objects_6 = os/libusb_1_0_la-openbsd_usb.lo +am__objects_7 = os/libusb_1_0_la-poll_windows.lo \ + os/libusb_1_0_la-windows_usb.lo libusb-1.0.lo +@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_FALSE@@OS_WINDOWS_TRUE@am__objects_8 = $(am__objects_7) +@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_TRUE@am__objects_8 = $(am__objects_6) \ +@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_TRUE@ $(am__objects_3) +@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_TRUE@am__objects_8 = $(am__objects_5) \ +@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_TRUE@ $(am__objects_3) +@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@am__objects_8 = $(am__objects_4) \ @OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@ $(am__objects_3) \ -@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@ libusb_1_0_la-linux_netlink.lo -@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@am__objects_7 = $(am__objects_4) \ +@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@ os/libusb_1_0_la-linux_netlink.lo +@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@am__objects_8 = $(am__objects_4) \ @OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@ $(am__objects_3) \ -@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@ libusb_1_0_la-linux_udev.lo -@OS_DARWIN_TRUE@am__objects_7 = $(am__objects_2) $(am__objects_3) +@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@ os/libusb_1_0_la-linux_udev.lo +@OS_DARWIN_TRUE@am__objects_8 = $(am__objects_2) $(am__objects_3) am_libusb_1_0_la_OBJECTS = libusb_1_0_la-core.lo \ libusb_1_0_la-descriptor.lo libusb_1_0_la-io.lo \ libusb_1_0_la-strerror.lo libusb_1_0_la-sync.lo \ - libusb_1_0_la-hotplug.lo $(am__objects_1) $(am__objects_7) + libusb_1_0_la-hotplug.lo $(am__objects_1) $(am__objects_8) libusb_1_0_la_OBJECTS = $(am_libusb_1_0_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -274,6 +280,7 @@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OS_DARWIN = @OS_DARWIN@ OS_LINUX = @OS_LINUX@ +OS_NETBSD = @OS_NETBSD@ OS_OPENBSD = @OS_OPENBSD@ OS_WINDOWS = @OS_WINDOWS@ OTOOL = @OTOOL@ @@ -346,15 +353,17 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = subdir-objects lib_LTLIBRARIES = libusb-1.0.la POSIX_POLL_SRC = os/poll_posix.c LINUX_USBFS_SRC = os/linux_usbfs.c DARWIN_USB_SRC = os/darwin_usb.c OPENBSD_USB_SRC = os/openbsd_usb.c +NETBSD_USB_SRC = os/netbsd_usb.c WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \ - $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \ + $(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \ $(POSIX_POLL_SRC) \ os/threads_posix.c os/threads_windows.c \ os/linux_udev.c os/linux_netlink.c @@ -366,6 +375,7 @@ EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \ @OS_LINUX_TRUE@@USE_UDEV_TRUE@OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \ @OS_LINUX_TRUE@@USE_UDEV_TRUE@ os/linux_udev.c +@OS_NETBSD_TRUE@OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC) @OS_OPENBSD_TRUE@OS_SRC = $(OPENBSD_USB_SRC) $(POSIX_POLL_SRC) @OS_WINDOWS_TRUE@OS_SRC = $(WINDOWS_USB_SRC) @OS_DARWIN_TRUE@AM_CFLAGS_EXT = -no-cpp-precomp @@ -449,50 +459,84 @@ clean-libLTLIBRARIES: echo rm -f $${locs}; \ rm -f $${locs}; \ } +os/$(am__dirstamp): + @$(MKDIR_P) os + @: > os/$(am__dirstamp) +os/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) os/$(DEPDIR) + @: > os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-threads_windows.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-threads_posix.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-darwin_usb.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-poll_posix.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-linux_usbfs.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-linux_netlink.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-linux_udev.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-netbsd_usb.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-openbsd_usb.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-poll_windows.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) +os/libusb_1_0_la-windows_usb.lo: os/$(am__dirstamp) \ + os/$(DEPDIR)/$(am__dirstamp) libusb-1.0.la: $(libusb_1_0_la_OBJECTS) $(libusb_1_0_la_DEPENDENCIES) $(EXTRA_libusb_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libusb_1_0_la_LINK) -rpath $(libdir) $(libusb_1_0_la_OBJECTS) $(libusb_1_0_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f os/*.$(OBJEXT) + -rm -f os/*.lo distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-core.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-darwin_usb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-descriptor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-hotplug.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-linux_netlink.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-linux_udev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-linux_usbfs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-openbsd_usb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-poll_posix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-poll_windows.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-strerror.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-sync.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-threads_posix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-threads_windows.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-windows_usb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-linux_udev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-poll_posix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-poll_windows.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-threads_posix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-threads_windows.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-windows_usb.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -539,81 +583,89 @@ libusb_1_0_la-hotplug.lo: hotplug.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-hotplug.lo `test -f 'hotplug.c' || echo '$(srcdir)/'`hotplug.c -libusb_1_0_la-threads_windows.lo: os/threads_windows.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-threads_windows.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-threads_windows.Tpo -c -o libusb_1_0_la-threads_windows.lo `test -f 'os/threads_windows.c' || echo '$(srcdir)/'`os/threads_windows.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-threads_windows.Tpo $(DEPDIR)/libusb_1_0_la-threads_windows.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/threads_windows.c' object='libusb_1_0_la-threads_windows.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-threads_windows.lo: os/threads_windows.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-threads_windows.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-threads_windows.Tpo -c -o os/libusb_1_0_la-threads_windows.lo `test -f 'os/threads_windows.c' || echo '$(srcdir)/'`os/threads_windows.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-threads_windows.Tpo os/$(DEPDIR)/libusb_1_0_la-threads_windows.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/threads_windows.c' object='os/libusb_1_0_la-threads_windows.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-threads_windows.lo `test -f 'os/threads_windows.c' || echo '$(srcdir)/'`os/threads_windows.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-threads_windows.lo `test -f 'os/threads_windows.c' || echo '$(srcdir)/'`os/threads_windows.c -libusb_1_0_la-threads_posix.lo: os/threads_posix.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-threads_posix.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-threads_posix.Tpo -c -o libusb_1_0_la-threads_posix.lo `test -f 'os/threads_posix.c' || echo '$(srcdir)/'`os/threads_posix.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-threads_posix.Tpo $(DEPDIR)/libusb_1_0_la-threads_posix.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/threads_posix.c' object='libusb_1_0_la-threads_posix.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-threads_posix.lo: os/threads_posix.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-threads_posix.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-threads_posix.Tpo -c -o os/libusb_1_0_la-threads_posix.lo `test -f 'os/threads_posix.c' || echo '$(srcdir)/'`os/threads_posix.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-threads_posix.Tpo os/$(DEPDIR)/libusb_1_0_la-threads_posix.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/threads_posix.c' object='os/libusb_1_0_la-threads_posix.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-threads_posix.lo `test -f 'os/threads_posix.c' || echo '$(srcdir)/'`os/threads_posix.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-threads_posix.lo `test -f 'os/threads_posix.c' || echo '$(srcdir)/'`os/threads_posix.c -libusb_1_0_la-darwin_usb.lo: os/darwin_usb.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-darwin_usb.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-darwin_usb.Tpo -c -o libusb_1_0_la-darwin_usb.lo `test -f 'os/darwin_usb.c' || echo '$(srcdir)/'`os/darwin_usb.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-darwin_usb.Tpo $(DEPDIR)/libusb_1_0_la-darwin_usb.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/darwin_usb.c' object='libusb_1_0_la-darwin_usb.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-darwin_usb.lo: os/darwin_usb.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-darwin_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Tpo -c -o os/libusb_1_0_la-darwin_usb.lo `test -f 'os/darwin_usb.c' || echo '$(srcdir)/'`os/darwin_usb.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/darwin_usb.c' object='os/libusb_1_0_la-darwin_usb.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-darwin_usb.lo `test -f 'os/darwin_usb.c' || echo '$(srcdir)/'`os/darwin_usb.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-darwin_usb.lo `test -f 'os/darwin_usb.c' || echo '$(srcdir)/'`os/darwin_usb.c -libusb_1_0_la-poll_posix.lo: os/poll_posix.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-poll_posix.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-poll_posix.Tpo -c -o libusb_1_0_la-poll_posix.lo `test -f 'os/poll_posix.c' || echo '$(srcdir)/'`os/poll_posix.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-poll_posix.Tpo $(DEPDIR)/libusb_1_0_la-poll_posix.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/poll_posix.c' object='libusb_1_0_la-poll_posix.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-poll_posix.lo: os/poll_posix.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-poll_posix.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-poll_posix.Tpo -c -o os/libusb_1_0_la-poll_posix.lo `test -f 'os/poll_posix.c' || echo '$(srcdir)/'`os/poll_posix.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-poll_posix.Tpo os/$(DEPDIR)/libusb_1_0_la-poll_posix.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/poll_posix.c' object='os/libusb_1_0_la-poll_posix.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-poll_posix.lo `test -f 'os/poll_posix.c' || echo '$(srcdir)/'`os/poll_posix.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-poll_posix.lo `test -f 'os/poll_posix.c' || echo '$(srcdir)/'`os/poll_posix.c -libusb_1_0_la-linux_usbfs.lo: os/linux_usbfs.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-linux_usbfs.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-linux_usbfs.Tpo -c -o libusb_1_0_la-linux_usbfs.lo `test -f 'os/linux_usbfs.c' || echo '$(srcdir)/'`os/linux_usbfs.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-linux_usbfs.Tpo $(DEPDIR)/libusb_1_0_la-linux_usbfs.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/linux_usbfs.c' object='libusb_1_0_la-linux_usbfs.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-linux_usbfs.lo: os/linux_usbfs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-linux_usbfs.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Tpo -c -o os/libusb_1_0_la-linux_usbfs.lo `test -f 'os/linux_usbfs.c' || echo '$(srcdir)/'`os/linux_usbfs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Tpo os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/linux_usbfs.c' object='os/libusb_1_0_la-linux_usbfs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-linux_usbfs.lo `test -f 'os/linux_usbfs.c' || echo '$(srcdir)/'`os/linux_usbfs.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-linux_usbfs.lo `test -f 'os/linux_usbfs.c' || echo '$(srcdir)/'`os/linux_usbfs.c -libusb_1_0_la-linux_netlink.lo: os/linux_netlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-linux_netlink.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-linux_netlink.Tpo -c -o libusb_1_0_la-linux_netlink.lo `test -f 'os/linux_netlink.c' || echo '$(srcdir)/'`os/linux_netlink.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-linux_netlink.Tpo $(DEPDIR)/libusb_1_0_la-linux_netlink.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/linux_netlink.c' object='libusb_1_0_la-linux_netlink.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-linux_netlink.lo: os/linux_netlink.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-linux_netlink.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Tpo -c -o os/libusb_1_0_la-linux_netlink.lo `test -f 'os/linux_netlink.c' || echo '$(srcdir)/'`os/linux_netlink.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Tpo os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/linux_netlink.c' object='os/libusb_1_0_la-linux_netlink.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-linux_netlink.lo `test -f 'os/linux_netlink.c' || echo '$(srcdir)/'`os/linux_netlink.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-linux_netlink.lo `test -f 'os/linux_netlink.c' || echo '$(srcdir)/'`os/linux_netlink.c -libusb_1_0_la-linux_udev.lo: os/linux_udev.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-linux_udev.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-linux_udev.Tpo -c -o libusb_1_0_la-linux_udev.lo `test -f 'os/linux_udev.c' || echo '$(srcdir)/'`os/linux_udev.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-linux_udev.Tpo $(DEPDIR)/libusb_1_0_la-linux_udev.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/linux_udev.c' object='libusb_1_0_la-linux_udev.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-linux_udev.lo: os/linux_udev.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-linux_udev.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-linux_udev.Tpo -c -o os/libusb_1_0_la-linux_udev.lo `test -f 'os/linux_udev.c' || echo '$(srcdir)/'`os/linux_udev.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-linux_udev.Tpo os/$(DEPDIR)/libusb_1_0_la-linux_udev.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/linux_udev.c' object='os/libusb_1_0_la-linux_udev.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-linux_udev.lo `test -f 'os/linux_udev.c' || echo '$(srcdir)/'`os/linux_udev.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-linux_udev.lo `test -f 'os/linux_udev.c' || echo '$(srcdir)/'`os/linux_udev.c -libusb_1_0_la-openbsd_usb.lo: os/openbsd_usb.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-openbsd_usb.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-openbsd_usb.Tpo -c -o libusb_1_0_la-openbsd_usb.lo `test -f 'os/openbsd_usb.c' || echo '$(srcdir)/'`os/openbsd_usb.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-openbsd_usb.Tpo $(DEPDIR)/libusb_1_0_la-openbsd_usb.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/openbsd_usb.c' object='libusb_1_0_la-openbsd_usb.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-netbsd_usb.lo: os/netbsd_usb.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-netbsd_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Tpo -c -o os/libusb_1_0_la-netbsd_usb.lo `test -f 'os/netbsd_usb.c' || echo '$(srcdir)/'`os/netbsd_usb.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/netbsd_usb.c' object='os/libusb_1_0_la-netbsd_usb.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-openbsd_usb.lo `test -f 'os/openbsd_usb.c' || echo '$(srcdir)/'`os/openbsd_usb.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-netbsd_usb.lo `test -f 'os/netbsd_usb.c' || echo '$(srcdir)/'`os/netbsd_usb.c -libusb_1_0_la-poll_windows.lo: os/poll_windows.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-poll_windows.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-poll_windows.Tpo -c -o libusb_1_0_la-poll_windows.lo `test -f 'os/poll_windows.c' || echo '$(srcdir)/'`os/poll_windows.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-poll_windows.Tpo $(DEPDIR)/libusb_1_0_la-poll_windows.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/poll_windows.c' object='libusb_1_0_la-poll_windows.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-openbsd_usb.lo: os/openbsd_usb.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-openbsd_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Tpo -c -o os/libusb_1_0_la-openbsd_usb.lo `test -f 'os/openbsd_usb.c' || echo '$(srcdir)/'`os/openbsd_usb.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/openbsd_usb.c' object='os/libusb_1_0_la-openbsd_usb.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-poll_windows.lo `test -f 'os/poll_windows.c' || echo '$(srcdir)/'`os/poll_windows.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-openbsd_usb.lo `test -f 'os/openbsd_usb.c' || echo '$(srcdir)/'`os/openbsd_usb.c -libusb_1_0_la-windows_usb.lo: os/windows_usb.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-windows_usb.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-windows_usb.Tpo -c -o libusb_1_0_la-windows_usb.lo `test -f 'os/windows_usb.c' || echo '$(srcdir)/'`os/windows_usb.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-windows_usb.Tpo $(DEPDIR)/libusb_1_0_la-windows_usb.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/windows_usb.c' object='libusb_1_0_la-windows_usb.lo' libtool=yes @AMDEPBACKSLASH@ +os/libusb_1_0_la-poll_windows.lo: os/poll_windows.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-poll_windows.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-poll_windows.Tpo -c -o os/libusb_1_0_la-poll_windows.lo `test -f 'os/poll_windows.c' || echo '$(srcdir)/'`os/poll_windows.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-poll_windows.Tpo os/$(DEPDIR)/libusb_1_0_la-poll_windows.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/poll_windows.c' object='os/libusb_1_0_la-poll_windows.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-windows_usb.lo `test -f 'os/windows_usb.c' || echo '$(srcdir)/'`os/windows_usb.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-poll_windows.lo `test -f 'os/poll_windows.c' || echo '$(srcdir)/'`os/poll_windows.c + +os/libusb_1_0_la-windows_usb.lo: os/windows_usb.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-windows_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-windows_usb.Tpo -c -o os/libusb_1_0_la-windows_usb.lo `test -f 'os/windows_usb.c' || echo '$(srcdir)/'`os/windows_usb.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-windows_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-windows_usb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os/windows_usb.c' object='os/libusb_1_0_la-windows_usb.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-windows_usb.lo `test -f 'os/windows_usb.c' || echo '$(srcdir)/'`os/windows_usb.c mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs + -rm -rf os/.libs os/_libs install-hdrHEADERS: $(hdr_HEADERS) @$(NORMAL_INSTALL) @list='$(hdr_HEADERS)'; test -n "$(hdrdir)" || list=; \ @@ -751,6 +803,8 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f os/$(DEPDIR)/$(am__dirstamp) + -rm -f os/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -761,7 +815,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) os/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -807,7 +861,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) os/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -851,7 +905,7 @@ all: libusb-1.0.la libusb-1.0.dll @OS_WINDOWS_TRUE@libusb-1.0.rc: version.h version_nano.h -libusb-1.0.dll: libusb-1.0.def +libusb-1.0.dll: libusb-1.0.def libusb-1.0.la # Rebuild the import lib from the .def so that MS and MinGW DLLs can be interchanged @CREATE_IMPORT_LIB_TRUE@ $(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a diff --git a/Externals/libusbx/libusb/core.c b/Externals/libusb/libusb/core.c similarity index 87% rename from Externals/libusbx/libusb/core.c rename to Externals/libusb/libusb/core.c index e29e8df25..f3d7ece65 100644 --- a/Externals/libusbx/libusb/core.c +++ b/Externals/libusb/libusb/core.c @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */ /* - * Core functions for libusbx + * Core functions for libusb * Copyright © 2012-2013 Nathan Hjelm * Copyright © 2007-2008 Daniel Drake * Copyright © 2001 Johannes Erdfelt @@ -33,6 +33,9 @@ #ifdef HAVE_SYS_TIME_H #include #endif +#ifdef HAVE_SYSLOG_H +#include +#endif #ifdef __ANDROID__ #include @@ -47,6 +50,8 @@ const struct usbi_os_backend * const usbi_backend = &linux_usbfs_backend; const struct usbi_os_backend * const usbi_backend = &darwin_backend; #elif defined(OS_OPENBSD) const struct usbi_os_backend * const usbi_backend = &openbsd_backend; +#elif defined(OS_NETBSD) +const struct usbi_os_backend * const usbi_backend = &netbsd_backend; #elif defined(OS_WINDOWS) const struct usbi_os_backend * const usbi_backend = &windows_backend; #elif defined(OS_WINCE) @@ -56,9 +61,9 @@ const struct usbi_os_backend * const usbi_backend = &wince_backend; #endif struct libusb_context *usbi_default_context = NULL; -const struct libusb_version libusb_version_internal = +static const struct libusb_version libusb_version_internal = { LIBUSB_MAJOR, LIBUSB_MINOR, LIBUSB_MICRO, LIBUSB_NANO, - LIBUSB_RC, "http://libusbx.org" }; + LIBUSB_RC, "http://libusb.info" }; static int default_context_refcnt = 0; static usbi_mutex_static_t default_context_lock = USBI_MUTEX_INITIALIZER; static struct timeval timestamp_origin = { 0, 0 }; @@ -67,18 +72,18 @@ usbi_mutex_static_t active_contexts_lock = USBI_MUTEX_INITIALIZER; struct list_head active_contexts_list; /** - * \mainpage libusbx-1.0 API Reference + * \mainpage libusb-1.0 API Reference * * \section intro Introduction * - * libusbx is an open source library that allows you to communicate with USB + * libusb is an open source library that allows you to communicate with USB * devices from userspace. For more info, see the - * libusbx homepage. + * libusb homepage. * * This documentation is aimed at application developers wishing to * communicate with USB peripherals from their own software. After reviewing * this documentation, feedback and questions can be sent to the - * libusbx-devel mailing list. + * libusb-devel mailing list. * * This documentation assumes knowledge of how to operate USB devices from * a software standpoint (descriptors, configurations, interfaces, endpoints, @@ -102,25 +107,25 @@ struct list_head active_contexts_list; * \section gettingstarted Getting Started * * To begin reading the API documentation, start with the Modules page which - * links to the different categories of libusbx's functionality. + * links to the different categories of libusb's functionality. * * One decision you will have to make is whether to use the synchronous * or the asynchronous data transfer interface. The \ref io documentation * provides some insight into this topic. * - * Some example programs can be found in the libusbx source distribution under - * the "examples" subdirectory. The libusbx homepage includes a list of - * real-life project examples which use libusbx. + * Some example programs can be found in the libusb source distribution under + * the "examples" subdirectory. The libusb homepage includes a list of + * real-life project examples which use libusb. * * \section errorhandling Error handling * - * libusbx functions typically return 0 on success or a negative error code + * libusb functions typically return 0 on success or a negative error code * on failure. These negative error codes relate to LIBUSB_ERROR constants * which are listed on the \ref misc "miscellaneous" documentation page. * * \section msglog Debug message logging * - * libusbx uses stderr for all logging. By default, logging is set to NONE, + * libusb uses stderr for all logging. By default, logging is set to NONE, * which means that no output will be produced. However, unless the library * has been compiled with logging disabled, then any application calls to * libusb_set_debug(), or the setting of the environmental variable @@ -129,19 +134,19 @@ struct list_head active_contexts_list; * direct it to the null device if its output is undesireable. * * The libusb_set_debug() function can be used to enable logging of certain - * messages. Under standard configuration, libusbx doesn't really log much + * messages. Under standard configuration, libusb doesn't really log much * so you are advised to use this function to enable all error/warning/ * informational messages. It will help debug problems with your software. * * The logged messages are unstructured. There is no one-to-one correspondence * between messages being logged and success or failure return codes from - * libusbx functions. There is no format to the messages, so you should not + * libusb functions. There is no format to the messages, so you should not * try to capture or parse them. They are not and will not be localized. * These messages are not intended to being passed to your application user; - * instead, you should interpret the error codes returned from libusbx functions + * instead, you should interpret the error codes returned from libusb functions * and provide appropriate notification to the user. The messages are simply * there to aid you as a programmer, and if you're confused because you're - * getting a strange error code from a libusbx function, enabling message + * getting a strange error code from a libusb function, enabling message * logging may give you a suitable explanation. * * The LIBUSB_DEBUG environment variable can be used to enable message logging @@ -150,18 +155,18 @@ struct list_head active_contexts_list; * environment variable is set, the message logging verbosity level is fixed * and libusb_set_debug() effectively does nothing. * - * libusbx can be compiled without any logging functions, useful for embedded + * libusb can be compiled without any logging functions, useful for embedded * systems. In this case, libusb_set_debug() and the LIBUSB_DEBUG environment * variable have no effects. * - * libusbx can also be compiled with verbose debugging messages always. When + * libusb can also be compiled with verbose debugging messages always. When * the library is compiled in this way, all messages of all verbosities are * always logged. libusb_set_debug() and the LIBUSB_DEBUG environment variable * have no effects. * * \section remarks Other remarks * - * libusbx does have imperfections. The \ref caveats "caveats" page attempts + * libusb does have imperfections. The \ref caveats "caveats" page attempts * to document these. */ @@ -176,7 +181,7 @@ struct list_head active_contexts_list; * reset). * * The problem is that any other program could reset the device your program - * is working with, at any time. libusbx does not offer a mechanism to inform + * is working with, at any time. libusb does not offer a mechanism to inform * you when this has happened, so if someone else resets your device it will * not be clear to your own program why the device state has changed. * @@ -201,7 +206,7 @@ struct list_head active_contexts_list; * * \section configsel Configuration selection and handling * - * When libusbx presents a device handle to an application, there is a chance + * When libusb presents a device handle to an application, there is a chance * that the corresponding device may be in unconfigured state. For devices * with multiple configurations, there is also a chance that the configuration * currently selected is not the one that the application wants to use. @@ -212,13 +217,13 @@ struct list_head active_contexts_list; * -# If the device is already in the desired configuration, calling * libusb_set_configuration() using the same configuration value will cause * a lightweight device reset. This may not be desirable behaviour. - * -# libusbx will be unable to change configuration if the device is in + * -# libusb will be unable to change configuration if the device is in * another configuration and other programs or drivers have claimed * interfaces under that configuration. - * -# In the case where the desired configuration is already active, libusbx + * -# In the case where the desired configuration is already active, libusb * may not even be able to perform a lightweight device reset. For example, * take my USB keyboard with fingerprint reader: I'm interested in driving - * the fingerprint reader interface through libusbx, but the kernel's + * the fingerprint reader interface through libusb, but the kernel's * USB-HID driver will almost always have claimed the keyboard interface. * Because the kernel has claimed an interface, it is not even possible to * perform the lightweight device reset, so libusb_set_configuration() will @@ -258,13 +263,13 @@ if (cfg != desired) * considerations apply to Darwin or other platforms. * * When a transfer completes early (i.e. when less data is received/sent in - * any one packet than the transfer buffer allows for) then libusbx is designed + * any one packet than the transfer buffer allows for) then libusb is designed * to terminate the transfer immediately, not transferring or receiving any * more data unless other transfers have been queued by the user. * - * On legacy platforms, libusbx is unable to do this in all situations. After + * On legacy platforms, libusb is unable to do this in all situations. After * the incomplete packet occurs, "surplus" data may be transferred. For recent - * versions of libusbx, this information is kept (the data length of the + * versions of libusb, this information is kept (the data length of the * transfer is updated) and, for device-to-host transfers, any surplus data was * added to the buffer. Still, this is not a nice solution because it loses the * information about the end of the short packet, and the user probably wanted @@ -273,7 +278,7 @@ if (cfg != desired) * * \section zlp Zero length packets * - * - libusbx is able to send a packet of zero length to an endpoint simply by + * - libusb is able to send a packet of zero length to an endpoint simply by * submitting a transfer of zero length. * - The \ref libusb_transfer_flags::LIBUSB_TRANSFER_ADD_ZERO_PACKET * "LIBUSB_TRANSFER_ADD_ZERO_PACKET" flag is currently only supported on Linux. @@ -282,24 +287,24 @@ if (cfg != desired) /** * \page contexts Contexts * - * It is possible that libusbx may be used simultaneously from two independent + * It is possible that libusb may be used simultaneously from two independent * libraries linked into the same executable. For example, if your application * has a plugin-like system which allows the user to dynamically load a range * of modules into your program, it is feasible that two independently - * developed modules may both use libusbx. + * developed modules may both use libusb. * - * libusbx is written to allow for these multiple user scenarios. The two - * "instances" of libusbx will not interfere: libusb_set_debug() calls + * libusb is written to allow for these multiple user scenarios. The two + * "instances" of libusb will not interfere: libusb_set_debug() calls * from one user will not affect the same settings for other users, other - * users can continue using libusbx after one of them calls libusb_exit(), etc. + * users can continue using libusb after one of them calls libusb_exit(), etc. * - * This is made possible through libusbx's context concept. When you + * This is made possible through libusb's context concept. When you * call libusb_init(), you are (optionally) given a context. You can then pass - * this context pointer back into future libusbx functions. + * this context pointer back into future libusb functions. * * In order to keep things simple for more simplistic applications, it is * legal to pass NULL to all functions requiring a context pointer (as long as - * you're sure no other code will attempt to use libusbx from the same process). + * you're sure no other code will attempt to use libusb from the same process). * When you pass NULL, the default context will be used. The default context * is created the first time a process calls libusb_init() when no other * context is alive. Contexts are destroyed during libusb_exit(). @@ -312,17 +317,17 @@ if (cfg != desired) * reference count goes from 0 to 1, and is deinitialized and destroyed when * its reference count goes from 1 to 0. * - * You may be wondering why only a subset of libusbx functions require a - * context pointer in their function definition. Internally, libusbx stores + * You may be wondering why only a subset of libusb functions require a + * context pointer in their function definition. Internally, libusb stores * context pointers in other objects (e.g. libusb_device instances) and hence * can infer the context from those objects. */ /** * @defgroup lib Library initialization/deinitialization - * This page details how to initialize and deinitialize libusbx. Initialization - * must be performed before using any libusbx functionality, and similarly you - * must not call any libusbx functions after deinitialization. + * This page details how to initialize and deinitialize libusb. Initialization + * must be performed before using any libusb functionality, and similarly you + * must not call any libusb functions after deinitialization. */ /** @@ -379,7 +384,7 @@ libusb_free_device_list(list, 1); * device. * * \section devshandles Devices and device handles - * libusbx has a concept of a USB device, represented by the + * libusb has a concept of a USB device, represented by the * \ref libusb_device opaque type. A device represents a USB device that * is currently or was previously connected to the system. Using a reference * to a device, you can determine certain information about the device (e.g. @@ -395,8 +400,8 @@ libusb_free_device_list(list, 1); * using the device. * * When you've found a device that you'd like to operate, you must ask - * libusbx to open the device using the libusb_open() function. Assuming - * success, libusbx then returns you a device handle + * libusb to open the device using the libusb_open() function. Assuming + * success, libusb then returns you a device handle * (a \ref libusb_device_handle pointer). All "real" I/O operations then * operate on the handle rather than the original device pointer. * @@ -404,10 +409,10 @@ libusb_free_device_list(list, 1); * * Device discovery (i.e. calling libusb_get_device_list()) returns a * freshly-allocated list of devices. The list itself must be freed when - * you are done with it. libusbx also needs to know when it is OK to free + * you are done with it. libusb also needs to know when it is OK to free * the contents of the list - the devices themselves. * - * To handle these issues, libusbx provides you with two separate items: + * To handle these issues, libusb provides you with two separate items: * - A function to free the list itself * - A reference counting system for the devices inside * @@ -564,6 +569,10 @@ void usbi_disconnect_device(struct libusb_device *dev) dev->attached = 0; usbi_mutex_unlock(&dev->lock); + usbi_mutex_lock(&ctx->usb_devs_lock); + list_del(&dev->list); + usbi_mutex_unlock(&ctx->usb_devs_lock); + /* Signal that an event has occurred for this device if we support hotplug AND * the hotplug pipe is ready. This prevents an event from getting raised during * initial enumeration. libusb_handle_events will take care of dereferencing the @@ -574,10 +583,6 @@ void usbi_disconnect_device(struct libusb_device *dev) usbi_err(DEVICE_CTX(dev), "error writing hotplug message"); } } - - usbi_mutex_lock(&ctx->usb_devs_lock); - list_del(&dev->list); - usbi_mutex_unlock(&ctx->usb_devs_lock); } /* Perform some final sanity checks on a newly discovered device. If this @@ -603,7 +608,7 @@ int usbi_sanitize_device(struct libusb_device *dev) return 0; } -/* Examine libusbx's internal list of known devices, looking for one with +/* Examine libusb's internal list of known devices, looking for one with * a specific session ID. Returns the matching device if it was found, and * NULL otherwise. */ struct libusb_device *usbi_get_device_by_session_id(struct libusb_context *ctx, @@ -615,7 +620,7 @@ struct libusb_device *usbi_get_device_by_session_id(struct libusb_context *ctx, usbi_mutex_lock(&ctx->usb_devs_lock); list_for_each_entry(dev, &ctx->usb_devs, list, struct libusb_device) if (dev->session_data == session_id) { - ret = dev; + ret = libusb_ref_device(dev); break; } usbi_mutex_unlock(&ctx->usb_devs_lock); @@ -758,7 +763,7 @@ uint8_t API_EXPORTED libusb_get_port_number(libusb_device *dev) /** \ingroup dev * Get the list of all port numbers from root for the specified device * - * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102 * \param dev a device * \param port_numbers the array that should contain the port numbers * \param port_numbers_len the maximum length of the array. As per the USB 3.0 @@ -770,22 +775,22 @@ int API_EXPORTED libusb_get_port_numbers(libusb_device *dev, uint8_t* port_numbers, int port_numbers_len) { int i = port_numbers_len; + struct libusb_context *ctx = DEVICE_CTX(dev); - while(dev) { - // HCDs can be listed as devices and would have port #0 - // TODO: see how the other backends want to implement HCDs as parents - if (dev->port_number == 0) - break; - i--; - if (i < 0) { - usbi_warn(DEVICE_CTX(dev), - "port numbers array too small"); + if (port_numbers_len <= 0) + return LIBUSB_ERROR_INVALID_PARAM; + + // HCDs can be listed as devices with port #0 + while((dev) && (dev->port_number != 0)) { + if (--i < 0) { + usbi_warn(ctx, "port numbers array is too small"); return LIBUSB_ERROR_OVERFLOW; } port_numbers[i] = dev->port_number; dev = dev->parent_dev; } - memmove(port_numbers, &port_numbers[i], port_numbers_len - i); + if (i < port_numbers_len) + memmove(port_numbers, &port_numbers[i], port_numbers_len - i); return port_numbers_len - i; } @@ -806,7 +811,7 @@ int API_EXPORTED libusb_get_port_path(libusb_context *ctx, libusb_device *dev, * \returns the device parent or NULL if not available * You should issue a \ref libusb_get_device_list() before calling this * function and make sure that you only access the parent before issuing - * \ref libusb_free_device_list(). The reason is that libusbx currently does + * \ref libusb_free_device_list(). The reason is that libusb currently does * not maintain a permanent list of device instances, and therefore can * only guarantee that parents are fully instantiated within a * libusb_get_device_list() - libusb_free_device_list() block. @@ -894,10 +899,14 @@ int API_EXPORTED libusb_get_max_packet_size(libusb_device *dev, } ep = find_endpoint(config, endpoint); - if (!ep) - return LIBUSB_ERROR_NOT_FOUND; + if (!ep) { + r = LIBUSB_ERROR_NOT_FOUND; + goto out; + } r = ep->wMaxPacketSize; + +out: libusb_free_config_descriptor(config); return r; } @@ -945,17 +954,21 @@ int API_EXPORTED libusb_get_max_iso_packet_size(libusb_device *dev, } ep = find_endpoint(config, endpoint); - if (!ep) - return LIBUSB_ERROR_NOT_FOUND; + if (!ep) { + r = LIBUSB_ERROR_NOT_FOUND; + goto out; + } val = ep->wMaxPacketSize; ep_type = (enum libusb_transfer_type) (ep->bmAttributes & 0x3); - libusb_free_config_descriptor(config); r = val & 0x07ff; if (ep_type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS || ep_type == LIBUSB_TRANSFER_TYPE_INTERRUPT) r *= (1 + ((val >> 11) & 3)); + +out: + libusb_free_config_descriptor(config); return r; } @@ -1115,7 +1128,7 @@ int API_EXPORTED libusb_open(libusb_device *dev, /* At this point, we want to interrupt any existing event handlers so * that they realise the addition of the new device's poll fd. One * example when this is desirable is if the user is running a separate - * dedicated libusbx events handling thread, which is running with a long + * dedicated libusb events handling thread, which is running with a long * or infinite timeout. We want to interrupt that iteration of the loop, * so that it picks up the new fd, and then continues. */ usbi_fd_notification(ctx); @@ -1126,7 +1139,7 @@ int API_EXPORTED libusb_open(libusb_device *dev, /** \ingroup dev * Convenience function for finding a device with a particular * idVendor/idProduct combination. This function is intended - * for those scenarios where you are using libusbx to knock up a quick test + * for those scenarios where you are using libusb to knock up a quick test * application - it allows you to avoid calling libusb_get_device_list() and * worrying about traversing/freeing the list. * @@ -1420,7 +1433,7 @@ int API_EXPORTED libusb_set_configuration(libusb_device_handle *dev, * you wish to use before you can perform I/O on any of its endpoints. * * It is legal to attempt to claim an already-claimed interface, in which - * case libusbx just returns 0 without doing anything. + * case libusb just returns 0 without doing anything. * * If auto_detach_kernel_driver is set to 1 for dev, the kernel driver * will be detached if necessary, on failure the detach error is returned. @@ -1610,9 +1623,72 @@ int API_EXPORTED libusb_reset_device(libusb_device_handle *dev) return usbi_backend->reset_device(dev); } +/** \ingroup asyncio + * Allocate up to num_streams usb bulk streams on the specified endpoints. This + * function takes an array of endpoints rather then a single endpoint because + * some protocols require that endpoints are setup with similar stream ids. + * All endpoints passed in must belong to the same interface. + * + * Note this function may return less streams then requested. Also note that the + * same number of streams are allocated for each endpoint in the endpoint array. + * + * Stream id 0 is reserved, and should not be used to communicate with devices. + * If libusb_alloc_streams() returns with a value of N, you may use stream ids + * 1 to N. + * + * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103 + * + * \param dev a device handle + * \param num_streams number of streams to try to allocate + * \param endpoints array of endpoints to allocate streams on + * \param num_endpoints length of the endpoints array + * \returns number of streams allocated, or a LIBUSB_ERROR code on failure + */ +int API_EXPORTED libusb_alloc_streams(libusb_device_handle *dev, + uint32_t num_streams, unsigned char *endpoints, int num_endpoints) +{ + usbi_dbg("streams %u eps %d", (unsigned) num_streams, num_endpoints); + + if (!dev->dev->attached) + return LIBUSB_ERROR_NO_DEVICE; + + if (usbi_backend->alloc_streams) + return usbi_backend->alloc_streams(dev, num_streams, endpoints, + num_endpoints); + else + return LIBUSB_ERROR_NOT_SUPPORTED; +} + +/** \ingroup asyncio + * Free usb bulk streams allocated with libusb_alloc_streams(). + * + * Note streams are automatically free-ed when releasing an interface. + * + * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103 + * + * \param dev a device handle + * \param endpoints array of endpoints to free streams on + * \param num_endpoints length of the endpoints array + * \returns LIBUSB_SUCCESS, or a LIBUSB_ERROR code on failure + */ +int API_EXPORTED libusb_free_streams(libusb_device_handle *dev, + unsigned char *endpoints, int num_endpoints) +{ + usbi_dbg("eps %d", num_endpoints); + + if (!dev->dev->attached) + return LIBUSB_ERROR_NO_DEVICE; + + if (usbi_backend->free_streams) + return usbi_backend->free_streams(dev, endpoints, + num_endpoints); + else + return LIBUSB_ERROR_NOT_SUPPORTED; +} + /** \ingroup dev * Determine if a kernel driver is active on an interface. If a kernel driver - * is active, you cannot claim the interface, and libusbx will be unable to + * is active, you cannot claim the interface, and libusb will be unable to * perform I/O. * * This functionality is not available on Windows. @@ -1647,7 +1723,7 @@ int API_EXPORTED libusb_kernel_driver_active(libusb_device_handle *dev, * * This functionality is not available on Darwin or Windows. * - * Note that libusbx itself also talks to the device through a special kernel + * Note that libusb itself also talks to the device through a special kernel * driver, if this driver is already attached to the device, this call will * not detach it and return LIBUSB_ERROR_NOT_FOUND. * @@ -1711,15 +1787,15 @@ int API_EXPORTED libusb_attach_kernel_driver(libusb_device_handle *dev, } /** \ingroup dev - * Enable/disable libusbx's automatic kernel driver detachment. When this is - * enabled libusbx will automatically detach the kernel driver on an interface + * Enable/disable libusb's automatic kernel driver detachment. When this is + * enabled libusb will automatically detach the kernel driver on an interface * when claiming the interface, and attach it when releasing the interface. * * Automatic kernel driver detachment is disabled on newly opened device * handles by default. * * On platforms which do not have LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER - * this function will return LIBUSB_ERROR_NOT_SUPPORTED, and libusbx will + * this function will return LIBUSB_ERROR_NOT_SUPPORTED, and libusb will * continue as if this function was never called. * * \param dev a device handle @@ -1749,19 +1825,19 @@ int API_EXPORTED libusb_set_auto_detach_kernel_driver( * printed. If you choose to increase the message verbosity level, ensure * that your application does not close the stdout/stderr file descriptors. * - * You are advised to use level LIBUSB_LOG_LEVEL_WARNING. libusbx is conservative + * You are advised to use level LIBUSB_LOG_LEVEL_WARNING. libusb is conservative * with its message logging and most of the time, will only log messages that * explain error conditions and other oddities. This will help you debug * your software. * - * If the LIBUSB_DEBUG environment variable was set when libusbx was + * If the LIBUSB_DEBUG environment variable was set when libusb was * initialized, this function does nothing: the message verbosity is fixed * to the value in the environment variable. * - * If libusbx was compiled without any message logging, this function does + * If libusb was compiled without any message logging, this function does * nothing: you'll never get any messages. * - * If libusbx was compiled with verbose debug message logging, this function + * If libusb was compiled with verbose debug message logging, this function * does nothing: you'll always get messages from all levels. * * \param ctx the context to operate on, or NULL for the default context @@ -1776,7 +1852,7 @@ void API_EXPORTED libusb_set_debug(libusb_context *ctx, int level) /** \ingroup lib * Initialize libusb. This function must be called before calling any other - * libusbx function. + * libusb function. * * If you do not provide an output location for a context pointer, a default * context will be created. If there was already a default context, it will @@ -1831,7 +1907,7 @@ int API_EXPORTED libusb_init(libusb_context **context) usbi_dbg("created default context"); } - usbi_dbg("libusbx v%d.%d.%d.%d", libusb_version_internal.major, libusb_version_internal.minor, + usbi_dbg("libusb v%d.%d.%d.%d", libusb_version_internal.major, libusb_version_internal.minor, libusb_version_internal.micro, libusb_version_internal.nano); usbi_mutex_init(&ctx->usb_devs_lock, NULL); @@ -1873,10 +1949,6 @@ err_free_ctx: if (ctx == usbi_default_context) usbi_default_context = NULL; - usbi_mutex_destroy(&ctx->open_devs_lock); - usbi_mutex_destroy(&ctx->usb_devs_lock); - usbi_mutex_destroy(&ctx->hotplug_cbs_lock); - usbi_mutex_static_lock(&active_contexts_lock); list_del (&ctx->list); usbi_mutex_static_unlock(&active_contexts_lock); @@ -1888,6 +1960,10 @@ err_free_ctx: } usbi_mutex_unlock(&ctx->usb_devs_lock); + usbi_mutex_destroy(&ctx->open_devs_lock); + usbi_mutex_destroy(&ctx->usb_devs_lock); + usbi_mutex_destroy(&ctx->hotplug_cbs_lock); + free(ctx); err_unlock: usbi_mutex_static_unlock(&default_context_lock); @@ -1902,6 +1978,7 @@ err_unlock: void API_EXPORTED libusb_exit(struct libusb_context *ctx) { struct libusb_device *dev, *next; + struct timeval tv = { 0, 0 }; usbi_dbg(""); USBI_GET_CONTEXT(ctx); @@ -1926,6 +2003,19 @@ void API_EXPORTED libusb_exit(struct libusb_context *ctx) if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) { usbi_hotplug_deregister_all(ctx); + + /* + * Ensure any pending unplug events are read from the hotplug + * pipe. The usb_device-s hold in the events are no longer part + * of usb_devs, but the events still hold a reference! + * + * Note we don't do this if the application has left devices + * open (which implies a buggy app) to avoid packet completion + * handlers running when the app does not expect them to run. + */ + if (list_empty(&ctx->open_devs)) + libusb_handle_events_timeout(ctx, &tv); + usbi_mutex_lock(&ctx->usb_devs_lock); list_for_each_entry_safe(dev, next, &ctx->usb_devs, list, struct libusb_device) { list_del(&dev->list); @@ -2026,10 +2116,42 @@ int usbi_gettimeofday(struct timeval *tp, void *tzp) } #endif -static void usbi_log_str(struct libusb_context *ctx, const char * str) +static void usbi_log_str(struct libusb_context *ctx, + enum libusb_log_level level, const char * str) { - UNUSED(ctx); +#if defined(USE_SYSTEM_LOGGING_FACILITY) +#if defined(OS_WINDOWS) || defined(OS_WINCE) + /* Windows CE only supports the Unicode version of OutputDebugString. */ + WCHAR wbuf[USBI_MAX_LOG_LEN]; + MultiByteToWideChar(CP_UTF8, 0, str, -1, wbuf, sizeof(wbuf)); + OutputDebugStringW(wbuf); +#elif defined(__ANDROID__) + int priority = ANDROID_LOG_UNKNOWN; + switch (level) { + case LIBUSB_LOG_LEVEL_INFO: priority = ANDROID_LOG_INFO; break; + case LIBUSB_LOG_LEVEL_WARNING: priority = ANDROID_LOG_WARN; break; + case LIBUSB_LOG_LEVEL_ERROR: priority = ANDROID_LOG_ERROR; break; + case LIBUSB_LOG_LEVEL_DEBUG: priority = ANDROID_LOG_DEBUG; break; + } + __android_log_write(priority, "libusb", str); +#elif defined(HAVE_SYSLOG_FUNC) + int syslog_level = LOG_INFO; + switch (level) { + case LIBUSB_LOG_LEVEL_INFO: syslog_level = LOG_INFO; break; + case LIBUSB_LOG_LEVEL_WARNING: syslog_level = LOG_WARNING; break; + case LIBUSB_LOG_LEVEL_ERROR: syslog_level = LOG_ERR; break; + case LIBUSB_LOG_LEVEL_DEBUG: syslog_level = LOG_DEBUG; break; + } + syslog(syslog_level, "%s", str); +#else /* All of gcc, Clang, XCode seem to use #warning */ +#warning System logging is not supported on this platform. Logging to stderr will be used instead. fputs(str, stderr); +#endif +#else + fputs(str, stderr); +#endif /* USE_SYSTEM_LOGGING_FACILITY */ + UNUSED(ctx); + UNUSED(level); } void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level, @@ -2045,47 +2167,32 @@ void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level, global_debug = 1; UNUSED(ctx); #else + int ctx_level = 0; + USBI_GET_CONTEXT(ctx); - if (ctx == NULL) + if (ctx) { + ctx_level = ctx->debug; + } else { + char *dbg = getenv("LIBUSB_DEBUG"); + if (dbg) + ctx_level = atoi(dbg); + } + global_debug = (ctx_level == LIBUSB_LOG_LEVEL_DEBUG); + if (!ctx_level) return; - global_debug = (ctx->debug == LIBUSB_LOG_LEVEL_DEBUG); - if (!ctx->debug) + if (level == LIBUSB_LOG_LEVEL_WARNING && ctx_level < LIBUSB_LOG_LEVEL_WARNING) return; - if (level == LIBUSB_LOG_LEVEL_WARNING && ctx->debug < LIBUSB_LOG_LEVEL_WARNING) + if (level == LIBUSB_LOG_LEVEL_INFO && ctx_level < LIBUSB_LOG_LEVEL_INFO) return; - if (level == LIBUSB_LOG_LEVEL_INFO && ctx->debug < LIBUSB_LOG_LEVEL_INFO) - return; - if (level == LIBUSB_LOG_LEVEL_DEBUG && ctx->debug < LIBUSB_LOG_LEVEL_DEBUG) + if (level == LIBUSB_LOG_LEVEL_DEBUG && ctx_level < LIBUSB_LOG_LEVEL_DEBUG) return; #endif -#ifdef __ANDROID__ - int prio; - switch (level) { - case LOG_LEVEL_INFO: - prio = ANDROID_LOG_INFO; - break; - case LOG_LEVEL_WARNING: - prio = ANDROID_LOG_WARN; - break; - case LOG_LEVEL_ERROR: - prio = ANDROID_LOG_ERROR; - break; - case LOG_LEVEL_DEBUG: - prio = ANDROID_LOG_DEBUG; - break; - default: - prio = ANDROID_LOG_UNKNOWN; - break; - } - - __android_log_vprint(prio, "LibUsb", format, args); -#else usbi_gettimeofday(&now, NULL); if ((global_debug) && (!has_debug_header_been_displayed)) { has_debug_header_been_displayed = 1; - usbi_log_str(ctx, "[timestamp] [threadID] facility level [function call] \n"); - usbi_log_str(ctx, "--------------------------------------------------------------------------------\n"); + usbi_log_str(ctx, LIBUSB_LOG_LEVEL_DEBUG, "[timestamp] [threadID] facility level [function call] \n"); + usbi_log_str(ctx, LIBUSB_LOG_LEVEL_DEBUG, "--------------------------------------------------------------------------------\n"); } if (now.tv_usec < timestamp_origin.tv_usec) { now.tv_sec--; @@ -2108,7 +2215,7 @@ void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level, prefix = "debug"; break; case LIBUSB_LOG_LEVEL_NONE: - break; + return; default: prefix = "unknown"; break; @@ -2116,11 +2223,11 @@ void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level, if (global_debug) { header_len = snprintf(buf, sizeof(buf), - "[%2d.%06d] [%08x] libusbx: %s [%s] ", + "[%2d.%06d] [%08x] libusb: %s [%s] ", (int)now.tv_sec, (int)now.tv_usec, usbi_get_tid(), prefix, function); } else { header_len = snprintf(buf, sizeof(buf), - "libusbx: %s [%s] ", prefix, function); + "libusb: %s [%s] ", prefix, function); } if (header_len < 0 || header_len >= sizeof(buf)) { @@ -2143,8 +2250,7 @@ void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level, } strcpy(buf + header_len + text_len, USBI_LOG_LINE_END); - usbi_log_str(ctx, buf); -#endif + usbi_log_str(ctx, level, buf); } void usbi_log(struct libusb_context *ctx, enum libusb_log_level level, @@ -2158,7 +2264,7 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level, } /** \ingroup misc - * Returns a constant NULL-terminated string with the ASCII name of a libusbx + * Returns a constant NULL-terminated string with the ASCII name of a libusb * error or transfer status code. The caller must not free() the returned * string. * diff --git a/Externals/libusbx/libusb/descriptor.c b/Externals/libusb/libusb/descriptor.c similarity index 99% rename from Externals/libusbx/libusb/descriptor.c rename to Externals/libusb/libusb/descriptor.c index ba6d1467d..93d34ced5 100644 --- a/Externals/libusbx/libusb/descriptor.c +++ b/Externals/libusb/libusb/descriptor.c @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */ /* - * USB descriptor handling functions for libusbx + * USB descriptor handling functions for libusb * Copyright © 2007 Daniel Drake * Copyright © 2001 Johannes Erdfelt * @@ -541,7 +541,7 @@ int usbi_device_cache_descriptor(libusb_device *dev) * * This is a non-blocking function; the device descriptor is cached in memory. * - * Note since libusbx-1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102, this + * Note since libusb-1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102, this * function always succeeds. * * \param dev the device @@ -660,7 +660,7 @@ int API_EXPORTED libusb_get_config_descriptor(libusb_device *dev, /* iterate through all configurations, returning the index of the configuration * matching a specific bConfigurationValue in the idx output parameter, or -1 * if the config was not found. - * returns 0 or a LIBUSB_ERROR code + * returns 0 on success or a LIBUSB_ERROR code */ int usbi_get_config_index_by_value(struct libusb_device *dev, uint8_t bConfigurationValue, int *idx) @@ -673,8 +673,10 @@ int usbi_get_config_index_by_value(struct libusb_device *dev, int host_endian; int r = usbi_backend->get_config_descriptor(dev, i, tmp, sizeof(tmp), &host_endian); - if (r < 0) + if (r < 0) { + *idx = -1; return r; + } if (tmp[5] == bConfigurationValue) { *idx = i; return 0; diff --git a/Externals/libusbx/libusb/hotplug.c b/Externals/libusb/libusb/hotplug.c similarity index 88% rename from Externals/libusbx/libusb/hotplug.c rename to Externals/libusb/libusb/hotplug.c index 6b04342f0..eba8f98b5 100644 --- a/Externals/libusbx/libusb/hotplug.c +++ b/Externals/libusb/libusb/hotplug.c @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */ /* - * Hotplug functions for libusbx + * Hotplug functions for libusb * Copyright © 2012-2013 Nathan Hjelm * Copyright © 2012-2013 Peter Stuge * @@ -45,7 +45,7 @@ * * \section intro Introduction * - * Version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102, has added support + * Version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102, has added support * for hotplug events on some platforms (you should test if your platform * supports hotplug notification by calling \ref libusb_has_capability() with * parameter \ref LIBUSB_CAP_HAS_HOTPLUG). @@ -59,7 +59,11 @@ * * A callback function must return an int (0 or 1) indicating whether the callback is * expecting additional events. Returning 0 will rearm the callback and 1 will cause - * the callback to be deregistered. + * the callback to be deregistered. Note that when callbacks are called from + * libusb_hotplug_register_callback() because of the \ref LIBUSB_HOTPLUG_ENUMERATE + * flag, the callback return value is ignored, iow you cannot cause a callback + * to be deregistered by returning 1 when it is called from + * libusb_hotplug_register_callback(). * * Callbacks for a particular context are automatically deregistered by libusb_exit(). * @@ -76,12 +80,16 @@ * are invalid and will remain so even if the device comes back. * * When handling a LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED event it is considered - * safe to call any libusbx function that takes a libusb_device. On the other hand, + * safe to call any libusb function that takes a libusb_device. On the other hand, * when handling a LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT event the only safe function * is libusb_get_device_descriptor(). * * The following code provides an example of the usage of the hotplug interface: \code +#include +#include +#include + static int count = 0; int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, @@ -127,10 +135,11 @@ int main (void) { } while (count < 2) { + libusb_handle_events_completed(NULL, NULL); usleep(10000); } - libusb_hotplug_deregister_callback(handle); + libusb_hotplug_deregister_callback(NULL, handle); libusb_exit(NULL); return 0; @@ -167,8 +176,7 @@ static int usbi_hotplug_match_cb (struct libusb_context *ctx, return 0; } - return hotplug_cb->cb (ctx == usbi_default_context ? NULL : ctx, - dev, event, hotplug_cb->user_data); + return hotplug_cb->cb (ctx, dev, event, hotplug_cb->user_data); } void usbi_hotplug_match(struct libusb_context *ctx, struct libusb_device *dev, @@ -192,18 +200,7 @@ void usbi_hotplug_match(struct libusb_context *ctx, struct libusb_device *dev, usbi_mutex_unlock(&ctx->hotplug_cbs_lock); - /* loop through and disconnect all open handles for this device */ - if (LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT == event) { - struct libusb_device_handle *handle; - - usbi_mutex_lock(&ctx->open_devs_lock); - list_for_each_entry(handle, &ctx->open_devs, list, struct libusb_device_handle) { - if (dev == handle->dev) { - usbi_handle_disconnect (handle); - } - } - usbi_mutex_unlock(&ctx->open_devs_lock); - } + /* the backend is expected to call the callback for each active transfer */ } int API_EXPORTED libusb_hotplug_register_callback(libusb_context *ctx, @@ -253,19 +250,29 @@ int API_EXPORTED libusb_hotplug_register_callback(libusb_context *ctx, list_add(&new_callback->list, &ctx->hotplug_cbs); + usbi_mutex_unlock(&ctx->hotplug_cbs_lock); + + if (flags & LIBUSB_HOTPLUG_ENUMERATE) { - struct libusb_device *dev; + int i, len; + struct libusb_device **devs; - usbi_mutex_lock(&ctx->usb_devs_lock); - - list_for_each_entry(dev, &ctx->usb_devs, list, struct libusb_device) { - (void) usbi_hotplug_match_cb (ctx, dev, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED, new_callback); + len = (int) libusb_get_device_list(ctx, &devs); + if (len < 0) { + libusb_hotplug_deregister_callback(ctx, + new_callback->handle); + return len; } - usbi_mutex_unlock(&ctx->usb_devs_lock); + for (i = 0; i < len; i++) { + usbi_hotplug_match_cb(ctx, devs[i], + LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED, + new_callback); + } + + libusb_free_device_list(devs, 1); } - usbi_mutex_unlock(&ctx->hotplug_cbs_lock); if (handle) { *handle = new_callback->handle; diff --git a/Externals/libusbx/libusb/hotplug.h b/Externals/libusb/libusb/hotplug.h similarity index 98% rename from Externals/libusbx/libusb/hotplug.h rename to Externals/libusb/libusb/hotplug.h index 614ddbcff..321a0a863 100644 --- a/Externals/libusbx/libusb/hotplug.h +++ b/Externals/libusb/libusb/hotplug.h @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */ /* - * Hotplug support for libusbx + * Hotplug support for libusb * Copyright © 2012-2013 Nathan Hjelm * Copyright © 2012-2013 Peter Stuge * diff --git a/Externals/libusbx/libusb/io.c b/Externals/libusb/libusb/io.c similarity index 90% rename from Externals/libusbx/libusb/io.c rename to Externals/libusb/libusb/io.c index 4368b9945..b9ca767d7 100644 --- a/Externals/libusbx/libusb/io.c +++ b/Externals/libusb/libusb/io.c @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */ /* - * I/O functions for libusbx + * I/O functions for libusb * Copyright © 2007-2009 Daniel Drake * Copyright © 2001 Johannes Erdfelt * @@ -43,10 +43,10 @@ * * \section intro Introduction * - * If you're using libusbx in your application, you're probably wanting to + * If you're using libusb in your application, you're probably wanting to * perform I/O with devices - you want to perform USB data transfers. * - * libusbx offers two separate interfaces for device I/O. This page aims to + * libusb offers two separate interfaces for device I/O. This page aims to * introduce the two in order to help you decide which one is more suitable * for your application. You can also choose to use both interfaces in your * application by considering each transfer on a case-by-case basis. @@ -76,7 +76,7 @@ * Data will arrive when the button is pressed by the user, which is * potentially hours later. * - * libusbx offers both a synchronous and an asynchronous interface to performing + * libusb offers both a synchronous and an asynchronous interface to performing * USB transfers. The main difference is that the synchronous interface * combines both steps indicated above into a single function call, whereas * the asynchronous interface separates them. @@ -131,9 +131,9 @@ if (r == 0 && actual_length == sizeof(data)) { * above. * * Instead of providing which functions that block until the I/O has complete, - * libusbx's asynchronous interface presents non-blocking functions which + * libusb's asynchronous interface presents non-blocking functions which * begin a transfer and then return immediately. Your application passes a - * callback function pointer to this non-blocking function, which libusbx will + * callback function pointer to this non-blocking function, which libusb will * call with the results of the transaction when it has completed. * * Transfers which have been submitted through the non-blocking functions @@ -144,12 +144,12 @@ if (r == 0 && actual_length == sizeof(data)) { * to use threads. * * This added flexibility does come with some complications though: - * - In the interest of being a lightweight library, libusbx does not create + * - In the interest of being a lightweight library, libusb does not create * threads and can only operate when your application is calling into it. Your - * application must call into libusbx from it's main loop when events are ready - * to be handled, or you must use some other scheme to allow libusbx to + * application must call into libusb from it's main loop when events are ready + * to be handled, or you must use some other scheme to allow libusb to * undertake whatever work needs to be done. - * - libusbx also needs to be called into at certain fixed points in time in + * - libusb also needs to be called into at certain fixed points in time in * order to accurately handle transfer timeouts. * - Memory handling becomes more complex. You cannot use stack memory unless * the function with that stack is guaranteed not to return until the transfer @@ -159,7 +159,7 @@ if (r == 0 && actual_length == sizeof(data)) { * results are handled. This becomes particularly obvious when you want to * submit a second transfer based on the results of an earlier transfer. * - * Internally, libusbx's synchronous interface is expressed in terms of function + * Internally, libusb's synchronous interface is expressed in terms of function * calls to the asynchronous interface. * * For details on how to use the asynchronous API, see the @@ -176,25 +176,25 @@ if (r == 0 && actual_length == sizeof(data)) { * constraints on packet size defined by endpoint descriptors. The host must * not send data payloads larger than the endpoint's maximum packet size. * - * libusbx and the underlying OS abstract out the packet concept, allowing you + * libusb and the underlying OS abstract out the packet concept, allowing you * to request transfers of any size. Internally, the request will be divided * up into correctly-sized packets. You do not have to be concerned with * packet sizes, but there is one exception when considering overflows. * * \section overflow Bulk/interrupt transfer overflows * - * When requesting data on a bulk endpoint, libusbx requires you to supply a - * buffer and the maximum number of bytes of data that libusbx can put in that + * When requesting data on a bulk endpoint, libusb requires you to supply a + * buffer and the maximum number of bytes of data that libusb can put in that * buffer. However, the size of the buffer is not communicated to the device - * the device is just asked to send any amount of data. * * There is no problem if the device sends an amount of data that is less than - * or equal to the buffer size. libusbx reports this condition to you through + * or equal to the buffer size. libusb reports this condition to you through * the \ref libusb_transfer::actual_length "libusb_transfer.actual_length" * field. * * Problems may occur if the device attempts to send more data than can fit in - * the buffer. libusbx reports LIBUSB_TRANSFER_OVERFLOW for this condition but + * the buffer. libusb reports LIBUSB_TRANSFER_OVERFLOW for this condition but * other behaviour is largely undefined: actual_length may or may not be * accurate, the chunk of data that can fit in the buffer (before overflow) * may or may not have been transferred. @@ -212,7 +212,7 @@ if (r == 0 && actual_length == sizeof(data)) { /** * @defgroup asyncio Asynchronous device I/O * - * This page details libusbx's asynchronous (non-blocking) API for USB device + * This page details libusb's asynchronous (non-blocking) API for USB device * I/O. This interface is very powerful but is also quite complex - you will * need to read this page carefully to understand the necessary considerations * and issues surrounding use of this interface. Simplistic applications @@ -227,7 +227,7 @@ if (r == 0 && actual_length == sizeof(data)) { * * \section asyncabstraction Transfer abstraction * - * For the asynchronous I/O, libusbx implements the concept of a generic + * For the asynchronous I/O, libusb implements the concept of a generic * transfer entity for all types of I/O (control, bulk, interrupt, * isochronous). The generic transfer object must be treated slightly * differently depending on which type of I/O you are performing with it. @@ -240,7 +240,7 @@ if (r == 0 && actual_length == sizeof(data)) { * -# Allocation: allocate a libusb_transfer * -# Filling: populate the libusb_transfer instance with information * about the transfer you wish to perform - * -# Submission: ask libusbx to submit the transfer + * -# Submission: ask libusb to submit the transfer * -# Completion handling: examine transfer results in the * libusb_transfer structure * -# Deallocation: clean up resources @@ -287,7 +287,7 @@ if (r == 0 && actual_length == sizeof(data)) { * * The user-specified callback is passed a pointer to the libusb_transfer * structure which was used to setup and submit the transfer. At completion - * time, libusbx has populated this structure with results of the transfer: + * time, libusb has populated this structure with results of the transfer: * success or failure reason, number of bytes of data transferred, etc. See * the libusb_transfer structure documentation for more information. * @@ -326,7 +326,7 @@ if (r == 0 && actual_length == sizeof(data)) { * has completed will result in undefined behaviour. * * When a transfer is cancelled, some of the data may have been transferred. - * libusbx will communicate this to you in the transfer callback. Do not assume + * libusb will communicate this to you in the transfer callback. Do not assume * that no data was transferred. * * \section bulk_overflows Overflows on device-to-host bulk/interrupt endpoints @@ -468,7 +468,7 @@ if (r == 0 && actual_length == sizeof(data)) { * * In most circumstances, it is not safe to use stack memory for transfer * buffers. This is because the function that fired off the asynchronous - * transfer may return before libusbx has finished using the buffer, and when + * transfer may return before libusb has finished using the buffer, and when * the function returns it's stack gets destroyed. This is true for both * host-to-device and device-to-host transfers. * @@ -488,43 +488,43 @@ if (r == 0 && actual_length == sizeof(data)) { * \ref libusb_transfer_status::LIBUSB_TRANSFER_ERROR "LIBUSB_TRANSFER_ERROR" * (they would normally be regarded as COMPLETED) * - \ref libusb_transfer_flags::LIBUSB_TRANSFER_FREE_BUFFER - * "LIBUSB_TRANSFER_FREE_BUFFER" allows you to ask libusbx to free the transfer + * "LIBUSB_TRANSFER_FREE_BUFFER" allows you to ask libusb to free the transfer * buffer when freeing the transfer. * - \ref libusb_transfer_flags::LIBUSB_TRANSFER_FREE_TRANSFER - * "LIBUSB_TRANSFER_FREE_TRANSFER" causes libusbx to automatically free the + * "LIBUSB_TRANSFER_FREE_TRANSFER" causes libusb to automatically free the * transfer after the transfer callback returns. * * \section asyncevent Event handling * - * An asynchronous model requires that libusbx perform work at various + * An asynchronous model requires that libusb perform work at various * points in time - namely processing the results of previously-submitted * transfers and invoking the user-supplied callback function. * * This gives rise to the libusb_handle_events() function which your - * application must call into when libusbx has work do to. This gives libusbx + * application must call into when libusb has work do to. This gives libusb * the opportunity to reap pending transfers, invoke callbacks, etc. * * There are 2 different approaches to dealing with libusb_handle_events: * * -# Repeatedly call libusb_handle_events() in blocking mode from a dedicated * thread. - * -# Integrate libusbx with your application's main event loop. libusbx + * -# Integrate libusb with your application's main event loop. libusb * exposes a set of file descriptors which allow you to do this. * * The first approach has the big advantage that it will also work on Windows - * were libusbx' poll API for select / poll integration is not available. So + * were libusb' poll API for select / poll integration is not available. So * if you want to support Windows and use the async API, you must use this * approach, see the \ref eventthread "Using an event handling thread" section * below for details. * * If you prefer a single threaded approach with a single central event loop, - * see the \ref poll "polling and timing" section for how to integrate libusbx + * see the \ref poll "polling and timing" section for how to integrate libusb * into your application's main event loop. * * \section eventthread Using an event handling thread * * Lets begin with stating the obvious: If you're going to use a separate - * thread for libusbx event handling, your callback functions MUST be + * thread for libusb event handling, your callback functions MUST be * threadsafe. * * Other then that doing event handling from a separate thread, is mostly @@ -545,7 +545,7 @@ void *event_thread_func(void *ctx) * libusb_handle_events() will not return. * * There are 2 different ways of dealing with this, depending on if your - * application uses libusbx' \ref hotplug "hotplug" support or not. + * application uses libusb' \ref hotplug "hotplug" support or not. * * Applications which do not use hotplug support, should not start the event * thread until after their first call to libusb_open(), and should stop the @@ -582,7 +582,7 @@ void my_libusb_exit(void) /** * @defgroup poll Polling and timing * - * This page documents libusbx's functions for polling events and timing. + * This page documents libusb's functions for polling events and timing. * These functions are only necessary for users of the * \ref asyncio "asynchronous API". If you are only using the simpler * \ref syncio "synchronous API" then you do not need to ever call these @@ -590,28 +590,28 @@ void my_libusb_exit(void) * * The justification for the functionality described here has already been * discussed in the \ref asyncevent "event handling" section of the - * asynchronous API documentation. In summary, libusbx does not create internal + * asynchronous API documentation. In summary, libusb does not create internal * threads for event processing and hence relies on your application calling - * into libusbx at certain points in time so that pending events can be handled. + * into libusb at certain points in time so that pending events can be handled. * * Your main loop is probably already calling poll() or select() or a * variant on a set of file descriptors for other event sources (e.g. keyboard * button presses, mouse movements, network sockets, etc). You then add - * libusbx's file descriptors to your poll()/select() calls, and when activity + * libusb's file descriptors to your poll()/select() calls, and when activity * is detected on such descriptors you know it is time to call * libusb_handle_events(). * - * There is one final event handling complication. libusbx supports + * There is one final event handling complication. libusb supports * asynchronous transfers which time out after a specified time period. * * On some platforms a timerfd is used, so the timeout handling is just another - * fd, on other platforms this requires that libusbx is called into at or after - * the timeout to handle it. So, in addition to considering libusbx's file - * descriptors in your main event loop, you must also consider that libusbx + * fd, on other platforms this requires that libusb is called into at or after + * the timeout to handle it. So, in addition to considering libusb's file + * descriptors in your main event loop, you must also consider that libusb * sometimes needs to be called into at fixed points in time even when there * is no file descriptor activity, see \ref polltime details. * - * In order to know precisely when libusbx needs to be called into, libusbx + * In order to know precisely when libusb needs to be called into, libusb * offers you a set of pollable file descriptors and information about when * the next timeout expires. * @@ -620,10 +620,10 @@ void my_libusb_exit(void) * * \section pollsimple The simple option * - * If your application revolves solely around libusbx and does not need to + * If your application revolves solely around libusb and does not need to * handle other event sources, you can have a program structure as follows: \code -// initialize libusbx +// initialize libusb // find and open device // maybe fire off some initial async I/O @@ -646,15 +646,15 @@ while (user_has_not_requested_exit) * * In more advanced applications, you will already have a main loop which * is monitoring other event sources: network sockets, X11 events, mouse - * movements, etc. Through exposing a set of file descriptors, libusbx is + * movements, etc. Through exposing a set of file descriptors, libusb is * designed to cleanly integrate into such main loops. * * In addition to polling file descriptors for the other event sources, you - * take a set of file descriptors from libusbx and monitor those too. When you - * detect activity on libusbx's file descriptors, you call + * take a set of file descriptors from libusb and monitor those too. When you + * detect activity on libusb's file descriptors, you call * libusb_handle_events_timeout() in non-blocking mode. * - * What's more, libusbx may also need to handle events at specific moments in + * What's more, libusb may also need to handle events at specific moments in * time. No file descriptor activity is generated at these times, so your * own application needs to be continually aware of when the next one of these * moments occurs (through calling libusb_get_next_timeout()), and then it @@ -662,25 +662,25 @@ while (user_has_not_requested_exit) * these moments occur. This means that you need to adjust your * poll()/select() timeout accordingly. * - * libusbx provides you with a set of file descriptors to poll and expects you + * libusb provides you with a set of file descriptors to poll and expects you * to poll all of them, treating them as a single entity. The meaning of each * file descriptor in the set is an internal implementation detail, * platform-dependent and may vary from release to release. Don't try and - * interpret the meaning of the file descriptors, just do as libusbx indicates, + * interpret the meaning of the file descriptors, just do as libusb indicates, * polling all of them at once. * * In pseudo-code, you want something that looks like: \code -// initialise libusbx +// initialise libusb libusb_get_pollfds(ctx) while (user has not requested application exit) { libusb_get_next_timeout(ctx); - poll(on libusbx file descriptors plus any other event sources of interest, - using a timeout no larger than the value libusbx just suggested) - if (poll() indicated activity on libusbx file descriptors) + poll(on libusb file descriptors plus any other event sources of interest, + using a timeout no larger than the value libusb just suggested) + if (poll() indicated activity on libusb file descriptors) libusb_handle_events_timeout(ctx, &zero_tv); - if (time has elapsed to or beyond the libusbx timeout) + if (time has elapsed to or beyond the libusb timeout) libusb_handle_events_timeout(ctx, &zero_tv); // handle events from other sources here } @@ -690,7 +690,7 @@ while (user has not requested application exit) { * * \subsection polltime Notes on time-based events * - * The above complication with having to track time and call into libusbx at + * The above complication with having to track time and call into libusb at * specific moments is a bit of a headache. For maximum compatibility, you do * need to write your main loop as above, but you may decide that you can * restrict the supported platforms of your application and get away with @@ -702,18 +702,18 @@ while (user has not requested application exit) { * - Linux, provided that the following version requirements are satisfied: * - Linux v2.6.27 or newer, compiled with timerfd support * - glibc v2.9 or newer - * - libusbx v1.0.5 or newer + * - libusb v1.0.5 or newer * * Under these configurations, libusb_get_next_timeout() will \em always return * 0, so your main loop can be simplified to: \code -// initialise libusbx +// initialise libusb libusb_get_pollfds(ctx) while (user has not requested application exit) { - poll(on libusbx file descriptors plus any other event sources of interest, + poll(on libusb file descriptors plus any other event sources of interest, using any timeout that you like) - if (poll() indicated activity on libusbx file descriptors) + if (poll() indicated activity on libusb file descriptors) libusb_handle_events_timeout(ctx, &zero_tv); // handle events from other sources here } @@ -723,20 +723,20 @@ while (user has not requested application exit) { * * Do remember that if you simplify your main loop to the above, you will * lose compatibility with some platforms (including legacy Linux platforms, - * and any future platforms supported by libusbx which may have time-based + * and any future platforms supported by libusb which may have time-based * event requirements). The resultant problems will likely appear as * strange bugs in your application. * * You can use the libusb_pollfds_handle_timeouts() function to do a runtime * check to see if it is safe to ignore the time-based event complications. - * If your application has taken the shortcut of ignoring libusbx's next timeout + * If your application has taken the shortcut of ignoring libusb's next timeout * in your main loop, then you are advised to check the return value of * libusb_pollfds_handle_timeouts() during application startup, and to abort * if the platform does suffer from these timing complications. * * \subsection fdsetchange Changes in the file descriptor set * - * The set of file descriptors that libusbx uses as event sources may change + * The set of file descriptors that libusb uses as event sources may change * during the life of your application. Rather than having to repeatedly * call libusb_get_pollfds(), you can set up notification functions for when * the file descriptor set changes using libusb_set_pollfd_notifiers(). @@ -757,10 +757,10 @@ while (user has not requested application exit) { /** \page mtasync Multi-threaded applications and asynchronous I/O * - * libusbx is a thread-safe library, but extra considerations must be applied - * to applications which interact with libusbx from multiple threads. + * libusb is a thread-safe library, but extra considerations must be applied + * to applications which interact with libusb from multiple threads. * - * The underlying issue that must be addressed is that all libusbx I/O + * The underlying issue that must be addressed is that all libusb I/O * revolves around monitoring file descriptors through the poll()/select() * system calls. This is directly exposed at the * \ref asyncio "asynchronous interface" but it is important to note that the @@ -768,13 +768,13 @@ while (user has not requested application exit) { * asynchonrous interface, therefore the same considerations apply. * * The issue is that if two or more threads are concurrently calling poll() - * or select() on libusbx's file descriptors then only one of those threads + * or select() on libusb's file descriptors then only one of those threads * will be woken up when an event arrives. The others will be completely * oblivious that anything has happened. * * Consider the following pseudo-code, which submits an asynchronous transfer * then waits for its completion. This style is one way you could implement a - * synchronous interface on top of the asynchronous interface (and libusbx + * synchronous interface on top of the asynchronous interface (and libusb * does something similar, albeit more advanced due to the complications * explained on this page). * @@ -787,7 +787,7 @@ void cb(struct libusb_transfer *transfer) void myfunc() { struct libusb_transfer *transfer; - unsigned char buffer[LIBUSB_CONTROL_SETUP_SIZE]; + unsigned char buffer[LIBUSB_CONTROL_SETUP_SIZE] __attribute__ ((aligned (2))); int completed = 0; transfer = libusb_alloc_transfer(0); @@ -797,7 +797,7 @@ void myfunc() { libusb_submit_transfer(transfer); while (!completed) { - poll(libusbx file descriptors, 120*1000); + poll(libusb file descriptors, 120*1000); if (poll indicates activity) libusb_handle_events_timeout(ctx, &zero_tv); } @@ -811,7 +811,7 @@ void myfunc() { * The poll() loop has a long timeout to minimize CPU usage during situations * when nothing is happening (it could reasonably be unlimited). * - * If this is the only thread that is polling libusbx's file descriptors, there + * If this is the only thread that is polling libusb's file descriptors, there * is no problem: there is no danger that another thread will swallow up the * event that we are interested in. On the other hand, if there is another * thread polling the same descriptors, there is a chance that it will receive @@ -823,13 +823,13 @@ void myfunc() { * * The solution here is to ensure that no two threads are ever polling the * file descriptors at the same time. A naive implementation of this would - * impact the capabilities of the library, so libusbx offers the scheme + * impact the capabilities of the library, so libusb offers the scheme * documented below to ensure no loss of functionality. * * Before we go any further, it is worth mentioning that all libusb-wrapped * event handling procedures fully adhere to the scheme documented below. * This includes libusb_handle_events() and its variants, and all the - * synchronous I/O functions - libusbx hides this headache from you. + * synchronous I/O functions - libusb hides this headache from you. * * \section Using libusb_handle_events() from multiple threads * @@ -875,17 +875,17 @@ void myfunc() { * * \section eventlock The events lock * - * The problem is when we consider the fact that libusbx exposes file + * The problem is when we consider the fact that libusb exposes file * descriptors to allow for you to integrate asynchronous USB I/O into * existing main loops, effectively allowing you to do some work behind - * libusbx's back. If you do take libusbx's file descriptors and pass them to + * libusb's back. If you do take libusb's file descriptors and pass them to * poll()/select() yourself, you need to be aware of the associated issues. * * The first concept to be introduced is the events lock. The events lock * is used to serialize threads that want to handle events, such that only * one thread is handling events at any one time. * - * You must take the events lock before polling libusbx file descriptors, + * You must take the events lock before polling libusb file descriptors, * using libusb_lock_events(). You must release the lock as soon as you have * aborted your poll()/select() loop, using libusb_unlock_events(). * @@ -896,7 +896,7 @@ void myfunc() { \code libusb_lock_events(ctx); while (!completed) { - poll(libusbx file descriptors, 120*1000); + poll(libusb file descriptors, 120*1000); if (poll indicates activity) libusb_handle_events_timeout(ctx, &zero_tv); } @@ -912,7 +912,7 @@ void myfunc() { * status of its transfer until the code above has finished (30 seconds later) * due to contention on the lock. * - * To solve this, libusbx offers you a mechanism to determine when another + * To solve this, libusb offers you a mechanism to determine when another * thread is handling events. It also offers a mechanism to block your thread * until the event handling thread has completed an event (and this mechanism * does not involve polling of file descriptors). @@ -938,7 +938,7 @@ if (libusb_try_lock_events(ctx) == 0) { libusb_unlock_events(ctx); goto retry; } - poll(libusbx file descriptors, 120*1000); + poll(libusb file descriptors, 120*1000); if (poll indicates activity) libusb_handle_events_locked(ctx, 0); } @@ -984,8 +984,8 @@ printf("completed!\n"); * should be apparent from the code shown above. * -# libusb_try_lock_events() is a non-blocking function which attempts * to acquire the events lock but returns a failure code if it is contended. - * -# libusb_event_handling_ok() checks that libusbx is still happy for your - * thread to be performing event handling. Sometimes, libusbx needs to + * -# libusb_event_handling_ok() checks that libusb is still happy for your + * thread to be performing event handling. Sometimes, libusb needs to * interrupt the event handler, and this is how you can check if you have * been interrupted. If this function returns 0, the correct behaviour is * for you to give up the event handling lock, and then to repeat the cycle. @@ -995,12 +995,12 @@ printf("completed!\n"); * libusb_handle_events_timeout() that you can call while holding the * events lock. libusb_handle_events_timeout() itself implements similar * logic to the above, so be sure not to call it when you are - * "working behind libusbx's back", as is the case here. + * "working behind libusb's back", as is the case here. * -# libusb_event_handler_active() determines if someone is currently * holding the events lock * * You might be wondering why there is no function to wake up all threads - * blocked on libusb_wait_for_event(). This is because libusbx can do this + * blocked on libusb_wait_for_event(). This is because libusb can do this * internally: it will wake up all such threads when someone calls * libusb_unlock_events() or when a transfer completes (at the point after its * callback has returned). @@ -1009,7 +1009,7 @@ printf("completed!\n"); * * The above explanation should be enough to get you going, but if you're * really thinking through the issues then you may be left with some more - * questions regarding libusbx's internals. If you're curious, read on, and if + * questions regarding libusb's internals. If you're curious, read on, and if * not, skip to the next section to avoid confusing yourself! * * The immediate question that may spring to mind is: what if one thread @@ -1024,14 +1024,14 @@ printf("completed!\n"); * are all kinds of race conditions that could arise here, so it is * important that nobody is doing event handling at this time. * - * libusbx handles these issues internally, so application developers do not + * libusb handles these issues internally, so application developers do not * have to stop their event handlers while opening/closing devices. Here's how * it works, focusing on the libusb_close() situation first: * - * -# During initialization, libusbx opens an internal pipe, and it adds the read + * -# During initialization, libusb opens an internal pipe, and it adds the read * end of this pipe to the set of file descriptors to be polled. - * -# During libusb_close(), libusbx writes some dummy data on this control pipe. - * This immediately interrupts the event handler. libusbx also records + * -# During libusb_close(), libusb writes some dummy data on this control pipe. + * This immediately interrupts the event handler. libusb also records * internally that it is trying to interrupt event handlers for this * high-priority event. * -# At this point, some of the functions described above start behaving @@ -1046,7 +1046,7 @@ printf("completed!\n"); * giving up the events lock very quickly, giving the high-priority * libusb_close() operation a "free ride" to acquire the events lock. All * threads that are competing to do event handling become event waiters. - * -# With the events lock held inside libusb_close(), libusbx can safely remove + * -# With the events lock held inside libusb_close(), libusb can safely remove * a file descriptor from the poll set, in the safety of knowledge that * nobody is polling those descriptors or trying to access the poll set. * -# After obtaining the events lock, the close operation completes very @@ -1063,7 +1063,7 @@ printf("completed!\n"); * call to libusb_open(): * * -# The device is opened and a file descriptor is added to the poll set. - * -# libusbx sends some dummy data on the control pipe, and records that it + * -# libusb sends some dummy data on the control pipe, and records that it * is trying to modify the poll descriptor set. * -# The event handler is interrupted, and the same behaviour change as for * libusb_close() takes effect, causing all event handling threads to become @@ -1079,7 +1079,7 @@ printf("completed!\n"); * * The above may seem a little complicated, but hopefully I have made it clear * why such complications are necessary. Also, do not forget that this only - * applies to applications that take libusbx's file descriptors and integrate + * applies to applications that take libusb's file descriptors and integrate * them into their own polling loops. * * You may decide that it is OK for your multi-threaded application to ignore @@ -1291,7 +1291,7 @@ out: } /** \ingroup asyncio - * Allocate a libusbx transfer with a specified number of isochronous packet + * Allocate a libusb transfer with a specified number of isochronous packet * descriptors. The returned transfer is pre-initialized for you. When the new * transfer is no longer needed, it should be freed with * libusb_free_transfer(). @@ -1439,6 +1439,7 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer) int r; int updated_fds; + usbi_mutex_lock(&ctx->flying_transfers_lock); usbi_mutex_lock(&itransfer->lock); itransfer->transferred = 0; itransfer->flags = 0; @@ -1448,7 +1449,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer) goto out; } - usbi_mutex_lock(&ctx->flying_transfers_lock); r = add_to_flying_list(itransfer); if (r == LIBUSB_SUCCESS) { r = usbi_backend->submit_transfer(itransfer); @@ -1456,12 +1456,14 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer) if (r != LIBUSB_SUCCESS) { list_del(&itransfer->list); arm_timerfd_for_next_timeout(ctx); + } else { + /* keep a reference to this device */ + libusb_ref_device(transfer->dev_handle->dev); } - usbi_mutex_unlock(&ctx->flying_transfers_lock); - out: updated_fds = (itransfer->flags & USBI_TRANSFER_UPDATED_FDS); usbi_mutex_unlock(&itransfer->lock); + usbi_mutex_unlock(&ctx->flying_transfers_lock); if (updated_fds) usbi_fd_notification(ctx); return r; @@ -1508,6 +1510,43 @@ int API_EXPORTED libusb_cancel_transfer(struct libusb_transfer *transfer) return r; } +/** \ingroup asyncio + * Set a transfers bulk stream id. Note users are advised to use + * libusb_fill_bulk_stream_transfer() instead of calling this function + * directly. + * + * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103 + * + * \param transfer the transfer to set the stream id for + * \param stream_id the stream id to set + * \see libusb_alloc_streams() + */ +void API_EXPORTED libusb_transfer_set_stream_id( + struct libusb_transfer *transfer, uint32_t stream_id) +{ + struct usbi_transfer *itransfer = + LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); + + itransfer->stream_id = stream_id; +} + +/** \ingroup asyncio + * Get a transfers bulk stream id. + * + * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103 + * + * \param transfer the transfer to get the stream id for + * \returns the stream id for the transfer + */ +uint32_t API_EXPORTED libusb_transfer_get_stream_id( + struct libusb_transfer *transfer) +{ + struct usbi_transfer *itransfer = + LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); + + return itransfer->stream_id; +} + /* Handle completion of a transfer (completion might be an error condition). * This will invoke the user-supplied callback function, which may end up * freeing the transfer. Therefore you cannot use the transfer structure @@ -1522,6 +1561,7 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer, struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_context *ctx = TRANSFER_CTX(transfer); + struct libusb_device_handle *handle = transfer->dev_handle; uint8_t flags; int r = 0; @@ -1562,6 +1602,7 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer, usbi_mutex_lock(&ctx->event_waiters_lock); usbi_cond_broadcast(&ctx->event_waiters_cond); usbi_mutex_unlock(&ctx->event_waiters_lock); + libusb_unref_device(handle->dev); return 0; } @@ -1585,11 +1626,11 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *transfer) /** \ingroup poll * Attempt to acquire the event handling lock. This lock is used to ensure that - * only one thread is monitoring libusbx event sources at any one time. + * only one thread is monitoring libusb event sources at any one time. * * You only need to use this lock if you are developing an application - * which calls poll() or select() on libusbx's file descriptors directly. - * If you stick to libusbx's event handling loop functions (e.g. + * which calls poll() or select() on libusb's file descriptors directly. + * If you stick to libusb's event handling loop functions (e.g. * libusb_handle_events()) then you do not need to be concerned with this * locking. * @@ -1600,7 +1641,7 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *transfer) * \param ctx the context to operate on, or NULL for the default context * \returns 0 if the lock was obtained successfully * \returns 1 if the lock was not obtained (i.e. another thread holds the lock) - * \see \ref mtasync + * \ref mtasync */ int API_EXPORTED libusb_try_lock_events(libusb_context *ctx) { @@ -1629,11 +1670,11 @@ int API_EXPORTED libusb_try_lock_events(libusb_context *ctx) /** \ingroup poll * Acquire the event handling lock, blocking until successful acquisition if * it is contended. This lock is used to ensure that only one thread is - * monitoring libusbx event sources at any one time. + * monitoring libusb event sources at any one time. * * You only need to use this lock if you are developing an application - * which calls poll() or select() on libusbx's file descriptors directly. - * If you stick to libusbx's event handling loop functions (e.g. + * which calls poll() or select() on libusb's file descriptors directly. + * If you stick to libusb's event handling loop functions (e.g. * libusb_handle_events()) then you do not need to be concerned with this * locking. * @@ -1642,7 +1683,7 @@ int API_EXPORTED libusb_try_lock_events(libusb_context *ctx) * as soon as possible. * * \param ctx the context to operate on, or NULL for the default context - * \see \ref mtasync + * \ref mtasync */ void API_EXPORTED libusb_lock_events(libusb_context *ctx) { @@ -1657,7 +1698,7 @@ void API_EXPORTED libusb_lock_events(libusb_context *ctx) * on libusb_wait_for_event(). * * \param ctx the context to operate on, or NULL for the default context - * \see \ref mtasync + * \ref mtasync */ void API_EXPORTED libusb_unlock_events(libusb_context *ctx) { @@ -1676,7 +1717,7 @@ void API_EXPORTED libusb_unlock_events(libusb_context *ctx) /** \ingroup poll * Determine if it is still OK for this thread to be doing event handling. * - * Sometimes, libusbx needs to temporarily pause all event handlers, and this + * Sometimes, libusb needs to temporarily pause all event handlers, and this * is the function you should use before polling file descriptors to see if * this is the case. * @@ -1692,7 +1733,7 @@ void API_EXPORTED libusb_unlock_events(libusb_context *ctx) * \param ctx the context to operate on, or NULL for the default context * \returns 1 if event handling can start or continue * \returns 0 if this thread must give up the events lock - * \see \ref fullstory "Multi-threaded I/O: the full story" + * \ref fullstory "Multi-threaded I/O: the full story" */ int API_EXPORTED libusb_event_handling_ok(libusb_context *ctx) { @@ -1720,7 +1761,7 @@ int API_EXPORTED libusb_event_handling_ok(libusb_context *ctx) * \param ctx the context to operate on, or NULL for the default context * \returns 1 if a thread is handling events * \returns 0 if there are no threads currently handling events - * \see \ref mtasync + * \ref mtasync */ int API_EXPORTED libusb_event_handler_active(libusb_context *ctx) { @@ -1750,14 +1791,14 @@ int API_EXPORTED libusb_event_handler_active(libusb_context *ctx) * events, then call libusb_wait_for_event(). * * You only need to use this lock if you are developing an application - * which calls poll() or select() on libusbx's file descriptors directly, + * which calls poll() or select() on libusb's file descriptors directly, * and may potentially be handling events from 2 threads simultaenously. - * If you stick to libusbx's event handling loop functions (e.g. + * If you stick to libusb's event handling loop functions (e.g. * libusb_handle_events()) then you do not need to be concerned with this * locking. * * \param ctx the context to operate on, or NULL for the default context - * \see \ref mtasync + * \ref mtasync */ void API_EXPORTED libusb_lock_event_waiters(libusb_context *ctx) { @@ -1768,7 +1809,7 @@ void API_EXPORTED libusb_lock_event_waiters(libusb_context *ctx) /** \ingroup poll * Release the event waiters lock. * \param ctx the context to operate on, or NULL for the default context - * \see \ref mtasync + * \ref mtasync */ void API_EXPORTED libusb_unlock_event_waiters(libusb_context *ctx) { @@ -1799,7 +1840,7 @@ void API_EXPORTED libusb_unlock_event_waiters(libusb_context *ctx) * indicates unlimited timeout. * \returns 0 after a transfer completes or another thread stops event handling * \returns 1 if the timeout expired - * \see \ref mtasync + * \ref mtasync */ int API_EXPORTED libusb_wait_for_event(libusb_context *ctx, struct timeval *tv) { @@ -1926,6 +1967,7 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) struct pollfd *fds = NULL; int i = -1; int timeout_ms; + int special_event; usbi_mutex_lock(&ctx->pollfds_lock); list_for_each_entry(ipollfd, &ctx->pollfds, list, struct usbi_pollfd) @@ -1955,6 +1997,7 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) if (tv->tv_usec % 1000) timeout_ms++; +redo_poll: usbi_dbg("poll() %d fds with timeout in %dms", nfds, timeout_ms); r = usbi_poll(fds, nfds, timeout_ms); usbi_dbg("poll() returned %d", r); @@ -1970,6 +2013,8 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) return LIBUSB_ERROR_IO; } + special_event = 0; + /* fd[0] is always the ctrl pipe */ if (fds[0].revents) { /* another thread wanted to interrupt event handling, and it succeeded! @@ -1993,11 +2038,12 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) ssize_t ret; usbi_dbg("caught a fish on the hotplug pipe"); + special_event = 1; /* read the message from the hotplug thread */ ret = usbi_read(ctx->hotplug_pipe[0], &message, sizeof (message)); - if (ret < sizeof(message)) { - usbi_err(ctx, "hotplug pipe read error %d < %d", + if (ret != sizeof(message)) { + usbi_err(ctx, "hotplug pipe read error %d != %u", ret, sizeof(message)); r = LIBUSB_ERROR_OTHER; goto handled; @@ -2020,6 +2066,7 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) /* timerfd indicates that a timeout has expired */ int ret; usbi_dbg("timerfd triggered"); + special_event = 1; ret = handle_timerfd_trigger(ctx); if (ret < 0) { @@ -2044,6 +2091,11 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) usbi_err(ctx, "backend handle_events failed with error %d", r); handled: + if (r == 0 && special_event) { + timeout_ms = 0; + goto redo_poll; + } + free(fds); return r; } @@ -2078,7 +2130,7 @@ static int get_next_timeout(libusb_context *ctx, struct timeval *tv, /** \ingroup poll * Handle any pending events. * - * libusbx determines "pending events" by checking if any timeouts have expired + * libusb determines "pending events" by checking if any timeouts have expired * and by checking the set of file descriptors for activity. * * If a zero timeval is passed, this function will handle any already-pending @@ -2099,7 +2151,7 @@ static int get_next_timeout(libusb_context *ctx, struct timeval *tv, * timeval struct for non-blocking mode * \param completed pointer to completion integer to check, or NULL * \returns 0 on success, or a LIBUSB_ERROR code on failure - * \see \ref mtasync + * \ref mtasync */ int API_EXPORTED libusb_handle_events_timeout_completed(libusb_context *ctx, struct timeval *tv, int *completed) @@ -2210,7 +2262,7 @@ int API_EXPORTED libusb_handle_events(libusb_context *ctx) * \param ctx the context to operate on, or NULL for the default context * \param completed pointer to completion integer to check, or NULL * \returns 0 on success, or a LIBUSB_ERROR code on failure - * \see \ref mtasync + * \ref mtasync */ int API_EXPORTED libusb_handle_events_completed(libusb_context *ctx, int *completed) @@ -2227,16 +2279,16 @@ int API_EXPORTED libusb_handle_events_completed(libusb_context *ctx, * held, see libusb_lock_events(). * * This function is designed to be called under the situation where you have - * taken the event lock and are calling poll()/select() directly on libusbx's + * taken the event lock and are calling poll()/select() directly on libusb's * file descriptors (as opposed to using libusb_handle_events() or similar). - * You detect events on libusbx's descriptors, so you then call this function + * You detect events on libusb's descriptors, so you then call this function * with a zero timeout value (while still holding the event lock). * * \param ctx the context to operate on, or NULL for the default context * \param tv the maximum time to block waiting for events, or zero for * non-blocking mode * \returns 0 on success, or a LIBUSB_ERROR code on failure - * \see \ref mtasync + * \ref mtasync */ int API_EXPORTED libusb_handle_events_locked(libusb_context *ctx, struct timeval *tv) @@ -2256,19 +2308,19 @@ int API_EXPORTED libusb_handle_events_locked(libusb_context *ctx, /** \ingroup poll * Determines whether your application must apply special timing considerations - * when monitoring libusbx's file descriptors. + * when monitoring libusb's file descriptors. * * This function is only useful for applications which retrieve and poll - * libusbx's file descriptors in their own main loop (\ref pollmain). + * libusb's file descriptors in their own main loop (\ref pollmain). * - * Ordinarily, libusbx's event handler needs to be called into at specific + * Ordinarily, libusb's event handler needs to be called into at specific * moments in time (in addition to times when there is activity on the file * descriptor set). The usual approach is to use libusb_get_next_timeout() * to learn about when the next timeout occurs, and to adjust your * poll()/select() timeout accordingly so that you can make a call into the * library at that time. * - * Some platforms supported by libusbx do not come with this baggage - any + * Some platforms supported by libusb do not come with this baggage - any * events relevant to timing will be represented by activity on the file * descriptor set, and libusb_get_next_timeout() will always return 0. * This function allows you to detect whether you are running on such a @@ -2277,10 +2329,10 @@ int API_EXPORTED libusb_handle_events_locked(libusb_context *ctx, * Since v1.0.5. * * \param ctx the context to operate on, or NULL for the default context - * \returns 0 if you must call into libusbx at times determined by + * \returns 0 if you must call into libusb at times determined by * libusb_get_next_timeout(), or 1 if all timeout events are handled internally * or through regular activity on the file descriptors. - * \see \ref pollmain "Polling libusbx file descriptors for event handling" + * \ref pollmain "Polling libusb file descriptors for event handling" */ int API_EXPORTED libusb_pollfds_handle_timeouts(libusb_context *ctx) { @@ -2294,21 +2346,21 @@ int API_EXPORTED libusb_pollfds_handle_timeouts(libusb_context *ctx) } /** \ingroup poll - * Determine the next internal timeout that libusbx needs to handle. You only + * Determine the next internal timeout that libusb needs to handle. You only * need to use this function if you are calling poll() or select() or similar - * on libusbx's file descriptors yourself - you do not need to use it if you + * on libusb's file descriptors yourself - you do not need to use it if you * are calling libusb_handle_events() or a variant directly. * * You should call this function in your main loop in order to determine how - * long to wait for select() or poll() to return results. libusbx needs to be + * long to wait for select() or poll() to return results. libusb needs to be * called into at this timeout, so you should use it as an upper bound on * your select() or poll() call. * * When the timeout has expired, call into libusb_handle_events_timeout() - * (perhaps in non-blocking mode) so that libusbx can handle the timeout. + * (perhaps in non-blocking mode) so that libusb can handle the timeout. * * This function may return 1 (success) and an all-zero timeval. If this is - * the case, it indicates that libusbx has a timeout that has already expired + * the case, it indicates that libusb has a timeout that has already expired * so you should call libusb_handle_events_timeout() or similar immediately. * A return code of 0 indicates that there are no pending timeouts. * @@ -2317,7 +2369,7 @@ int API_EXPORTED libusb_pollfds_handle_timeouts(libusb_context *ctx) * * \param ctx the context to operate on, or NULL for the default context * \param tv output location for a relative time against the current - * clock in which libusbx must be called into in order to process timeout events + * clock in which libusb must be called into in order to process timeout events * \returns 0 if there are no pending timeouts, 1 if a timeout was returned, * or LIBUSB_ERROR_OTHER on failure */ @@ -2384,7 +2436,7 @@ int API_EXPORTED libusb_get_next_timeout(libusb_context *ctx, /** \ingroup poll * Register notification functions for file descriptor additions/removals. * These functions will be invoked for every new or removed file descriptor - * that libusbx uses as an event source. + * that libusb uses as an event source. * * To remove notifiers, pass NULL values for the function pointers. * @@ -2462,7 +2514,7 @@ void usbi_remove_pollfd(struct libusb_context *ctx, int fd) /** \ingroup poll * Retrieve a list of file descriptors that should be polled by your main loop - * as libusbx event sources. + * as libusb event sources. * * The returned list is NULL-terminated and should be freed with free() when * done. The actual list contents must not be touched. @@ -2502,7 +2554,7 @@ out: usbi_mutex_unlock(&ctx->pollfds_lock); return (const struct libusb_pollfd **) ret; #else - usbi_err(ctx, "external polling of libusbx's internal descriptors "\ + usbi_err(ctx, "external polling of libusb's internal descriptors "\ "is not yet supported on Windows platforms"); return NULL; #endif diff --git a/Externals/libusbx/libusb/libusb-1.0.def b/Externals/libusb/libusb/libusb-1.0.def similarity index 95% rename from Externals/libusbx/libusb/libusb-1.0.def rename to Externals/libusb/libusb/libusb-1.0.def index cb0e32ab9..d45cfc55a 100644 --- a/Externals/libusbx/libusb/libusb-1.0.def +++ b/Externals/libusb/libusb/libusb-1.0.def @@ -1,5 +1,7 @@ LIBRARY "libusb-1.0.dll" EXPORTS + libusb_alloc_streams + libusb_alloc_streams@16 = libusb_alloc_streams libusb_alloc_transfer libusb_alloc_transfer@4 = libusb_alloc_transfer libusb_attach_kernel_driver @@ -38,6 +40,8 @@ EXPORTS libusb_free_ss_endpoint_companion_descriptor@4 = libusb_free_ss_endpoint_companion_descriptor libusb_free_ss_usb_device_capability_descriptor libusb_free_ss_usb_device_capability_descriptor@4 = libusb_free_ss_usb_device_capability_descriptor + libusb_free_streams + libusb_free_streams@12 = libusb_free_streams libusb_free_transfer libusb_free_transfer@4 = libusb_free_transfer libusb_free_usb_2_0_extension_descriptor @@ -146,6 +150,10 @@ EXPORTS libusb_strerror@4 = libusb_strerror libusb_submit_transfer libusb_submit_transfer@4 = libusb_submit_transfer + libusb_transfer_get_stream_id + libusb_transfer_get_stream_id@4 = libusb_transfer_get_stream_id + libusb_transfer_set_stream_id + libusb_transfer_set_stream_id@8 = libusb_transfer_set_stream_id libusb_try_lock_events libusb_try_lock_events@4 = libusb_try_lock_events libusb_unlock_event_waiters diff --git a/Externals/libusbx/libusb/libusb-1.0.rc b/Externals/libusb/libusb/libusb-1.0.rc similarity index 97% rename from Externals/libusbx/libusb/libusb-1.0.rc rename to Externals/libusb/libusb/libusb-1.0.rc index ae49757cc..3dce6d5a9 100644 --- a/Externals/libusbx/libusb/libusb-1.0.rc +++ b/Externals/libusb/libusb/libusb-1.0.rc @@ -41,7 +41,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "libusbx.org\0" + VALUE "CompanyName", "libusb.info\0" VALUE "FileDescription", "C library for writing portable USB drivers in userspace\0" VALUE "FileVersion", LIBUSB_VERSIONSTRING VALUE "InternalName", "libusb\0" diff --git a/Externals/libusbx/libusb/libusb.h b/Externals/libusb/libusb/libusb.h similarity index 92% rename from Externals/libusbx/libusb/libusb.h rename to Externals/libusb/libusb/libusb.h index e8e120162..a19ab3488 100644 --- a/Externals/libusbx/libusb/libusb.h +++ b/Externals/libusb/libusb/libusb.h @@ -1,10 +1,10 @@ /* - * Public libusbx header file + * Public libusb header file * Copyright © 2001 Johannes Erdfelt * Copyright © 2007-2008 Daniel Drake * Copyright © 2012 Pete Batard * Copyright © 2012 Nathan Hjelm - * For more information, please visit: http://libusbx.org + * For more information, please visit: http://libusb.info * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -62,7 +62,7 @@ typedef unsigned __int32 uint32_t; #include /* 'interface' might be defined as a macro on Windows, so we need to - * undefine it so as not to break the current libusbx API, because + * undefine it so as not to break the current libusb API, because * libusb_config_descriptor has an 'interface' member * As this can be problematic if you include windows.h after libusb.h * in your sources, we force windows.h to be included first. */ @@ -85,14 +85,14 @@ typedef unsigned __int32 uint32_t; /** \def LIBUSB_CALL * \ingroup misc - * libusbx's Windows calling convention. + * libusb's Windows calling convention. * * Under Windows, the selection of available compilers and configurations * means that, unlike other platforms, there is not one true calling * convention (calling convention: the manner in which parameters are * passed to funcions in the generated assembly code). * - * Matching the Windows API itself, libusbx uses the WINAPI convention (which + * Matching the Windows API itself, libusb uses the WINAPI convention (which * translates to the stdcall convention) and guarantees that the * library is compiled in this way. The public header file also includes * appropriate annotations so that your own software will use the right @@ -100,7 +100,7 @@ typedef unsigned __int32 uint32_t; * your codebase. * * The one consideration that you must apply in your software is to mark - * all functions which you use as libusbx callbacks with this LIBUSB_CALL + * all functions which you use as libusb callbacks with this LIBUSB_CALL * annotation, so that they too get compiled for the correct calling * convention. * @@ -108,7 +108,7 @@ typedef unsigned __int32 uint32_t; * means that you can apply it to your code without worrying about * cross-platform compatibility. */ -/* LIBUSB_CALL must be defined on both definition and declaration of libusbx +/* LIBUSB_CALL must be defined on both definition and declaration of libusb * functions. You'd think that declaration would be enough, but cygwin will * complain about conflicting types unless both are marked this way. * The placement of this macro is important too; it must appear after the @@ -121,36 +121,39 @@ typedef unsigned __int32 uint32_t; #define LIBUSB_CALL #endif -/** \def LIBUSBX_API_VERSION +/** \def LIBUSB_API_VERSION * \ingroup misc - * libusbx's API version. + * libusb's API version. * - * Since version 1.0.13, to help with feature detection, libusbx defines - * a LIBUSBX_API_VERSION macro that gets increased every time there is a + * Since version 1.0.13, to help with feature detection, libusb defines + * a LIBUSB_API_VERSION macro that gets increased every time there is a * significant change to the API, such as the introduction of a new call, * the definition of a new macro/enum member, or any other element that - * libusbx applications may want to detect at compilation time. + * libusb applications may want to detect at compilation time. * * The macro is typically used in an application as follows: * \code - * #if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01001234) - * // Use one of the newer features from the libusbx API + * #if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01001234) + * // Use one of the newer features from the libusb API * #endif * \endcode * - * Another feature of LIBUSBX_API_VERSION is that it can be used to detect - * whether you are compiling against the libusb or the libusbx library. + * Another feature of LIBUSB_API_VERSION is that it can be used to detect + * whether you are compiling against the libusb or the libusb library. * - * Internally, LIBUSBX_API_VERSION is defined as follows: - * (libusbx major << 24) | (libusbx minor << 16) | (16 bit incremental) + * Internally, LIBUSB_API_VERSION is defined as follows: + * (libusb major << 24) | (libusb minor << 16) | (16 bit incremental) */ -#define LIBUSBX_API_VERSION 0x01000102 +#define LIBUSB_API_VERSION 0x01000103 + +/* The following is kept for compatibility, but will be deprecated in the future */ +#define LIBUSBX_API_VERSION LIBUSB_API_VERSION #ifdef __cplusplus extern "C" { #endif -/** \def libusb_cpu_to_le16 +/** * \ingroup misc * Convert a 16-bit value from host-endian to little-endian format. On * little endian systems, this function does nothing. On big endian systems, @@ -340,7 +343,10 @@ enum libusb_transfer_type { LIBUSB_TRANSFER_TYPE_BULK = 2, /** Interrupt endpoint */ - LIBUSB_TRANSFER_TYPE_INTERRUPT = 3 + LIBUSB_TRANSFER_TYPE_INTERRUPT = 3, + + /** Stream endpoint */ + LIBUSB_TRANSFER_TYPE_BULK_STREAM = 4, }; /** \ingroup misc @@ -562,7 +568,7 @@ struct libusb_endpoint_descriptor { /** For audio devices only: the address if the synch endpoint */ uint8_t bSynchAddress; - /** Extra descriptors. If libusbx encounters unknown endpoint descriptors, + /** Extra descriptors. If libusb encounters unknown endpoint descriptors, * it will store them here, should you wish to parse them. */ const unsigned char *extra; @@ -612,7 +618,7 @@ struct libusb_interface_descriptor { * by the bNumEndpoints field. */ const struct libusb_endpoint_descriptor *endpoint; - /** Extra descriptors. If libusbx encounters unknown interface descriptors, + /** Extra descriptors. If libusb encounters unknown interface descriptors, * it will store them here, should you wish to parse them. */ const unsigned char *extra; @@ -670,7 +676,7 @@ struct libusb_config_descriptor { * this array is determined by the bNumInterfaces field. */ const struct libusb_interface *interface; - /** Extra descriptors. If libusbx encounters unknown configuration + /** Extra descriptors. If libusb encounters unknown configuration * descriptors, it will store them here, should you wish to parse them. */ const unsigned char *extra; @@ -889,7 +895,7 @@ struct libusb_control_setup { #define LIBUSB_CONTROL_SETUP_SIZE (sizeof(struct libusb_control_setup)) -/* libusbx */ +/* libusb */ struct libusb_context; struct libusb_device; @@ -897,7 +903,7 @@ struct libusb_device_handle; struct libusb_hotplug_callback; /** \ingroup lib - * Structure providing the version of the libusbx runtime + * Structure providing the version of the libusb runtime */ struct libusb_version { /** Library major version. */ @@ -920,16 +926,16 @@ struct libusb_version { }; /** \ingroup lib - * Structure representing a libusbx session. The concept of individual libusbx + * Structure representing a libusb session. The concept of individual libusb * sessions allows for your program to use two libraries (or dynamically * load two modules) which both independently use libusb. This will prevent - * interference between the individual libusbx users - for example + * interference between the individual libusb users - for example * libusb_set_debug() will not affect the other user of the library, and * libusb_exit() will not destroy resources that the other user is still * using. * * Sessions are created by libusb_init() and destroyed through libusb_exit(). - * If your application is guaranteed to only ever include a single libusbx + * If your application is guaranteed to only ever include a single libusb * user (i.e. you), you do not have to worry about contexts: pass NULL in * every function call where a context is required. The default context * will be used. @@ -1042,7 +1048,7 @@ enum libusb_bos_type { }; /** \ingroup misc - * Error codes. Most libusbx functions return 0 on success or one of these + * Error codes. Most libusb functions return 0 on success or one of these * codes on failure. * You can call libusb_error_name() to retrieve a string representation of an * error code or libusb_strerror() to get an end-user suitable description of @@ -1188,7 +1194,7 @@ struct libusb_transfer; * Asynchronous transfer callback function type. When submitting asynchronous * transfers, you pass a pointer to a callback function of this type via the * \ref libusb_transfer::callback "callback" member of the libusb_transfer - * structure. libusbx will call this function later, when the transfer has + * structure. libusb will call this function later, when the transfer has * completed or failed. See \ref asyncio for more information. * \param transfer The libusb_transfer struct the callback function is being * notified about. @@ -1271,7 +1277,7 @@ enum libusb_capability { LIBUSB_CAP_HAS_HOTPLUG = 0x0001, /** The library can access HID devices without requiring user intervention. * Note that before being able to actually access an HID device, you may - * still have to call additional libusbx functions such as + * still have to call additional libusb functions such as * \ref libusb_detach_kernel_driver(). */ LIBUSB_CAP_HAS_HID_ACCESS = 0x0100, /** The library supports detaching of the default USB driver, using @@ -1384,6 +1390,11 @@ int LIBUSB_CALL libusb_clear_halt(libusb_device_handle *dev, unsigned char endpoint); int LIBUSB_CALL libusb_reset_device(libusb_device_handle *dev); +int LIBUSB_CALL libusb_alloc_streams(libusb_device_handle *dev, + uint32_t num_streams, unsigned char *endpoints, int num_endpoints); +int LIBUSB_CALL libusb_free_streams(libusb_device_handle *dev, + unsigned char *endpoints, int num_endpoints); + int LIBUSB_CALL libusb_kernel_driver_active(libusb_device_handle *dev, int interface_number); int LIBUSB_CALL libusb_detach_kernel_driver(libusb_device_handle *dev, @@ -1428,7 +1439,7 @@ static inline unsigned char *libusb_control_transfer_get_data( static inline struct libusb_control_setup *libusb_control_transfer_get_setup( struct libusb_transfer *transfer) { - return (struct libusb_control_setup *) transfer->buffer; + return (struct libusb_control_setup *)(void *) transfer->buffer; } /** \ingroup asyncio @@ -1437,6 +1448,7 @@ static inline struct libusb_control_setup *libusb_control_transfer_get_setup( * be given in host-endian byte order. * * \param buffer buffer to output the setup packet into + * This pointer must be aligned to at least 2 bytes boundary. * \param bmRequestType see the * \ref libusb_control_setup::bmRequestType "bmRequestType" field of * \ref libusb_control_setup @@ -1457,7 +1469,7 @@ static inline void libusb_fill_control_setup(unsigned char *buffer, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint16_t wLength) { - struct libusb_control_setup *setup = (struct libusb_control_setup *) buffer; + struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *) buffer; setup->bmRequestType = bmRequestType; setup->bRequest = bRequest; setup->wValue = libusb_cpu_to_le16(wValue); @@ -1469,6 +1481,10 @@ struct libusb_transfer * LIBUSB_CALL libusb_alloc_transfer(int iso_packets); int LIBUSB_CALL libusb_submit_transfer(struct libusb_transfer *transfer); int LIBUSB_CALL libusb_cancel_transfer(struct libusb_transfer *transfer); void LIBUSB_CALL libusb_free_transfer(struct libusb_transfer *transfer); +void LIBUSB_CALL libusb_transfer_set_stream_id( + struct libusb_transfer *transfer, uint32_t stream_id); +uint32_t LIBUSB_CALL libusb_transfer_get_stream_id( + struct libusb_transfer *transfer); /** \ingroup asyncio * Helper function to populate the required \ref libusb_transfer fields @@ -1493,6 +1509,7 @@ void LIBUSB_CALL libusb_free_transfer(struct libusb_transfer *transfer); * \param dev_handle handle of the device that will handle the transfer * \param buffer data buffer. If provided, this function will interpret the * first 8 bytes as a setup packet and infer the transfer length from that. + * This pointer must be aligned to at least 2 bytes boundary. * \param callback callback function to be invoked on transfer completion * \param user_data user data to pass to callback function * \param timeout timeout for the transfer in milliseconds @@ -1502,7 +1519,7 @@ static inline void libusb_fill_control_transfer( unsigned char *buffer, libusb_transfer_cb_fn callback, void *user_data, unsigned int timeout) { - struct libusb_control_setup *setup = (struct libusb_control_setup *) buffer; + struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *) buffer; transfer->dev_handle = dev_handle; transfer->endpoint = 0; transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL; @@ -1543,6 +1560,34 @@ static inline void libusb_fill_bulk_transfer(struct libusb_transfer *transfer, transfer->callback = callback; } +/** \ingroup asyncio + * Helper function to populate the required \ref libusb_transfer fields + * for a bulk transfer using bulk streams. + * + * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103 + * + * \param transfer the transfer to populate + * \param dev_handle handle of the device that will handle the transfer + * \param endpoint address of the endpoint where this transfer will be sent + * \param stream_id bulk stream id for this transfer + * \param buffer data buffer + * \param length length of data buffer + * \param callback callback function to be invoked on transfer completion + * \param user_data user data to pass to callback function + * \param timeout timeout for the transfer in milliseconds + */ +static inline void libusb_fill_bulk_stream_transfer( + struct libusb_transfer *transfer, libusb_device_handle *dev_handle, + unsigned char endpoint, uint32_t stream_id, + unsigned char *buffer, int length, libusb_transfer_cb_fn callback, + void *user_data, unsigned int timeout) +{ + libusb_fill_bulk_transfer(transfer, dev_handle, endpoint, buffer, + length, callback, user_data, timeout); + transfer->type = LIBUSB_TRANSFER_TYPE_BULK_STREAM; + libusb_transfer_set_stream_id(transfer, stream_id); +} + /** \ingroup asyncio * Helper function to populate the required \ref libusb_transfer fields * for an interrupt transfer. @@ -1827,7 +1872,7 @@ void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx, * per libusb_context and it is safe to call libusb_hotplug_deregister_callback() * on an already deregisted callback. * - * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102 * * For more information, see \ref hotplug. */ @@ -1835,7 +1880,7 @@ typedef int libusb_hotplug_callback_handle; /** \ingroup hotplug * - * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102 * * Flags for hotplug events */ typedef enum { @@ -1845,7 +1890,7 @@ typedef enum { /** \ingroup hotplug * - * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102 * * Hotplug events */ typedef enum { @@ -1869,15 +1914,15 @@ typedef enum { * This callback may be called by an internal event thread and as such it is * recommended the callback do minimal processing before returning. * - * libusbx will call this function later, when a matching event had happened on + * libusb will call this function later, when a matching event had happened on * a matching device. See \ref hotplug for more information. * * It is safe to call either libusb_hotplug_register_callback() or * libusb_hotplug_deregister_callback() from within a callback function. * - * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102 * - * \param libusb_context context of this notification + * \param ctx context of this notification * \param device libusb_device this event occurred on * \param event event that occurred * \param user_data user data provided when this callback was registered @@ -1897,7 +1942,19 @@ typedef int (LIBUSB_CALL *libusb_hotplug_callback_fn)(libusb_context *ctx, * armed until either it is deregistered with libusb_hotplug_deregister_callback() * or the supplied callback returns 1 to indicate it is finished processing events. * - * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * If the \ref LIBUSB_HOTPLUG_ENUMERATE is passed the callback will be + * called with a \ref LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED for all devices + * already plugged into the machine. Note that libusb modifies its internal + * device list from a separate thread, while calling hotplug callbacks from + * libusb_handle_events(), so it is possible for a device to already be present + * on, or removed from, its internal device list, while the hotplug callbacks + * still need to be dispatched. This means that when using \ref + * LIBUSB_HOTPLUG_ENUMERATE, your callback may be called twice for the arrival + * of the same device, once from libusb_hotplug_register_callback() and once + * from libusb_handle_events(); and/or your callback may be called for the + * removal of a device for which an arrived call was never made. + * + * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102 * * \param[in] ctx context to register this callback with * \param[in] events bitwise or of events that will trigger this callback. See \ref @@ -1926,7 +1983,7 @@ int LIBUSB_CALL libusb_hotplug_register_callback(libusb_context *ctx, * Deregister a callback from a libusb_context. This function is safe to call from within * a hotplug callback. * - * Since version 1.0.16, \ref LIBUSBX_API_VERSION >= 0x01000102 + * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102 * * \param[in] ctx context this callback is registered with * \param[in] handle the handle of the callback to deregister diff --git a/Externals/libusbx/libusb/libusbi.h b/Externals/libusb/libusb/libusbi.h similarity index 95% rename from Externals/libusbx/libusb/libusbi.h rename to Externals/libusb/libusb/libusbi.h index 02efae300..a36482c93 100644 --- a/Externals/libusbx/libusb/libusbi.h +++ b/Externals/libusb/libusb/libusbi.h @@ -1,5 +1,5 @@ /* - * Internal header for libusbx + * Internal header for libusb * Copyright © 2007-2009 Daniel Drake * Copyright © 2001 Johannes Erdfelt * @@ -23,6 +23,8 @@ #include "config.h" +#include + #include #include #include @@ -37,11 +39,11 @@ #include "libusb.h" #include "version.h" -/* Inside the libusbx code, mark all public functions as follows: +/* Inside the libusb code, mark all public functions as follows: * return_type API_EXPORTED function_name(params) { ... } * But if the function returns a pointer, mark it as follows: * DEFAULT_VISIBILITY return_type * LIBUSB_CALL function_name(params) { ... } - * In the libusbx public header, mark all declarations as: + * In the libusb public header, mark all declarations as: * return_type LIBUSB_CALL function_name(params); */ #define API_EXPORTED LIBUSB_CALL DEFAULT_VISIBILITY @@ -147,6 +149,15 @@ static inline void *usbi_reallocf(void *ptr, size_t size) #define TIMESPEC_IS_SET(ts) ((ts)->tv_sec != 0 || (ts)->tv_nsec != 0) +/* Some platforms don't have this define */ +#ifndef TIMESPEC_TO_TIMEVAL +#define TIMESPEC_TO_TIMEVAL(tv, ts) \ + do { \ + (tv)->tv_sec = (ts)->tv_sec; \ + (tv)->tv_usec = (ts)->tv_nsec / 1000; \ + } while (0) +#endif + void usbi_log(struct libusb_context *ctx, enum libusb_log_level level, const char *function, const char *format, ...); @@ -355,6 +366,7 @@ struct usbi_transfer { struct list_head list; struct timeval timeout; int transferred; + uint32_t stream_id; uint8_t flags; /* this lock is held during libusb_submit_transfer() and @@ -433,7 +445,7 @@ void usbi_connect_device (struct libusb_device *dev); void usbi_disconnect_device (struct libusb_device *dev); /* Internal abstraction for poll (needs struct usbi_transfer on Windows) */ -#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_OPENBSD) || defined(OS_NETBSD) #include #include "os/poll_posix.h" #elif defined(OS_WINDOWS) || defined(OS_WINCE) @@ -501,7 +513,7 @@ struct usbi_os_backend { * to determine specific capabilities of the system, allocate required * data structures for later, etc. * - * This function is called when a libusbx user initializes the library + * This function is called when a libusb user initializes the library * prior to use. * * Return 0 on success, or a LIBUSB_ERROR code on failure. @@ -531,9 +543,9 @@ struct usbi_os_backend { * but that is an unlikely case. * * After computing a session ID for a device, call - * usbi_get_device_by_session_id(). This function checks if libusbx already - * knows about the device, and if so, it provides you with a libusb_device - * structure for it. + * usbi_get_device_by_session_id(). This function checks if libusb already + * knows about the device, and if so, it provides you with a reference + * to a libusb_device structure for it. * * If usbi_get_device_by_session_id() returns NULL, it is time to allocate * a new device structure for the device. Call usbi_alloc_device() to @@ -592,7 +604,7 @@ struct usbi_os_backend { * * Your backend should allocate any internal resources required for I/O * and other operations so that those operations can happen (hopefully) - * without hiccup. This is also a good place to inform libusbx that it + * without hiccup. This is also a good place to inform libusb that it * should monitor certain file descriptors related to this device - * see the usbi_add_pollfd() function. * @@ -616,7 +628,7 @@ struct usbi_os_backend { /* Close a device such that the handle cannot be used again. Your backend * should destroy any resources that were allocated in the open path. * This may also be a good place to call usbi_remove_pollfd() to inform - * libusbx of any file descriptors associated with this device that should + * libusb of any file descriptors associated with this device that should * no longer be monitored. * * This function is called when the user closes a device handle. @@ -689,7 +701,7 @@ struct usbi_os_backend { * (LE). If it returns the multi-byte values in host-endian format, * set the host_endian output parameter to "1". * - * Return 0 on success or a LIBUSB_ERROR code on failure. + * Return the length read on success or a LIBUSB_ERROR code on failure. */ int (*get_config_descriptor)(struct libusb_device *device, uint8_t config_index, unsigned char *buffer, size_t len, @@ -717,7 +729,7 @@ struct usbi_os_backend { * * If you cannot retrieve this from cache, either do not implement this * function, or return LIBUSB_ERROR_NOT_SUPPORTED. This will cause - * libusbx to retrieve the information through a standard control transfer. + * libusb to retrieve the information through a standard control transfer. * * This function must be non-blocking. * Return: @@ -832,6 +844,14 @@ struct usbi_os_backend { */ int (*reset_device)(struct libusb_device_handle *handle); + /* Alloc num_streams usb3 bulk streams on the passed in endpoints */ + int (*alloc_streams)(struct libusb_device_handle *handle, + uint32_t num_streams, unsigned char *endpoints, int num_endpoints); + + /* Free usb3 bulk streams allocated with alloc_streams */ + int (*free_streams)(struct libusb_device_handle *handle, + unsigned char *endpoints, int num_endpoints); + /* Determine if a kernel driver is active on an interface. Optional. * * The presence of a kernel driver on an interface indicates that any @@ -916,7 +936,7 @@ struct usbi_os_backend { * all private data from the transfer as if you were just about to report * completion or cancellation. * - * This function might seem a bit out of place. It is used when libusbx + * This function might seem a bit out of place. It is used when libusb * detects a disconnected device - it calls this function for all pending * transfers before reporting completion (with the disconnect code) to * the user. Maybe we can improve upon this internal interface in future. @@ -995,6 +1015,7 @@ extern const struct usbi_os_backend * const usbi_backend; extern const struct usbi_os_backend linux_usbfs_backend; extern const struct usbi_os_backend darwin_backend; extern const struct usbi_os_backend openbsd_backend; +extern const struct usbi_os_backend netbsd_backend; extern const struct usbi_os_backend windows_backend; extern const struct usbi_os_backend wince_backend; diff --git a/Externals/libusbx/libusb/os/darwin_usb.c b/Externals/libusb/libusb/os/darwin_usb.c similarity index 89% rename from Externals/libusbx/libusb/os/darwin_usb.c rename to Externals/libusb/libusb/os/darwin_usb.c index a24558cb5..19174b131 100644 --- a/Externals/libusbx/libusb/os/darwin_usb.c +++ b/Externals/libusb/libusb/os/darwin_usb.c @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode:nil -*- */ /* - * darwin backend for libusbx 1.0 - * Copyright © 2008-2013 Nathan Hjelm + * darwin backend for libusb 1.0 + * Copyright © 2008-2014 Nathan Hjelm * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -71,6 +71,7 @@ static int process_new_device (struct libusb_context *ctx, io_service_t service) #if defined(ENABLE_LOGGING) static const char *darwin_error_str (int result) { + static char string_buffer[50]; switch (result) { case kIOReturnSuccess: return "no error"; @@ -103,7 +104,8 @@ static const char *darwin_error_str (int result) { case kIOUSBHighSpeedSplitError: return "high speed split error"; default: - return "unknown error"; + snprintf(string_buffer, sizeof(string_buffer), "unknown error (0x%x)", result); + return string_buffer; } } #endif @@ -149,7 +151,7 @@ static void darwin_ref_cached_device(struct darwin_cached_device *cached_dev) { cached_dev->refcount++; } -static int ep_to_pipeRef(struct libusb_device_handle *dev_handle, uint8_t ep, uint8_t *pipep, uint8_t *ifcp) { +static int ep_to_pipeRef(struct libusb_device_handle *dev_handle, uint8_t ep, uint8_t *pipep, uint8_t *ifcp, struct darwin_interface **interface_out) { struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv; /* current interface */ @@ -166,8 +168,14 @@ static int ep_to_pipeRef(struct libusb_device_handle *dev_handle, uint8_t ep, ui for (i = 0 ; i < cInterface->num_endpoints ; i++) { if (cInterface->endpoint_addrs[i] == ep) { *pipep = i + 1; - *ifcp = iface; - usbi_dbg ("pipe %d on interface %d matches", *pipep, *ifcp); + + if (ifcp) + *ifcp = iface; + + if (interface_out) + *interface_out = cInterface; + + usbi_dbg ("pipe %d on interface %d matches", *pipep, iface); return 0; } } @@ -177,7 +185,7 @@ static int ep_to_pipeRef(struct libusb_device_handle *dev_handle, uint8_t ep, ui /* No pipe found with the correct endpoint address */ usbi_warn (HANDLE_CTX(dev_handle), "no pipeRef found with endpoint address 0x%02x.", ep); - return -1; + return LIBUSB_ERROR_NOT_FOUND; } static int usb_setup_device_iterator (io_iterator_t *deviceIterator, UInt32 location) { @@ -210,6 +218,7 @@ static int usb_setup_device_iterator (io_iterator_t *deviceIterator, UInt32 loca return IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, deviceIterator); } +/* Returns 1 on success, 0 on failure. */ static int get_ioregistry_value_number (io_service_t service, CFStringRef property, CFNumberType type, void *p) { CFTypeRef cfNumber = IORegistryEntryCreateCFProperty (service, property, kCFAllocatorDefault, 0); int ret = 0; @@ -275,6 +284,8 @@ static void darwin_devices_detached (void *ptr, io_iterator_t rem_devices) { UInt64 session; int ret; + usbi_mutex_lock(&active_contexts_lock); + while ((device = IOIteratorNext (rem_devices)) != 0) { /* get the location from the i/o registry */ ret = get_ioregistry_value_number (device, CFSTR("sessionID"), kCFNumberSInt64Type, &session); @@ -282,21 +293,31 @@ static void darwin_devices_detached (void *ptr, io_iterator_t rem_devices) { if (!ret) continue; - usbi_mutex_lock(&active_contexts_lock); - list_for_each_entry(ctx, &active_contexts_list, list, struct libusb_context) { usbi_dbg ("notifying context %p of device disconnect", ctx); - dev = usbi_get_device_by_session_id(ctx, session); + dev = usbi_get_device_by_session_id(ctx, (unsigned long) session); if (dev) { /* signal the core that this device has been disconnected. the core will tear down this device when the reference count reaches 0 */ usbi_disconnect_device(dev); + libusb_unref_device(dev); } } - - usbi_mutex_unlock(&active_contexts_lock); } + + usbi_mutex_unlock(&active_contexts_lock); +} + +static void darwin_hotplug_poll (void) +{ + /* not sure if 5 seconds will be too long/short but it should work ok */ + mach_timespec_t timeout = {.tv_sec = 5, .tv_nsec = 0}; + + /* since a kernel thread may nodify the IOInterators used for + * hotplug notidication we can't just clear the iterators. + * instead just wait until all IOService providers are quiet */ + (void) IOKitWaitQuiet (kIOMasterPortDefault, &timeout); } static void darwin_clear_iterator (io_iterator_t iter) { @@ -342,8 +363,8 @@ static void *darwin_event_thread_main (void *arg0) { /* create notifications for removed devices */ kresult = IOServiceAddMatchingNotification (libusb_notification_port, kIOTerminatedNotification, IOServiceMatching(kIOUSBDeviceClassName), - (IOServiceMatchingCallback)darwin_devices_detached, - (void *)ctx, &libusb_rem_device_iterator); + darwin_devices_detached, + ctx, &libusb_rem_device_iterator); if (kresult != kIOReturnSuccess) { usbi_err (ctx, "could not add hotplug event source: %s", darwin_error_str (kresult)); @@ -354,8 +375,8 @@ static void *darwin_event_thread_main (void *arg0) { /* create notifications for attached devices */ kresult = IOServiceAddMatchingNotification(libusb_notification_port, kIOFirstMatchNotification, IOServiceMatching(kIOUSBDeviceClassName), - (IOServiceMatchingCallback)darwin_devices_attached, - (void *)ctx, &libusb_add_device_iterator); + darwin_devices_attached, + ctx, &libusb_add_device_iterator); if (kresult != kIOReturnSuccess) { usbi_err (ctx, "could not add hotplug event source: %s", darwin_error_str (kresult)); @@ -397,7 +418,8 @@ static void *darwin_event_thread_main (void *arg0) { pthread_exit (NULL); } -static void _darwin_finalize(void) { +/* cleanup function to destroy cached devices */ +static void __attribute__((destructor)) _darwin_finalize(void) { struct darwin_cached_device *dev, *next; usbi_mutex_lock(&darwin_cached_devices_lock); @@ -409,7 +431,6 @@ static void _darwin_finalize(void) { static int darwin_init(struct libusb_context *ctx) { host_name_port_t host_self; - static int initted = 0; int rc; rc = darwin_scan_devices (ctx); @@ -420,17 +441,12 @@ static int darwin_init(struct libusb_context *ctx) { if (OSAtomicIncrement32Barrier(&initCount) == 1) { /* create the clocks that will be used */ - if (!initted) { - initted = 1; - atexit(_darwin_finalize); - } - host_self = mach_host_self(); host_get_clock_service(host_self, CALENDAR_CLOCK, &clock_realtime); host_get_clock_service(host_self, SYSTEM_CLOCK, &clock_monotonic); mach_port_deallocate(mach_task_self(), host_self); - pthread_create (&libusb_darwin_at, NULL, darwin_event_thread_main, (void *)ctx); + pthread_create (&libusb_darwin_at, NULL, darwin_event_thread_main, ctx); pthread_mutex_lock (&libusb_darwin_at_mutex); while (!libusb_darwin_acfl) @@ -524,7 +540,7 @@ static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t confi if (ret != LIBUSB_SUCCESS) return ret; - return len; + return (int) len; } /* check whether the os has configured the device */ @@ -701,7 +717,7 @@ static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct da else usbi_warn (ctx, "could not retrieve device descriptor %.4x:%.4x: %s (%x). skipping device", idVendor, idProduct, darwin_error_str (ret), ret); - return -1; + return darwin_to_libusb (ret); } /* catch buggy hubs (which appear to be virtual). Apple's own USB prober has problems with these devices. */ @@ -709,7 +725,7 @@ static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct da /* not a valid device */ usbi_warn (ctx, "idProduct from iokit (%04x) does not match idProduct in descriptor (%04x). skipping device", idProduct, libusb_le16_to_cpu (dev->dev_descriptor.idProduct)); - return -1; + return LIBUSB_ERROR_NO_DEVICE; } usbi_dbg ("cached device descriptor:"); @@ -729,26 +745,24 @@ static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct da dev->can_enumerate = 1; - return 0; + return LIBUSB_SUCCESS; } static int darwin_get_cached_device(struct libusb_context *ctx, io_service_t service, struct darwin_cached_device **cached_out) { struct darwin_cached_device *new_device; - UInt64 sessionID, parent_sessionID; + UInt64 sessionID = 0, parent_sessionID = 0; int ret = LIBUSB_SUCCESS; usb_device_t **device; io_service_t parent; kern_return_t result; UInt8 port = 0; - *cached_out = NULL; - /* get some info from the io registry */ (void) get_ioregistry_value_number (service, CFSTR("sessionID"), kCFNumberSInt64Type, &sessionID); (void) get_ioregistry_value_number (service, CFSTR("PortNum"), kCFNumberSInt8Type, &port); - usbi_dbg("finding cached device for sessionID 0x\n" PRIx64, sessionID); + usbi_dbg("finding cached device for sessionID 0x%" PRIx64, sessionID); result = IORegistryEntryGetParentEntry (service, kIOUSBPlane, &parent); @@ -759,8 +773,10 @@ static int darwin_get_cached_device(struct libusb_context *ctx, io_service_t ser usbi_mutex_lock(&darwin_cached_devices_lock); do { + *cached_out = NULL; + list_for_each_entry(new_device, &darwin_cached_devices, list, struct darwin_cached_device) { - usbi_dbg("matching sessionID 0x%x against cached device with sessionID 0x%x", sessionID, new_device->session); + usbi_dbg("matching sessionID 0x%" PRIx64 " against cached device with sessionID 0x%" PRIx64, sessionID, new_device->session); if (new_device->session == sessionID) { usbi_dbg("using cached device for device"); *cached_out = new_device; @@ -771,19 +787,17 @@ static int darwin_get_cached_device(struct libusb_context *ctx, io_service_t ser if (*cached_out) break; - usbi_dbg("caching new device with sessionID 0x%x\n", sessionID); - - new_device = calloc (1, sizeof (*new_device)); - if (!new_device) { - ret = LIBUSB_ERROR_NO_MEM; - break; - } + usbi_dbg("caching new device with sessionID 0x%" PRIx64, sessionID); device = darwin_device_from_service (service); if (!device) { ret = LIBUSB_ERROR_NO_DEVICE; - free (new_device); - new_device = NULL; + break; + } + + new_device = calloc (1, sizeof (*new_device)); + if (!new_device) { + ret = LIBUSB_ERROR_NO_MEM; break; } @@ -833,7 +847,7 @@ static int process_new_device (struct libusb_context *ctx, io_service_t service) do { ret = darwin_get_cached_device (ctx, service, &cached_device); - if (ret < 0 || (cached_device && !cached_device->can_enumerate)) { + if (ret < 0 || !cached_device->can_enumerate) { return ret; } @@ -843,10 +857,10 @@ static int process_new_device (struct libusb_context *ctx, io_service_t service) if (ret) break; - usbi_dbg ("allocating new device in context %p for with session 0x%08x", + usbi_dbg ("allocating new device in context %p for with session 0x%" PRIx64, ctx, cached_device->session); - dev = usbi_alloc_device(ctx, cached_device->session); + dev = usbi_alloc_device(ctx, (unsigned long) cached_device->session); if (!dev) { return LIBUSB_ERROR_NO_MEM; } @@ -857,7 +871,7 @@ static int process_new_device (struct libusb_context *ctx, io_service_t service) darwin_ref_cached_device (priv->dev); if (cached_device->parent_session > 0) { - dev->parent_dev = usbi_get_device_by_session_id (ctx, cached_device->parent_session); + dev->parent_dev = usbi_get_device_by_session_id (ctx, (unsigned long) cached_device->parent_session); } else { dev->parent_dev = NULL; } @@ -865,11 +879,6 @@ static int process_new_device (struct libusb_context *ctx, io_service_t service) dev->bus_number = cached_device->location >> 24; dev->device_address = cached_device->address; - /* need to add a reference to the parent device */ - if (dev->parent_dev) { - libusb_ref_device(dev->parent_dev); - } - (*(priv->dev->device))->GetDeviceSpeed (priv->dev->device, &devSpeed); switch (devSpeed) { @@ -1129,7 +1138,7 @@ static int get_endpoints (struct libusb_device_handle *dev_handle, int iface) { usbi_dbg ("interface: %i pipe %i: dir: %i number: %i", iface, i, direction, number); - cInterface->endpoint_addrs[i - 1] = ((direction << 7 & LIBUSB_ENDPOINT_DIR_MASK) | (number & LIBUSB_ENDPOINT_ADDRESS_MASK)); + cInterface->endpoint_addrs[i - 1] = (((kUSBIn == direction) << kUSBRqDirnShift) | (number & LIBUSB_ENDPOINT_ADDRESS_MASK)); } cInterface->num_endpoints = numep; @@ -1301,22 +1310,18 @@ static int darwin_set_interface_altsetting(struct libusb_device_handle *dev_hand } static int darwin_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint) { - struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv; - /* current interface */ struct darwin_interface *cInterface; - uint8_t pipeRef, iface; IOReturn kresult; + uint8_t pipeRef; /* determine the interface/endpoint to use */ - if (ep_to_pipeRef (dev_handle, endpoint, &pipeRef, &iface) != 0) { + if (ep_to_pipeRef (dev_handle, endpoint, &pipeRef, NULL, &cInterface) != 0) { usbi_err (HANDLE_CTX (dev_handle), "endpoint not found on any open interface"); return LIBUSB_ERROR_NOT_FOUND; } - cInterface = &priv->interfaces[iface]; - /* newer versions of darwin support clearing additional bits on the device's endpoint */ kresult = (*(cInterface->interface))->ClearPipeStallBothEnds(cInterface->interface, pipeRef); if (kresult) @@ -1430,26 +1435,29 @@ static void darwin_destroy_device(struct libusb_device *dev) { static int submit_bulk_transfer(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); - struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; IOReturn ret; uint8_t transferType; /* None of the values below are used in libusbx for bulk transfers */ - uint8_t direction, number, interval, pipeRef, iface; + uint8_t direction, number, interval, pipeRef; uint16_t maxPacketSize; struct darwin_interface *cInterface; - if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface) != 0) { + if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) { usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface"); return LIBUSB_ERROR_NOT_FOUND; } - cInterface = &priv->interfaces[iface]; + ret = (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number, + &transferType, &maxPacketSize, &interval); - (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number, - &transferType, &maxPacketSize, &interval); + if (ret) { + usbi_err (TRANSFER_CTX (transfer), "bulk transfer failed (dir = %s): %s (code = 0x%08x)", IS_XFERIN(transfer) ? "In" : "Out", + darwin_error_str(ret), ret); + return darwin_to_libusb (ret); + } if (0 != (transfer->length % maxPacketSize)) { /* do not need a zero packet */ @@ -1485,13 +1493,44 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) { return darwin_to_libusb (ret); } +#if InterfaceVersion >= 550 +static int submit_stream_transfer(struct usbi_transfer *itransfer) { + struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + struct darwin_interface *cInterface; + uint8_t pipeRef; + IOReturn ret; + + if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) { + usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface"); + + return LIBUSB_ERROR_NOT_FOUND; + } + + itransfer->flags |= USBI_TRANSFER_OS_HANDLES_TIMEOUT; + + if (IS_XFERIN(transfer)) + ret = (*(cInterface->interface))->ReadStreamsPipeAsyncTO(cInterface->interface, pipeRef, itransfer->stream_id, + transfer->buffer, transfer->length, transfer->timeout, + transfer->timeout, darwin_async_io_callback, (void *)itransfer); + else + ret = (*(cInterface->interface))->WriteStreamsPipeAsyncTO(cInterface->interface, pipeRef, itransfer->stream_id, + transfer->buffer, transfer->length, transfer->timeout, + transfer->timeout, darwin_async_io_callback, (void *)itransfer); + + if (ret) + usbi_err (TRANSFER_CTX (transfer), "bulk stream transfer failed (dir = %s): %s (code = 0x%08x)", IS_XFERIN(transfer) ? "In" : "Out", + darwin_error_str(ret), ret); + + return darwin_to_libusb (ret); +} +#endif + static int submit_iso_transfer(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); - struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; IOReturn kresult; - uint8_t direction, number, interval, pipeRef, iface, transferType; + uint8_t direction, number, interval, pipeRef, transferType; uint16_t maxPacketSize; UInt64 frame; AbsoluteTime atTime; @@ -1512,19 +1551,17 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) { return LIBUSB_ERROR_NO_MEM; } - /* copy the frame list from the libusbx descriptor (the structures differ only is member order) */ + /* copy the frame list from the libusb descriptor (the structures differ only is member order) */ for (i = 0 ; i < transfer->num_iso_packets ; i++) tpriv->isoc_framelist[i].frReqCount = transfer->iso_packet_desc[i].length; /* determine the interface/endpoint to use */ - if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface) != 0) { + if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) { usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface"); return LIBUSB_ERROR_NOT_FOUND; } - cInterface = &priv->interfaces[iface]; - /* determine the properties of this endpoint and the speed of the device */ (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number, &transferType, &maxPacketSize, &interval); @@ -1579,7 +1616,6 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct libusb_control_setup *setup = (struct libusb_control_setup *) transfer->buffer; struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(transfer->dev_handle->dev); - struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer); IOReturn kresult; @@ -1593,7 +1629,7 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) { tpriv->req.wValue = OSSwapLittleToHostInt16 (setup->wValue); tpriv->req.wIndex = OSSwapLittleToHostInt16 (setup->wIndex); tpriv->req.wLength = OSSwapLittleToHostInt16 (setup->wLength); - /* data is stored after the libusbx control block */ + /* data is stored after the libusb control block */ tpriv->req.pData = transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE; tpriv->req.completionTimeout = transfer->timeout; tpriv->req.noDataTimeout = transfer->timeout; @@ -1604,16 +1640,14 @@ static int submit_control_transfer(struct usbi_transfer *itransfer) { if (transfer->endpoint) { struct darwin_interface *cInterface; - uint8_t pipeRef, iface; + uint8_t pipeRef; - if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface) != 0) { + if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) { usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface"); return LIBUSB_ERROR_NOT_FOUND; } - cInterface = &priv->interfaces[iface]; - kresult = (*(cInterface->interface))->ControlRequestAsyncTO (cInterface->interface, pipeRef, &(tpriv->req), darwin_async_io_callback, itransfer); } else /* control request on endpoint 0 */ @@ -1636,6 +1670,13 @@ static int darwin_submit_transfer(struct usbi_transfer *itransfer) { return submit_bulk_transfer(itransfer); case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: return submit_iso_transfer(itransfer); + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: +#if InterfaceVersion >= 550 + return submit_stream_transfer(itransfer); +#else + usbi_err (TRANSFER_CTX(transfer), "IOUSBFamily version does not support bulk stream transfers"); + return LIBUSB_ERROR_NOT_SUPPORTED; +#endif default: usbi_err (TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type); return LIBUSB_ERROR_INVALID_PARAM; @@ -1660,26 +1701,28 @@ static int cancel_control_transfer(struct usbi_transfer *itransfer) { static int darwin_abort_transfers (struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(transfer->dev_handle->dev); - struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv; struct darwin_interface *cInterface; uint8_t pipeRef, iface; IOReturn kresult; - if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface) != 0) { + if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface, &cInterface) != 0) { usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface"); return LIBUSB_ERROR_NOT_FOUND; } - cInterface = &priv->interfaces[iface]; - if (!dpriv->device) return LIBUSB_ERROR_NO_DEVICE; usbi_warn (ITRANSFER_CTX (itransfer), "aborting all transactions on interface %d pipe %d", iface, pipeRef); /* abort transactions */ - (*(cInterface->interface))->AbortPipe (cInterface->interface, pipeRef); +#if InterfaceVersion >= 550 + if (LIBUSB_TRANSFER_TYPE_BULK_STREAM == transfer->type) + (*(cInterface->interface))->AbortStreamsPipe (cInterface->interface, pipeRef, itransfer->stream_id); + else +#endif + (*(cInterface->interface))->AbortPipe (cInterface->interface, pipeRef); usbi_dbg ("calling clear pipe stall to clear the data toggle bit"); @@ -1727,10 +1770,9 @@ static void darwin_async_io_callback (void *refcon, IOReturn result, void *arg0) /* if requested write a zero packet */ if (kIOReturnSuccess == result && IS_XFEROUT(transfer) && transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) { struct darwin_interface *cInterface; - uint8_t iface, pipeRef; + uint8_t pipeRef; - (void) ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface); - cInterface = &priv->interfaces[iface]; + (void) ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface); (*(cInterface->interface))->WritePipe (cInterface->interface, pipeRef, transfer->buffer, 0); } @@ -1861,6 +1903,64 @@ static int darwin_clock_gettime(int clk_id, struct timespec *tp) { return 0; } +#if InterfaceVersion >= 550 +static int darwin_alloc_streams (struct libusb_device_handle *dev_handle, uint32_t num_streams, unsigned char *endpoints, + int num_endpoints) { + struct darwin_interface *cInterface; + UInt32 supportsStreams; + uint8_t pipeRef; + int rc, i; + + /* find the mimimum number of supported streams on the endpoint list */ + for (i = 0 ; i < num_endpoints ; ++i) { + if (0 != (rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface))) { + return rc; + } + + (*(cInterface->interface))->SupportsStreams (cInterface->interface, pipeRef, &supportsStreams); + if (num_streams > supportsStreams) + num_streams = supportsStreams; + } + + /* it is an error if any endpoint in endpoints does not support streams */ + if (0 == num_streams) + return LIBUSB_ERROR_INVALID_PARAM; + + /* create the streams */ + for (i = 0 ; i < num_endpoints ; ++i) { + (void) ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface); + + rc = (*(cInterface->interface))->CreateStreams (cInterface->interface, pipeRef, num_streams); + if (kIOReturnSuccess != rc) + return darwin_to_libusb(rc); + } + + return num_streams; +} + +static int darwin_free_streams (struct libusb_device_handle *dev_handle, unsigned char *endpoints, int num_endpoints) { + struct darwin_interface *cInterface; + UInt32 supportsStreams; + uint8_t pipeRef; + int rc; + + for (int i = 0 ; i < num_endpoints ; ++i) { + if (0 != (rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface))) + return rc; + + (*(cInterface->interface))->SupportsStreams (cInterface->interface, pipeRef, &supportsStreams); + if (0 == supportsStreams) + return LIBUSB_ERROR_INVALID_PARAM; + + rc = (*(cInterface->interface))->CreateStreams (cInterface->interface, pipeRef, 0); + if (kIOReturnSuccess != rc) + return darwin_to_libusb(rc); + } + + return LIBUSB_SUCCESS; +} +#endif + const struct usbi_os_backend darwin_backend = { .name = "Darwin", .caps = 0, @@ -1870,6 +1970,7 @@ const struct usbi_os_backend darwin_backend = { .get_device_descriptor = darwin_get_device_descriptor, .get_active_config_descriptor = darwin_get_active_config_descriptor, .get_config_descriptor = darwin_get_config_descriptor, + .hotplug_poll = darwin_hotplug_poll, .open = darwin_open, .close = darwin_close, @@ -1882,6 +1983,11 @@ const struct usbi_os_backend darwin_backend = { .clear_halt = darwin_clear_halt, .reset_device = darwin_reset_device, +#if InterfaceVersion >= 550 + .alloc_streams = darwin_alloc_streams, + .free_streams = darwin_free_streams, +#endif + .kernel_driver_active = darwin_kernel_driver_active, .detach_kernel_driver = darwin_detach_kernel_driver, .attach_kernel_driver = darwin_attach_kernel_driver, diff --git a/Externals/libusbx/libusb/os/darwin_usb.h b/Externals/libusb/libusb/os/darwin_usb.h similarity index 97% rename from Externals/libusbx/libusb/os/darwin_usb.h rename to Externals/libusb/libusb/os/darwin_usb.h index 53b8542b1..883888195 100644 --- a/Externals/libusbx/libusb/os/darwin_usb.h +++ b/Externals/libusb/libusb/os/darwin_usb.h @@ -1,5 +1,5 @@ /* - * darwin backend for libusbx 1.0 + * darwin backend for libusb 1.0 * Copyright © 2008-2013 Nathan Hjelm * * This library is free software; you can redistribute it and/or @@ -137,7 +137,7 @@ struct darwin_device_handle_priv { uint8_t num_endpoints; CFRunLoopSourceRef cfSource; uint64_t frames[256]; - uint8_t endpoint_addrs[USB_MAXENDPOINTS]; + uint8_t endpoint_addrs[USB_MAXENDPOINTS]; } interfaces[USB_MAXINTERFACES]; }; diff --git a/Externals/libusbx/libusb/os/linux_netlink.c b/Externals/libusb/libusb/os/linux_netlink.c similarity index 63% rename from Externals/libusbx/libusb/os/linux_netlink.c rename to Externals/libusb/libusb/os/linux_netlink.c index 3a68f69d9..306f0b452 100644 --- a/Externals/libusbx/libusb/os/linux_netlink.c +++ b/Externals/libusb/libusb/os/linux_netlink.c @@ -21,6 +21,10 @@ */ #include "config.h" +#include "libusb.h" +#include "libusbi.h" +#include "linux_usbfs.h" + #include #include #include @@ -30,46 +34,113 @@ #include #include #include + +#ifdef HAVE_ASM_TYPES_H +#include +#endif + +#ifdef HAVE_SYS_SOCKET_H #include +#endif + #include -#include "libusb.h" -#include "libusbi.h" -#include "linux_usbfs.h" - +#ifdef HAVE_LINUX_NETLINK_H #include +#endif + +#ifdef HAVE_LINUX_FILTER_H #include +#endif #define KERNEL 1 static int linux_netlink_socket = -1; +static int netlink_control_pipe[2] = { -1, -1 }; static pthread_t libusb_linux_event_thread; static void *linux_netlink_event_thread_main(void *arg); struct sockaddr_nl snl = { .nl_family=AF_NETLINK, .nl_groups=KERNEL }; +static int set_fd_cloexec_nb (int fd) +{ + int flags; + +#if defined(FD_CLOEXEC) + flags = fcntl (linux_netlink_socket, F_GETFD); + if (0 > flags) { + return -1; + } + + if (!(flags & FD_CLOEXEC)) { + fcntl (linux_netlink_socket, F_SETFD, flags | FD_CLOEXEC); + } +#endif + + flags = fcntl (linux_netlink_socket, F_GETFL); + if (0 > flags) { + return -1; + } + + if (!(flags & O_NONBLOCK)) { + fcntl (linux_netlink_socket, F_SETFL, flags | O_NONBLOCK); + } + + return 0; +} + int linux_netlink_start_event_monitor(void) { + int socktype = SOCK_RAW; int ret; snl.nl_groups = KERNEL; - linux_netlink_socket = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_KOBJECT_UEVENT); +#if defined(SOCK_CLOEXEC) + socktype |= SOCK_CLOEXEC; +#endif +#if defined(SOCK_NONBLOCK) + socktype |= SOCK_NONBLOCK; +#endif + + linux_netlink_socket = socket(PF_NETLINK, socktype, NETLINK_KOBJECT_UEVENT); + if (-1 == linux_netlink_socket && EINVAL == errno) { + linux_netlink_socket = socket(PF_NETLINK, SOCK_RAW, NETLINK_KOBJECT_UEVENT); + } + if (-1 == linux_netlink_socket) { return LIBUSB_ERROR_OTHER; } + ret = set_fd_cloexec_nb (linux_netlink_socket); + if (0 != ret) { + close (linux_netlink_socket); + linux_netlink_socket = -1; + return LIBUSB_ERROR_OTHER; + } + ret = bind(linux_netlink_socket, (struct sockaddr *) &snl, sizeof(snl)); if (0 != ret) { + close(linux_netlink_socket); return LIBUSB_ERROR_OTHER; } /* TODO -- add authentication */ /* setsockopt(linux_netlink_socket, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)); */ + ret = usbi_pipe(netlink_control_pipe); + if (ret) { + usbi_err(NULL, "could not create netlink control pipe"); + close(linux_netlink_socket); + return LIBUSB_ERROR_OTHER; + } + ret = pthread_create(&libusb_linux_event_thread, NULL, linux_netlink_event_thread_main, NULL); if (0 != ret) { + close(netlink_control_pipe[0]); + close(netlink_control_pipe[1]); + close(linux_netlink_socket); return LIBUSB_ERROR_OTHER; } @@ -79,22 +150,30 @@ int linux_netlink_start_event_monitor(void) int linux_netlink_stop_event_monitor(void) { int r; + char dummy = 1; if (-1 == linux_netlink_socket) { /* already closed. nothing to do */ return LIBUSB_SUCCESS; } - r = close(linux_netlink_socket); - if (0 > r) { - usbi_err(NULL, "error closing netlink socket. %s", strerror(errno)); - return LIBUSB_ERROR_OTHER; + /* Write some dummy data to the control pipe and + * wait for the thread to exit */ + r = usbi_write(netlink_control_pipe[1], &dummy, sizeof(dummy)); + if (r <= 0) { + usbi_warn(NULL, "netlink control pipe signal failed"); } + pthread_join(libusb_linux_event_thread, NULL); - pthread_cancel(libusb_linux_event_thread); - + close(linux_netlink_socket); linux_netlink_socket = -1; + /* close and reset control pipe */ + close(netlink_control_pipe[0]); + close(netlink_control_pipe[1]); + netlink_control_pipe[0] = -1; + netlink_control_pipe[1] = -1; + return LIBUSB_SUCCESS; } @@ -145,8 +224,32 @@ static int linux_netlink_parse(char *buffer, size_t len, int *detached, const ch tmp = netlink_message_parse(buffer, len, "BUSNUM"); if (NULL == tmp) { - /* no bus number (likely a usb interface). ignore*/ - return -1; + /* no bus number. try "DEVICE" */ + tmp = netlink_message_parse(buffer, len, "DEVICE"); + if (NULL == tmp) { + /* not usb. ignore */ + return -1; + } + + /* Parse a device path such as /dev/bus/usb/003/004 */ + char *pLastSlash = (char*)strrchr(tmp,'/'); + if(NULL == pLastSlash) { + return -1; + } + + *devaddr = strtoul(pLastSlash + 1, NULL, 10); + if (errno) { + errno = 0; + return -1; + } + + *busnum = strtoul(pLastSlash - 3, NULL, 10); + if (errno) { + errno = 0; + return -1; + } + + return 0; } *busnum = (uint8_t)(strtoul(tmp, NULL, 10) & 0xff); @@ -214,7 +317,7 @@ static int linux_netlink_read_message(void) /* signal device is available (or not) to all contexts */ if (detached) - linux_hotplug_disconnected(busnum, devaddr, sys_name); + linux_device_disconnected(busnum, devaddr, sys_name); else linux_hotplug_enumerate(busnum, devaddr, sys_name); @@ -223,20 +326,32 @@ static int linux_netlink_read_message(void) static void *linux_netlink_event_thread_main(void *arg) { - struct pollfd fds = {.fd = linux_netlink_socket, - .events = POLLIN}; + char dummy; + int r; + struct pollfd fds[] = { + { .fd = netlink_control_pipe[0], + .events = POLLIN }, + { .fd = linux_netlink_socket, + .events = POLLIN }, + }; /* silence compiler warning */ (void) arg; - while (1 == poll(&fds, 1, -1)) { - if (POLLIN != fds.revents) { + while (poll(fds, 2, -1) >= 0) { + if (fds[0].revents & POLLIN) { + /* activity on control pipe, read the byte and exit */ + r = usbi_read(netlink_control_pipe[0], &dummy, sizeof(dummy)); + if (r <= 0) { + usbi_warn(NULL, "netlink control pipe read failed"); + } break; } - - usbi_mutex_static_lock(&linux_hotplug_lock); - linux_netlink_read_message(); - usbi_mutex_static_unlock(&linux_hotplug_lock); + if (fds[1].revents & POLLIN) { + usbi_mutex_static_lock(&linux_hotplug_lock); + linux_netlink_read_message(); + usbi_mutex_static_unlock(&linux_hotplug_lock); + } } return NULL; diff --git a/Externals/libusbx/libusb/os/linux_udev.c b/Externals/libusb/libusb/os/linux_udev.c similarity index 82% rename from Externals/libusbx/libusb/os/linux_udev.c rename to Externals/libusb/libusb/os/linux_udev.c index 5a2aadfd4..0394048ab 100644 --- a/Externals/libusbx/libusb/os/linux_udev.c +++ b/Externals/libusb/libusb/os/linux_udev.c @@ -46,6 +46,7 @@ /* udev context */ static struct udev *udev_ctx = NULL; static int udev_monitor_fd = -1; +static int udev_control_pipe[2] = {-1, -1}; static struct udev_monitor *udev_monitor = NULL; static pthread_t linux_event_thread; @@ -60,7 +61,7 @@ int linux_udev_start_event_monitor(void) udev_ctx = udev_new(); if (!udev_ctx) { usbi_err(NULL, "could not create udev context"); - return LIBUSB_ERROR_OTHER; + goto err; } udev_monitor = udev_monitor_new_from_netlink(udev_ctx, "udev"); @@ -95,34 +96,49 @@ int linux_udev_start_event_monitor(void) goto err_free_monitor; } + r = usbi_pipe(udev_control_pipe); + if (r) { + usbi_err(NULL, "could not create udev control pipe"); + goto err_free_monitor; + } + r = pthread_create(&linux_event_thread, NULL, linux_udev_event_thread_main, NULL); if (r) { usbi_err(NULL, "creating hotplug event thread (%d)", r); - goto err_free_monitor; + goto err_close_pipe; } return LIBUSB_SUCCESS; +err_close_pipe: + close(udev_control_pipe[0]); + close(udev_control_pipe[1]); err_free_monitor: udev_monitor_unref(udev_monitor); udev_monitor = NULL; udev_monitor_fd = -1; err_free_ctx: udev_unref(udev_ctx); +err: udev_ctx = NULL; return LIBUSB_ERROR_OTHER; } int linux_udev_stop_event_monitor(void) { + char dummy = 1; + int r; + assert(udev_ctx != NULL); assert(udev_monitor != NULL); assert(udev_monitor_fd != -1); - /* Cancel the event thread. This is the only way to guarantee the - thread exits since closing the monitor fd won't necessarily cause - poll to return. */ - pthread_cancel(linux_event_thread); + /* Write some dummy data to the control pipe and + * wait for the thread to exit */ + r = usbi_write(udev_control_pipe[1], &dummy, sizeof(dummy)); + if (r <= 0) { + usbi_warn(NULL, "udev control pipe signal failed"); + } pthread_join(linux_event_thread, NULL); /* Release the udev monitor */ @@ -134,27 +150,45 @@ int linux_udev_stop_event_monitor(void) udev_unref(udev_ctx); udev_ctx = NULL; + /* close and reset control pipe */ + close(udev_control_pipe[0]); + close(udev_control_pipe[1]); + udev_control_pipe[0] = -1; + udev_control_pipe[1] = -1; + return LIBUSB_SUCCESS; } static void *linux_udev_event_thread_main(void *arg) { + char dummy; + int r; struct udev_device* udev_dev; - struct pollfd fds = {.fd = udev_monitor_fd, - .events = POLLIN}; + struct pollfd fds[] = { + {.fd = udev_control_pipe[0], + .events = POLLIN}, + {.fd = udev_monitor_fd, + .events = POLLIN}, + }; usbi_dbg("udev event thread entering."); - while (1 == poll(&fds, 1, -1)) { - if (NULL == udev_monitor || POLLIN != fds.revents) { + while (poll(fds, 2, -1) >= 0) { + if (fds[0].revents & POLLIN) { + /* activity on control pipe, read the byte and exit */ + r = usbi_read(udev_control_pipe[0], &dummy, sizeof(dummy)); + if (r <= 0) { + usbi_warn(NULL, "udev control pipe read failed"); + } break; } - - usbi_mutex_static_lock(&linux_hotplug_lock); - udev_dev = udev_monitor_receive_device(udev_monitor); - if (udev_dev) - udev_hotplug_event(udev_dev); - usbi_mutex_static_unlock(&linux_hotplug_lock); + if (fds[1].revents & POLLIN) { + usbi_mutex_static_lock(&linux_hotplug_lock); + udev_dev = udev_monitor_receive_device(udev_monitor); + if (udev_dev) + udev_hotplug_event(udev_dev); + usbi_mutex_static_unlock(&linux_hotplug_lock); + } } usbi_dbg("udev event thread exiting"); @@ -207,7 +241,7 @@ static void udev_hotplug_event(struct udev_device* udev_dev) if (strncmp(udev_action, "add", 3) == 0) { linux_hotplug_enumerate(busnum, devaddr, sys_name); } else if (detached) { - linux_hotplug_disconnected(busnum, devaddr, sys_name); + linux_device_disconnected(busnum, devaddr, sys_name); } else { usbi_err(NULL, "ignoring udev action %s", udev_action); } diff --git a/Externals/libusbx/libusb/os/linux_usbfs.c b/Externals/libusb/libusb/os/linux_usbfs.c similarity index 93% rename from Externals/libusbx/libusb/os/linux_usbfs.c rename to Externals/libusb/libusb/os/linux_usbfs.c index 09288af71..db2171010 100644 --- a/Externals/libusbx/libusb/os/linux_usbfs.c +++ b/Externals/libusb/libusb/os/linux_usbfs.c @@ -1,5 +1,6 @@ +/* -*- Mode: C; c-basic-offset:8 ; indent-tabs-mode:t -*- */ /* - * Linux usbfs backend for libusbx + * Linux usbfs backend for libusb * Copyright © 2007-2009 Daniel Drake * Copyright © 2001 Johannes Erdfelt * Copyright © 2013 Nathan Hjelm @@ -48,7 +49,7 @@ * sysfs allows us to read the kernel's in-memory copies of device descriptors * and so forth, avoiding the need to open the device: * - The binary "descriptors" file contains all config descriptors since - * 2.6.26, commit 217a9081d8e69026186067711131b77f0ce219ed + * 2.6.26, commit 217a9081d8e69026186067711131b77f0ce219ed * - The binary "descriptors" file was added in 2.6.23, commit * 69d42a78f935d19384d1f6e4f94b65bb162b36df, but it only contains the * active config descriptors @@ -118,9 +119,11 @@ static int sysfs_can_relate_devices = -1; static int sysfs_has_descriptors = -1; /* how many times have we initted (and not exited) ? */ -static volatile int init_count = 0; +static int init_count = 0; -/* Serialize hotplug start/stop, scan-devices, event-thread, and poll */ +/* Serialize hotplug start/stop */ +usbi_mutex_static_t linux_hotplug_startstop_lock = USBI_MUTEX_INITIALIZER; +/* Serialize scan-devices, event-thread, and poll */ usbi_mutex_static_t linux_hotplug_lock = USBI_MUTEX_INITIALIZER; static int linux_start_event_monitor(void); @@ -181,6 +184,7 @@ static int _get_usbfs_fd(struct libusb_device *dev, mode_t mode, int silent) struct libusb_context *ctx = DEVICE_CTX(dev); char path[PATH_MAX]; int fd; + int delay = 10000; if (usbdev_names) snprintf(path, PATH_MAX, "%s/usbdev%d.%d", @@ -193,11 +197,23 @@ static int _get_usbfs_fd(struct libusb_device *dev, mode_t mode, int silent) if (fd != -1) return fd; /* Success */ + if (errno == ENOENT) { + if (!silent) + usbi_err(ctx, "File doesn't exist, wait %d ms and try again\n", delay/1000); + + /* Wait 10ms for USB device path creation.*/ + usleep(delay); + + fd = open(path, mode); + if (fd != -1) + return fd; /* Success */ + } + if (!silent) { - usbi_err(ctx, "libusbx couldn't open USB device %s: %s", + usbi_err(ctx, "libusb couldn't open USB device %s: %s", path, strerror(errno)); if (errno == EACCES && mode == O_RDWR) - usbi_err(ctx, "libusbx requires write access to USB " + usbi_err(ctx, "libusb requires write access to USB " "device nodes."); } @@ -419,7 +435,7 @@ static int op_init(struct libusb_context *ctx) if (sysfs_has_descriptors) usbi_dbg("sysfs has complete descriptors"); - usbi_mutex_static_lock(&linux_hotplug_lock); + usbi_mutex_static_lock(&linux_hotplug_startstop_lock); r = LIBUSB_SUCCESS; if (init_count == 0) { /* start up hotplug event handler */ @@ -433,20 +449,20 @@ static int op_init(struct libusb_context *ctx) linux_stop_event_monitor(); } else usbi_err(ctx, "error starting hotplug event monitor"); - usbi_mutex_static_unlock(&linux_hotplug_lock); + usbi_mutex_static_unlock(&linux_hotplug_startstop_lock); return r; } static void op_exit(void) { - usbi_mutex_static_lock(&linux_hotplug_lock); + usbi_mutex_static_lock(&linux_hotplug_startstop_lock); assert(init_count != 0); if (!--init_count) { /* tear down event handler */ (void)linux_stop_event_monitor(); } - usbi_mutex_static_unlock(&linux_hotplug_lock); + usbi_mutex_static_unlock(&linux_hotplug_startstop_lock); } static int linux_start_event_monitor(void) @@ -469,11 +485,19 @@ static int linux_stop_event_monitor(void) static int linux_scan_devices(struct libusb_context *ctx) { + int ret; + + usbi_mutex_static_lock(&linux_hotplug_lock); + #if defined(USE_UDEV) - return linux_udev_scan_devices(ctx); + ret = linux_udev_scan_devices(ctx); #else - return linux_default_scan_devices(ctx); + ret = linux_default_scan_devices(ctx); #endif + + usbi_mutex_static_unlock(&linux_hotplug_lock); + + return ret; } static void op_hotplug_poll(void) @@ -553,7 +577,7 @@ static int op_get_device_descriptor(struct libusb_device *dev, static int sysfs_get_active_config(struct libusb_device *dev, int *config) { char *endptr; - char tmp[4] = {0, 0, 0, 0}; + char tmp[5] = {0, 0, 0, 0, 0}; long num; int fd; ssize_t r; @@ -565,7 +589,7 @@ static int sysfs_get_active_config(struct libusb_device *dev, int *config) r = read(fd, tmp, sizeof(tmp)); close(fd); if (r < 0) { - usbi_err(DEVICE_CTX(dev), + usbi_err(DEVICE_CTX(dev), "read bConfigurationValue failed ret=%d errno=%d", r, errno); return LIBUSB_ERROR_IO; } else if (r == 0) { @@ -596,6 +620,8 @@ int linux_get_device_address (struct libusb_context *ctx, int detached, uint8_t *busnum, uint8_t *devaddr,const char *dev_node, const char *sys_name) { + int sysfs_attr; + usbi_dbg("getting address for device: %s detached: %d", sys_name, detached); /* can't use sysfs to read the bus and device number if the * device has been detached */ @@ -616,17 +642,22 @@ int linux_get_device_address (struct libusb_context *ctx, int detached, usbi_dbg("scan %s", sys_name); - *busnum = __read_sysfs_attr(ctx, sys_name, "busnum"); - if (0 > *busnum) - return *busnum; + sysfs_attr = __read_sysfs_attr(ctx, sys_name, "busnum"); + if (0 > sysfs_attr) + return sysfs_attr; + if (sysfs_attr > 255) + return LIBUSB_ERROR_INVALID_PARAM; + *busnum = (uint8_t) sysfs_attr; - *devaddr = __read_sysfs_attr(ctx, sys_name, "devnum"); - if (0 > *devaddr) - return *devaddr; + sysfs_attr = __read_sysfs_attr(ctx, sys_name, "devnum"); + if (0 > sysfs_attr) + return sysfs_attr; + if (sysfs_attr > 255) + return LIBUSB_ERROR_INVALID_PARAM; + + *devaddr = (uint8_t) sysfs_attr; usbi_dbg("bus=%d dev=%d", *busnum, *devaddr); - if (*busnum > 255 || *devaddr > 255) - return LIBUSB_ERROR_INVALID_PARAM; return LIBUSB_SUCCESS; } @@ -895,7 +926,7 @@ static int initialize_device(struct libusb_device *dev, uint8_t busnum, } priv->descriptors_len += r; } while (priv->descriptors_len == descriptors_size); - + close(fd); if (priv->descriptors_len < DEVICE_DESC_LENGTH) { @@ -1030,9 +1061,11 @@ int linux_enumerate_device(struct libusb_context *ctx, usbi_dbg("busnum %d devaddr %d session_id %ld", busnum, devaddr, session_id); - if (usbi_get_device_by_session_id(ctx, session_id)) { + dev = usbi_get_device_by_session_id(ctx, session_id); + if (dev) { /* device already exists in the context */ usbi_dbg("session_id %ld already exists", session_id); + libusb_unref_device(dev); return LIBUSB_SUCCESS; } @@ -1072,7 +1105,7 @@ void linux_hotplug_enumerate(uint8_t busnum, uint8_t devaddr, const char *sys_na usbi_mutex_static_unlock(&active_contexts_lock); } -void linux_hotplug_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys_name) +void linux_device_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys_name) { struct libusb_context *ctx; struct libusb_device *dev; @@ -1083,6 +1116,7 @@ void linux_hotplug_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys dev = usbi_get_device_by_session_id (ctx, session_id); if (NULL != dev) { usbi_disconnect_device (dev); + libusb_unref_device(dev); } else { usbi_dbg("device not found for session %x", session_id); } @@ -1247,8 +1281,20 @@ static int op_open(struct libusb_device_handle *handle) int r; hpriv->fd = _get_usbfs_fd(handle->dev, O_RDWR, 0); - if (hpriv->fd < 0) + if (hpriv->fd < 0) { + if (hpriv->fd == LIBUSB_ERROR_NO_DEVICE) { + /* device will still be marked as attached if hotplug monitor thread + * hasn't processed remove event yet */ + usbi_mutex_static_lock(&linux_hotplug_lock); + if (handle->dev->attached) { + usbi_dbg("open failed with no device, but device still attached"); + linux_device_disconnected(handle->dev->bus_number, + handle->dev->device_address, NULL); + } + usbi_mutex_static_unlock(&linux_hotplug_lock); + } return hpriv->fd; + } r = ioctl(hpriv->fd, IOCTL_USBFS_GET_CAPABILITIES, &hpriv->caps); if (r < 0) { @@ -1449,6 +1495,56 @@ out: return ret; } +static int do_streams_ioctl(struct libusb_device_handle *handle, long req, + uint32_t num_streams, unsigned char *endpoints, int num_endpoints) +{ + int r, fd = _device_handle_priv(handle)->fd; + struct usbfs_streams *streams; + + if (num_endpoints > 30) /* Max 15 in + 15 out eps */ + return LIBUSB_ERROR_INVALID_PARAM; + + streams = malloc(sizeof(struct usbfs_streams) + num_endpoints); + if (!streams) + return LIBUSB_ERROR_NO_MEM; + + streams->num_streams = num_streams; + streams->num_eps = num_endpoints; + memcpy(streams->eps, endpoints, num_endpoints); + + r = ioctl(fd, req, streams); + + free(streams); + + if (r < 0) { + if (errno == ENOTTY) + return LIBUSB_ERROR_NOT_SUPPORTED; + else if (errno == EINVAL) + return LIBUSB_ERROR_INVALID_PARAM; + else if (errno == ENODEV) + return LIBUSB_ERROR_NO_DEVICE; + + usbi_err(HANDLE_CTX(handle), + "streams-ioctl failed error %d errno %d", r, errno); + return LIBUSB_ERROR_OTHER; + } + return r; +} + +static int op_alloc_streams(struct libusb_device_handle *handle, + uint32_t num_streams, unsigned char *endpoints, int num_endpoints) +{ + return do_streams_ioctl(handle, IOCTL_USBFS_ALLOC_STREAMS, + num_streams, endpoints, num_endpoints); +} + +static int op_free_streams(struct libusb_device_handle *handle, + unsigned char *endpoints, int num_endpoints) +{ + return do_streams_ioctl(handle, IOCTL_USBFS_FREE_STREAMS, 0, + endpoints, num_endpoints); +} + static int op_kernel_driver_active(struct libusb_device_handle *handle, int interface) { @@ -1656,8 +1752,7 @@ static void free_iso_urbs(struct linux_transfer_priv *tpriv) tpriv->iso_urbs = NULL; } -static int submit_bulk_transfer(struct usbi_transfer *itransfer, - unsigned char urb_type) +static int submit_bulk_transfer(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); @@ -1745,7 +1840,19 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer, for (i = 0; i < num_urbs; i++) { struct usbfs_urb *urb = &urbs[i]; urb->usercontext = itransfer; - urb->type = urb_type; + switch (transfer->type) { + case LIBUSB_TRANSFER_TYPE_BULK: + urb->type = USBFS_URB_TYPE_BULK; + urb->stream_id = 0; + break; + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + urb->type = USBFS_URB_TYPE_BULK; + urb->stream_id = itransfer->stream_id; + break; + case LIBUSB_TRANSFER_TYPE_INTERRUPT: + urb->type = USBFS_URB_TYPE_INTERRUPT; + break; + } urb->endpoint = transfer->endpoint; urb->buffer = transfer->buffer + (i * bulk_buffer_len); /* don't set the short not ok flag for the last URB */ @@ -1775,7 +1882,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer, "submiturb failed error %d errno=%d", r, errno); r = LIBUSB_ERROR_IO; } - + /* if the first URB submission fails, we can simply free up and * return failure immediately. */ if (i == 0) { @@ -1790,7 +1897,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer, * complications: * - discarding is asynchronous - discarded urbs will be reaped * later. the user must not have freed the transfer when the - * discarded URBs are reaped, otherwise libusbx will be using + * discarded URBs are reaped, otherwise libusb will be using * freed memory. * - the earlier URBs may have completed successfully and we do * not want to throw away any data. @@ -1952,7 +2059,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) * complications: * - discarding is asynchronous - discarded urbs will be reaped * later. the user must not have freed the transfer when the - * discarded URBs are reaped, otherwise libusbx will be using + * discarded URBs are reaped, otherwise libusb will be using * freed memory. * - the earlier URBs may have completed successfully and we do * not want to throw away any data. @@ -2028,9 +2135,10 @@ static int op_submit_transfer(struct usbi_transfer *itransfer) case LIBUSB_TRANSFER_TYPE_CONTROL: return submit_control_transfer(itransfer); case LIBUSB_TRANSFER_TYPE_BULK: - return submit_bulk_transfer(itransfer, USBFS_URB_TYPE_BULK); + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + return submit_bulk_transfer(itransfer); case LIBUSB_TRANSFER_TYPE_INTERRUPT: - return submit_bulk_transfer(itransfer, USBFS_URB_TYPE_INTERRUPT); + return submit_bulk_transfer(itransfer); case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: return submit_iso_transfer(itransfer); default: @@ -2048,6 +2156,7 @@ static int op_cancel_transfer(struct usbi_transfer *itransfer) switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_BULK: + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: if (tpriv->reap_action == ERROR) break; /* else, fall through */ @@ -2078,6 +2187,7 @@ static void op_clear_transfer_priv(struct usbi_transfer *itransfer) switch (transfer->type) { case LIBUSB_TRANSFER_TYPE_CONTROL: case LIBUSB_TRANSFER_TYPE_BULK: + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: case LIBUSB_TRANSFER_TYPE_INTERRUPT: usbi_mutex_lock(&itransfer->lock); if (tpriv->urbs) @@ -2127,7 +2237,7 @@ static int handle_bulk_completion(struct usbi_transfer *itransfer, * * When this happens, our objectives are not to lose any "surplus" data, * and also to stick it at the end of the previously-received data - * (closing any holes), so that libusbx reports the total amount of + * (closing any holes), so that libusb reports the total amount of * transferred data and presents it in a contiguous chunk. */ if (urb->actual_length > 0) { @@ -2446,6 +2556,7 @@ static int reap_for_handle(struct libusb_device_handle *handle) case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: return handle_iso_completion(itransfer, urb); case LIBUSB_TRANSFER_TYPE_BULK: + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: case LIBUSB_TRANSFER_TYPE_INTERRUPT: return handle_bulk_completion(itransfer, urb); case LIBUSB_TRANSFER_TYPE_CONTROL: @@ -2479,9 +2590,22 @@ static int op_handle_events(struct libusb_context *ctx, break; } + if (!hpriv || hpriv->fd != pollfd->fd) { + usbi_err(ctx, "cannot find handle for fd %d\n", + pollfd->fd); + continue; + } + if (pollfd->revents & POLLERR) { usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->fd); usbi_handle_disconnect(handle); + /* device will still be marked as attached if hotplug monitor thread + * hasn't processed remove event yet */ + usbi_mutex_static_lock(&linux_hotplug_lock); + if (handle->dev->attached) + linux_device_disconnected(handle->dev->bus_number, + handle->dev->device_address, NULL); + usbi_mutex_static_unlock(&linux_hotplug_lock); continue; } @@ -2543,6 +2667,9 @@ const struct usbi_os_backend linux_usbfs_backend = { .clear_halt = op_clear_halt, .reset_device = op_reset_device, + .alloc_streams = op_alloc_streams, + .free_streams = op_free_streams, + .kernel_driver_active = op_kernel_driver_active, .detach_kernel_driver = op_detach_kernel_driver, .attach_kernel_driver = op_attach_kernel_driver, diff --git a/Externals/libusbx/libusb/os/linux_usbfs.h b/Externals/libusb/libusb/os/linux_usbfs.h similarity index 91% rename from Externals/libusbx/libusb/os/linux_usbfs.h rename to Externals/libusb/libusb/os/linux_usbfs.h index 499bab78e..f2404abf5 100644 --- a/Externals/libusbx/libusb/os/linux_usbfs.h +++ b/Externals/libusb/libusb/os/linux_usbfs.h @@ -94,7 +94,10 @@ struct usbfs_urb { int buffer_length; int actual_length; int start_frame; - int number_of_packets; + union { + int number_of_packets; /* Only used for isoc urbs */ + unsigned int stream_id; /* Only used with bulk streams */ + }; int error_count; unsigned int signr; void *usercontext; @@ -132,6 +135,12 @@ struct usbfs_disconnect_claim { char driver[USBFS_MAXDRIVERNAME + 1]; }; +struct usbfs_streams { + unsigned int num_streams; /* Not used by USBDEVFS_FREE_STREAMS */ + unsigned int num_eps; + unsigned char eps[0]; +}; + #define IOCTL_USBFS_CONTROL _IOWR('U', 0, struct usbfs_ctrltransfer) #define IOCTL_USBFS_BULK _IOWR('U', 2, struct usbfs_bulktransfer) #define IOCTL_USBFS_RESETEP _IOR('U', 3, unsigned int) @@ -155,6 +164,8 @@ struct usbfs_disconnect_claim { #define IOCTL_USBFS_RELEASE_PORT _IOR('U', 25, unsigned int) #define IOCTL_USBFS_GET_CAPABILITIES _IOR('U', 26, __u32) #define IOCTL_USBFS_DISCONNECT_CLAIM _IOR('U', 27, struct usbfs_disconnect_claim) +#define IOCTL_USBFS_ALLOC_STREAMS _IOR('U', 28, struct usbfs_streams) +#define IOCTL_USBFS_FREE_STREAMS _IOR('U', 29, struct usbfs_streams) extern usbi_mutex_static_t linux_hotplug_lock; @@ -170,7 +181,7 @@ void linux_netlink_hotplug_poll(void); #endif void linux_hotplug_enumerate(uint8_t busnum, uint8_t devaddr, const char *sys_name); -void linux_hotplug_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys_name); +void linux_device_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys_name); int linux_get_device_address (struct libusb_context *ctx, int detached, uint8_t *busnum, uint8_t *devaddr, const char *dev_node, diff --git a/Externals/libusbx/libusb/os/openbsd_usb.c b/Externals/libusb/libusb/os/netbsd_usb.c similarity index 81% rename from Externals/libusbx/libusb/os/openbsd_usb.c rename to Externals/libusb/libusb/os/netbsd_usb.c index f4fd4543a..ed4f50e6d 100644 --- a/Externals/libusbx/libusb/os/openbsd_usb.c +++ b/Externals/libusb/libusb/os/netbsd_usb.c @@ -47,36 +47,36 @@ struct handle_priv { /* * Backend functions */ -static int obsd_get_device_list(struct libusb_context *, +static int netbsd_get_device_list(struct libusb_context *, struct discovered_devs **); -static int obsd_open(struct libusb_device_handle *); -static void obsd_close(struct libusb_device_handle *); +static int netbsd_open(struct libusb_device_handle *); +static void netbsd_close(struct libusb_device_handle *); -static int obsd_get_device_descriptor(struct libusb_device *, unsigned char *, +static int netbsd_get_device_descriptor(struct libusb_device *, unsigned char *, int *); -static int obsd_get_active_config_descriptor(struct libusb_device *, +static int netbsd_get_active_config_descriptor(struct libusb_device *, unsigned char *, size_t, int *); -static int obsd_get_config_descriptor(struct libusb_device *, uint8_t, +static int netbsd_get_config_descriptor(struct libusb_device *, uint8_t, unsigned char *, size_t, int *); -static int obsd_get_configuration(struct libusb_device_handle *, int *); -static int obsd_set_configuration(struct libusb_device_handle *, int); +static int netbsd_get_configuration(struct libusb_device_handle *, int *); +static int netbsd_set_configuration(struct libusb_device_handle *, int); -static int obsd_claim_interface(struct libusb_device_handle *, int); -static int obsd_release_interface(struct libusb_device_handle *, int); +static int netbsd_claim_interface(struct libusb_device_handle *, int); +static int netbsd_release_interface(struct libusb_device_handle *, int); -static int obsd_set_interface_altsetting(struct libusb_device_handle *, int, +static int netbsd_set_interface_altsetting(struct libusb_device_handle *, int, int); -static int obsd_clear_halt(struct libusb_device_handle *, unsigned char); -static int obsd_reset_device(struct libusb_device_handle *); -static void obsd_destroy_device(struct libusb_device *); +static int netbsd_clear_halt(struct libusb_device_handle *, unsigned char); +static int netbsd_reset_device(struct libusb_device_handle *); +static void netbsd_destroy_device(struct libusb_device *); -static int obsd_submit_transfer(struct usbi_transfer *); -static int obsd_cancel_transfer(struct usbi_transfer *); -static void obsd_clear_transfer_priv(struct usbi_transfer *); -static int obsd_handle_events(struct libusb_context *ctx, struct pollfd *, +static int netbsd_submit_transfer(struct usbi_transfer *); +static int netbsd_cancel_transfer(struct usbi_transfer *); +static void netbsd_clear_transfer_priv(struct usbi_transfer *); +static int netbsd_handle_events(struct libusb_context *ctx, struct pollfd *, nfds_t, int); -static int obsd_clock_gettime(int, struct timespec *); +static int netbsd_clock_gettime(int, struct timespec *); /* * Private functions @@ -87,44 +87,47 @@ static int _sync_control_transfer(struct usbi_transfer *); static int _sync_gen_transfer(struct usbi_transfer *); static int _access_endpoint(struct libusb_transfer *); -const struct usbi_os_backend openbsd_backend = { - "Synchronous OpenBSD backend", +const struct usbi_os_backend netbsd_backend = { + "Synchronous NetBSD backend", 0, NULL, /* init() */ NULL, /* exit() */ - obsd_get_device_list, + netbsd_get_device_list, NULL, /* hotplug_poll */ - obsd_open, - obsd_close, + netbsd_open, + netbsd_close, - obsd_get_device_descriptor, - obsd_get_active_config_descriptor, - obsd_get_config_descriptor, + netbsd_get_device_descriptor, + netbsd_get_active_config_descriptor, + netbsd_get_config_descriptor, NULL, /* get_config_descriptor_by_value() */ - obsd_get_configuration, - obsd_set_configuration, + netbsd_get_configuration, + netbsd_set_configuration, - obsd_claim_interface, - obsd_release_interface, + netbsd_claim_interface, + netbsd_release_interface, - obsd_set_interface_altsetting, - obsd_clear_halt, - obsd_reset_device, + netbsd_set_interface_altsetting, + netbsd_clear_halt, + netbsd_reset_device, + + NULL, /* alloc_streams */ + NULL, /* free_streams */ NULL, /* kernel_driver_active() */ NULL, /* detach_kernel_driver() */ NULL, /* attach_kernel_driver() */ - obsd_destroy_device, + netbsd_destroy_device, - obsd_submit_transfer, - obsd_cancel_transfer, - obsd_clear_transfer_priv, + netbsd_submit_transfer, + netbsd_cancel_transfer, + netbsd_clear_transfer_priv, - obsd_handle_events, + netbsd_handle_events, - obsd_clock_gettime, + netbsd_clock_gettime, sizeof(struct device_priv), sizeof(struct handle_priv), 0, /* transfer_priv_size */ @@ -132,7 +135,7 @@ const struct usbi_os_backend openbsd_backend = { }; int -obsd_get_device_list(struct libusb_context * ctx, +netbsd_get_device_list(struct libusb_context * ctx, struct discovered_devs **discdevs) { struct libusb_device *dev; @@ -161,9 +164,7 @@ obsd_get_device_list(struct libusb_context * ctx, session_id = (di.udi_bus << 8 | di.udi_addr); dev = usbi_get_device_by_session_id(ctx, session_id); - if (dev) { - dev = libusb_ref_device(dev); - } else { + if (dev == NULL) { dev = usbi_alloc_device(ctx, session_id); if (dev == NULL) return (LIBUSB_ERROR_NO_MEM); @@ -207,7 +208,7 @@ error: } int -obsd_open(struct libusb_device_handle *handle) +netbsd_open(struct libusb_device_handle *handle) { struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; @@ -228,7 +229,7 @@ obsd_open(struct libusb_device_handle *handle) } void -obsd_close(struct libusb_device_handle *handle) +netbsd_close(struct libusb_device_handle *handle) { struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; @@ -245,7 +246,7 @@ obsd_close(struct libusb_device_handle *handle) } int -obsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf, +netbsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf, int *host_endian) { struct device_priv *dpriv = (struct device_priv *)dev->os_priv; @@ -260,7 +261,7 @@ obsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf, } int -obsd_get_active_config_descriptor(struct libusb_device *dev, +netbsd_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buf, size_t len, int *host_endian) { struct device_priv *dpriv = (struct device_priv *)dev->os_priv; @@ -279,7 +280,7 @@ obsd_get_active_config_descriptor(struct libusb_device *dev, } int -obsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx, +netbsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx, unsigned char *buf, size_t len, int *host_endian) { struct device_priv *dpriv = (struct device_priv *)dev->os_priv; @@ -317,7 +318,7 @@ obsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx, } int -obsd_get_configuration(struct libusb_device_handle *handle, int *config) +netbsd_get_configuration(struct libusb_device_handle *handle, int *config) { struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; @@ -332,7 +333,7 @@ obsd_get_configuration(struct libusb_device_handle *handle, int *config) } int -obsd_set_configuration(struct libusb_device_handle *handle, int config) +netbsd_set_configuration(struct libusb_device_handle *handle, int config) { struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; @@ -345,7 +346,7 @@ obsd_set_configuration(struct libusb_device_handle *handle, int config) } int -obsd_claim_interface(struct libusb_device_handle *handle, int iface) +netbsd_claim_interface(struct libusb_device_handle *handle, int iface) { struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; int i; @@ -357,7 +358,7 @@ obsd_claim_interface(struct libusb_device_handle *handle, int iface) } int -obsd_release_interface(struct libusb_device_handle *handle, int iface) +netbsd_release_interface(struct libusb_device_handle *handle, int iface) { struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; int i; @@ -370,7 +371,7 @@ obsd_release_interface(struct libusb_device_handle *handle, int iface) } int -obsd_set_interface_altsetting(struct libusb_device_handle *handle, int iface, +netbsd_set_interface_altsetting(struct libusb_device_handle *handle, int iface, int altsetting) { struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; @@ -390,7 +391,7 @@ obsd_set_interface_altsetting(struct libusb_device_handle *handle, int iface, } int -obsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) +netbsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) { struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; struct usb_ctl_request req; @@ -410,7 +411,7 @@ obsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) } int -obsd_reset_device(struct libusb_device_handle *handle) +netbsd_reset_device(struct libusb_device_handle *handle) { usbi_dbg(""); @@ -418,7 +419,7 @@ obsd_reset_device(struct libusb_device_handle *handle) } void -obsd_destroy_device(struct libusb_device *dev) +netbsd_destroy_device(struct libusb_device *dev) { struct device_priv *dpriv = (struct device_priv *)dev->os_priv; @@ -428,7 +429,7 @@ obsd_destroy_device(struct libusb_device *dev) } int -obsd_submit_transfer(struct usbi_transfer *itransfer) +netbsd_submit_transfer(struct usbi_transfer *itransfer) { struct libusb_transfer *transfer; struct handle_priv *hpriv; @@ -460,6 +461,9 @@ obsd_submit_transfer(struct usbi_transfer *itransfer) } err = _sync_gen_transfer(itransfer); break; + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + err = LIBUSB_ERROR_NOT_SUPPORTED; + break; } if (err) @@ -472,7 +476,7 @@ obsd_submit_transfer(struct usbi_transfer *itransfer) } int -obsd_cancel_transfer(struct usbi_transfer *itransfer) +netbsd_cancel_transfer(struct usbi_transfer *itransfer) { usbi_dbg(""); @@ -480,7 +484,7 @@ obsd_cancel_transfer(struct usbi_transfer *itransfer) } void -obsd_clear_transfer_priv(struct usbi_transfer *itransfer) +netbsd_clear_transfer_priv(struct usbi_transfer *itransfer) { usbi_dbg(""); @@ -488,7 +492,7 @@ obsd_clear_transfer_priv(struct usbi_transfer *itransfer) } int -obsd_handle_events(struct libusb_context *ctx, struct pollfd *fds, nfds_t nfds, +netbsd_handle_events(struct libusb_context *ctx, struct pollfd *fds, nfds_t nfds, int num_ready) { struct libusb_device_handle *handle; @@ -548,7 +552,7 @@ obsd_handle_events(struct libusb_context *ctx, struct pollfd *fds, nfds_t nfds, } int -obsd_clock_gettime(int clkid, struct timespec *tp) +netbsd_clock_gettime(int clkid, struct timespec *tp) { usbi_dbg("clock %d", clkid); @@ -641,7 +645,7 @@ _sync_control_transfer(struct usbi_transfer *itransfer) req.ucr_request.bmRequestType = setup->bmRequestType; req.ucr_request.bRequest = setup->bRequest; - /* Don't use USETW, libusbx already deals with the endianness */ + /* Don't use USETW, libusb already deals with the endianness */ (*(uint16_t *)req.ucr_request.wValue) = setup->wValue; (*(uint16_t *)req.ucr_request.wIndex) = setup->wIndex; (*(uint16_t *)req.ucr_request.wLength) = setup->wLength; diff --git a/Externals/libusb/libusb/os/openbsd_usb.c b/Externals/libusb/libusb/os/openbsd_usb.c new file mode 100644 index 000000000..ff470bead --- /dev/null +++ b/Externals/libusb/libusb/os/openbsd_usb.c @@ -0,0 +1,832 @@ +/* + * Copyright © 2011-2013 Martin Pieuchot + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +#include "libusb.h" +#include "libusbi.h" + +struct device_priv { + char *devname; /* name of the ugen(4) node */ + int fd; /* device file descriptor */ + + unsigned char *cdesc; /* active config descriptor */ + usb_device_descriptor_t ddesc; /* usb device descriptor */ +}; + +struct handle_priv { + int pipe[2]; /* for event notification */ + int endpoints[USB_MAX_ENDPOINTS]; +}; + +/* + * Backend functions + */ +static int obsd_get_device_list(struct libusb_context *, + struct discovered_devs **); +static int obsd_open(struct libusb_device_handle *); +static void obsd_close(struct libusb_device_handle *); + +static int obsd_get_device_descriptor(struct libusb_device *, unsigned char *, + int *); +static int obsd_get_active_config_descriptor(struct libusb_device *, + unsigned char *, size_t, int *); +static int obsd_get_config_descriptor(struct libusb_device *, uint8_t, + unsigned char *, size_t, int *); + +static int obsd_get_configuration(struct libusb_device_handle *, int *); +static int obsd_set_configuration(struct libusb_device_handle *, int); + +static int obsd_claim_interface(struct libusb_device_handle *, int); +static int obsd_release_interface(struct libusb_device_handle *, int); + +static int obsd_set_interface_altsetting(struct libusb_device_handle *, int, + int); +static int obsd_clear_halt(struct libusb_device_handle *, unsigned char); +static int obsd_reset_device(struct libusb_device_handle *); +static void obsd_destroy_device(struct libusb_device *); + +static int obsd_submit_transfer(struct usbi_transfer *); +static int obsd_cancel_transfer(struct usbi_transfer *); +static void obsd_clear_transfer_priv(struct usbi_transfer *); +static int obsd_handle_events(struct libusb_context *ctx, struct pollfd *, + nfds_t, int); +static int obsd_clock_gettime(int, struct timespec *); + +/* + * Private functions + */ +static int _errno_to_libusb(int); +static int _cache_active_config_descriptor(struct libusb_device *); +static int _sync_control_transfer(struct usbi_transfer *); +static int _sync_gen_transfer(struct usbi_transfer *); +static int _access_endpoint(struct libusb_transfer *); + +static int _bus_open(int); + + +const struct usbi_os_backend openbsd_backend = { + "Synchronous OpenBSD backend", + 0, + NULL, /* init() */ + NULL, /* exit() */ + obsd_get_device_list, + NULL, /* hotplug_poll */ + obsd_open, + obsd_close, + + obsd_get_device_descriptor, + obsd_get_active_config_descriptor, + obsd_get_config_descriptor, + NULL, /* get_config_descriptor_by_value() */ + + obsd_get_configuration, + obsd_set_configuration, + + obsd_claim_interface, + obsd_release_interface, + + obsd_set_interface_altsetting, + obsd_clear_halt, + obsd_reset_device, + + NULL, /* alloc_streams */ + NULL, /* free_streams */ + + NULL, /* kernel_driver_active() */ + NULL, /* detach_kernel_driver() */ + NULL, /* attach_kernel_driver() */ + + obsd_destroy_device, + + obsd_submit_transfer, + obsd_cancel_transfer, + obsd_clear_transfer_priv, + + obsd_handle_events, + + obsd_clock_gettime, + sizeof(struct device_priv), + sizeof(struct handle_priv), + 0, /* transfer_priv_size */ + 0, /* add_iso_packet_size */ +}; + +#define DEVPATH "/dev/" +#define USBDEV DEVPATH "usb" + +int +obsd_get_device_list(struct libusb_context * ctx, + struct discovered_devs **discdevs) +{ + struct discovered_devs *ddd; + struct libusb_device *dev; + struct device_priv *dpriv; + struct usb_device_info di; + struct usb_device_ddesc dd; + unsigned long session_id; + char devices[USB_MAX_DEVICES]; + char busnode[16]; + char *udevname; + int fd, addr, i, j; + + usbi_dbg(""); + + for (i = 0; i < 8; i++) { + snprintf(busnode, sizeof(busnode), USBDEV "%d", i); + + if ((fd = open(busnode, O_RDWR)) < 0) { + if (errno != ENOENT && errno != ENXIO) + usbi_err(ctx, "could not open %s", busnode); + continue; + } + + bzero(devices, sizeof(devices)); + for (addr = 1; addr < USB_MAX_DEVICES; addr++) { + if (devices[addr]) + continue; + + di.udi_addr = addr; + if (ioctl(fd, USB_DEVICEINFO, &di) < 0) + continue; + + /* + * XXX If ugen(4) is attached to the USB device + * it will be used. + */ + udevname = NULL; + for (j = 0; j < USB_MAX_DEVNAMES; j++) + if (!strncmp("ugen", di.udi_devnames[j], 4)) { + udevname = strdup(di.udi_devnames[j]); + break; + } + + session_id = (di.udi_bus << 8 | di.udi_addr); + dev = usbi_get_device_by_session_id(ctx, session_id); + + if (dev == NULL) { + dev = usbi_alloc_device(ctx, session_id); + if (dev == NULL) { + close(fd); + return (LIBUSB_ERROR_NO_MEM); + } + + dev->bus_number = di.udi_bus; + dev->device_address = di.udi_addr; + dev->speed = di.udi_speed; + + dpriv = (struct device_priv *)dev->os_priv; + dpriv->fd = -1; + dpriv->cdesc = NULL; + dpriv->devname = udevname; + + dd.udd_bus = di.udi_bus; + dd.udd_addr = di.udi_addr; + if (ioctl(fd, USB_DEVICE_GET_DDESC, &dd) < 0) { + libusb_unref_device(dev); + continue; + } + dpriv->ddesc = dd.udd_desc; + + if (_cache_active_config_descriptor(dev)) { + libusb_unref_device(dev); + continue; + } + + if (usbi_sanitize_device(dev)) { + libusb_unref_device(dev); + continue; + } + } + + ddd = discovered_devs_append(*discdevs, dev); + if (ddd == NULL) { + close(fd); + return (LIBUSB_ERROR_NO_MEM); + } + libusb_unref_device(dev); + + *discdevs = ddd; + devices[addr] = 1; + } + + close(fd); + } + + return (LIBUSB_SUCCESS); +} + +int +obsd_open(struct libusb_device_handle *handle) +{ + struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; + struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; + char devnode[16]; + + if (dpriv->devname) { + /* + * Only open ugen(4) attached devices read-write, all + * read-only operations are done through the bus node. + */ + snprintf(devnode, sizeof(devnode), DEVPATH "%s.00", + dpriv->devname); + dpriv->fd = open(devnode, O_RDWR); + if (dpriv->fd < 0) + return _errno_to_libusb(errno); + + usbi_dbg("open %s: fd %d", devnode, dpriv->fd); + } + + if (pipe(hpriv->pipe) < 0) + return _errno_to_libusb(errno); + + return usbi_add_pollfd(HANDLE_CTX(handle), hpriv->pipe[0], POLLIN); +} + +void +obsd_close(struct libusb_device_handle *handle) +{ + struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; + struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; + + if (dpriv->devname) { + usbi_dbg("close: fd %d", dpriv->fd); + + close(dpriv->fd); + dpriv->fd = -1; + } + + usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->pipe[0]); + + close(hpriv->pipe[0]); + close(hpriv->pipe[1]); +} + +int +obsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf, + int *host_endian) +{ + struct device_priv *dpriv = (struct device_priv *)dev->os_priv; + + usbi_dbg(""); + + memcpy(buf, &dpriv->ddesc, DEVICE_DESC_LENGTH); + + *host_endian = 0; + + return (LIBUSB_SUCCESS); +} + +int +obsd_get_active_config_descriptor(struct libusb_device *dev, + unsigned char *buf, size_t len, int *host_endian) +{ + struct device_priv *dpriv = (struct device_priv *)dev->os_priv; + usb_config_descriptor_t *ucd = (usb_config_descriptor_t *)dpriv->cdesc; + + len = MIN(len, UGETW(ucd->wTotalLength)); + + usbi_dbg("len %d", len); + + memcpy(buf, dpriv->cdesc, len); + + *host_endian = 0; + + return (len); +} + +int +obsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx, + unsigned char *buf, size_t len, int *host_endian) +{ + struct usb_device_fdesc udf; + int fd, err; + + if ((fd = _bus_open(dev->bus_number)) < 0) + return _errno_to_libusb(errno); + + udf.udf_bus = dev->bus_number; + udf.udf_addr = dev->device_address; + udf.udf_config_index = idx; + udf.udf_size = len; + udf.udf_data = buf; + + usbi_dbg("index %d, len %d", udf.udf_config_index, len); + + if (ioctl(fd, USB_DEVICE_GET_FDESC, &udf) < 0) { + err = errno; + close(fd); + return _errno_to_libusb(err); + } + close(fd); + + *host_endian = 0; + + return (len); +} + +int +obsd_get_configuration(struct libusb_device_handle *handle, int *config) +{ + struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; + usb_config_descriptor_t *ucd = (usb_config_descriptor_t *)dpriv->cdesc; + + *config = ucd->bConfigurationValue; + + usbi_dbg("bConfigurationValue %d", *config); + + return (LIBUSB_SUCCESS); +} + +int +obsd_set_configuration(struct libusb_device_handle *handle, int config) +{ + struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; + + if (dpriv->devname == NULL) + return (LIBUSB_ERROR_NOT_SUPPORTED); + + usbi_dbg("bConfigurationValue %d", config); + + if (ioctl(dpriv->fd, USB_SET_CONFIG, &config) < 0) + return _errno_to_libusb(errno); + + return _cache_active_config_descriptor(handle->dev); +} + +int +obsd_claim_interface(struct libusb_device_handle *handle, int iface) +{ + struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; + int i; + + for (i = 0; i < USB_MAX_ENDPOINTS; i++) + hpriv->endpoints[i] = -1; + + return (LIBUSB_SUCCESS); +} + +int +obsd_release_interface(struct libusb_device_handle *handle, int iface) +{ + struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv; + int i; + + for (i = 0; i < USB_MAX_ENDPOINTS; i++) + if (hpriv->endpoints[i] >= 0) + close(hpriv->endpoints[i]); + + return (LIBUSB_SUCCESS); +} + +int +obsd_set_interface_altsetting(struct libusb_device_handle *handle, int iface, + int altsetting) +{ + struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv; + struct usb_alt_interface intf; + + if (dpriv->devname == NULL) + return (LIBUSB_ERROR_NOT_SUPPORTED); + + usbi_dbg("iface %d, setting %d", iface, altsetting); + + memset(&intf, 0, sizeof(intf)); + + intf.uai_interface_index = iface; + intf.uai_alt_no = altsetting; + + if (ioctl(dpriv->fd, USB_SET_ALTINTERFACE, &intf) < 0) + return _errno_to_libusb(errno); + + return (LIBUSB_SUCCESS); +} + +int +obsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint) +{ + struct usb_ctl_request req; + int fd, err; + + if ((fd = _bus_open(handle->dev->bus_number)) < 0) + return _errno_to_libusb(errno); + + usbi_dbg(""); + + req.ucr_addr = handle->dev->device_address; + req.ucr_request.bmRequestType = UT_WRITE_ENDPOINT; + req.ucr_request.bRequest = UR_CLEAR_FEATURE; + USETW(req.ucr_request.wValue, UF_ENDPOINT_HALT); + USETW(req.ucr_request.wIndex, endpoint); + USETW(req.ucr_request.wLength, 0); + + if (ioctl(fd, USB_REQUEST, &req) < 0) { + err = errno; + close(fd); + return _errno_to_libusb(err); + } + close(fd); + + return (LIBUSB_SUCCESS); +} + +int +obsd_reset_device(struct libusb_device_handle *handle) +{ + usbi_dbg(""); + + return (LIBUSB_ERROR_NOT_SUPPORTED); +} + +void +obsd_destroy_device(struct libusb_device *dev) +{ + struct device_priv *dpriv = (struct device_priv *)dev->os_priv; + + usbi_dbg(""); + + free(dpriv->cdesc); + free(dpriv->devname); +} + +int +obsd_submit_transfer(struct usbi_transfer *itransfer) +{ + struct libusb_transfer *transfer; + struct handle_priv *hpriv; + int err = 0; + + usbi_dbg(""); + + transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + hpriv = (struct handle_priv *)transfer->dev_handle->os_priv; + + switch (transfer->type) { + case LIBUSB_TRANSFER_TYPE_CONTROL: + err = _sync_control_transfer(itransfer); + break; + case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: + if (IS_XFEROUT(transfer)) { + /* Isochronous write is not supported */ + err = LIBUSB_ERROR_NOT_SUPPORTED; + break; + } + err = _sync_gen_transfer(itransfer); + break; + case LIBUSB_TRANSFER_TYPE_BULK: + case LIBUSB_TRANSFER_TYPE_INTERRUPT: + if (IS_XFEROUT(transfer) && + transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) { + err = LIBUSB_ERROR_NOT_SUPPORTED; + break; + } + err = _sync_gen_transfer(itransfer); + break; + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + err = LIBUSB_ERROR_NOT_SUPPORTED; + break; + } + + if (err) + return (err); + + if (write(hpriv->pipe[1], &itransfer, sizeof(itransfer)) < 0) + return _errno_to_libusb(errno); + + return (LIBUSB_SUCCESS); +} + +int +obsd_cancel_transfer(struct usbi_transfer *itransfer) +{ + usbi_dbg(""); + + return (LIBUSB_ERROR_NOT_SUPPORTED); +} + +void +obsd_clear_transfer_priv(struct usbi_transfer *itransfer) +{ + usbi_dbg(""); + + /* Nothing to do */ +} + +int +obsd_handle_events(struct libusb_context *ctx, struct pollfd *fds, nfds_t nfds, + int num_ready) +{ + struct libusb_device_handle *handle; + struct handle_priv *hpriv = NULL; + struct usbi_transfer *itransfer; + struct pollfd *pollfd; + int i, err = 0; + + usbi_dbg(""); + + pthread_mutex_lock(&ctx->open_devs_lock); + for (i = 0; i < nfds && num_ready > 0; i++) { + pollfd = &fds[i]; + + if (!pollfd->revents) + continue; + + hpriv = NULL; + num_ready--; + list_for_each_entry(handle, &ctx->open_devs, list, + struct libusb_device_handle) { + hpriv = (struct handle_priv *)handle->os_priv; + + if (hpriv->pipe[0] == pollfd->fd) + break; + + hpriv = NULL; + } + + if (NULL == hpriv) { + usbi_dbg("fd %d is not an event pipe!", pollfd->fd); + err = ENOENT; + break; + } + + if (pollfd->revents & POLLERR) { + usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->pipe[0]); + usbi_handle_disconnect(handle); + continue; + } + + if (read(hpriv->pipe[0], &itransfer, sizeof(itransfer)) < 0) { + err = errno; + break; + } + + if ((err = usbi_handle_transfer_completion(itransfer, + LIBUSB_TRANSFER_COMPLETED))) + break; + } + pthread_mutex_unlock(&ctx->open_devs_lock); + + if (err) + return _errno_to_libusb(err); + + return (LIBUSB_SUCCESS); +} + +int +obsd_clock_gettime(int clkid, struct timespec *tp) +{ + usbi_dbg("clock %d", clkid); + + if (clkid == USBI_CLOCK_REALTIME) + return clock_gettime(CLOCK_REALTIME, tp); + + if (clkid == USBI_CLOCK_MONOTONIC) + return clock_gettime(CLOCK_MONOTONIC, tp); + + return (LIBUSB_ERROR_INVALID_PARAM); +} + +int +_errno_to_libusb(int err) +{ + usbi_dbg("error: %s (%d)", strerror(err), err); + + switch (err) { + case EIO: + return (LIBUSB_ERROR_IO); + case EACCES: + return (LIBUSB_ERROR_ACCESS); + case ENOENT: + return (LIBUSB_ERROR_NO_DEVICE); + case ENOMEM: + return (LIBUSB_ERROR_NO_MEM); + case ETIMEDOUT: + return (LIBUSB_ERROR_TIMEOUT); + } + + return (LIBUSB_ERROR_OTHER); +} + +int +_cache_active_config_descriptor(struct libusb_device *dev) +{ + struct device_priv *dpriv = (struct device_priv *)dev->os_priv; + struct usb_device_cdesc udc; + struct usb_device_fdesc udf; + unsigned char* buf; + int fd, len, err; + + if ((fd = _bus_open(dev->bus_number)) < 0) + return _errno_to_libusb(errno); + + usbi_dbg("fd %d, addr %d", fd, dev->device_address); + + udc.udc_bus = dev->bus_number; + udc.udc_addr = dev->device_address; + udc.udc_config_index = USB_CURRENT_CONFIG_INDEX; + if (ioctl(fd, USB_DEVICE_GET_CDESC, &udc) < 0) { + err = errno; + close(fd); + return _errno_to_libusb(errno); + } + + usbi_dbg("active bLength %d", udc.udc_desc.bLength); + + len = UGETW(udc.udc_desc.wTotalLength); + buf = malloc(len); + if (buf == NULL) + return (LIBUSB_ERROR_NO_MEM); + + udf.udf_bus = dev->bus_number; + udf.udf_addr = dev->device_address; + udf.udf_config_index = udc.udc_config_index; + udf.udf_size = len; + udf.udf_data = buf; + + usbi_dbg("index %d, len %d", udf.udf_config_index, len); + + if (ioctl(fd, USB_DEVICE_GET_FDESC, &udf) < 0) { + err = errno; + close(fd); + free(buf); + return _errno_to_libusb(err); + } + close(fd); + + if (dpriv->cdesc) + free(dpriv->cdesc); + dpriv->cdesc = buf; + + return (LIBUSB_SUCCESS); +} + +int +_sync_control_transfer(struct usbi_transfer *itransfer) +{ + struct libusb_transfer *transfer; + struct libusb_control_setup *setup; + struct device_priv *dpriv; + struct usb_ctl_request req; + + transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv; + setup = (struct libusb_control_setup *)transfer->buffer; + + usbi_dbg("type %x request %x value %x index %d length %d timeout %d", + setup->bmRequestType, setup->bRequest, + libusb_le16_to_cpu(setup->wValue), + libusb_le16_to_cpu(setup->wIndex), + libusb_le16_to_cpu(setup->wLength), transfer->timeout); + + req.ucr_addr = transfer->dev_handle->dev->device_address; + req.ucr_request.bmRequestType = setup->bmRequestType; + req.ucr_request.bRequest = setup->bRequest; + /* Don't use USETW, libusb already deals with the endianness */ + (*(uint16_t *)req.ucr_request.wValue) = setup->wValue; + (*(uint16_t *)req.ucr_request.wIndex) = setup->wIndex; + (*(uint16_t *)req.ucr_request.wLength) = setup->wLength; + req.ucr_data = transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE; + + if ((transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) == 0) + req.ucr_flags = USBD_SHORT_XFER_OK; + + if (dpriv->devname == NULL) { + /* + * XXX If the device is not attached to ugen(4) it is + * XXX still possible to submit a control transfer but + * XXX with the default timeout only. + */ + int fd, err; + + if ((fd = _bus_open(transfer->dev_handle->dev->bus_number)) < 0) + return _errno_to_libusb(errno); + + if ((ioctl(fd, USB_REQUEST, &req)) < 0) { + err = errno; + close(fd); + return _errno_to_libusb(err); + } + close(fd); + } else { + if ((ioctl(dpriv->fd, USB_SET_TIMEOUT, &transfer->timeout)) < 0) + return _errno_to_libusb(errno); + + if ((ioctl(dpriv->fd, USB_DO_REQUEST, &req)) < 0) + return _errno_to_libusb(errno); + } + + itransfer->transferred = req.ucr_actlen; + + usbi_dbg("transferred %d", itransfer->transferred); + + return (0); +} + +int +_access_endpoint(struct libusb_transfer *transfer) +{ + struct handle_priv *hpriv; + struct device_priv *dpriv; + char devnode[16]; + int fd, endpt; + mode_t mode; + + hpriv = (struct handle_priv *)transfer->dev_handle->os_priv; + dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv; + + endpt = UE_GET_ADDR(transfer->endpoint); + mode = IS_XFERIN(transfer) ? O_RDONLY : O_WRONLY; + + usbi_dbg("endpoint %d mode %d", endpt, mode); + + if (hpriv->endpoints[endpt] < 0) { + /* Pick the right endpoint node */ + snprintf(devnode, sizeof(devnode), DEVPATH "%s.%02d", + dpriv->devname, endpt); + + /* We may need to read/write to the same endpoint later. */ + if (((fd = open(devnode, O_RDWR)) < 0) && (errno == ENXIO)) + if ((fd = open(devnode, mode)) < 0) + return (-1); + + hpriv->endpoints[endpt] = fd; + } + + return (hpriv->endpoints[endpt]); +} + +int +_sync_gen_transfer(struct usbi_transfer *itransfer) +{ + struct libusb_transfer *transfer; + struct device_priv *dpriv; + int fd, nr = 1; + + transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); + dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv; + + if (dpriv->devname == NULL) + return (LIBUSB_ERROR_NOT_SUPPORTED); + + /* + * Bulk, Interrupt or Isochronous transfer depends on the + * endpoint and thus the node to open. + */ + if ((fd = _access_endpoint(transfer)) < 0) + return _errno_to_libusb(errno); + + if ((ioctl(fd, USB_SET_TIMEOUT, &transfer->timeout)) < 0) + return _errno_to_libusb(errno); + + if (IS_XFERIN(transfer)) { + if ((transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) == 0) + if ((ioctl(fd, USB_SET_SHORT_XFER, &nr)) < 0) + return _errno_to_libusb(errno); + + nr = read(fd, transfer->buffer, transfer->length); + } else { + nr = write(fd, transfer->buffer, transfer->length); + } + + if (nr < 0) + return _errno_to_libusb(errno); + + itransfer->transferred = nr; + + return (0); +} + +int +_bus_open(int number) +{ + char busnode[16]; + + snprintf(busnode, sizeof(busnode), USBDEV "%d", number); + + return open(busnode, O_RDWR); +} diff --git a/Externals/libusbx/libusb/os/poll_posix.c b/Externals/libusb/libusb/os/poll_posix.c similarity index 100% rename from Externals/libusbx/libusb/os/poll_posix.c rename to Externals/libusb/libusb/os/poll_posix.c diff --git a/Externals/libusbx/libusb/os/poll_posix.h b/Externals/libusb/libusb/os/poll_posix.h similarity index 100% rename from Externals/libusbx/libusb/os/poll_posix.h rename to Externals/libusb/libusb/os/poll_posix.h diff --git a/Externals/libusbx/libusb/os/poll_windows.c b/Externals/libusb/libusb/os/poll_windows.c similarity index 99% rename from Externals/libusbx/libusb/os/poll_windows.c rename to Externals/libusb/libusb/os/poll_windows.c index 7ed19ba32..2a75c5e7e 100644 --- a/Externals/libusbx/libusb/os/poll_windows.c +++ b/Externals/libusb/libusb/os/poll_windows.c @@ -22,7 +22,7 @@ */ /* - * poll() and pipe() Windows compatibility layer for libusbx 1.0 + * poll() and pipe() Windows compatibility layer for libusb 1.0 * * The way this layer works is by using OVERLAPPED with async I/O transfers, as * OVERLAPPED have an associated event which is flagged for I/O completion. @@ -252,7 +252,7 @@ void exit_polling(void) /* * Create a fake pipe. - * As libusbx only uses pipes for signaling, all we need from a pipe is an + * As libusb only uses pipes for signaling, all we need from a pipe is an * event. To that extent, we create a single wfd and overlapped as a means * to access that event. */ @@ -428,7 +428,7 @@ struct winfd fd_to_winfd(int fd) CHECK_INIT_POLLING; - if (fd <= 0) + if (fd < 0) return INVALID_WINFD; for (i=0; i * Copyright © 2011 Peter Stuge @@ -63,7 +63,9 @@ finish: int usbi_get_tid(void) { int ret = -1; -#if defined(__linux__) +#if defined(__ANDROID__) + ret = gettid(); +#elif defined(__linux__) ret = syscall(SYS_gettid); #elif defined(__OpenBSD__) /* The following only works with OpenBSD > 5.1 as it requires diff --git a/Externals/libusbx/libusb/os/threads_posix.h b/Externals/libusb/libusb/os/threads_posix.h similarity index 97% rename from Externals/libusbx/libusb/os/threads_posix.h rename to Externals/libusb/libusb/os/threads_posix.h index 0b6a71a55..d7a5d215f 100644 --- a/Externals/libusbx/libusb/os/threads_posix.h +++ b/Externals/libusb/libusb/os/threads_posix.h @@ -1,5 +1,5 @@ /* - * libusbx synchronization using POSIX Threads + * libusb synchronization using POSIX Threads * * Copyright © 2010 Peter Stuge * diff --git a/Externals/libusbx/libusb/os/threads_windows.c b/Externals/libusb/libusb/os/threads_windows.c similarity index 99% rename from Externals/libusbx/libusb/os/threads_windows.c rename to Externals/libusb/libusb/os/threads_windows.c index cad27e9ea..ac12738c7 100644 --- a/Externals/libusbx/libusb/os/threads_windows.c +++ b/Externals/libusb/libusb/os/threads_windows.c @@ -1,5 +1,5 @@ /* - * libusbx synchronization on Microsoft Windows + * libusb synchronization on Microsoft Windows * * Copyright © 2010 Michael Plante * diff --git a/Externals/libusbx/libusb/os/threads_windows.h b/Externals/libusb/libusb/os/threads_windows.h similarity index 98% rename from Externals/libusbx/libusb/os/threads_windows.h rename to Externals/libusb/libusb/os/threads_windows.h index df8a0eeb0..2b829253b 100644 --- a/Externals/libusbx/libusb/os/threads_windows.h +++ b/Externals/libusb/libusb/os/threads_windows.h @@ -1,5 +1,5 @@ /* - * libusbx synchronization on Microsoft Windows + * libusb synchronization on Microsoft Windows * * Copyright © 2010 Michael Plante * diff --git a/Externals/libusbx/libusb/os/wince_usb.c b/Externals/libusb/libusb/os/wince_usb.c similarity index 97% rename from Externals/libusbx/libusb/os/wince_usb.c rename to Externals/libusb/libusb/os/wince_usb.c index e4a66331e..4d9b3ccc2 100644 --- a/Externals/libusbx/libusb/os/wince_usb.c +++ b/Externals/libusb/libusb/os/wince_usb.c @@ -1,5 +1,5 @@ /* - * Windows CE backend for libusbx 1.0 + * Windows CE backend for libusb 1.0 * Copyright © 2011-2013 RealVNC Ltd. * Large portions taken from Windows backend, which is * Copyright © 2009-2010 Pete Batard @@ -38,7 +38,7 @@ unsigned __stdcall wince_clock_gettime_threaded(void* param); uint64_t hires_frequency, hires_ticks_to_ps; int errno; const uint64_t epoch_time = UINT64_C(116444736000000000); // 1970.01.01 00:00:000 in MS Filetime -enum windows_version windows_version = WINDOWS_CE; +int windows_version = WINDOWS_CE; static int concurrent_usage = -1; // Timer thread // NB: index 0 is for monotonic and 1 is for the thread exit event @@ -234,6 +234,12 @@ static int wince_init(struct libusb_context *ctx) usbi_err(ctx, "Unable to create timer thread - aborting"); goto init_exit; } + + // Wait for timer thread to init before continuing. + if (WaitForSingleObject(timer_response, INFINITE) != WAIT_OBJECT_0) { + usbi_err(ctx, "Failed to wait for timer thread to become ready - aborting"); + goto init_exit; + } } // At this stage, either we went through full init successfully, or didn't need to r = LIBUSB_SUCCESS; @@ -366,7 +372,6 @@ static int wince_get_device_list( if (dev) { usbi_dbg("using existing device for %d/%d (session %ld)", bus_addr, dev_addr, session_id); - libusb_ref_device(dev); // Release just this element in the device list (as we already hold a // reference to it). UkwReleaseDeviceList(driver_handle, &devices[i], 1); @@ -684,6 +689,8 @@ static int wince_submit_transfer( return wince_submit_control_or_bulk_transfer(itransfer); case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: return wince_submit_iso_transfer(itransfer); + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + return LIBUSB_ERROR_NOT_SUPPORTED; default: usbi_err(TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type); return LIBUSB_ERROR_INVALID_PARAM; @@ -796,6 +803,8 @@ static void wince_handle_callback (struct usbi_transfer *itransfer, uint32_t io_ case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: wince_transfer_callback (itransfer, io_result, io_size); break; + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + return LIBUSB_ERROR_NOT_SUPPORTED; default: usbi_err(ITRANSFER_CTX(itransfer), "unknown endpoint type %d", transfer->type); } @@ -877,6 +886,11 @@ unsigned __stdcall wince_clock_gettime_threaded(void* param) usbi_dbg("hires timer available (Frequency: %"PRIu64" Hz)", hires_frequency); } + // Signal wince_init() that we're ready to service requests + if (ReleaseSemaphore(timer_response, 1, NULL) == 0) { + usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0)); + } + // Main loop - wait for requests while (1) { timer_index = WaitForMultipleObjects(2, timer_request, FALSE, INFINITE) - WAIT_OBJECT_0; @@ -911,7 +925,7 @@ unsigned __stdcall wince_clock_gettime_threaded(void* param) nb_responses = InterlockedExchange((LONG*)&request_count[0], 0); if ( (nb_responses) && (ReleaseSemaphore(timer_response, nb_responses, NULL) == 0) ) { - usbi_dbg("unable to release timer semaphore %d: %s", windows_error_str(0)); + usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0)); } continue; case 1: // time to quit @@ -995,6 +1009,9 @@ const struct usbi_os_backend wince_backend = { wince_clear_halt, wince_reset_device, + NULL, /* alloc_streams */ + NULL, /* free_streams */ + wince_kernel_driver_active, wince_detach_kernel_driver, wince_attach_kernel_driver, diff --git a/Externals/libusbx/libusb/os/wince_usb.h b/Externals/libusb/libusb/os/wince_usb.h similarity index 99% rename from Externals/libusbx/libusb/os/wince_usb.h rename to Externals/libusb/libusb/os/wince_usb.h index 3db9693a1..bc61b5c10 100644 --- a/Externals/libusbx/libusb/os/wince_usb.h +++ b/Externals/libusb/libusb/os/wince_usb.h @@ -1,5 +1,5 @@ /* - * Windows CE backend for libusbx 1.0 + * Windows CE backend for libusb 1.0 * Copyright © 2011-2013 RealVNC Ltd. * Portions taken from Windows backend, which is * Copyright © 2009-2010 Pete Batard @@ -36,7 +36,7 @@ // This backend dynamically loads ceusbkwrapper.dll and doesn't include // ceusbkwrapper.h directly to simplify the build process. The kernel // side wrapper driver is built using the platform image build tools, -// which makes it difficult to reference directly from the libusbx build +// which makes it difficult to reference directly from the libusb build // system. struct UKW_DEVICE_PRIV; typedef struct UKW_DEVICE_PRIV *UKW_DEVICE; diff --git a/Externals/libusbx/libusb/os/windows_common.h b/Externals/libusb/libusb/os/windows_common.h similarity index 99% rename from Externals/libusbx/libusb/os/windows_common.h rename to Externals/libusb/libusb/os/windows_common.h index 1da72bd9f..fe95d79d2 100644 --- a/Externals/libusbx/libusb/os/windows_common.h +++ b/Externals/libusb/libusb/os/windows_common.h @@ -1,5 +1,5 @@ /* - * Windows backend common header for libusbx 1.0 + * Windows backend common header for libusb 1.0 * * This file brings together header code common between * the desktop Windows and Windows CE backends. diff --git a/Externals/libusbx/libusb/os/windows_usb.c b/Externals/libusb/libusb/os/windows_usb.c similarity index 94% rename from Externals/libusbx/libusb/os/windows_usb.c rename to Externals/libusb/libusb/os/windows_usb.c index 63357b1a2..6c4297184 100644 --- a/Externals/libusbx/libusb/os/windows_usb.c +++ b/Externals/libusb/libusb/os/windows_usb.c @@ -1,5 +1,5 @@ /* - * windows backend for libusbx 1.0 + * windows backend for libusb 1.0 * Copyright © 2009-2012 Pete Batard * With contributions from Michael Plante, Orin Eman et al. * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer @@ -100,7 +100,8 @@ static int composite_copy_transfer_data(int sub_api, struct usbi_transfer *itran // Global variables uint64_t hires_frequency, hires_ticks_to_ps; const uint64_t epoch_time = UINT64_C(116444736000000000); // 1970.01.01 00:00:000 in MS Filetime -enum windows_version windows_version = WINDOWS_UNSUPPORTED; +int windows_version = WINDOWS_UNDEFINED; +static char windows_version_str[128] = "Windows Undefined"; // Concurrency static int concurrent_usage = -1; usbi_mutex_t autoclaim_lock; @@ -158,6 +159,20 @@ static char err_string[ERR_BUFFER_SIZE]; safe_sprintf(err_string, ERR_BUFFER_SIZE, "[%u] ", error_code); + // Translate codes returned by SetupAPI. The ones we are dealing with are either + // in 0x0000xxxx or 0xE000xxxx and can be distinguished from standard error codes. + // See http://msdn.microsoft.com/en-us/library/windows/hardware/ff545011.aspx + switch (error_code & 0xE0000000) { + case 0: + error_code = HRESULT_FROM_WIN32(error_code); // Still leaves ERROR_SUCCESS unmodified + break; + case 0xE0000000: + error_code = 0x80000000 | (FACILITY_SETUPAPI << 16) | (error_code & 0x0000FFFF); + break; + default: + break; + } + size = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &err_string[safe_strlen(err_string)], ERR_BUFFER_SIZE - (DWORD)safe_strlen(err_string), NULL); @@ -195,7 +210,7 @@ static char* sanitize_path(const char* path) size = safe_strlen(path)+1; root_size = sizeof(root_prefix)-1; - // Microsoft indiscriminatly uses '\\?\', '\\.\', '##?#" or "##.#" for root prefixes. + // Microsoft indiscriminately uses '\\?\', '\\.\', '##?#" or "##.#" for root prefixes. if (!((size > 3) && (((path[0] == '\\') && (path[1] == '\\') && (path[3] == '\\')) || ((path[0] == '#') && (path[1] == '#') && (path[3] == '#'))))) { add_root = root_size; @@ -207,7 +222,7 @@ static char* sanitize_path(const char* path) safe_strcpy(&ret_path[add_root], size-add_root, path); - // Ensure consistancy with root prefix + // Ensure consistency with root prefix for (j=0; j 6 || (vi.dwMajorVersion == 6 && vi.dwMinorVersion >= 2)) { + // Starting with Windows 8.1 Preview, GetVersionEx() does no longer report the actual OS version + // See: http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx + + major_equal = VerSetConditionMask(0, VER_MAJORVERSION, VER_EQUAL); + for (major = vi.dwMajorVersion; major <= 9; major++) { + memset(&vi2, 0, sizeof(vi2)); + vi2.dwOSVersionInfoSize = sizeof(vi2); vi2.dwMajorVersion = major; + if (!VerifyVersionInfoA(&vi2, VER_MAJORVERSION, major_equal)) + continue; + if (vi.dwMajorVersion < major) { + vi.dwMajorVersion = major; vi.dwMinorVersion = 0; + } + + minor_equal = VerSetConditionMask(0, VER_MINORVERSION, VER_EQUAL); + for (minor = vi.dwMinorVersion; minor <= 9; minor++) { + memset(&vi2, 0, sizeof(vi2)); vi2.dwOSVersionInfoSize = sizeof(vi2); + vi2.dwMinorVersion = minor; + if (!VerifyVersionInfoA(&vi2, VER_MINORVERSION, minor_equal)) + continue; + vi.dwMinorVersion = minor; + break; + } + + break; + } + } + + if (vi.dwMajorVersion <= 0xf && vi.dwMinorVersion <= 0xf) { + ws = (vi.wProductType <= VER_NT_WORKSTATION); + windows_version = vi.dwMajorVersion << 4 | vi.dwMinorVersion; + switch (windows_version) { + case 0x50: w = "2000"; + break; + case 0x51: w = "XP"; + break; + case 0x52: w = ("2003"); + break; + case 0x60: w = (ws?"Vista":"2008"); + break; + case 0x61: w = (ws?"7":"2008_R2"); + break; + case 0x62: w = (ws?"8":"2012"); + break; + case 0x63: w = (ws?"8.1":"2012_R2"); + break; + case 0x64: w = (ws?"8.2":"2012_R3"); + break; + default: + if (windows_version < 0x50) + windows_version = WINDOWS_UNSUPPORTED; + else + w = "9 or later"; + break; + } + } + } + + if (is_x64()) + w64 = "64-bit"; + + vptr = &windows_version_str[sizeof("Windows ") - 1]; + vlen = sizeof(windows_version_str) - sizeof("Windows ") - 1; + if (!w) + safe_sprintf(vptr, vlen, "%s %u.%u %s", (vi.dwPlatformId==VER_PLATFORM_WIN32_NT?"NT":"??"), + (unsigned)vi.dwMajorVersion, (unsigned)vi.dwMinorVersion, w64); + else if (vi.wServicePackMinor) + safe_sprintf(vptr, vlen, "%s SP%u.%u %s", w, vi.wServicePackMajor, vi.wServicePackMinor, w64); + else if (vi.wServicePackMajor) + safe_sprintf(vptr, vlen, "%s SP%u %s", w, vi.wServicePackMajor, w64); + else + safe_sprintf(vptr, vlen, "%s %s", w, w64); +} + /* - * init: libusbx backend init function + * init: libusb backend init function * * This function enumerates the HCDs (Host Controller Drivers) and populates our private HCD list - * In our implementation, we equate Windows' "HCD" to libusbx's "bus". Note that bus is zero indexed. + * In our implementation, we equate Windows' "HCD" to libusb's "bus". Note that bus is zero indexed. * HCDs are not expected to change after init (might not hold true for hot pluggable USB PCI card?) */ static int windows_init(struct libusb_context *ctx) { int i, r = LIBUSB_ERROR_OTHER; - OSVERSIONINFO os_version; HANDLE semaphore; char sem_name[11+1+8]; // strlen(libusb_init)+'\0'+(32-bit hex PID) @@ -822,19 +948,8 @@ static int windows_init(struct libusb_context *ctx) // NB: concurrent usage supposes that init calls are equally balanced with // exit calls. If init is called more than exit, we will not exit properly if ( ++concurrent_usage == 0 ) { // First init? - // Detect OS version - memset(&os_version, 0, sizeof(OSVERSIONINFO)); - os_version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - windows_version = WINDOWS_UNSUPPORTED; - if ((GetVersionEx(&os_version) != 0) && (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT)) { - if ((os_version.dwMajorVersion == 5) && (os_version.dwMinorVersion == 1)) { - windows_version = WINDOWS_XP; - } else if ((os_version.dwMajorVersion == 5) && (os_version.dwMinorVersion == 2)) { - windows_version = WINDOWS_2003; // also includes XP 64 - } else if (os_version.dwMajorVersion >= 6) { - windows_version = WINDOWS_VISTA_AND_LATER; - } - } + get_windows_version(); + usbi_dbg(windows_version_str); if (windows_version == WINDOWS_UNSUPPORTED) { usbi_err(ctx, "This version of Windows is NOT supported"); r = LIBUSB_ERROR_NOT_SUPPORTED; @@ -886,6 +1001,12 @@ static int windows_init(struct libusb_context *ctx) } SetThreadAffinityMask(timer_thread, 0); + // Wait for timer thread to init before continuing. + if (WaitForSingleObject(timer_response, INFINITE) != WAIT_OBJECT_0) { + usbi_err(ctx, "Failed to wait for timer thread to become ready - aborting"); + goto init_exit; + } + // Create a hash table to store session ids. Second parameter is better if prime htab_create(ctx, HTAB_SIZE); } @@ -1008,6 +1129,7 @@ static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle // Dummy call to get the required data size. Initial failures are reported as info rather // than error as they can occur for non-penalizing situations, such as with some hubs. + // coverity[tainted_data_argument] if (!DeviceIoControl(hub_handle, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, &cd_buf_short, size, &cd_buf_short, size, &ret_size, NULL)) { usbi_info(ctx, "could not access configuration descriptor (dummy) for '%s': %s", device_id, windows_error_str(0)); @@ -1058,14 +1180,14 @@ static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle // Cache the descriptor priv->config_descriptor[i] = (unsigned char*) malloc(cd_data->wTotalLength); if (priv->config_descriptor[i] == NULL) - return LIBUSB_ERROR_NO_MEM; + LOOP_BREAK(LIBUSB_ERROR_NO_MEM); memcpy(priv->config_descriptor[i], cd_data, cd_data->wTotalLength); } return LIBUSB_SUCCESS; } /* - * Populate a libusbx device structure + * Populate a libusb device structure */ static int init_device(struct libusb_device* dev, struct libusb_device* parent_dev, uint8_t port_number, char* device_id, DWORD devinst) @@ -1073,14 +1195,16 @@ static int init_device(struct libusb_device* dev, struct libusb_device* parent_d HANDLE handle; DWORD size; USB_NODE_CONNECTION_INFORMATION_EX conn_info; + USB_NODE_CONNECTION_INFORMATION_EX_V2 conn_info_v2; struct windows_device_priv *priv, *parent_priv; - struct libusb_context *ctx = DEVICE_CTX(dev); + struct libusb_context *ctx; struct libusb_device* tmp_dev; unsigned i; if ((dev == NULL) || (parent_dev == NULL)) { return LIBUSB_ERROR_NOT_FOUND; } + ctx = DEVICE_CTX(dev); priv = _device_priv(dev); parent_priv = _device_priv(parent_dev); if (parent_priv->apib->id != USB_API_HUB) { @@ -1097,8 +1221,10 @@ static int init_device(struct libusb_device* dev, struct libusb_device* parent_d if (tmp_dev->bus_number != 0) { usbi_dbg("got bus number from ancestor #%d", i); parent_dev->bus_number = tmp_dev->bus_number; + libusb_unref_device(tmp_dev); break; } + libusb_unref_device(tmp_dev); } } if (parent_dev->bus_number == 0) { @@ -1110,7 +1236,7 @@ static int init_device(struct libusb_device* dev, struct libusb_device* parent_d dev->port_number = port_number; priv->depth = parent_priv->depth + 1; priv->parent_dev = parent_dev; - dev->parent_dev = libusb_ref_device(parent_dev); + dev->parent_dev = parent_dev; // If the device address is already set, we can stop here if (dev->device_address != 0) { @@ -1126,6 +1252,7 @@ static int init_device(struct libusb_device* dev, struct libusb_device* parent_d } size = sizeof(conn_info); conn_info.ConnectionIndex = (ULONG)port_number; + // coverity[tainted_data_argument] if (!DeviceIoControl(handle, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, &conn_info, size, &conn_info, size, &size, NULL)) { usbi_warn(ctx, "could not get node connection information for device '%s': %s", @@ -1147,6 +1274,23 @@ static int init_device(struct libusb_device* dev, struct libusb_device* parent_d dev->num_configurations = 0; priv->dev_descriptor.bNumConfigurations = 0; } + + // In their great wisdom, Microsoft decided to BREAK the USB speed report between Windows 7 and Windows 8 + if (windows_version >= WINDOWS_8) { + memset(&conn_info_v2, 0, sizeof(conn_info_v2)); + size = sizeof(conn_info_v2); + conn_info_v2.ConnectionIndex = (ULONG)port_number; + conn_info_v2.Length = size; + conn_info_v2.SupportedUsbProtocols.Usb300 = 1; + if (!DeviceIoControl(handle, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX_V2, + &conn_info_v2, size, &conn_info_v2, size, &size, NULL)) { + usbi_warn(ctx, "could not get node connection information (V2) for device '%s': %s", + device_id, windows_error_str(0)); + } else if (conn_info_v2.Flags.DeviceIsOperatingAtSuperSpeedOrHigher) { + conn_info.Speed = 3; + } + } + safe_closehandle(handle); if (conn_info.DeviceAddress > UINT8_MAX) { @@ -1224,7 +1368,7 @@ static void get_api_type(struct libusb_context *ctx, HDEVINFO *dev_info, for (k=0; k<3; k++) { j = get_sub_api(lookup[k].list, i); if (j >= 0) { - usbi_dbg("matched %s name against %s API", + usbi_dbg("matched %s name against %s", lookup[k].designation, (i!=USB_API_WINUSBX)?usb_api_backend[i].designation:sub_api_name[j]); *api = i; *sub_api = j; @@ -1317,7 +1461,7 @@ static int set_hid_interface(struct libusb_context* ctx, struct libusb_device* d } /* - * get_device_list: libusbx backend device enumeration function + * get_device_list: libusb backend device enumeration function */ static int windows_get_device_list(struct libusb_context *ctx, struct discovered_devs **_discdevs) { @@ -1467,7 +1611,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered if (!pSetupDiGetDeviceRegistryPropertyA(dev_info, &dev_info_data, SPDRP_DRIVER, ®_type, (BYTE*)strbuf, size, &size)) { usbi_info(ctx, "The following device has no driver: '%s'", dev_id_path); - usbi_info(ctx, "libusbx will not be able to access it."); + usbi_info(ctx, "libusb will not be able to access it."); } // ...and to add the additional device interface GUIDs key = pSetupDiOpenDevRegKey(dev_info, &dev_info_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); @@ -1531,6 +1675,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered parent_priv = _device_priv(parent_dev); // virtual USB devices are also listed during GEN - don't process these yet if ( (pass == GEN_PASS) && (parent_priv->apib->id != USB_API_HUB) ) { + libusb_unref_device(parent_dev); continue; } break; @@ -1553,20 +1698,20 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered LOOP_BREAK(LIBUSB_ERROR_NO_MEM); } windows_device_priv_init(dev); - // Keep track of devices that need unref - unref_list[unref_cur++] = dev; - if (unref_cur >= unref_size) { - unref_size += 64; - unref_list = usbi_reallocf(unref_list, unref_size*sizeof(libusb_device*)); - if (unref_list == NULL) { - usbi_err(ctx, "could not realloc list for unref - aborting."); - LOOP_BREAK(LIBUSB_ERROR_NO_MEM); - } - } } else { usbi_dbg("found existing device for session [%X] (%d.%d)", session_id, dev->bus_number, dev->device_address); } + // Keep track of devices that need unref + unref_list[unref_cur++] = dev; + if (unref_cur >= unref_size) { + unref_size += 64; + unref_list = usbi_reallocf(unref_list, unref_size*sizeof(libusb_device*)); + if (unref_list == NULL) { + usbi_err(ctx, "could not realloc list for unref - aborting."); + LOOP_BREAK(LIBUSB_ERROR_NO_MEM); + } + } priv = _device_priv(dev); } @@ -1652,6 +1797,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered break; } } + libusb_unref_device(parent_dev); break; } } @@ -1663,16 +1809,18 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered } // Unref newly allocated devs - for (i=0; iconfig_descriptor[config_index], size); *host_endian = 0; - return size; + return (int)size; } /* @@ -1995,6 +2143,8 @@ static int windows_submit_transfer(struct usbi_transfer *itransfer) return submit_bulk_transfer(itransfer); case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: return submit_iso_transfer(itransfer); + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + return LIBUSB_ERROR_NOT_SUPPORTED; default: usbi_err(TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type); return LIBUSB_ERROR_INVALID_PARAM; @@ -2028,6 +2178,8 @@ static int windows_cancel_transfer(struct usbi_transfer *itransfer) case LIBUSB_TRANSFER_TYPE_INTERRUPT: case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: return windows_abort_transfers(itransfer); + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + return LIBUSB_ERROR_NOT_SUPPORTED; default: usbi_err(ITRANSFER_CTX(itransfer), "unknown endpoint type %d", transfer->type); return LIBUSB_ERROR_INVALID_PARAM; @@ -2068,7 +2220,7 @@ static void windows_transfer_callback(struct usbi_transfer *itransfer, uint32_t } break; default: - usbi_err(ITRANSFER_CTX(itransfer), "detected I/O error %d: %s", io_result, windows_error_str(0)); + usbi_err(ITRANSFER_CTX(itransfer), "detected I/O error %d: %s", io_result, windows_error_str(io_result)); status = LIBUSB_TRANSFER_ERROR; break; } @@ -2087,6 +2239,9 @@ static void windows_handle_callback (struct usbi_transfer *itransfer, uint32_t i case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: windows_transfer_callback (itransfer, io_result, io_size); break; + case LIBUSB_TRANSFER_TYPE_BULK_STREAM: + usbi_warn(ITRANSFER_CTX(itransfer), "bulk stream transfers are not yet supported on this platform"); + break; default: usbi_err(ITRANSFER_CTX(itransfer), "unknown endpoint type %d", transfer->type); } @@ -2172,6 +2327,11 @@ unsigned __stdcall windows_clock_gettime_threaded(void* param) usbi_dbg("hires timer available (Frequency: %"PRIu64" Hz)", hires_frequency); } + // Signal windows_init() that we're ready to service requests + if (ReleaseSemaphore(timer_response, 1, NULL) == 0) { + usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0)); + } + // Main loop - wait for requests while (1) { timer_index = WaitForMultipleObjects(2, timer_request, FALSE, INFINITE) - WAIT_OBJECT_0; @@ -2193,7 +2353,7 @@ unsigned __stdcall windows_clock_gettime_threaded(void* param) case 0: WaitForSingleObject(timer_mutex, INFINITE); // Requests to this thread are for hires always - if (QueryPerformanceCounter(&hires_counter) != 0) { + if ((QueryPerformanceCounter(&hires_counter) != 0) && (hires_frequency != 0)) { timer_tp.tv_sec = (long)(hires_counter.QuadPart / hires_frequency); timer_tp.tv_nsec = (long)(((hires_counter.QuadPart % hires_frequency)/1000) * hires_ticks_to_ps); } else { @@ -2206,7 +2366,7 @@ unsigned __stdcall windows_clock_gettime_threaded(void* param) nb_responses = InterlockedExchange((LONG*)&request_count[0], 0); if ( (nb_responses) && (ReleaseSemaphore(timer_response, nb_responses, NULL) == 0) ) { - usbi_dbg("unable to release timer semaphore %d: %s", windows_error_str(0)); + usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0)); } continue; case 1: // time to quit @@ -2288,6 +2448,9 @@ const struct usbi_os_backend windows_backend = { windows_clear_halt, windows_reset_device, + NULL, /* alloc_streams */ + NULL, /* free_streams */ + windows_kernel_driver_active, windows_detach_kernel_driver, windows_attach_kernel_driver, @@ -2366,7 +2529,7 @@ static int common_configure_endpoints(int sub_api, struct libusb_device_handle * return LIBUSB_SUCCESS; } // These names must be uppercase -const char* hub_driver_names[] = {"USBHUB", "USBHUB3", "NUSB3HUB", "RUSB3HUB", "FLXHCIH", "TIHUB3", "ETRONHUB3", "VIAHUB3", "ASMTHUB3", "IUSB3HUB"}; +const char* hub_driver_names[] = {"USBHUB", "USBHUB3", "USB3HUB", "NUSB3HUB", "RUSB3HUB", "FLXHCIH", "TIHUB3", "ETRONHUB3", "VIAHUB3", "ASMTHUB3", "IUSB3HUB", "VUSB3HUB", "AMDHUB30"}; const char* composite_driver_names[] = {"USBCCGP"}; const char* winusbx_driver_names[] = WINUSBX_DRV_NAMES; const char* hid_driver_names[] = {"HIDUSB", "MOUHID", "KBDHID"}; @@ -2726,11 +2889,10 @@ static int winusbx_claim_interface(int sub_api, struct libusb_device_handle *dev usbi_err(ctx, "could not open device %s: %s", filter_path, windows_error_str(0)); } else { WinUSBX[sub_api].Free(winusb_handle); - if (!WinUSBX[sub_api].Initialize(file_handle, &winusb_handle)) { - continue; - } - found_filter = true; - break; + if (WinUSBX[sub_api].Initialize(file_handle, &winusb_handle)) + found_filter = true; + else + usbi_err(ctx, "could not initialize filter driver for %s", filter_path); } } } @@ -4146,19 +4308,21 @@ static int hid_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, if (transfer_priv->hid_buffer != NULL) { // If we have a valid hid_buffer, it means the transfer was async if (transfer_priv->hid_dest != NULL) { // Data readout - // First, check for overflow - if (corrected_size > transfer_priv->hid_expected_size) { - usbi_err(ctx, "OVERFLOW!"); - corrected_size = (uint32_t)transfer_priv->hid_expected_size; - r = LIBUSB_TRANSFER_OVERFLOW; - } + if (corrected_size > 0) { + // First, check for overflow + if (corrected_size > transfer_priv->hid_expected_size) { + usbi_err(ctx, "OVERFLOW!"); + corrected_size = (uint32_t)transfer_priv->hid_expected_size; + r = LIBUSB_TRANSFER_OVERFLOW; + } - if (transfer_priv->hid_buffer[0] == 0) { - // Discard the 1 byte report ID prefix - corrected_size--; - memcpy(transfer_priv->hid_dest, transfer_priv->hid_buffer+1, corrected_size); - } else { - memcpy(transfer_priv->hid_dest, transfer_priv->hid_buffer, corrected_size); + if (transfer_priv->hid_buffer[0] == 0) { + // Discard the 1 byte report ID prefix + corrected_size--; + memcpy(transfer_priv->hid_dest, transfer_priv->hid_buffer+1, corrected_size); + } else { + memcpy(transfer_priv->hid_dest, transfer_priv->hid_buffer, corrected_size); + } } transfer_priv->hid_dest = NULL; } @@ -4286,7 +4450,7 @@ static int composite_submit_control_transfer(int sub_api, struct usbi_transfer * } } - usbi_err(ctx, "no libusbx supported interfaces to complete request"); + usbi_err(ctx, "no libusb supported interfaces to complete request"); return LIBUSB_ERROR_NOT_FOUND; } diff --git a/Externals/libusbx/libusb/os/windows_usb.h b/Externals/libusb/libusb/os/windows_usb.h similarity index 96% rename from Externals/libusbx/libusb/os/windows_usb.h rename to Externals/libusb/libusb/os/windows_usb.h index 5d67a562e..413adfc49 100644 --- a/Externals/libusbx/libusb/os/windows_usb.h +++ b/Externals/libusb/libusb/os/windows_usb.h @@ -1,5 +1,5 @@ /* - * Windows backend for libusbx 1.0 + * Windows backend for libusb 1.0 * Copyright © 2009-2012 Pete Batard * With contributions from Michael Plante, Orin Eman et al. * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer @@ -40,6 +40,11 @@ #define SPDRP_INSTALL_STATE 34 #endif +// Missing from MinGW +#if !defined(FACILITY_SETUPAPI) +#define FACILITY_SETUPAPI 15 +#endif + #if defined(__CYGWIN__ ) #define _stricmp stricmp // cygwin produces a warning unless these prototypes are defined @@ -305,6 +310,9 @@ struct driver_lookup { /* OLE32 dependency */ DLL_DECLARE_PREFIXED(WINAPI, HRESULT, p, CLSIDFromString, (LPCOLESTR, LPCLSID)); +/* This call is only available from XP SP2 */ +DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, IsWow64Process, (HANDLE, PBOOL)); + /* SetupAPI dependencies */ DLL_DECLARE_PREFIXED(WINAPI, HDEVINFO, p, SetupDiGetClassDevsA, (const GUID*, PCSTR, HWND, DWORD)); DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiEnumDeviceInfo, (HDEVINFO, DWORD, PSP_DEVINFO_DATA)); @@ -359,6 +367,9 @@ typedef RETURN_TYPE CONFIGRET; #if !defined(USB_GET_HUB_CAPABILITIES_EX) #define USB_GET_HUB_CAPABILITIES_EX 276 #endif +#if !defined(USB_GET_NODE_CONNECTION_INFORMATION_EX_V2) +#define USB_GET_NODE_CONNECTION_INFORMATION_EX_V2 279 +#endif #ifndef METHOD_BUFFERED #define METHOD_BUFFERED 0 @@ -419,6 +430,9 @@ DLL_DECLARE(WINAPI, CONFIGRET, CM_Get_Device_IDA, (DEVINST, PCHAR, ULONG, ULONG) #define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX \ CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION_EX, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX_V2 \ + CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION_EX_V2, METHOD_BUFFERED, FILE_ANY_ACCESS) + #define IOCTL_USB_GET_NODE_CONNECTION_ATTRIBUTES \ CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_ATTRIBUTES, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -559,6 +573,32 @@ typedef struct USB_NODE_CONNECTION_INFORMATION_EX { // USB_PIPE_INFO PipeList[0]; } USB_NODE_CONNECTION_INFORMATION_EX, *PUSB_NODE_CONNECTION_INFORMATION_EX; +typedef union _USB_PROTOCOLS { + ULONG ul; + struct { + ULONG Usb110:1; + ULONG Usb200:1; + ULONG Usb300:1; + ULONG ReservedMBZ:29; + }; +} USB_PROTOCOLS, *PUSB_PROTOCOLS; + +typedef union _USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS { + ULONG ul; + struct { + ULONG DeviceIsOperatingAtSuperSpeedOrHigher:1; + ULONG DeviceIsSuperSpeedCapableOrHigher:1; + ULONG ReservedMBZ:30; + }; +} USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS, *PUSB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS; + +typedef struct _USB_NODE_CONNECTION_INFORMATION_EX_V2 { + ULONG ConnectionIndex; + ULONG Length; + USB_PROTOCOLS SupportedUsbProtocols; + USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS Flags; +} USB_NODE_CONNECTION_INFORMATION_EX_V2, *PUSB_NODE_CONNECTION_INFORMATION_EX_V2; + typedef struct USB_HUB_CAP_FLAGS { ULONG HubIsHighSpeedCapable:1; ULONG HubIsHighSpeed:1; diff --git a/Externals/libusbx/libusb/strerror.c b/Externals/libusb/libusb/strerror.c similarity index 87% rename from Externals/libusbx/libusb/strerror.c rename to Externals/libusb/libusb/strerror.c index a3c3afa3f..7fba0e472 100644 --- a/Externals/libusbx/libusb/strerror.c +++ b/Externals/libusb/libusb/strerror.c @@ -35,7 +35,7 @@ static size_t usbi_locale = 0; * How to add a new \ref libusb_strerror() translation: *
    *
  1. Download the latest \c strerror.c from:
    - * https://raw.github.com/libusbx/libusbx/master/libusb/sterror.c
    2. + * https://raw.github.com/libusb/libusb/master/libusb/sterror.c *
  2. Open the file in an UTF-8 capable editor
    3. *
  3. Add the 2 letter ISO 639-1 * code for your locale at the end of \c usbi_locale_supported[]
    @@ -53,11 +53,11 @@ static size_t usbi_locale = 0; * } * };\endcode
    4. *
  4. Translate each of the English messages from the section you copied into your language
    5. - *
  5. Save the file (in UTF-8 format) and send it to \c libusbx-devel@lists.sourceforge.net
    6. + *
  6. Save the file (in UTF-8 format) and send it to \c libusb-devel\@lists.sourceforge.net
    7. *
*/ -static const char* usbi_locale_supported[] = { "en", "nl", "fr" }; +static const char* usbi_locale_supported[] = { "en", "nl", "fr", "ru" }; static const char* usbi_localized_errors[ARRAYSIZE(usbi_locale_supported)][LIBUSB_ERROR_COUNT] = { { /* English (en) */ "Success", @@ -103,7 +103,22 @@ static const char* usbi_localized_errors[ARRAYSIZE(usbi_locale_supported)][LIBUS "Appel système abandonné (peut-être à cause d’un signal)", "Mémoire insuffisante", "Opération non supportée or non implémentée sur cette plateforme", - "Autre erreur" + "Autre erreur", + }, { /* Russian (ru) */ + "Успех", + "Ошибка ввода/вывода", + "Неверный параметр", + "Доступ запрещён (не хватает прав)", + "Устройство отсутствует (возможно, оно было отсоединено)", + "Элемент не найден", + "Ресурс занят", + "Истекло время ожидания операции", + "Переполнение", + "Ошибка канала", + "Системный вызов прерван (возможно, сигналом)", + "Память исчерпана", + "Операция не поддерживается данной платформой", + "Неизвестная ошибка" } }; diff --git a/Externals/libusbx/libusb/sync.c b/Externals/libusb/libusb/sync.c similarity index 96% rename from Externals/libusbx/libusb/sync.c rename to Externals/libusb/libusb/sync.c index 42e486db3..d87032d01 100644 --- a/Externals/libusbx/libusb/sync.c +++ b/Externals/libusb/libusb/sync.c @@ -1,5 +1,5 @@ /* - * Synchronous I/O functions for libusbx + * Synchronous I/O functions for libusb * Copyright © 2007-2008 Daniel Drake * * This library is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ /** * @defgroup syncio Synchronous device I/O * - * This page documents libusbx's synchronous (blocking) API for USB device I/O. + * This page documents libusb's synchronous (blocking) API for USB device I/O. * This interface is easy to use but has some limitations. More advanced users * may wish to consider using the \ref asyncio "asynchronous I/O API" instead. */ @@ -222,9 +222,9 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle, * Not all of the data may have been written. * * Also check transferred when dealing with a timeout error code. - * libusbx may have to split your transfer into a number of chunks to satisfy + * libusb may have to split your transfer into a number of chunks to satisfy * underlying O/S requirements, meaning that the timeout may expire after - * the first few chunks have completed. libusbx is careful not to lose any data + * the first few chunks have completed. libusb is careful not to lose any data * that may have been transferred; do not assume that timeout conditions * indicate a complete lack of I/O. * @@ -270,9 +270,9 @@ int API_EXPORTED libusb_bulk_transfer(struct libusb_device_handle *dev_handle, * writes. Not all of the data may have been written. * * Also check transferred when dealing with a timeout error code. - * libusbx may have to split your transfer into a number of chunks to satisfy + * libusb may have to split your transfer into a number of chunks to satisfy * underlying O/S requirements, meaning that the timeout may expire after - * the first few chunks have completed. libusbx is careful not to lose any data + * the first few chunks have completed. libusb is careful not to lose any data * that may have been transferred; do not assume that timeout conditions * indicate a complete lack of I/O. * diff --git a/Externals/libusbx/libusb/version.h b/Externals/libusb/libusb/version.h similarity index 94% rename from Externals/libusbx/libusb/version.h rename to Externals/libusb/libusb/version.h index cf37de97a..330576556 100644 --- a/Externals/libusbx/libusb/version.h +++ b/Externals/libusb/libusb/version.h @@ -7,7 +7,7 @@ #define LIBUSB_MINOR 0 #endif #ifndef LIBUSB_MICRO -#define LIBUSB_MICRO 16 +#define LIBUSB_MICRO 19 #endif #ifndef LIBUSB_NANO #define LIBUSB_NANO 0 diff --git a/Externals/libusb/libusb/version_nano.h b/Externals/libusb/libusb/version_nano.h new file mode 100644 index 000000000..8c4063a31 --- /dev/null +++ b/Externals/libusb/libusb/version_nano.h @@ -0,0 +1 @@ +#define LIBUSB_NANO 10903 diff --git a/Externals/libusbx/msvc/libusb_static_2013.vcxproj b/Externals/libusb/libusb_static_2013.vcxproj similarity index 62% rename from Externals/libusbx/msvc/libusb_static_2013.vcxproj rename to Externals/libusb/libusb_static_2013.vcxproj index c2ee80d41..cbdbd686e 100644 --- a/Externals/libusbx/msvc/libusb_static_2013.vcxproj +++ b/Externals/libusb/libusb_static_2013.vcxproj @@ -1,4 +1,4 @@ - + @@ -19,8 +19,8 @@ + libusb-1.0 (static) {349EE8F9-7D25-4909-AAF5-FF3FADE72187} - libusb-1.0 @@ -39,39 +39,40 @@ - - + + + - .;..\libusb;%(AdditionalIncludeDirectories) + + .\msvc;%(AdditionalIncludeDirectories) - - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - \ No newline at end of file + diff --git a/Externals/libusbx/msvc/config.h b/Externals/libusb/msvc/config.h similarity index 93% rename from Externals/libusbx/msvc/config.h rename to Externals/libusb/msvc/config.h index bb542c5dc..4b418db11 100644 --- a/Externals/libusbx/msvc/config.h +++ b/Externals/libusb/msvc/config.h @@ -25,6 +25,9 @@ /* Uncomment to start with debug message logging enabled */ // #define ENABLE_DEBUG_LOGGING 1 +/* Uncomment to enabling logging to system log */ +// #define USE_SYSTEM_LOGGING_FACILITY + /* type of second poll() argument */ #define POLL_NFDS_TYPE unsigned int diff --git a/Externals/libusbx/msvc/ddk_build.cmd b/Externals/libusb/msvc/ddk_build.cmd similarity index 100% rename from Externals/libusbx/msvc/ddk_build.cmd rename to Externals/libusb/msvc/ddk_build.cmd diff --git a/Externals/libusbx/msvc/errno.h b/Externals/libusb/msvc/errno.h similarity index 100% rename from Externals/libusbx/msvc/errno.h rename to Externals/libusb/msvc/errno.h diff --git a/Externals/libusb/msvc/fxload_2010.vcxproj b/Externals/libusb/msvc/fxload_2010.vcxproj new file mode 100644 index 000000000..8bd601065 --- /dev/null +++ b/Externals/libusb/msvc/fxload_2010.vcxproj @@ -0,0 +1,170 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + fxload + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88} + examples + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/fxload_2010.vcxproj.filters b/Externals/libusb/msvc/fxload_2010.vcxproj.filters new file mode 100644 index 000000000..c274b2320 --- /dev/null +++ b/Externals/libusb/msvc/fxload_2010.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {651ff73d-037b-4903-8dd3-56e9950be25c} + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/fxload_2012.vcxproj b/Externals/libusb/msvc/fxload_2012.vcxproj new file mode 100644 index 000000000..e9fd47700 --- /dev/null +++ b/Externals/libusb/msvc/fxload_2012.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + fxload + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88} + examples + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/fxload_2012.vcxproj.filters b/Externals/libusb/msvc/fxload_2012.vcxproj.filters new file mode 100644 index 000000000..c274b2320 --- /dev/null +++ b/Externals/libusb/msvc/fxload_2012.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {651ff73d-037b-4903-8dd3-56e9950be25c} + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/fxload_2013.vcxproj b/Externals/libusb/msvc/fxload_2013.vcxproj new file mode 100644 index 000000000..770fc57f3 --- /dev/null +++ b/Externals/libusb/msvc/fxload_2013.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + fxload + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88} + examples + Win32Proj + + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories) + WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/fxload_sources b/Externals/libusb/msvc/fxload_sources new file mode 100644 index 000000000..d6e31d691 --- /dev/null +++ b/Externals/libusb/msvc/fxload_sources @@ -0,0 +1,23 @@ +TARGETNAME=fxload +TARGETTYPE=PROGRAM +386_STDCALL=0 + +_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) + +!IFNDEF MSC_WARNING_LEVEL +MSC_WARNING_LEVEL=/W3 +!ENDIF + +!IFDEF STATIC_LIBC +USE_LIBCMT=1 +!ELSE +USE_MSVCRT=1 +!ENDIF + +UMTYPE=console +INCLUDES=..\..\msvc;..\..\libusb;..\getopt;$(DDK_INC_PATH) +C_DEFINES=$(C_DEFINES) /D__GNU_LIBRARY__ +UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib \ + ..\getopt\getopt_ddkbuild\obj$(BUILD_ALT_DIR)\*\getopt.lib +SOURCES=..\ezusb.c \ + ..\fxload.c diff --git a/Externals/libusb/msvc/getopt_2005.vcproj b/Externals/libusb/msvc/getopt_2005.vcproj new file mode 100644 index 000000000..0efcb0b51 --- /dev/null +++ b/Externals/libusb/msvc/getopt_2005.vcproj @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusb/msvc/getopt_2010.vcxproj b/Externals/libusb/msvc/getopt_2010.vcxproj new file mode 100644 index 000000000..3f413c79b --- /dev/null +++ b/Externals/libusb/msvc/getopt_2010.vcxproj @@ -0,0 +1,131 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} + getopt + + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + true + + + + + X64 + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + true + + + + + MaxSpeed + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + true + + + + + X64 + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/getopt_2010.vcxproj.filters b/Externals/libusb/msvc/getopt_2010.vcxproj.filters new file mode 100644 index 000000000..d5f4518e6 --- /dev/null +++ b/Externals/libusb/msvc/getopt_2010.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/getopt_2012.vcxproj b/Externals/libusb/msvc/getopt_2012.vcxproj new file mode 100644 index 000000000..327aac334 --- /dev/null +++ b/Externals/libusb/msvc/getopt_2012.vcxproj @@ -0,0 +1,136 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} + getopt + getopt + + + + StaticLibrary + Unicode + true + v110 + + + StaticLibrary + Unicode + v110 + + + StaticLibrary + Unicode + true + v110 + + + StaticLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + true + + + + + X64 + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + true + + + + + MaxSpeed + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + true + + + + + X64 + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/getopt_2012.vcxproj.filters b/Externals/libusb/msvc/getopt_2012.vcxproj.filters new file mode 100644 index 000000000..d5f4518e6 --- /dev/null +++ b/Externals/libusb/msvc/getopt_2012.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/getopt_2013.vcxproj b/Externals/libusb/msvc/getopt_2013.vcxproj new file mode 100644 index 000000000..55ba37fbd --- /dev/null +++ b/Externals/libusb/msvc/getopt_2013.vcxproj @@ -0,0 +1,136 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} + getopt + getopt + + + + StaticLibrary + Unicode + true + v120 + + + StaticLibrary + Unicode + v120 + + + StaticLibrary + Unicode + true + v120 + + + StaticLibrary + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + true + + + + + X64 + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + true + + + + + MaxSpeed + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + true + + + + + X64 + + + HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/getopt_sources b/Externals/libusb/msvc/getopt_sources new file mode 100644 index 000000000..b9adc1b75 --- /dev/null +++ b/Externals/libusb/msvc/getopt_sources @@ -0,0 +1,20 @@ +TARGETTYPE=LIBRARY +TARGETNAME=getopt +386_STDCALL=0 + +_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) + +!IFNDEF MSC_WARNING_LEVEL +MSC_WARNING_LEVEL=/W3 +!ENDIF + +USE_MSVCRT=1 + +INCLUDES=$(DDK_INC_PATH) +C_DEFINES = $(C_DEFINES) /DDDKBUILD /DHAVE_STRING_H + +TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \ + $(SDK_LIB_PATH)\user32.lib + +SOURCES=..\getopt1.c \ + ..\getopt.c diff --git a/Externals/libusb/msvc/hotplugtest_2010.vcxproj b/Externals/libusb/msvc/hotplugtest_2010.vcxproj new file mode 100644 index 000000000..90584ed7f --- /dev/null +++ b/Externals/libusb/msvc/hotplugtest_2010.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + hotplugtest + {99D2AC64-DC66-4422-91CE-6715C403C9E5} + examples + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/hotplugtest_2010.vcxproj.filters b/Externals/libusb/msvc/hotplugtest_2010.vcxproj.filters new file mode 100644 index 000000000..1c9a88098 --- /dev/null +++ b/Externals/libusb/msvc/hotplugtest_2010.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/hotplugtest_2012.vcxproj b/Externals/libusb/msvc/hotplugtest_2012.vcxproj new file mode 100644 index 000000000..9045585c7 --- /dev/null +++ b/Externals/libusb/msvc/hotplugtest_2012.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + hotplugtest + {99D2AC64-DC66-4422-91CE-6715C403C9E5} + examples + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/hotplugtest_2012.vcxproj.filters b/Externals/libusb/msvc/hotplugtest_2012.vcxproj.filters new file mode 100644 index 000000000..1c9a88098 --- /dev/null +++ b/Externals/libusb/msvc/hotplugtest_2012.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/hotplugtest_2013.vcxproj b/Externals/libusb/msvc/hotplugtest_2013.vcxproj new file mode 100644 index 000000000..835b5f432 --- /dev/null +++ b/Externals/libusb/msvc/hotplugtest_2013.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + hotplugtest + {99D2AC64-DC66-4422-91CE-6715C403C9E5} + examples + Win32Proj + + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/hotplugtest_sources b/Externals/libusb/msvc/hotplugtest_sources new file mode 100644 index 000000000..1b27cad91 --- /dev/null +++ b/Externals/libusb/msvc/hotplugtest_sources @@ -0,0 +1,20 @@ +TARGETNAME=hotplugtest +TARGETTYPE=PROGRAM +386_STDCALL=0 + +_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) + +!IFNDEF MSC_WARNING_LEVEL +MSC_WARNING_LEVEL=/W3 +!ENDIF + +!IFDEF STATIC_LIBC +USE_LIBCMT=1 +!ELSE +USE_MSVCRT=1 +!ENDIF + +UMTYPE=console +INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH) +UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib +SOURCES=..\hotplugtest.c diff --git a/Externals/libusbx/msvc/inttypes.h b/Externals/libusb/msvc/inttypes.h similarity index 100% rename from Externals/libusbx/msvc/inttypes.h rename to Externals/libusb/msvc/inttypes.h diff --git a/Externals/libusb/msvc/libusb.dsw b/Externals/libusb/msvc/libusb.dsw new file mode 100644 index 000000000..14569a6ef --- /dev/null +++ b/Externals/libusb/msvc/libusb.dsw @@ -0,0 +1,71 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libusb_dll"=".\libusb_dll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libusb_static"=".\libusb_static.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "listdevs"=".\listdevs.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libusb_static + End Project Dependency +}}} + +############################################################################### + +Project: "xusb"=".\xusb.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libusb_static + End Project Dependency +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/Externals/libusb/msvc/libusb_2005.sln b/Externals/libusb/msvc/libusb_2005.sln new file mode 100644 index 000000000..f014186d4 --- /dev/null +++ b/Externals/libusb/msvc/libusb_2005.sln @@ -0,0 +1,95 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2005.vcproj", "{5AB6B770-1925-48D5-ABC2-930F3259C020}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2005.vcproj", "{8224C054-5968-4238-832C-167155E7ECC3}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2005.vcproj", "{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2005.vcproj", "{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2005.vcproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|Win32.ActiveCfg = Debug|Win32 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|Win32.Build.0 = Debug|Win32 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|x64.ActiveCfg = Debug|x64 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|x64.Build.0 = Debug|x64 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|Win32.ActiveCfg = Release|Win32 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|Win32.Build.0 = Release|Win32 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|x64.ActiveCfg = Release|x64 + {5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|x64.Build.0 = Release|x64 + {8224C054-5968-4238-832C-167155E7ECC3}.Debug|Win32.ActiveCfg = Debug|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Debug|Win32.Build.0 = Debug|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Debug|x64.ActiveCfg = Debug|x64 + {8224C054-5968-4238-832C-167155E7ECC3}.Debug|x64.Build.0 = Debug|x64 + {8224C054-5968-4238-832C-167155E7ECC3}.Release|Win32.ActiveCfg = Release|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Release|Win32.Build.0 = Release|Win32 + {8224C054-5968-4238-832C-167155E7ECC3}.Release|x64.ActiveCfg = Release|x64 + {8224C054-5968-4238-832C-167155E7ECC3}.Release|x64.Build.0 = Release|x64 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|Win32.ActiveCfg = Debug|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|Win32.Build.0 = Debug|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|x64.ActiveCfg = Debug|x64 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|x64.Build.0 = Debug|x64 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|Win32.ActiveCfg = Release|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|Win32.Build.0 = Release|Win32 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|x64.ActiveCfg = Release|x64 + {98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|x64.Build.0 = Release|x64 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|Win32.Build.0 = Debug|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|x64.ActiveCfg = Debug|x64 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|x64.Build.0 = Debug|x64 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|Win32.ActiveCfg = Release|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|Win32.Build.0 = Release|Win32 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|x64.ActiveCfg = Release|x64 + {08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|x64.Build.0 = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Externals/libusb/msvc/libusb_2010.sln b/Externals/libusb/msvc/libusb_2010.sln new file mode 100644 index 000000000..257eee011 --- /dev/null +++ b/Externals/libusb/msvc/libusb_2010.sln @@ -0,0 +1,94 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2010.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2010.vcxproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2010.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2010.vcxproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxload", "fxload_2010.vcxproj", "{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}" + ProjectSection(ProjectDependencies) = postProject + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} = {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2010.vcxproj", "{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2010.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2010.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.Build.0 = Debug|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.ActiveCfg = Release|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.Build.0 = Release|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.ActiveCfg = Release|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.Build.0 = Release|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.Build.0 = Debug|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.ActiveCfg = Debug|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.Build.0 = Debug|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.ActiveCfg = Release|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.Build.0 = Release|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.ActiveCfg = Release|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.Build.0 = Release|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.ActiveCfg = Debug|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.Build.0 = Debug|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.ActiveCfg = Debug|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.Build.0 = Debug|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.ActiveCfg = Release|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.Build.0 = Release|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.ActiveCfg = Release|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.Build.0 = Release|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.ActiveCfg = Debug|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.Build.0 = Debug|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.ActiveCfg = Debug|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.Build.0 = Debug|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.ActiveCfg = Release|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.Build.0 = Release|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Externals/libusb/msvc/libusb_2012.sln b/Externals/libusb/msvc/libusb_2012.sln new file mode 100644 index 000000000..c5c5800cf --- /dev/null +++ b/Externals/libusb/msvc/libusb_2012.sln @@ -0,0 +1,94 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2012.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2012.vcxproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2012.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2012.vcxproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxload", "fxload_2012.vcxproj", "{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}" + ProjectSection(ProjectDependencies) = postProject + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} = {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2012.vcxproj", "{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2012.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2012.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.Build.0 = Debug|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.ActiveCfg = Release|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.Build.0 = Release|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.ActiveCfg = Release|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.Build.0 = Release|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.Build.0 = Debug|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.ActiveCfg = Debug|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.Build.0 = Debug|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.ActiveCfg = Release|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.Build.0 = Release|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.ActiveCfg = Release|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.Build.0 = Release|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.ActiveCfg = Debug|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.Build.0 = Debug|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.ActiveCfg = Debug|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.Build.0 = Debug|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.ActiveCfg = Release|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.Build.0 = Release|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.ActiveCfg = Release|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.Build.0 = Release|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.ActiveCfg = Debug|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.Build.0 = Debug|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.ActiveCfg = Debug|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.Build.0 = Debug|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.ActiveCfg = Release|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.Build.0 = Release|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Externals/libusb/msvc/libusb_2013.sln b/Externals/libusb/msvc/libusb_2013.sln new file mode 100644 index 000000000..9d04d2c51 --- /dev/null +++ b/Externals/libusb/msvc/libusb_2013.sln @@ -0,0 +1,100 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2013.vcxproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2013.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2013.vcxproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxload", "fxload_2013.vcxproj", "{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}" + ProjectSection(ProjectDependencies) = postProject + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} = {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2013.vcxproj", "{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2013.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2013.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 + {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 + {349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.Build.0 = Debug|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.ActiveCfg = Release|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.Build.0 = Release|Win32 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.ActiveCfg = Release|x64 + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.Build.0 = Release|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.Build.0 = Debug|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.ActiveCfg = Debug|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.Build.0 = Debug|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.ActiveCfg = Release|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.Build.0 = Release|Win32 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.ActiveCfg = Release|x64 + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.Build.0 = Release|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.ActiveCfg = Debug|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.Build.0 = Debug|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.ActiveCfg = Debug|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.Build.0 = Debug|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.ActiveCfg = Release|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.Build.0 = Release|Win32 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.ActiveCfg = Release|x64 + {9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.Build.0 = Release|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.ActiveCfg = Debug|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.Build.0 = Debug|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.ActiveCfg = Debug|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.Build.0 = Debug|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.ActiveCfg = Release|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.Build.0 = Release|Win32 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64 + {53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64 + {99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Externals/libusb/msvc/libusb_dll.dsp b/Externals/libusb/msvc/libusb_dll.dsp new file mode 100644 index 000000000..f2b15f069 --- /dev/null +++ b/Externals/libusb/msvc/libusb_dll.dsp @@ -0,0 +1,194 @@ +# Microsoft Developer Studio Project File - Name="libusb_dll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libusb_dll - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libusb_dll.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libusb_dll.mak" CFG="libusb_dll - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libusb_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libusb_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libusb_dll - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../Win32/Release/dll" +# PROP Intermediate_Dir "../Win32/Release/dll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LIBUSB_DLL_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Win32/Release/dll/libusb-1.0.dll" + +!ELSEIF "$(CFG)" == "libusb_dll - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../Win32/Debug/dll" +# PROP Intermediate_Dir "../Win32/Debug/dll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LIBUSB_DLL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo /n +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Win32/Debug/dll/libusb-1.0.dll" +# SUBTRACT LINK32 /pdb:none /incremental:no + +!ENDIF + +# Begin Target + +# Name "libusb_dll - Win32 Release" +# Name "libusb_dll - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\libusb\core.c +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\darwin_usb.c +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + +SOURCE=..\libusb\descriptor.c +# End Source File +# Begin Source File + +SOURCE=..\libusb\io.c +# End Source File +# Begin Source File + +SOURCE="..\libusb\libusb-1.0.rc" +# End Source File +# Begin Source File + +SOURCE="..\libusb\libusb-1.0.def" +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\linux_usbfs.c +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\poll_windows.c +# End Source File +# Begin Source File + +SOURCE=..\libusb\sync.c +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\threads_windows.c +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\windows_usb.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\config.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\darwin_usb.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\libusb.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\libusbi.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\linux_usbfs.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\poll_posix.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\poll_windows.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\threads_posix.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\threads_windows.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\windows_usb.h +# End Source File +# Begin Source File + +SOURCE=..\libusb\os\windows_common.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/Externals/libusb/msvc/libusb_dll_2005.vcproj b/Externals/libusb/msvc/libusb_dll_2005.vcproj new file mode 100644 index 000000000..82e5af56e --- /dev/null +++ b/Externals/libusb/msvc/libusb_dll_2005.vcproj @@ -0,0 +1,436 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusb/msvc/libusb_dll_2010.vcxproj b/Externals/libusb/msvc/libusb_dll_2010.vcxproj new file mode 100644 index 000000000..6925b1b89 --- /dev/null +++ b/Externals/libusb/msvc/libusb_dll_2010.vcxproj @@ -0,0 +1,170 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + libusb-1.0 (dll) + {349EE8FA-7D25-4909-AAF5-FF3FADE72187} + libusbdll + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + libusb-1.0 + libusb-1.0 + libusb-1.0 + libusb-1.0 + + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + true + + + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + true + + + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level4 + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + + + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level4 + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/libusb_dll_2010.vcxproj.filters b/Externals/libusb/msvc/libusb_dll_2010.vcxproj.filters new file mode 100644 index 000000000..7a4578c5b --- /dev/null +++ b/Externals/libusb/msvc/libusb_dll_2010.vcxproj.filters @@ -0,0 +1,81 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {d81e81ca-b13e-4a15-b54b-b12b41361e6b} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/libusb_dll_2012.vcxproj b/Externals/libusb/msvc/libusb_dll_2012.vcxproj new file mode 100644 index 000000000..adcad4ad0 --- /dev/null +++ b/Externals/libusb/msvc/libusb_dll_2012.vcxproj @@ -0,0 +1,175 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + libusb-1.0 (dll) + {349EE8FA-7D25-4909-AAF5-FF3FADE72187} + libusbdll + + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + libusb-1.0 + libusb-1.0 + libusb-1.0 + libusb-1.0 + + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + true + + + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + true + + + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level4 + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + + + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level4 + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusbx/msvc/libusb_static_2013.vcxproj.filters b/Externals/libusb/msvc/libusb_dll_2012.vcxproj.filters similarity index 85% rename from Externals/libusbx/msvc/libusb_static_2013.vcxproj.filters rename to Externals/libusb/msvc/libusb_dll_2012.vcxproj.filters index 5cd806065..ccada704b 100644 --- a/Externals/libusbx/msvc/libusb_static_2013.vcxproj.filters +++ b/Externals/libusb/msvc/libusb_dll_2012.vcxproj.filters @@ -9,6 +9,9 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd + + {d81e81ca-b13e-4a15-b54b-b12b41361e6b} + @@ -58,17 +61,24 @@ Header Files - + Header Files Header Files - - Header Files - Header Files + + + Resource Files + + + + + Resource Files + + \ No newline at end of file diff --git a/Externals/libusb/msvc/libusb_dll_2013.vcxproj b/Externals/libusb/msvc/libusb_dll_2013.vcxproj new file mode 100644 index 000000000..c1b2a0a13 --- /dev/null +++ b/Externals/libusb/msvc/libusb_dll_2013.vcxproj @@ -0,0 +1,175 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + libusb-1.0 (dll) + {349EE8FA-7D25-4909-AAF5-FF3FADE72187} + libusbdll + + + + DynamicLibrary + Unicode + true + v120 + + + DynamicLibrary + Unicode + v120 + + + DynamicLibrary + Unicode + true + v120 + + + DynamicLibrary + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\ + $(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\ + libusb-1.0 + libusb-1.0 + libusb-1.0 + libusb-1.0 + + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + true + + + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + true + + + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level4 + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + + + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level4 + + + $(OutDir)libusb-1.0.dll + ..\libusb\libusb-1.0.def + libusb-1.0.rc;%(EmbedManagedResourceFile) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/libusb_dll_wince.vcproj b/Externals/libusb/msvc/libusb_dll_wince.vcproj new file mode 100644 index 000000000..822404c24 --- /dev/null +++ b/Externals/libusb/msvc/libusb_dll_wince.vcproj @@ -0,0 +1,1243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusbx/msvc/libusb_sources b/Externals/libusb/msvc/libusb_sources similarity index 100% rename from Externals/libusbx/msvc/libusb_sources rename to Externals/libusb/msvc/libusb_sources diff --git a/Externals/libusbx/msvc/libusb_static.dsp b/Externals/libusb/msvc/libusb_static.dsp similarity index 100% rename from Externals/libusbx/msvc/libusb_static.dsp rename to Externals/libusb/msvc/libusb_static.dsp diff --git a/Externals/libusbx/msvc/libusb_static_2005.vcproj b/Externals/libusb/msvc/libusb_static_2005.vcproj similarity index 100% rename from Externals/libusbx/msvc/libusb_static_2005.vcproj rename to Externals/libusb/msvc/libusb_static_2005.vcproj diff --git a/Externals/libusbx/msvc/libusb_static_2010.vcxproj b/Externals/libusb/msvc/libusb_static_2010.vcxproj similarity index 67% rename from Externals/libusbx/msvc/libusb_static_2010.vcxproj rename to Externals/libusb/msvc/libusb_static_2010.vcxproj index 73e5cbdb1..1958d1172 100644 --- a/Externals/libusbx/msvc/libusb_static_2010.vcxproj +++ b/Externals/libusb/msvc/libusb_static_2010.vcxproj @@ -1,14 +1,6 @@  - - DebugFast - Win32 - - - DebugFast - x64 - Debug Win32 @@ -27,7 +19,7 @@ - libusb + libusb-1.0 (static) {349EE8F9-7D25-4909-AAF5-FF3FADE72187} libusb @@ -41,10 +33,6 @@ StaticLibrary Unicode - - StaticLibrary - Unicode - StaticLibrary Unicode @@ -54,10 +42,6 @@ StaticLibrary Unicode - - StaticLibrary - Unicode - @@ -67,39 +51,27 @@ - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ libusb-1.0 - libusb-1.0 libusb-1.0 libusb-1.0 - libusb-1.0 libusb-1.0 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ @@ -114,19 +86,6 @@ $(OutDir)libusb-1.0.lib - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-1.0.lib - - X64 @@ -143,22 +102,6 @@ $(OutDir)libusb-1.0.lib - - - X64 - - - Disabled - .;..\libusb;%(AdditionalIncludeDirectories) - _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - Level4 - ProgramDatabase - - - $(OutDir)libusb-1.0.lib - - .;..\libusb;%(AdditionalIncludeDirectories) diff --git a/Externals/libusbx/msvc/libusb_static_2010.vcxproj.filters b/Externals/libusb/msvc/libusb_static_2010.vcxproj.filters similarity index 100% rename from Externals/libusbx/msvc/libusb_static_2010.vcxproj.filters rename to Externals/libusb/msvc/libusb_static_2010.vcxproj.filters diff --git a/Externals/libusbx/msvc/libusb_static_2012.vcxproj b/Externals/libusb/msvc/libusb_static_2012.vcxproj similarity index 96% rename from Externals/libusbx/msvc/libusb_static_2012.vcxproj rename to Externals/libusb/msvc/libusb_static_2012.vcxproj index 7d4894bbf..88605ba24 100644 --- a/Externals/libusbx/msvc/libusb_static_2012.vcxproj +++ b/Externals/libusb/msvc/libusb_static_2012.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,19 +28,23 @@ StaticLibrary Unicode true + v110 StaticLibrary Unicode + v110 StaticLibrary Unicode true + v110 StaticLibrary Unicode + v110 diff --git a/Externals/libusbx/msvc/libusb_static_2012.vcxproj.filters b/Externals/libusb/msvc/libusb_static_2012.vcxproj.filters similarity index 100% rename from Externals/libusbx/msvc/libusb_static_2012.vcxproj.filters rename to Externals/libusb/msvc/libusb_static_2012.vcxproj.filters diff --git a/Externals/libusb/msvc/libusb_static_2013.vcxproj b/Externals/libusb/msvc/libusb_static_2013.vcxproj new file mode 100644 index 000000000..05b7bd863 --- /dev/null +++ b/Externals/libusb/msvc/libusb_static_2013.vcxproj @@ -0,0 +1,160 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + libusb-1.0 (static) + {349EE8F9-7D25-4909-AAF5-FF3FADE72187} + libusb + + + + StaticLibrary + Unicode + true + v120 + + + StaticLibrary + Unicode + v120 + + + StaticLibrary + Unicode + true + v120 + + + StaticLibrary + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ + $(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\ + libusb-1.0 + libusb-1.0 + libusb-1.0 + libusb-1.0 + + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.lib + + + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + Level4 + ProgramDatabase + + + $(OutDir)libusb-1.0.lib + + + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level4 + + + $(OutDir)libusb-1.0.lib + + + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + _WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level4 + + + $(OutDir)libusb-1.0.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusbx/msvc/libusb_static_wince.vcproj b/Externals/libusb/msvc/libusb_static_wince.vcproj similarity index 100% rename from Externals/libusbx/msvc/libusb_static_wince.vcproj rename to Externals/libusb/msvc/libusb_static_wince.vcproj diff --git a/Externals/libusb/msvc/libusb_wince.sln b/Externals/libusb/msvc/libusb_wince.sln new file mode 100644 index 000000000..a0d1758a5 --- /dev/null +++ b/Externals/libusb/msvc/libusb_wince.sln @@ -0,0 +1,246 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_wince.vcproj", "{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_wince.vcproj", "{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_wince.vcproj", "{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_wince.vcproj", "{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_wince.vcproj", "{61476624-3354-48C8-9334-85AC0D624640}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|STANDARDSDK_500 (ARMV4I) = Debug|STANDARDSDK_500 (ARMV4I) + Debug|STANDARDSDK_500 (MIPSII) = Debug|STANDARDSDK_500 (MIPSII) + Debug|STANDARDSDK_500 (MIPSII_FP) = Debug|STANDARDSDK_500 (MIPSII_FP) + Debug|STANDARDSDK_500 (MIPSIV) = Debug|STANDARDSDK_500 (MIPSIV) + Debug|STANDARDSDK_500 (MIPSIV_FP) = Debug|STANDARDSDK_500 (MIPSIV_FP) + Debug|STANDARDSDK_500 (SH4) = Debug|STANDARDSDK_500 (SH4) + Debug|STANDARDSDK_500 (x86) = Debug|STANDARDSDK_500 (x86) + Release|STANDARDSDK_500 (ARMV4I) = Release|STANDARDSDK_500 (ARMV4I) + Release|STANDARDSDK_500 (MIPSII) = Release|STANDARDSDK_500 (MIPSII) + Release|STANDARDSDK_500 (MIPSII_FP) = Release|STANDARDSDK_500 (MIPSII_FP) + Release|STANDARDSDK_500 (MIPSIV) = Release|STANDARDSDK_500 (MIPSIV) + Release|STANDARDSDK_500 (MIPSIV_FP) = Release|STANDARDSDK_500 (MIPSIV_FP) + Release|STANDARDSDK_500 (SH4) = Release|STANDARDSDK_500 (SH4) + Release|STANDARDSDK_500 (x86) = Release|STANDARDSDK_500 (x86) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86) + {6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86) + {960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86) + {93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86) + {CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86) + {61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86) + {61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Externals/libusb/msvc/listdevs.dsp b/Externals/libusb/msvc/listdevs.dsp new file mode 100644 index 000000000..93a93e4b4 --- /dev/null +++ b/Externals/libusb/msvc/listdevs.dsp @@ -0,0 +1,103 @@ +# Microsoft Developer Studio Project File - Name="listdevs" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=listdevs - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "listdevs.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "listdevs.mak" CFG="listdevs - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "listdevs - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "listdevs - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "listdevs - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../Win32/Release/examples" +# PROP Intermediate_Dir "../Win32/Release/examples/listdevs" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../libusb" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /EHsc /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "listdevs - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../Win32/Debug/examples" +# PROP Intermediate_Dir "../Win32/Debug/examples/listdevs" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libusb" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /GZ /EHsc /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/poll_windows.sbr" "../Win32/Debug/dll/threads_windows.sbr" "../Win32/Debug/dll/windows_usb.sbr" +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "listdevs - Win32 Release" +# Name "listdevs - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\examples\listdevs.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/Externals/libusb/msvc/listdevs_2005.vcproj b/Externals/libusb/msvc/listdevs_2005.vcproj new file mode 100644 index 000000000..88cef7fc1 --- /dev/null +++ b/Externals/libusb/msvc/listdevs_2005.vcproj @@ -0,0 +1,360 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusb/msvc/listdevs_2010.vcxproj b/Externals/libusb/msvc/listdevs_2010.vcxproj new file mode 100644 index 000000000..5829aaef7 --- /dev/null +++ b/Externals/libusb/msvc/listdevs_2010.vcxproj @@ -0,0 +1,165 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + listdevs + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87} + examples + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(ProjectName).pdb + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(ProjectName).pdb + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/listdevs_2010.vcxproj.filters b/Externals/libusb/msvc/listdevs_2010.vcxproj.filters new file mode 100644 index 000000000..de4d3afe3 --- /dev/null +++ b/Externals/libusb/msvc/listdevs_2010.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/listdevs_2012.vcxproj b/Externals/libusb/msvc/listdevs_2012.vcxproj new file mode 100644 index 000000000..97fe3368a --- /dev/null +++ b/Externals/libusb/msvc/listdevs_2012.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + listdevs + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87} + examples + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(ProjectName).pdb + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(ProjectName).pdb + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/listdevs_2012.vcxproj.filters b/Externals/libusb/msvc/listdevs_2012.vcxproj.filters new file mode 100644 index 000000000..de4d3afe3 --- /dev/null +++ b/Externals/libusb/msvc/listdevs_2012.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/listdevs_2013.vcxproj b/Externals/libusb/msvc/listdevs_2013.vcxproj new file mode 100644 index 000000000..7bee105a8 --- /dev/null +++ b/Externals/libusb/msvc/listdevs_2013.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + listdevs + {F4938DB0-3DE7-4737-9C5A-EAD1BE819F87} + examples + Win32Proj + + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(ProjectName).pdb + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(ProjectName).pdb + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + ..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + $(TargetDir)$(ProjectName).pdb + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/listdevs_sources b/Externals/libusb/msvc/listdevs_sources new file mode 100644 index 000000000..97a5723e4 --- /dev/null +++ b/Externals/libusb/msvc/listdevs_sources @@ -0,0 +1,19 @@ +TARGETNAME=listdevs +TARGETTYPE=PROGRAM +386_STDCALL=0 + +_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) +!IFNDEF MSC_WARNING_LEVEL +MSC_WARNING_LEVEL=/W3 +!ENDIF + +!IFDEF STATIC_LIBC +USE_LIBCMT=1 +!ELSE +USE_MSVCRT=1 +!ENDIF + +UMTYPE=console +INCLUDES=..\..\libusb;$(DDK_INC_PATH) +UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib +SOURCES=..\listdevs.c diff --git a/Externals/libusb/msvc/listdevs_wince.vcproj b/Externals/libusb/msvc/listdevs_wince.vcproj new file mode 100644 index 000000000..a31424b58 --- /dev/null +++ b/Externals/libusb/msvc/listdevs_wince.vcproj @@ -0,0 +1,1120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusbx/msvc/missing.c b/Externals/libusb/msvc/missing.c similarity index 100% rename from Externals/libusbx/msvc/missing.c rename to Externals/libusb/msvc/missing.c diff --git a/Externals/libusbx/msvc/missing.h b/Externals/libusb/msvc/missing.h similarity index 100% rename from Externals/libusbx/msvc/missing.h rename to Externals/libusb/msvc/missing.h diff --git a/Externals/libusbx/msvc/stdint.h b/Externals/libusb/msvc/stdint.h similarity index 100% rename from Externals/libusbx/msvc/stdint.h rename to Externals/libusb/msvc/stdint.h diff --git a/Externals/libusb/msvc/stress_2005.vcproj b/Externals/libusb/msvc/stress_2005.vcproj new file mode 100644 index 000000000..ebb54918c --- /dev/null +++ b/Externals/libusb/msvc/stress_2005.vcproj @@ -0,0 +1,390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusb/msvc/stress_2010.vcxproj b/Externals/libusb/msvc/stress_2010.vcxproj new file mode 100644 index 000000000..f97479680 --- /dev/null +++ b/Externals/libusb/msvc/stress_2010.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + stress + {53942EFF-C810-458D-B3CB-EE5CE9F1E781} + tests + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/stress_2010.vcxproj.filters b/Externals/libusb/msvc/stress_2010.vcxproj.filters new file mode 100644 index 000000000..bbe84b878 --- /dev/null +++ b/Externals/libusb/msvc/stress_2010.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {28b6220e-d087-4f48-bd69-ffe0ac5bcc7a} + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/stress_2012.vcxproj b/Externals/libusb/msvc/stress_2012.vcxproj new file mode 100644 index 000000000..94ca14998 --- /dev/null +++ b/Externals/libusb/msvc/stress_2012.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + stress + {53942EFF-C810-458D-B3CB-EE5CE9F1E781} + tests + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/stress_2012.vcxproj.filters b/Externals/libusb/msvc/stress_2012.vcxproj.filters new file mode 100644 index 000000000..bbe84b878 --- /dev/null +++ b/Externals/libusb/msvc/stress_2012.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {28b6220e-d087-4f48-bd69-ffe0ac5bcc7a} + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/stress_2013.vcxproj b/Externals/libusb/msvc/stress_2013.vcxproj new file mode 100644 index 000000000..da70339a5 --- /dev/null +++ b/Externals/libusb/msvc/stress_2013.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + stress + {53942EFF-C810-458D-B3CB-EE5CE9F1E781} + tests + Win32Proj + + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\ + $(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/stress_wince.vcproj b/Externals/libusb/msvc/stress_wince.vcproj new file mode 100644 index 000000000..86b038842 --- /dev/null +++ b/Externals/libusb/msvc/stress_wince.vcproj @@ -0,0 +1,1128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusb/msvc/xusb.dsp b/Externals/libusb/msvc/xusb.dsp new file mode 100644 index 000000000..0e5c13bd0 --- /dev/null +++ b/Externals/libusb/msvc/xusb.dsp @@ -0,0 +1,102 @@ +# Microsoft Developer Studio Project File - Name="xusb" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=xusb - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "xusb.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "xusb.mak" CFG="xusb - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xusb - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "xusb - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "xusb - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../Win32/Release/examples" +# PROP Intermediate_Dir "../Win32/Release/examples/xusb" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /EHsc /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "xusb - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "xusb___Win32_Debug" +# PROP BASE Intermediate_Dir "xusb___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../Win32/Debug/examples" +# PROP Intermediate_Dir "../Win32/Debug/examples/xusb" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /GZ /EHsc /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/poll_windows.sbr" "../Win32/Debug/dll/threads_windows.sbr" "../Win32/Debug/dll/windows_usb.sbr" +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 + +!ENDIF + +# Begin Target + +# Name "xusb - Win32 Release" +# Name "xusb - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\examples\xusb.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/Externals/libusb/msvc/xusb_2005.vcproj b/Externals/libusb/msvc/xusb_2005.vcproj new file mode 100644 index 000000000..6ad9b7c0c --- /dev/null +++ b/Externals/libusb/msvc/xusb_2005.vcproj @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusb/msvc/xusb_2010.vcxproj b/Externals/libusb/msvc/xusb_2010.vcxproj new file mode 100644 index 000000000..b66c85fcf --- /dev/null +++ b/Externals/libusb/msvc/xusb_2010.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + xusb + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11} + examples + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/xusb_2010.vcxproj.filters b/Externals/libusb/msvc/xusb_2010.vcxproj.filters new file mode 100644 index 000000000..22c76f737 --- /dev/null +++ b/Externals/libusb/msvc/xusb_2010.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/xusb_2012.vcxproj b/Externals/libusb/msvc/xusb_2012.vcxproj new file mode 100644 index 000000000..77e7a061e --- /dev/null +++ b/Externals/libusb/msvc/xusb_2012.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + xusb + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11} + examples + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/xusb_2012.vcxproj.filters b/Externals/libusb/msvc/xusb_2012.vcxproj.filters new file mode 100644 index 000000000..22c76f737 --- /dev/null +++ b/Externals/libusb/msvc/xusb_2012.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/xusb_2013.vcxproj b/Externals/libusb/msvc/xusb_2013.vcxproj new file mode 100644 index 000000000..5b68b6296 --- /dev/null +++ b/Externals/libusb/msvc/xusb_2013.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + xusb + {3F3138D0-7AB7-4268-9BF3-1A3EA5503A11} + examples + Win32Proj + + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + Application + Unicode + true + v120 + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\ + $(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\ + + + + $(IntDir)$(ProjectName).htm + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + Disabled + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + + + %(AdditionalLibraryDirectories) + true + Console + MachineX64 + + + + + $(IntDir)$(ProjectName).htm + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX86 + + + + + $(IntDir)$(ProjectName).htm + + + X64 + + + .;..\libusb;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + %(AdditionalLibraryDirectories) + Console + MachineX64 + + + + + + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + false + + + + + + \ No newline at end of file diff --git a/Externals/libusb/msvc/xusb_sources b/Externals/libusb/msvc/xusb_sources new file mode 100644 index 000000000..b43f94f68 --- /dev/null +++ b/Externals/libusb/msvc/xusb_sources @@ -0,0 +1,20 @@ +TARGETNAME=xusb +TARGETTYPE=PROGRAM +386_STDCALL=0 + +_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP) + +!IFNDEF MSC_WARNING_LEVEL +MSC_WARNING_LEVEL=/W3 +!ENDIF + +!IFDEF STATIC_LIBC +USE_LIBCMT=1 +!ELSE +USE_MSVCRT=1 +!ENDIF + +UMTYPE=console +INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH) +UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib +SOURCES=..\xusb.c diff --git a/Externals/libusb/msvc/xusb_wince.vcproj b/Externals/libusb/msvc/xusb_wince.vcproj new file mode 100644 index 000000000..17f1e85c0 --- /dev/null +++ b/Externals/libusb/msvc/xusb_wince.vcproj @@ -0,0 +1,1120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Externals/libusbx/Makefile.am b/Externals/libusbx/Makefile.am deleted file mode 100644 index 93ce9414f..000000000 --- a/Externals/libusbx/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip -ACLOCAL_AMFLAGS = -I m4 -DISTCLEANFILES = libusb-1.0.pc -EXTRA_DIST = TODO PORTING msvc libusb/libusb-1.0.def libusb/version_nano.h \ - examples/getopt/getopt.c examples/getopt/getopt1.c examples/getopt/getopt.h -SUBDIRS = libusb doc - -if BUILD_EXAMPLES -SUBDIRS += examples -endif - -if BUILD_TESTS -SUBDIRS += tests -endif - -pkgconfigdir=$(libdir)/pkgconfig -pkgconfig_DATA=libusb-1.0.pc - -.PHONY: dist-up - -reldir = .release/$(distdir) -dist-up: dist - rm -rf $(reldir) - mkdir -p $(reldir) - cp $(distdir).tar.bz2 $(reldir) - rsync -rv $(reldir) frs.sourceforge.net:/home/frs/project/l/li/libusb/libusb-1.0/ - rm -rf $(reldir) diff --git a/Externals/libusbx/Makefile.in b/Externals/libusbx/Makefile.in deleted file mode 100644 index 05bfacf0f..000000000 --- a/Externals/libusbx/Makefile.in +++ /dev/null @@ -1,875 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@BUILD_EXAMPLES_TRUE@am__append_1 = examples -@BUILD_TESTS_TRUE@am__append_2 = tests -subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/libusb-1.0.pc.in COPYING \ - THANKS TODO compile config.guess config.sub depcomp install-sh \ - missing ltmain.sh -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/libusb/version.h $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = libusb-1.0.pc -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -DATA = $(pkgconfig_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope -DIST_SUBDIRS = libusb doc examples tests -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi -am__post_remove_distdir = $(am__remove_distdir) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 -DIST_TARGETS = dist-bzip2 -distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_CFLAGS = @AM_CFLAGS@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLDFLAGS = @LTLDFLAGS@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OS_DARWIN = @OS_DARWIN@ -OS_LINUX = @OS_LINUX@ -OS_OPENBSD = @OS_OPENBSD@ -OS_WINDOWS = @OS_WINDOWS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_UDEV = @USE_UDEV@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip -ACLOCAL_AMFLAGS = -I m4 -DISTCLEANFILES = libusb-1.0.pc -EXTRA_DIST = TODO PORTING msvc libusb/libusb-1.0.def libusb/version_nano.h \ - examples/getopt/getopt.c examples/getopt/getopt1.c examples/getopt/getopt.h - -SUBDIRS = libusb doc $(am__append_1) $(am__append_2) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libusb-1.0.pc -reldir = .release/$(distdir) -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: Makefile - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): - -config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 -libusb-1.0.pc: $(top_builddir)/config.status $(srcdir)/libusb-1.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscope: cscope.files - test ! -s cscope.files \ - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -clean-cscope: - -rm -f cscope.files -cscope.files: clean-cscope cscopelist -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) - -dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) config.h -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-pkgconfigDATA - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-pkgconfigDATA - -.MAKE: $(am__recursive_targets) all install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-libtool cscope cscopelist-am ctags ctags-am dist \ - dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-pkgconfigDATA - - -.PHONY: dist-up -dist-up: dist - rm -rf $(reldir) - mkdir -p $(reldir) - cp $(distdir).tar.bz2 $(reldir) - rsync -rv $(reldir) frs.sourceforge.net:/home/frs/project/l/li/libusb/libusb-1.0/ - rm -rf $(reldir) - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/Externals/libusbx/NEWS b/Externals/libusbx/NEWS deleted file mode 100644 index 162025388..000000000 --- a/Externals/libusbx/NEWS +++ /dev/null @@ -1,2 +0,0 @@ -For the latest libusbx news, please refer to the ChangeLog file, or visit: -http://libusbx.org diff --git a/Externals/libusbx/README b/Externals/libusbx/README deleted file mode 100644 index 3add73110..000000000 --- a/Externals/libusbx/README +++ /dev/null @@ -1,28 +0,0 @@ -libusbx -======= - -libusbx is a library for USB device access from Linux, Mac OS X, -Windows and OpenBSD/NetBSD userspace, with OpenBSD/NetBSD, and to a -lesser extent some of the newest features of Windows (such as libusbK -and libusb-win32 driver support) being EXPERIMENTAL. -It is written in C and licensed under the GNU Lesser General Public -License version 2.1 or, at your option, any later version (see COPYING). - -libusbx is abstracted internally in such a way that it can hopefully -be ported to other operating systems. Please see the PORTING file -for more information. - -libusbx homepage: -http://libusbx.org/ - -Developers will wish to consult the API documentation: -http://api.libusbx.org - -Use the mailing list for questions, comments, etc: -http://mailing-list.libusbx.org - -- Pete Batard -- Hans de Goede -- Xiaofan Chen -- Ludovic Rousseau -(use the mailing list rather than mailing developers directly) diff --git a/Externals/libusbx/THANKS b/Externals/libusbx/THANKS deleted file mode 100644 index 4189af2cb..000000000 --- a/Externals/libusbx/THANKS +++ /dev/null @@ -1,7 +0,0 @@ -Development contributors are listed in the AUTHORS file. Community members who -have also made significant contributions in other areas are listed below: - -Alan Stern -Ludovic Rousseau -Tim Roberts -Xiaofan Chen diff --git a/Externals/libusbx/TODO b/Externals/libusbx/TODO deleted file mode 100644 index e64b27915..000000000 --- a/Externals/libusbx/TODO +++ /dev/null @@ -1,2 +0,0 @@ -Please see the libusbx roadmap by visiting: -https://github.com/libusbx/libusbx/issues/milestones?direction=asc&sort=due_date \ No newline at end of file diff --git a/Externals/libusbx/aclocal.m4 b/Externals/libusbx/aclocal.m4 deleted file mode 100644 index b83972751..000000000 --- a/Externals/libusbx/aclocal.m4 +++ /dev/null @@ -1,1112 +0,0 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. - -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically 'autoreconf'.])]) - -# Copyright (C) 2002-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - - -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) - -# Copyright (C) 2003-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless 'enable' is passed literally. -# For symmetry, 'disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], - am_maintainer_other[ make rules and dependencies not useful - (and sometimes confusing) to the casual installer])], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) - -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac - -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) - -# Copyright (C) 2009-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor 'install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -# -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], - - [pax], - [], - - [m4_fatal([Unknown tar format])]) - - AC_MSG_CHECKING([how to create a $1 tar archive]) - - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} - - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi - done - rm -rf conftest.dir - - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) - -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([m4/libtool.m4]) -m4_include([m4/ltoptions.m4]) -m4_include([m4/ltsugar.m4]) -m4_include([m4/ltversion.m4]) -m4_include([m4/lt~obsolete.m4]) diff --git a/Externals/libusbx/compile b/Externals/libusbx/compile deleted file mode 100644 index 531136b06..000000000 --- a/Externals/libusbx/compile +++ /dev/null @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Externals/libusbx/config.guess b/Externals/libusbx/config.guess deleted file mode 100644 index 1804e9fcd..000000000 --- a/Externals/libusbx/config.guess +++ /dev/null @@ -1,1535 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. - -timestamp='2012-12-29' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches with a ChangeLog entry to config-patches@gnu.org. - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; -esac - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Externals/libusbx/config.h.in b/Externals/libusbx/config.h.in deleted file mode 100644 index 41c7f0f7f..000000000 --- a/Externals/libusbx/config.h.in +++ /dev/null @@ -1,134 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Default visibility */ -#undef DEFAULT_VISIBILITY - -/* Start with debug message logging enabled */ -#undef ENABLE_DEBUG_LOGGING - -/* Message logging */ -#undef ENABLE_LOGGING - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `udev' library (-ludev). */ -#undef HAVE_LIBUDEV - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBUDEV_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_FILTER_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_NETLINK_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_POLL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SIGNAL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if the system has the type `struct timespec'. */ -#undef HAVE_STRUCT_TIMESPEC - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Darwin backend */ -#undef OS_DARWIN - -/* Linux backend */ -#undef OS_LINUX - -/* OpenBSD/NetBSD backend */ -#undef OS_OPENBSD - -/* Windows backend */ -#undef OS_WINDOWS - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* type of second poll() argument */ -#undef POLL_NFDS_TYPE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Use POSIX Threads */ -#undef THREADS_POSIX - -/* timerfd headers available */ -#undef USBI_TIMERFD_AVAILABLE - -/* Use udev for device enumeration/hotplug */ -#undef USE_UDEV - -/* Version number of package */ -#undef VERSION - -/* Use GNU extensions */ -#undef _GNU_SOURCE - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif diff --git a/Externals/libusbx/config.sub b/Externals/libusbx/config.sub deleted file mode 100644 index 52f04bcd7..000000000 --- a/Externals/libusbx/config.sub +++ /dev/null @@ -1,1790 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. - -timestamp='2012-12-29' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches with a ChangeLog entry to config-patches@gnu.org. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ - | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i386-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -nacl*) - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Externals/libusbx/configure b/Externals/libusbx/configure deleted file mode 100644 index fcf943c2a..000000000 --- a/Externals/libusbx/configure +++ /dev/null @@ -1,15137 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libusbx 1.0.16. -# -# Report bugs to . -# -# -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 - - test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: libusbx-devel@lists.sourceforge.net about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -SHELL=${CONFIG_SHELL-/bin/sh} - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='libusbx' -PACKAGE_TARNAME='libusbx' -PACKAGE_VERSION='1.0.16' -PACKAGE_STRING='libusbx 1.0.16' -PACKAGE_BUGREPORT='libusbx-devel@lists.sourceforge.net' -PACKAGE_URL='http://libusbx.org' - -ac_unique_file="libusb/core.c" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='am__EXEEXT_FALSE -am__EXEEXT_TRUE -LTLIBOBJS -LIBOBJS -LTLDFLAGS -AM_CFLAGS -HAVE_SIGACTION_FALSE -HAVE_SIGACTION_TRUE -BUILD_TESTS_FALSE -BUILD_TESTS_TRUE -BUILD_EXAMPLES_FALSE -BUILD_EXAMPLES_TRUE -USE_UDEV_FALSE -USE_UDEV_TRUE -CREATE_IMPORT_LIB_FALSE -CREATE_IMPORT_LIB_TRUE -THREADS_POSIX_FALSE -THREADS_POSIX_TRUE -OS_WINDOWS_FALSE -OS_WINDOWS_TRUE -OS_OPENBSD_FALSE -OS_OPENBSD_TRUE -OS_DARWIN_FALSE -OS_DARWIN_TRUE -OS_LINUX_FALSE -OS_LINUX_TRUE -OS_WINDOWS -OS_OPENBSD -OS_DARWIN -USE_UDEV -OS_LINUX -RC -CPP -OTOOL64 -OTOOL -LIPO -NMEDIT -DSYMUTIL -MANIFEST_TOOL -RANLIB -ac_ct_AR -AR -DLLTOOL -OBJDUMP -LN_S -NM -ac_ct_DUMPBIN -DUMPBIN -LD -FGREP -EGREP -GREP -SED -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -LIBTOOL -am__fastdepCC_FALSE -am__fastdepCC_TRUE -CCDEPMODE -am__nodep -AMDEPBACKSLASH -AMDEP_FALSE -AMDEP_TRUE -am__quote -am__include -DEPDIR -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE -AM_BACKSLASH -AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V -am__untar -am__tar -AMTAR -am__leading_dot -SET_MAKE -AWK -mkdir_p -MKDIR_P -INSTALL_STRIP_PROGRAM -STRIP -install_sh -MAKEINFO -AUTOHEADER -AUTOMAKE -AUTOCONF -ACLOCAL -VERSION -PACKAGE -CYGPATH_W -am__isrc -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_silent_rules -enable_maintainer_mode -enable_dependency_tracking -enable_shared -enable_static -with_pic -enable_fast_install -with_gnu_ld -with_sysroot -enable_libtool_lock -enable_udev -enable_timerfd -enable_log -enable_debug_log -enable_examples_build -enable_tests_build -' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures libusbx 1.0.16 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/libusbx] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of libusbx 1.0.16:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: "make V=1") - --disable-silent-rules verbose build output (undo: "make V=0") - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer - --enable-dependency-tracking - do not reject slow dependency extractors - --disable-dependency-tracking - speeds up one-time build - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-udev use udev for device enumeration and hotplug support - (recommended, default: yes) - --enable-timerfd use timerfd for timing (default auto) - --disable-log disable all logging - --enable-debug-log start with debug message logging enabled (default n) - --enable-examples-build build example applications (default n) - --enable-tests-build build test applications (default n) - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -libusbx home page: . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -libusbx configure 1.0.16 -generated by GNU Autoconf 2.69 - -Copyright (C) 2012 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------------------- ## -## Report this to libusbx-devel@lists.sourceforge.net ## -## -------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_type - -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_decl -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by libusbx $as_me 1.0.16, which was -generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - $as_echo "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - $as_echo "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - $as_echo "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -# Library versioning -# These numbers should be tweaked on every release. Read carefully: -# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -# http://sourceware.org/autobook/autobook/autobook_91.html -lt_current="1" -lt_revision="0" -lt_age="1" -LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" - -am__api_version='1.13' - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; -esac - -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken - alias in your environment" "$LINENO" 5 - fi - if test "$2" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$2" = conftest.file - ) -then - # Ok. - : -else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi - -rm -f conftest.file - -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} -fi - -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - -fi - - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=1;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='libusbx' - VERSION='1.0.16' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -mkdir_p='$(MKDIR_P)' - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' - - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar pax cpio none' - -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - - - -ac_config_headers="$ac_config_headers config.h" - -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=0;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_FGREP" || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_FGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_FGREP=$FGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - - -test -z "$GREP" && GREP=grep - - - - - - - - - - - - - - - - - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len - - - - - - -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi - - - - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac - -fi - -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac - -fi - -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - - - - - - - - -if test -n "$ac_tool_prefix"; then - for ac_prog in ar - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - - - - - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } - -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; -else - with_sysroot=no -fi - - -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } - - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -fi - -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi -else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -fi - -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi - - - - - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - - - - - -# Set options - - - - enable_dlopen=no - - - enable_win32_dll=no - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - - - - - - - - - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi - - - - - - - - - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -test -z "$LN_S" && LN_S="ln -s" - - - - - - - - - - - - - - -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - - - -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF - - - - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - -lt_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - - - - - - - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi - - - - - - - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - - else - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo (void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes -else - ac_cv_lib_dld_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes -else - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes -else - ac_cv_lib_dld_dld_link=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RC"; then - ac_cv_prog_RC="$RC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RC="${ac_tool_prefix}windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RC=$ac_cv_prog_RC -if test -n "$RC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5 -$as_echo "$RC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RC"; then - ac_ct_RC=$RC - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RC"; then - ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RC="windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RC=$ac_cv_prog_ac_ct_RC -if test -n "$ac_ct_RC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5 -$as_echo "$ac_ct_RC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RC" = x; then - RC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RC=$ac_ct_RC - fi -else - RC="$ac_cv_prog_RC" -fi - - - - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -objext_RC=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - -lt_cv_prog_compiler_c_o_RC=yes - -if test -n "$compiler"; then - : - - - -fi - -GCC=$lt_save_GCC -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - - - -$as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - -LTLDFLAGS="${LTLDFLAGS} -no-undefined" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5 -$as_echo_n "checking operating system... " >&6; } - -case $host in -*-linux*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5 -$as_echo "Linux" >&6; } - backend="linux" - threads="posix" - ;; -*-darwin*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin/Mac OS X" >&5 -$as_echo "Darwin/Mac OS X" >&6; } - backend="darwin" - threads="posix" - ;; -*-openbsd*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenBSD" >&5 -$as_echo "OpenBSD" >&6; } - backend="bsd" - threads="posix" - ;; -*-netbsd*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: NetBSD (using OpenBSD backend)" >&5 -$as_echo "NetBSD (using OpenBSD backend)" >&6; } - backend="bsd" - threads="posix" - ;; -*-mingw*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5 -$as_echo "Windows" >&6; } - backend="windows" - threads="windows" - create_import_lib="yes" - AM_CFLAGS="${AM_CFLAGS} -fno-omit-frame-pointer" - ;; -*-cygwin*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cygwin (using Windows backend)" >&5 -$as_echo "Cygwin (using Windows backend)" >&6; } - backend="windows" - threads="posix" - ;; -*) - as_fn_error $? "unsupported operating system" "$LINENO" 5 -esac - -case $backend in -linux) - -$as_echo "#define OS_LINUX 1" >>confdefs.h - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 -$as_echo_n "checking for library containing clock_gettime... " >&6; } -if ${ac_cv_search_clock_gettime+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (); -int -main () -{ -return clock_gettime (); - ; - return 0; -} -_ACEOF -for ac_lib in '' rt; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib -pthread $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_clock_gettime=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_clock_gettime+:} false; then : - break -fi -done -if ${ac_cv_search_clock_gettime+:} false; then : - -else - ac_cv_search_clock_gettime=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 -$as_echo "$ac_cv_search_clock_gettime" >&6; } -ac_res=$ac_cv_search_clock_gettime -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - # Check whether --enable-udev was given. -if test "${enable_udev+set}" = set; then : - enableval=$enable_udev; -else - enable_udev="yes" -fi - - if test "x$enable_udev" = "xyes" ; then - # system has udev. use it or fail! - for ac_header in libudev.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "libudev.h" "ac_cv_header_libudev_h" "$ac_includes_default" -if test "x$ac_cv_header_libudev_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBUDEV_H 1 -_ACEOF - -else - as_fn_error $? "\"udev support requested but libudev not installed\"" "$LINENO" 5 -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for udev_new in -ludev" >&5 -$as_echo_n "checking for udev_new in -ludev... " >&6; } -if ${ac_cv_lib_udev_udev_new+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ludev $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char udev_new (); -int -main () -{ -return udev_new (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_udev_udev_new=yes -else - ac_cv_lib_udev_udev_new=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_udev_udev_new" >&5 -$as_echo "$ac_cv_lib_udev_udev_new" >&6; } -if test "x$ac_cv_lib_udev_udev_new" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBUDEV 1 -_ACEOF - - LIBS="-ludev $LIBS" - -else - as_fn_error $? "\"udev support requested but libudev not installed\"" "$LINENO" 5 -fi - - -$as_echo "#define USE_UDEV 1" >>confdefs.h - - else - for ac_header in linux/netlink.h linux/filter.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - as_fn_error $? "\"Linux netlink headers not found\"" "$LINENO" 5 -fi - -done - - fi - - THREAD_CFLAGS="-pthread" - LIBS="${LIBS} -pthread" - for ac_header in poll.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default" -if test "x$ac_cv_header_poll_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_POLL_H 1 -_ACEOF - -fi - -done - - -$as_echo "#define POLL_NFDS_TYPE nfds_t" >>confdefs.h - - ;; -darwin) - -$as_echo "#define OS_DARWIN 1" >>confdefs.h - - - LIBS="-lobjc -Wl,-framework,IOKit -Wl,-framework,CoreFoundation" - LTLDFLAGS="${LTLDFLAGS} -Wl,-prebind" - for ac_header in poll.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default" -if test "x$ac_cv_header_poll_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_POLL_H 1 -_ACEOF - -fi - -done - - ac_fn_c_check_type "$LINENO" "nfds_t" "ac_cv_type_nfds_t" "#include -" -if test "x$ac_cv_type_nfds_t" = xyes; then : - -$as_echo "#define POLL_NFDS_TYPE nfds_t" >>confdefs.h - -else - -$as_echo "#define POLL_NFDS_TYPE unsigned int" >>confdefs.h - -fi - - ;; -bsd) - -$as_echo "#define OS_OPENBSD 1" >>confdefs.h - - - THREAD_CFLAGS="-pthread" - LIBS="-pthread" - for ac_header in poll.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default" -if test "x$ac_cv_header_poll_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_POLL_H 1 -_ACEOF - -fi - -done - - -$as_echo "#define POLL_NFDS_TYPE nfds_t" >>confdefs.h - - ;; -windows) - -$as_echo "#define OS_WINDOWS 1" >>confdefs.h - - - LIBS="" - LTLDFLAGS="${LTLDFLAGS} -avoid-version -Wl,--add-stdcall-alias" - -$as_echo "#define POLL_NFDS_TYPE unsigned int" >>confdefs.h - - ;; -esac - - - - if test "x$backend" = xlinux; then - OS_LINUX_TRUE= - OS_LINUX_FALSE='#' -else - OS_LINUX_TRUE='#' - OS_LINUX_FALSE= -fi - - if test "x$backend" = xdarwin; then - OS_DARWIN_TRUE= - OS_DARWIN_FALSE='#' -else - OS_DARWIN_TRUE='#' - OS_DARWIN_FALSE= -fi - - if test "x$backend" = xbsd; then - OS_OPENBSD_TRUE= - OS_OPENBSD_FALSE='#' -else - OS_OPENBSD_TRUE='#' - OS_OPENBSD_FALSE= -fi - - if test "x$backend" = xwindows; then - OS_WINDOWS_TRUE= - OS_WINDOWS_FALSE='#' -else - OS_WINDOWS_TRUE='#' - OS_WINDOWS_FALSE= -fi - - if test "x$threads" = xposix; then - THREADS_POSIX_TRUE= - THREADS_POSIX_FALSE='#' -else - THREADS_POSIX_TRUE='#' - THREADS_POSIX_FALSE= -fi - - if test "x$create_import_lib" = "xyes"; then - CREATE_IMPORT_LIB_TRUE= - CREATE_IMPORT_LIB_FALSE='#' -else - CREATE_IMPORT_LIB_TRUE='#' - CREATE_IMPORT_LIB_FALSE= -fi - - if test "x$enable_udev" = xyes; then - USE_UDEV_TRUE= - USE_UDEV_FALSE='#' -else - USE_UDEV_TRUE='#' - USE_UDEV_FALSE= -fi - -if test "$threads" = posix; then - -$as_echo "#define THREADS_POSIX 1" >>confdefs.h - -fi - -# timerfd -ac_fn_c_check_header_mongrel "$LINENO" "sys/timerfd.h" "ac_cv_header_sys_timerfd_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_timerfd_h" = xyes; then : - timerfd_h=1 -else - timerfd_h=0 -fi - - -# Check whether --enable-timerfd was given. -if test "${enable_timerfd+set}" = set; then : - enableval=$enable_timerfd; use_timerfd=$enableval -else - use_timerfd='auto' -fi - - -if test "x$use_timerfd" = "xyes" -a "x$timerfd_h" = "x0"; then - as_fn_error $? "timerfd header not available; glibc 2.9+ required" "$LINENO" 5 -fi - -ac_fn_c_check_decl "$LINENO" "TFD_NONBLOCK" "ac_cv_have_decl_TFD_NONBLOCK" "#include -" -if test "x$ac_cv_have_decl_TFD_NONBLOCK" = xyes; then : - tfd_hdr_ok=yes -else - tfd_hdr_ok=no -fi - -if test "x$use_timerfd" = "xyes" -a "x$tfd_hdr_ok" = "xno"; then - as_fn_error $? "timerfd header not usable; glibc 2.9+ required" "$LINENO" 5 -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use timerfd for timing" >&5 -$as_echo_n "checking whether to use timerfd for timing... " >&6; } -if test "x$use_timerfd" = "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (disabled by user)" >&5 -$as_echo "no (disabled by user)" >&6; } -else - if test "x$timerfd_h" = "x1" -a "x$tfd_hdr_ok" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define USBI_TIMERFD_AVAILABLE 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (header not available)" >&5 -$as_echo "no (header not available)" >&6; } - fi -fi - -ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "$ac_includes_default" -if test "x$ac_cv_type_struct_timespec" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TIMESPEC 1 -_ACEOF - - -fi - - -# Message logging -# Check whether --enable-log was given. -if test "${enable_log+set}" = set; then : - enableval=$enable_log; log_enabled=$enableval -else - log_enabled='yes' -fi - -if test "x$log_enabled" != "xno"; then - -$as_echo "#define ENABLE_LOGGING 1" >>confdefs.h - -fi - -# Check whether --enable-debug-log was given. -if test "${enable_debug_log+set}" = set; then : - enableval=$enable_debug_log; debug_log_enabled=$enableval -else - debug_log_enabled='no' -fi - -if test "x$debug_log_enabled" != "xno"; then - -$as_echo "#define ENABLE_DEBUG_LOGGING 1" >>confdefs.h - -fi - -# Examples build -# Check whether --enable-examples-build was given. -if test "${enable_examples_build+set}" = set; then : - enableval=$enable_examples_build; build_examples=$enableval -else - build_examples='no' -fi - - if test "x$build_examples" != "xno"; then - BUILD_EXAMPLES_TRUE= - BUILD_EXAMPLES_FALSE='#' -else - BUILD_EXAMPLES_TRUE='#' - BUILD_EXAMPLES_FALSE= -fi - - -# Tests build -# Check whether --enable-tests-build was given. -if test "${enable_tests_build+set}" = set; then : - enableval=$enable_tests_build; build_tests=$enableval -else - build_tests='no' -fi - - if test "x$build_tests" != "xno"; then - BUILD_TESTS_TRUE= - BUILD_TESTS_FALSE='#' -else - BUILD_TESTS_TRUE='#' - BUILD_TESTS_FALSE= -fi - - -# check for -fvisibility=hidden compiler support (GCC >= 3.4) -saved_cflags="$CFLAGS" -# -Werror required for cygwin -CFLAGS="$CFLAGS -Werror -fvisibility=hidden" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - VISIBILITY_CFLAGS="-fvisibility=hidden" - -$as_echo "#define DEFAULT_VISIBILITY __attribute__((visibility(\"default\")))" >>confdefs.h - -else - VISIBILITY_CFLAGS="" - -$as_echo "#define DEFAULT_VISIBILITY /**/" >>confdefs.h - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$saved_cflags" - -# check for -Wno-pointer-sign compiler support (GCC >= 4) -saved_cflags="$CFLAGS" -CFLAGS="$CFLAGS -Wno-pointer-sign" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - nopointersign_cflags="-Wno-pointer-sign" -else - nopointersign_cflags="" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$saved_cflags" - -# sigaction not available on MinGW -ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" -if test "x$ac_cv_func_sigaction" = xyes; then : - have_sigaction=yes -else - have_sigaction=no -fi - - if test "x$have_sigaction" = "xyes"; then - HAVE_SIGACTION_TRUE= - HAVE_SIGACTION_FALSE='#' -else - HAVE_SIGACTION_TRUE='#' - HAVE_SIGACTION_FALSE= -fi - - -# headers not available on all platforms but required on others -for ac_header in sys/time.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIME_H 1 -_ACEOF - -fi - -done - -for ac_func in gettimeofday -do : - ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETTIMEOFDAY 1 -_ACEOF - -fi -done - -for ac_header in signal.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default" -if test "x$ac_cv_header_signal_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SIGNAL_H 1 -_ACEOF - -fi - -done - - -AM_CFLAGS="${AM_CFLAGS} -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow ${THREAD_CFLAGS} ${VISIBILITY_CFLAGS}" - - - - -ac_config_files="$ac_config_files libusb-1.0.pc" - -ac_config_files="$ac_config_files Makefile" - -ac_config_files="$ac_config_files libusb/Makefile" - -ac_config_files="$ac_config_files examples/Makefile" - -ac_config_files="$ac_config_files tests/Makefile" - -ac_config_files="$ac_config_files doc/Makefile" - -ac_config_files="$ac_config_files doc/doxygen.cfg" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then - as_fn_error $? "conditional \"OS_LINUX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${OS_DARWIN_TRUE}" && test -z "${OS_DARWIN_FALSE}"; then - as_fn_error $? "conditional \"OS_DARWIN\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${OS_OPENBSD_TRUE}" && test -z "${OS_OPENBSD_FALSE}"; then - as_fn_error $? "conditional \"OS_OPENBSD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${OS_WINDOWS_TRUE}" && test -z "${OS_WINDOWS_FALSE}"; then - as_fn_error $? "conditional \"OS_WINDOWS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${THREADS_POSIX_TRUE}" && test -z "${THREADS_POSIX_FALSE}"; then - as_fn_error $? "conditional \"THREADS_POSIX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${CREATE_IMPORT_LIB_TRUE}" && test -z "${CREATE_IMPORT_LIB_FALSE}"; then - as_fn_error $? "conditional \"CREATE_IMPORT_LIB\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${USE_UDEV_TRUE}" && test -z "${USE_UDEV_FALSE}"; then - as_fn_error $? "conditional \"USE_UDEV\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then - as_fn_error $? "conditional \"BUILD_EXAMPLES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_TESTS_TRUE}" && test -z "${BUILD_TESTS_FALSE}"; then - as_fn_error $? "conditional \"BUILD_TESTS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${HAVE_SIGACTION_TRUE}" && test -z "${HAVE_SIGACTION_FALSE}"; then - as_fn_error $? "conditional \"HAVE_SIGACTION\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by libusbx $as_me 1.0.16, which was -generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to . -libusbx home page: ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -ac_cs_version="\\ -libusbx config.status 1.0.16 -configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2012 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -AWK='$AWK' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`' -reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`' -reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`' -compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`' -GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`' -archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`' -module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`' -hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`' -inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`' -always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`' -include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`' -prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`' -postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`' -file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`' -hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`' - -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ -GREP \ -EGREP \ -FGREP \ -LD \ -NM \ -LN_S \ -lt_SP2NL \ -lt_NL2SP \ -reload_flag \ -OBJDUMP \ -deplibs_check_method \ -file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -DLLTOOL \ -sharedlib_from_linklib_cmd \ -AR \ -AR_FLAGS \ -archiver_list_spec \ -STRIP \ -RANLIB \ -CC \ -CFLAGS \ -compiler \ -lt_cv_sys_global_symbol_pipe \ -lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_c_name_address \ -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ -lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ -lt_prog_compiler_wl \ -lt_prog_compiler_static \ -lt_cv_prog_compiler_c_o \ -need_locks \ -MANIFEST_TOOL \ -DSYMUTIL \ -NMEDIT \ -LIPO \ -OTOOL \ -OTOOL64 \ -shrext_cmds \ -export_dynamic_flag_spec \ -whole_archive_flag_spec \ -compiler_needs_object \ -with_gnu_ld \ -allow_undefined_flag \ -no_undefined_flag \ -hardcode_libdir_flag_spec \ -hardcode_libdir_separator \ -exclude_expsyms \ -include_expsyms \ -file_list_spec \ -variables_saved_for_relink \ -libname_spec \ -library_names_spec \ -soname_spec \ -install_override_mode \ -finish_eval \ -old_striplib \ -striplib \ -LD_RC \ -reload_flag_RC \ -compiler_RC \ -lt_prog_compiler_no_builtin_flag_RC \ -lt_prog_compiler_pic_RC \ -lt_prog_compiler_wl_RC \ -lt_prog_compiler_static_RC \ -lt_cv_prog_compiler_c_o_RC \ -export_dynamic_flag_spec_RC \ -whole_archive_flag_spec_RC \ -compiler_needs_object_RC \ -with_gnu_ld_RC \ -allow_undefined_flag_RC \ -no_undefined_flag_RC \ -hardcode_libdir_flag_spec_RC \ -hardcode_libdir_separator_RC \ -exclude_expsyms_RC \ -include_expsyms_RC \ -file_list_spec_RC; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in reload_cmds \ -old_postinstall_cmds \ -old_postuninstall_cmds \ -old_archive_cmds \ -extract_expsyms_cmds \ -old_archive_from_new_cmds \ -old_archive_from_expsyms_cmds \ -archive_cmds \ -archive_expsym_cmds \ -module_cmds \ -module_expsym_cmds \ -export_symbols_cmds \ -prelink_cmds \ -postlink_cmds \ -postinstall_cmds \ -postuninstall_cmds \ -finish_cmds \ -sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -reload_cmds_RC \ -old_archive_cmds_RC \ -old_archive_from_new_cmds_RC \ -old_archive_from_expsyms_cmds_RC \ -archive_cmds_RC \ -archive_expsym_cmds_RC \ -module_cmds_RC \ -module_expsym_cmds_RC \ -export_symbols_cmds_RC \ -prelink_cmds_RC \ -postlink_cmds_RC; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - - - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' - - - - - - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "libusb-1.0.pc") CONFIG_FILES="$CONFIG_FILES libusb-1.0.pc" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "libusb/Makefile") CONFIG_FILES="$CONFIG_FILES libusb/Makefile" ;; - "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES doc/doxygen.cfg" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 - fi -# Compute "$ac_file"'s index in $config_headers. -_am_arg="$ac_file" -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} - ;; - "libtool":C) - - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -# The names of the tagged configurations supported by this script. -available_tags="RC " - -# ### BEGIN LIBTOOL CONFIG - -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# What type of objects to build. -pic_mode=$pic_mode - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="\$SED -e 1s/^X//" - -# A grep program that handles long lines. -GREP=$lt_GREP - -# An ERE matcher. -EGREP=$lt_EGREP - -# A literal string matcher. -FGREP=$lt_FGREP - -# A BSD- or MS-compatible name lister. -NM=$lt_NM - -# Whether we need soft or hard links. -LN_S=$lt_LN_S - -# What is the maximum length of a command? -max_cmd_len=$max_cmd_len - -# Object file suffix (normally "o"). -objext=$ac_objext - -# Executable file suffix (normally ""). -exeext=$exeext - -# whether the shell understands "unset". -lt_unset=$lt_unset - -# turn spaces into newlines. -SP2NL=$lt_lt_SP2NL - -# turn newlines into spaces. -NL2SP=$lt_lt_NL2SP - -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd - -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd - -# An object symbol dumper. -OBJDUMP=$lt_OBJDUMP - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method = "file_magic". -file_magic_cmd=$lt_file_magic_cmd - -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob - -# DLL creation program. -DLLTOOL=$lt_DLLTOOL - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd - -# The archiver. -AR=$lt_AR - -# Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS - -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec - -# A symbol stripping program. -STRIP=$lt_STRIP - -# Commands used to install an old-style archive. -RANLIB=$lt_RANLIB -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - -# A C compiler. -LTCC=$lt_CC - -# LTCC compiler flags. -LTCFLAGS=$lt_CFLAGS - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# Used to examine libraries when file_magic_cmd begins with "file". -MAGIC_CMD=$MAGIC_CMD - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL - -# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL=$lt_DSYMUTIL - -# Tool to change global to local symbols on Mac OS X. -NMEDIT=$lt_NMEDIT - -# Tool to manipulate fat objects and archives on Mac OS X. -LIPO=$lt_LIPO - -# ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL=$lt_OTOOL - -# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64=$lt_OTOOL64 - -# Old archive suffix (normally "a"). -libext=$libext - -# Shared library suffix (normally ".so"). -shrext_cmds=$lt_shrext_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at link time. -variables_saved_for_relink=$lt_variables_saved_for_relink - -# Do we need the "lib" prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Library versioning type. -version_type=$version_type - -# Shared library runtime path variable. -runpath_var=$runpath_var - -# Shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - -# Command to use after installation of a shared archive. -postinstall_cmds=$lt_postinstall_cmds - -# Command to use after uninstallation of a shared archive. -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# As "finish_cmds", except a single script fragment to be evaled but -# not shown. -finish_eval=$lt_finish_eval - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Compile-time system search path for libraries. -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - - -# The linker used to build libraries. -LD=$lt_LD - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds - -# A language specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU compiler? -with_gcc=$GCC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - -ltmain="$ac_aux_dir/ltmain.sh" - - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: RC - -# The linker used to build libraries. -LD=$lt_LD_RC - -# How to create reloadable object files. -reload_flag=$lt_reload_flag_RC -reload_cmds=$lt_reload_cmds_RC - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_RC - -# A language specific compiler. -CC=$lt_compiler_RC - -# Is the compiler the GNU compiler? -with_gcc=$GCC_RC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_RC - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_RC - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_RC - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_RC - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_RC - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_RC -archive_expsym_cmds=$lt_archive_expsym_cmds_RC - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_RC -module_expsym_cmds=$lt_module_expsym_cmds_RC - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_RC - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_RC - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_RC - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_RC - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_RC - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_RC - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_RC - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_RC - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_RC - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_RC - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_RC - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_RC - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_RC - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_RC - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds_RC - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_RC - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_RC - -# ### END LIBTOOL TAG CONFIG: RC -_LT_EOF - - ;; - - esac -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - diff --git a/Externals/libusbx/configure.ac b/Externals/libusbx/configure.ac deleted file mode 100644 index 6d6b35d6e..000000000 --- a/Externals/libusbx/configure.ac +++ /dev/null @@ -1,249 +0,0 @@ -dnl These m4 macros are whitespace sensitive and break if moved around much. -m4_define([LU_VERSION_H], m4_include([libusb/version.h])) -m4_define([LU_DEFINE_VERSION_ATOM], - [m4_define([$1], m4_bregexp(LU_VERSION_H, - [^#define\s*$1\s*\([0-9]*\).*], [\1]))]) -m4_define([LU_DEFINE_VERSION_RC_ATOM], - [m4_define([$1], m4_bregexp(LU_VERSION_H, - [^#define\s*$1\s*"\(-rc[0-9]*\)".*], [\1]))]) -dnl The m4_bregexp() returns (only) the numbers following the #define named -dnl in the first macro parameter. m4_define() then defines the name for use -dnl in AC_INIT. - -LU_DEFINE_VERSION_ATOM([LIBUSB_MAJOR]) -LU_DEFINE_VERSION_ATOM([LIBUSB_MINOR]) -LU_DEFINE_VERSION_ATOM([LIBUSB_MICRO]) -LU_DEFINE_VERSION_RC_ATOM([LIBUSB_RC]) - -AC_INIT([libusbx],[LIBUSB_MAJOR[.]LIBUSB_MINOR[.]LIBUSB_MICRO[]LIBUSB_RC],[libusbx-devel@lists.sourceforge.net],[libusbx],[http://libusbx.org]) - -# Library versioning -# These numbers should be tweaked on every release. Read carefully: -# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -# http://sourceware.org/autobook/autobook/autobook_91.html -lt_current="1" -lt_revision="0" -lt_age="1" -LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" - -AM_INIT_AUTOMAKE -AM_MAINTAINER_MODE - -AC_CONFIG_SRCDIR([libusb/core.c]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADERS([config.h]) -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AC_PREREQ([2.50]) -AC_PROG_CC -LT_INIT -LT_LANG([Windows Resource]) -AC_C_INLINE -AM_PROG_CC_C_O -AC_DEFINE([_GNU_SOURCE], 1, [Use GNU extensions]) - -LTLDFLAGS="${LTLDFLAGS} -no-undefined" - -AC_MSG_CHECKING([operating system]) - -case $host in -*-linux*) - AC_MSG_RESULT([Linux]) - backend="linux" - threads="posix" - ;; -*-darwin*) - AC_MSG_RESULT([Darwin/Mac OS X]) - backend="darwin" - threads="posix" - ;; -*-openbsd*) - AC_MSG_RESULT([OpenBSD]) - backend="bsd" - threads="posix" - ;; -*-netbsd*) - AC_MSG_RESULT([NetBSD (using OpenBSD backend)]) - backend="bsd" - threads="posix" - ;; -*-mingw*) - AC_MSG_RESULT([Windows]) - backend="windows" - threads="windows" - create_import_lib="yes" - AM_CFLAGS="${AM_CFLAGS} -fno-omit-frame-pointer" - ;; -*-cygwin*) - AC_MSG_RESULT([Cygwin (using Windows backend)]) - backend="windows" - threads="posix" - ;; -*) - AC_MSG_ERROR([unsupported operating system]) -esac - -case $backend in -linux) - AC_DEFINE(OS_LINUX, 1, [Linux backend]) - AC_SUBST(OS_LINUX) - AC_SEARCH_LIBS(clock_gettime, rt, [], [], -pthread) - AC_ARG_ENABLE([udev], - [AC_HELP_STRING([--enable-udev], [use udev for device enumeration and hotplug support (recommended, default: yes)])], - [], [enable_udev="yes"]) - if test "x$enable_udev" = "xyes" ; then - # system has udev. use it or fail! - AC_CHECK_HEADERS([libudev.h],[],[AC_ERROR(["udev support requested but libudev not installed"])]) - AC_CHECK_LIB([udev], [udev_new], [], [AC_ERROR(["udev support requested but libudev not installed"])]) - AC_DEFINE(USE_UDEV, 1, [Use udev for device enumeration/hotplug]) - else - AC_CHECK_HEADERS([linux/netlink.h linux/filter.h], [], [AC_ERROR(["Linux netlink headers not found"])]) - fi - AC_SUBST(USE_UDEV) - THREAD_CFLAGS="-pthread" - LIBS="${LIBS} -pthread" - AC_CHECK_HEADERS([poll.h]) - AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument]) - ;; -darwin) - AC_DEFINE(OS_DARWIN, 1, [Darwin backend]) - AC_SUBST(OS_DARWIN) - LIBS="-lobjc -Wl,-framework,IOKit -Wl,-framework,CoreFoundation" - LTLDFLAGS="${LTLDFLAGS} -Wl,-prebind" - AC_CHECK_HEADERS([poll.h]) - AC_CHECK_TYPE([nfds_t], - [AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])], - [AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[type of second poll() argument])], - [#include ]) - ;; -bsd) - AC_DEFINE(OS_OPENBSD, 1, [OpenBSD/NetBSD backend]) - AC_SUBST(OS_OPENBSD) - THREAD_CFLAGS="-pthread" - LIBS="-pthread" - AC_CHECK_HEADERS([poll.h]) - AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument]) - ;; -windows) - AC_DEFINE(OS_WINDOWS, 1, [Windows backend]) - AC_SUBST(OS_WINDOWS) - LIBS="" - LTLDFLAGS="${LTLDFLAGS} -avoid-version -Wl,--add-stdcall-alias" - AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[type of second poll() argument]) - ;; -esac - -AC_SUBST(LIBS) - -AM_CONDITIONAL(OS_LINUX, test "x$backend" = xlinux) -AM_CONDITIONAL(OS_DARWIN, test "x$backend" = xdarwin) -AM_CONDITIONAL(OS_OPENBSD, test "x$backend" = xbsd) -AM_CONDITIONAL(OS_WINDOWS, test "x$backend" = xwindows) -AM_CONDITIONAL(THREADS_POSIX, test "x$threads" = xposix) -AM_CONDITIONAL(CREATE_IMPORT_LIB, test "x$create_import_lib" = "xyes") -AM_CONDITIONAL(USE_UDEV, test "x$enable_udev" = xyes) -if test "$threads" = posix; then - AC_DEFINE(THREADS_POSIX, 1, [Use POSIX Threads]) -fi - -# timerfd -AC_CHECK_HEADER([sys/timerfd.h], [timerfd_h=1], [timerfd_h=0]) -AC_ARG_ENABLE([timerfd], - [AS_HELP_STRING([--enable-timerfd], - [use timerfd for timing (default auto)])], - [use_timerfd=$enableval], [use_timerfd='auto']) - -if test "x$use_timerfd" = "xyes" -a "x$timerfd_h" = "x0"; then - AC_MSG_ERROR([timerfd header not available; glibc 2.9+ required]) -fi - -AC_CHECK_DECL([TFD_NONBLOCK], [tfd_hdr_ok=yes], [tfd_hdr_ok=no], [#include ]) -if test "x$use_timerfd" = "xyes" -a "x$tfd_hdr_ok" = "xno"; then - AC_MSG_ERROR([timerfd header not usable; glibc 2.9+ required]) -fi - -AC_MSG_CHECKING([whether to use timerfd for timing]) -if test "x$use_timerfd" = "xno"; then - AC_MSG_RESULT([no (disabled by user)]) -else - if test "x$timerfd_h" = "x1" -a "x$tfd_hdr_ok" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(USBI_TIMERFD_AVAILABLE, 1, [timerfd headers available]) - else - AC_MSG_RESULT([no (header not available)]) - fi -fi - -AC_CHECK_TYPES(struct timespec) - -# Message logging -AC_ARG_ENABLE([log], [AS_HELP_STRING([--disable-log], [disable all logging])], - [log_enabled=$enableval], - [log_enabled='yes']) -if test "x$log_enabled" != "xno"; then - AC_DEFINE([ENABLE_LOGGING], 1, [Message logging]) -fi - -AC_ARG_ENABLE([debug-log], [AS_HELP_STRING([--enable-debug-log], - [start with debug message logging enabled (default n)])], - [debug_log_enabled=$enableval], - [debug_log_enabled='no']) -if test "x$debug_log_enabled" != "xno"; then - AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Start with debug message logging enabled]) -fi - -# Examples build -AC_ARG_ENABLE([examples-build], [AS_HELP_STRING([--enable-examples-build], - [build example applications (default n)])], - [build_examples=$enableval], - [build_examples='no']) -AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$build_examples" != "xno"]) - -# Tests build -AC_ARG_ENABLE([tests-build], [AS_HELP_STRING([--enable-tests-build], - [build test applications (default n)])], - [build_tests=$enableval], - [build_tests='no']) -AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != "xno"]) - -# check for -fvisibility=hidden compiler support (GCC >= 3.4) -saved_cflags="$CFLAGS" -# -Werror required for cygwin -CFLAGS="$CFLAGS -Werror -fvisibility=hidden" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [VISIBILITY_CFLAGS="-fvisibility=hidden" - AC_DEFINE([DEFAULT_VISIBILITY], [__attribute__((visibility("default")))], [Default visibility]) ], - [ VISIBILITY_CFLAGS="" - AC_DEFINE([DEFAULT_VISIBILITY], [], [Default visibility]) ], - ]) -CFLAGS="$saved_cflags" - -# check for -Wno-pointer-sign compiler support (GCC >= 4) -saved_cflags="$CFLAGS" -CFLAGS="$CFLAGS -Wno-pointer-sign" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - nopointersign_cflags="-Wno-pointer-sign", nopointersign_cflags="") -CFLAGS="$saved_cflags" - -# sigaction not available on MinGW -AC_CHECK_FUNC([sigaction], [have_sigaction=yes], [have_sigaction=no]) -AM_CONDITIONAL([HAVE_SIGACTION], [test "x$have_sigaction" = "xyes"]) - -# headers not available on all platforms but required on others -AC_CHECK_HEADERS([sys/time.h]) -AC_CHECK_FUNCS(gettimeofday) -AC_CHECK_HEADERS([signal.h]) - -AM_CFLAGS="${AM_CFLAGS} -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow ${THREAD_CFLAGS} ${VISIBILITY_CFLAGS}" - -AC_SUBST(AM_CFLAGS) -AC_SUBST(LTLDFLAGS) - -AC_CONFIG_FILES([libusb-1.0.pc]) -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([libusb/Makefile]) -AC_CONFIG_FILES([examples/Makefile]) -AC_CONFIG_FILES([tests/Makefile]) -AC_CONFIG_FILES([doc/Makefile]) -AC_CONFIG_FILES([doc/doxygen.cfg]) -AC_OUTPUT diff --git a/Externals/libusbx/depcomp b/Externals/libusbx/depcomp deleted file mode 100644 index 06b0882dd..000000000 --- a/Externals/libusbx/depcomp +++ /dev/null @@ -1,790 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2012-10-18.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by 'PROGRAMS ARGS'. - object Object file output by 'PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -# Get the directory component of the given path, and save it in the -# global variables '$dir'. Note that this directory component will -# be either empty or ending with a '/' character. This is deliberate. -set_dir_from () -{ - case $1 in - */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; - *) dir=;; - esac -} - -# Get the suffix-stripped basename of the given path, and save it the -# global variable '$base'. -set_base_from () -{ - base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -} - -# If no dependency file was actually created by the compiler invocation, -# we still have to create a dummy depfile, to avoid errors with the -# Makefile "include basename.Plo" scheme. -make_dummy_depfile () -{ - echo "#dummy" > "$depfile" -} - -# Factor out some common post-processing of the generated depfile. -# Requires the auxiliary global variable '$tmpdepfile' to be set. -aix_post_process_depfile () -{ - # If the compiler actually managed to produce a dependency file, - # post-process it. - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependency.h'. - # Do two passes, one to just change these to - # $object: dependency.h - # and one to simply output - # dependency.h: - # which is needed to avoid the deleted-header problem. - { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" - sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" - } > "$depfile" - rm -f "$tmpdepfile" - else - make_dummy_depfile - fi -} - -# A tabulation character. -tab=' ' -# A newline character. -nl=' -' -# Character ranges might be problematic outside the C locale. -# These definitions help. -upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -lower=abcdefghijklmnopqrstuvwxyz -digits=0123456789 -alpha=${upper}${lower} - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Avoid interferences from the environment. -gccflag= dashmflag= - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp -fi - -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - -if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -## (see the conditional assignment to $gccflag above). -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). Also, it might not be -## supported by the other compilers which use the 'gcc' depmode. -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The second -e expression handles DOS-style file names with drive - # letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the "deleted header file" problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. -## Some versions of gcc put a space before the ':'. On the theory -## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ - | tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" - ;; - -xlc) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts '$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - aix_post_process_depfile - ;; - -tcc) - # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 - # FIXME: That version still under development at the moment of writing. - # Make that this statement remains true also for stable, released - # versions. - # It will wrap lines (doesn't matter whether long or short) with a - # trailing '\', as in: - # - # foo.o : \ - # foo.c \ - # foo.h \ - # - # It will put a trailing '\' even on the last line, and will use leading - # spaces rather than leading tabs (at least since its commit 0394caf7 - # "Emit spaces for -MD"). - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. - # We have to change lines of the first kind to '$object: \'. - sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" - # And for each line of the second kind, we have to emit a 'dep.h:' - # dummy dependency, to avoid the deleted-header problem. - sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - -## The order of this option in the case statement is important, since the -## shell code in configure will try each of these formats in the order -## listed in this file. A plain '-MD' option would be understood by many -## compilers, so we must ensure this comes after the gcc and icc options. -pgcc) - # Portland's C compiler understands '-MD'. - # Will always output deps to 'file.d' where file is the root name of the - # source file under compilation, even if file resides in a subdirectory. - # The object file name does not affect the name of the '.d' file. - # pgcc 10.2 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\' : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - set_dir_from "$object" - # Use the source, not the object, to determine the base name, since - # that's sadly what pgcc will do too. - set_base_from "$source" - tmpdepfile=$base.d - - # For projects that build the same source file twice into different object - # files, the pgcc approach of using the *source* file root name can cause - # problems in parallel builds. Use a locking strategy to avoid stomping on - # the same $tmpdepfile. - lockdir=$base.d-lock - trap " - echo '$0: caught signal, cleaning up...' >&2 - rmdir '$lockdir' - exit 1 - " 1 2 13 15 - numtries=100 - i=$numtries - while test $i -gt 0; do - # mkdir is a portable test-and-set. - if mkdir "$lockdir" 2>/dev/null; then - # This process acquired the lock. - "$@" -MD - stat=$? - # Release the lock. - rmdir "$lockdir" - break - else - # If the lock is being held by a different process, wait - # until the winning process is done or we timeout. - while test -d "$lockdir" && test $i -gt 0; do - sleep 1 - i=`expr $i - 1` - done - fi - i=`expr $i - 1` - done - trap - 1 2 13 15 - if test $i -le 0; then - echo "$0: failed to acquire lock after $numtries attempts" >&2 - echo "$0: check lockdir '$lockdir'" >&2 - exit 1 - fi - - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" - # Add 'dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - set_dir_from "$object" - set_base_from "$object" - - if test "$libtool" = yes; then - # Libtool generates 2 separate objects for the 2 libraries. These - # two compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir$base.o.d # libtool 1.5 - tmpdepfile2=$dir.libs/$base.o.d # Likewise. - tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - # Same post-processing that is required for AIX mode. - aix_post_process_depfile - ;; - -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/'"$tab"'\1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/'"$tab"'/ - G - p -}' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for ':' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. - "$@" $dashmflag | - sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this sed invocation - # correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no eat=no - for arg - do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - if test $eat = yes; then - eat=no - continue - fi - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix=`echo "$object" | sed 's/^.*\././'` - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process the last invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed '1,2d' "$tmpdepfile" \ - | tr ' ' "$nl" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E \ - | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - | sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - IFS=" " - for arg - do - case "$arg" in - -o) - shift - ;; - $object) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" - echo "$tab" >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Externals/libusbx/install-sh b/Externals/libusbx/install-sh deleted file mode 100644 index 377bb8687..000000000 --- a/Externals/libusbx/install-sh +++ /dev/null @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-11-20.07; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Externals/libusbx/libusb-1.0.pc.in b/Externals/libusbx/libusb-1.0.pc.in deleted file mode 100644 index 7bc33c121..000000000 --- a/Externals/libusbx/libusb-1.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libusbx-1.0 -Description: C API for USB device access from Linux, Mac OS X, Windows and OpenBSD/NetBSD userspace -Version: @VERSION@ -Libs: -L${libdir} -lusb-1.0 -Libs.private: @LIBS@ -Cflags: -I${includedir}/libusb-1.0 diff --git a/Externals/libusbx/libusb/version_nano.h b/Externals/libusbx/libusb/version_nano.h deleted file mode 100644 index 525cd7d52..000000000 --- a/Externals/libusbx/libusb/version_nano.h +++ /dev/null @@ -1 +0,0 @@ -#define LIBUSB_NANO 10774 diff --git a/Externals/libusbx/ltmain.sh b/Externals/libusbx/ltmain.sh deleted file mode 100644 index 63ae69dc6..000000000 --- a/Externals/libusbx/ltmain.sh +++ /dev/null @@ -1,9655 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . - -PROGRAM=libtool -PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# func_enable_tag tagname -# Verify that TAGNAME is valid, and either flag an error and exit, or -# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -# variable here. -func_enable_tag () -{ - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; - *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" - libobj="$func_basename_result" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $ECHO "Try \`$progname --help' for more information about other modes." -} - -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff --git a/Externals/libusbx/m4/libtool.m4 b/Externals/libusbx/m4/libtool.m4 deleted file mode 100644 index 56666f0ec..000000000 --- a/Externals/libusbx/m4/libtool.m4 +++ /dev/null @@ -1,7986 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - -## ------------------------------------- ## -## Accumulate code for creating libtool. ## -## ------------------------------------- ## - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - -## ------------------------ ## -## FIXME: Eliminate VARNAME ## -## ------------------------ ## - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -_LT_OUTPUT_LIBTOOL_INIT -]) - -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) - -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_REPLACE_SHELLFNS - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac - - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/Externals/libusbx/m4/ltoptions.m4 b/Externals/libusbx/m4/ltoptions.m4 deleted file mode 100644 index 5d9acd8e2..000000000 --- a/Externals/libusbx/m4/ltoptions.m4 +++ /dev/null @@ -1,384 +0,0 @@ -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 7 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - -## --------------------------------- ## -## Macros to handle LT_INIT options. ## -## --------------------------------- ## - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - -## ----------------- ## -## LTDL_INIT Options ## -## ----------------- ## - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/Externals/libusbx/m4/ltsugar.m4 b/Externals/libusbx/m4/ltsugar.m4 deleted file mode 100644 index 9000a057d..000000000 --- a/Externals/libusbx/m4/ltsugar.m4 +++ /dev/null @@ -1,123 +0,0 @@ -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) diff --git a/Externals/libusbx/m4/ltversion.m4 b/Externals/libusbx/m4/ltversion.m4 deleted file mode 100644 index 07a8602d4..000000000 --- a/Externals/libusbx/m4/ltversion.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# @configure_input@ - -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) diff --git a/Externals/libusbx/m4/lt~obsolete.m4 b/Externals/libusbx/m4/lt~obsolete.m4 deleted file mode 100644 index c573da90c..000000000 --- a/Externals/libusbx/m4/lt~obsolete.m4 +++ /dev/null @@ -1,98 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 5 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/Externals/libusbx/missing b/Externals/libusbx/missing deleted file mode 100644 index cdea51493..000000000 --- a/Externals/libusbx/missing +++ /dev/null @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2012-06-26.16; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java b/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java index 779feee70..83960433e 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java @@ -45,7 +45,6 @@ public final class AssetCopyService extends IntentService if(!file.exists()) { NativeLibrary.CreateUserFolders(); - copyAsset("Dolphin.ini", ConfigDir + File.separator + "Dolphin.ini"); copyAsset("dsp_coef.bin", GCDir + File.separator + "dsp_coef.bin"); copyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); copyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index 1cfeb5cba..da46daecc 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -10,6 +10,7 @@ import org.dolphinemu.dolphinemu.NativeLibrary; import android.content.Context; import android.content.SharedPreferences; +import android.os.Build; import android.preference.PreferenceManager; /** @@ -39,11 +40,15 @@ public final class UserPreferences SharedPreferences.Editor editor = prefs.edit(); // Add the settings. - editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3")); + if (Build.CPU_ABI.contains("arm64")) + editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "4")); + else + editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3")); + editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True")); editor.putBoolean("fastmemPref", getConfig("Dolphin.ini", "Core", "Fastmem", "False").equals("True")); - editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer")); + editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL")); editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True")); editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True")); @@ -56,7 +61,7 @@ public final class UserPreferences editor.putBoolean("forceTextureFiltering", getConfig("gfx_opengl.ini", "Enhancements", "ForceFiltering", "False").equals("True")); editor.putBoolean("disableFog", getConfig("gfx_opengl.ini", "Settings", "DisableFog", "False").equals("True")); editor.putBoolean("skipEFBAccess", getConfig("gfx_opengl.ini", "Hacks", "EFBAccessEnable", "False").equals("True")); - editor.putBoolean("ignoreFormatChanges", getConfig("gfx_opengl.ini", "Hacks", "EFBEmulateFormatChanges", "False").equals("False")); + editor.putBoolean("ignoreFormatChanges", getConfig("gfx_opengl.ini", "Hacks", "EFBEmulateFormatChanges", "False").equals("True")); editor.putString("stereoscopyMode", getConfig("gfx_opengl.ini", "Enhancements", "StereoMode", "0")); editor.putBoolean("stereoSwapEyes", getConfig("gfx_opengl.ini", "Enhancements", "StereoSwapEyes", "False").equals("True")); editor.putString("stereoDepth", getConfig("gfx_opengl.ini", "Enhancements", "StereoDepth", "20")); diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 6c962873a..267ceff2b 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1,11 +1,56 @@ +set(CMAKE_FAKELANG_CREATE_STATIC_LIBRARY "touch ") +if(ENABLE_PCH) + # This is actually a .h file, but trick cmake into compiling it as a source file + set(pch_out_filename "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/pch.dir/pch.h") + if (ANDROID) + set(pch_lib_filename "${LIBRARY_OUTPUT_PATH}/libpch.a") + else() + set(pch_lib_filename "${CMAKE_CURRENT_BINARY_DIR}/libpch.a") + endif() + set(pch_src_filename "${CMAKE_CURRENT_SOURCE_DIR}/PCH/pch.h") + + if(APPLE) + set(type objective-c++-header) + else() + set(type c++-header) + endif() + + set_source_files_properties( + PCH/pch.h PROPERTIES + COMPILE_FLAGS "-x ${type}" + HEADER_FILE_ONLY 0 + LANGUAGE CXX) + + add_library(pch STATIC PCH/pch.h) + + add_custom_command( + TARGET pch + PRE_LINK + COMMAND ln -fs "${pch_out_filename}.o" "${pch_out_filename}.gch" + COMMAND ln -fs "${pch_out_filename}.o" "${pch_out_filename}.pch" + COMMAND cp "${pch_src_filename}" "${pch_out_filename}") + + set_target_properties( + pch PROPERTIES + LINKER_LANGUAGE FAKELANG) +endif(ENABLE_PCH) +macro(add_dolphin_library lib srcs libs) + add_library(${lib} STATIC ${srcs}) + target_link_libraries(${lib} ${libs}) + if(ENABLE_PCH) + add_dependencies(${lib} pch) + set_source_files_properties( + ${srcs} PROPERTIES + COMPILE_FLAGS "-include '${pch_out_filename}'" + OBJECT_DEPENDS "${pch_lib_filename}") + endif(ENABLE_PCH) +endmacro(add_dolphin_library) + add_subdirectory(Core) +add_subdirectory(UnitTests) if (DSPTOOL) add_subdirectory(DSPTool) endif() -if (UNITTESTS) - add_subdirectory(UnitTests) -endif() - -# TODO: Add DSPSpy and TestSuite. Preferrably make them option()s and cpack components +# TODO: Add DSPSpy. Preferrably make it option() and cpack component diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index d8c315016..b8a7ee78a 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -188,7 +188,7 @@ static u32 LoadStoreExcEnc[][5] = { void ARM64XEmitter::EncodeCompareBranchInst(u32 op, ARM64Reg Rt, const void* ptr) { bool b64Bit = Is64Bit(Rt); - s64 distance = (s64)ptr - (s64(m_code) + 8); + s64 distance = (s64)ptr - (s64)m_code; _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", __FUNCTION__, distance); @@ -198,13 +198,13 @@ void ARM64XEmitter::EncodeCompareBranchInst(u32 op, ARM64Reg Rt, const void* ptr Rt = DecodeReg(Rt); Write32((b64Bit << 31) | (0x34 << 24) | (op << 24) | \ - (distance << 5) | Rt); + (((u32)distance << 5) & 0xFFFFE0) | Rt); } void ARM64XEmitter::EncodeTestBranchInst(u32 op, ARM64Reg Rt, u8 bits, const void* ptr) { bool b64Bit = Is64Bit(Rt); - s64 distance = (s64)ptr - (s64(m_code) + 8); + s64 distance = (s64)ptr - (s64)m_code; _assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", __FUNCTION__, distance); @@ -414,7 +414,7 @@ void ARM64XEmitter::EncodeLoadStoreIndexedInst(u32 op, u32 op2, ARM64Reg Rt, ARM u32 offset = imm & 0x1FF; - _assert_msg_(DYNA_REC, imm < -256 || imm > 255, "%s: offset too large %d", __FUNCTION__, imm); + _assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s: offset too large %d", __FUNCTION__, imm); Rt = DecodeReg(Rt); Rn = DecodeReg(Rn); @@ -433,7 +433,7 @@ void ARM64XEmitter::EncodeLoadStoreIndexedInst(u32 op, ARM64Reg Rt, ARM64Reg Rn, else if (size == 16) imm >>= 1; - _assert_msg_(DYNA_REC, imm < 0, "%s(INDEX_UNSIGNED): offset must be positive", __FUNCTION__); + _assert_msg_(DYNA_REC, imm >= 0, "%s(INDEX_UNSIGNED): offset must be positive %d", __FUNCTION__, imm); _assert_msg_(DYNA_REC, !(imm & ~0xFFF), "%s(INDEX_UNSIGNED): offset too large %d", __FUNCTION__, imm); Rt = DecodeReg(Rt); @@ -540,6 +540,15 @@ void ARM64XEmitter::EncodeAddressInst(u32 op, ARM64Reg Rd, s32 imm) ((imm & 0x1FFFFC) << 3) | Rd); } +void ARM64XEmitter::EncodeLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + _assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s received too large offset: %d", __FUNCTION__, imm); + Rt = DecodeReg(Rt); + Rn = DecodeReg(Rn); + + Write32((size << 30) | (0b111 << 27) | (op << 22) | ((imm & 0x1FF) << 12) | (Rn << 5) | Rt); +} + // FixupBranch branching void ARM64XEmitter::SetJumpTarget(FixupBranch const& branch) { @@ -557,7 +566,7 @@ void ARM64XEmitter::SetJumpTarget(FixupBranch const& branch) _assert_msg_(DYNA_REC, distance >= -0xFFFFF && distance < 0xFFFFF, "%s(%d): Received too large distance: %lx", __FUNCTION__, branch.type, distance); bool b64Bit = Is64Bit(branch.reg); ARM64Reg reg = DecodeReg(branch.reg); - inst = (b64Bit << 31) | (0x1A << 25) | (Not << 24) | (distance << 5) | reg; + inst = (b64Bit << 31) | (0x1A << 25) | (Not << 24) | ((distance << 5) & 0xFFFFE0) | reg; } break; case 2: // B (conditional) @@ -1006,6 +1015,10 @@ void ARM64XEmitter::SMADDL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra) { EncodeData3SrcInst(2, Rd, Rn, Rm, Ra); } +void ARM64XEmitter::SMULL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) +{ + SMADDL(Rd, Rn, Rm, SP); +} void ARM64XEmitter::SMSUBL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra) { EncodeData3SrcInst(3, Rd, Rn, Rm, Ra); @@ -1420,6 +1433,45 @@ void ARM64XEmitter::PRFM(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm) EncodeLoadStoreRegisterOffset(3, 2, Rt, Rn, Rm); } +// Load/Store register (unscaled offset) +void ARM64XEmitter::STURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(0, 0, Rt, Rn, imm); +} +void ARM64XEmitter::LDURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(0, 1, Rt, Rn, imm); +} +void ARM64XEmitter::LDURSB(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(0, Is64Bit(Rt) ? 2 : 3, Rt, Rn, imm); +} +void ARM64XEmitter::STURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(1, 0, Rt, Rn, imm); +} +void ARM64XEmitter::LDURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(1, 1, Rt, Rn, imm); +} +void ARM64XEmitter::LDURSH(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(1, Is64Bit(Rt) ? 2 : 3, Rt, Rn, imm); +} +void ARM64XEmitter::STUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(Is64Bit(Rt) ? 3 : 2, 0, Rt, Rn, imm); +} +void ARM64XEmitter::LDUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + EncodeLoadStoreUnscaled(Is64Bit(Rt) ? 3 : 2, 1, Rt, Rn, imm); +} +void ARM64XEmitter::LDURSW(ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + _assert_msg_(DYNA_REC, !Is64Bit(Rt), "%s must have a 64bit destination register!", __FUNCTION__); + EncodeLoadStoreUnscaled(2, 2, Rt, Rn, imm); +} + // Address of label/page PC-relative void ARM64XEmitter::ADR(ARM64Reg Rd, s32 imm) { @@ -1437,9 +1489,6 @@ void ARM64XEmitter::MOVI2R(ARM64Reg Rd, u64 imm, bool optimize) BitSet32 upload_part(0); bool need_movz = false; - if (!Is64Bit(Rd)) - _assert_msg_(DYNA_REC, !(imm >> 32), "%s: immediate doesn't fit in 32bit register: %lx", __FUNCTION__, imm); - if (!imm) { // Zero immediate, just clear the register @@ -1640,8 +1689,8 @@ void ARM64FloatEmitter::EmitLoadStoreImmediate(u8 size, u32 opc, IndexType type, if (type == INDEX_UNSIGNED) { - _assert_msg_(DYNA_REC, imm & (size - 1), "%s(INDEX_UNSIGNED) immediate offset must be aligned to size!", __FUNCTION__); - _assert_msg_(DYNA_REC, imm < 0, "%s(INDEX_UNSIGNED) immediate offset must be positive!", __FUNCTION__); + _assert_msg_(DYNA_REC, !(imm & ((size - 1) >> 3)), "%s(INDEX_UNSIGNED) immediate offset must be aligned to size!", __FUNCTION__); + _assert_msg_(DYNA_REC, imm >= 0, "%s(INDEX_UNSIGNED) immediate offset must be positive!", __FUNCTION__); if (size == 16) imm >>= 1; else if (size == 32) @@ -1654,7 +1703,7 @@ void ARM64FloatEmitter::EmitLoadStoreImmediate(u8 size, u32 opc, IndexType type, } else { - _assert_msg_(DYNA_REC, imm < -256 || imm > 255, "%s immediate offset must be within range of -256 to 256!", __FUNCTION__); + _assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s immediate offset must be within range of -256 to 256!", __FUNCTION__); encoded_imm = (imm & 0x1FF) << 2; if (type == INDEX_POST) encoded_imm |= 1; @@ -1668,7 +1717,7 @@ void ARM64FloatEmitter::EmitLoadStoreImmediate(u8 size, u32 opc, IndexType type, void ARM64FloatEmitter::Emit2Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { - _assert_msg_(DYNA_REC, IsQuad(Rd), "%s only supports double and single registers!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsQuad(Rd), "%s only supports double and single registers!", __FUNCTION__); Rd = DecodeReg(Rd); Rn = DecodeReg(Rn); Rm = DecodeReg(Rm); @@ -1679,7 +1728,7 @@ void ARM64FloatEmitter::Emit2Source(bool M, bool S, u32 type, u32 opcode, ARM64R void ARM64FloatEmitter::EmitThreeSame(bool U, u32 size, u32 opcode, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { - _assert_msg_(DYNA_REC, IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__); bool quad = IsQuad(Rd); Rd = DecodeReg(Rd); Rn = DecodeReg(Rn); @@ -1700,7 +1749,7 @@ void ARM64FloatEmitter::EmitCopy(bool Q, u32 op, u32 imm5, u32 imm4, ARM64Reg Rd void ARM64FloatEmitter::Emit2RegMisc(bool U, u32 size, u32 opcode, ARM64Reg Rd, ARM64Reg Rn) { - _assert_msg_(DYNA_REC, IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__); bool quad = IsQuad(Rd); Rd = DecodeReg(Rd); Rn = DecodeReg(Rn); @@ -1711,7 +1760,7 @@ void ARM64FloatEmitter::Emit2RegMisc(bool U, u32 size, u32 opcode, ARM64Reg Rd, void ARM64FloatEmitter::EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, bool S, u32 size, ARM64Reg Rt, ARM64Reg Rn) { - _assert_msg_(DYNA_REC, IsSingle(Rt), "%s doesn't support singles!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsSingle(Rt), "%s doesn't support singles!", __FUNCTION__); bool quad = IsQuad(Rt); Rt = DecodeReg(Rt); Rn = DecodeReg(Rn); @@ -1722,7 +1771,7 @@ void ARM64FloatEmitter::EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, void ARM64FloatEmitter::EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, bool S, u32 size, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm) { - _assert_msg_(DYNA_REC, IsSingle(Rt), "%s doesn't support singles!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsSingle(Rt), "%s doesn't support singles!", __FUNCTION__); bool quad = IsQuad(Rt); Rt = DecodeReg(Rt); Rn = DecodeReg(Rn); @@ -1734,7 +1783,7 @@ void ARM64FloatEmitter::EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, void ARM64FloatEmitter::Emit1Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn) { - _assert_msg_(DYNA_REC, IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); Rd = DecodeReg(Rd); Rn = DecodeReg(Rn); @@ -1744,7 +1793,7 @@ void ARM64FloatEmitter::Emit1Source(bool M, bool S, u32 type, u32 opcode, ARM64R void ARM64FloatEmitter::EmitConversion(bool sf, bool S, u32 type, u32 rmode, u32 opcode, ARM64Reg Rd, ARM64Reg Rn) { - _assert_msg_(DYNA_REC, !(Rn <= SP), "%s only supports GPR as source!", __FUNCTION__); + _assert_msg_(DYNA_REC, Rn <= SP, "%s only supports GPR as source!", __FUNCTION__); Rd = DecodeReg(Rd); Rn = DecodeReg(Rn); @@ -1754,7 +1803,7 @@ void ARM64FloatEmitter::EmitConversion(bool sf, bool S, u32 type, u32 rmode, u32 void ARM64FloatEmitter::EmitCompare(bool M, bool S, u32 op, u32 opcode2, ARM64Reg Rn, ARM64Reg Rm) { - _assert_msg_(DYNA_REC, IsQuad(Rn), "%s doesn't support vector!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsQuad(Rn), "%s doesn't support vector!", __FUNCTION__); bool is_double = IsDouble(Rn); Rn = DecodeReg(Rn); @@ -1766,7 +1815,7 @@ void ARM64FloatEmitter::EmitCompare(bool M, bool S, u32 op, u32 opcode2, ARM64Re void ARM64FloatEmitter::EmitCondSelect(bool M, bool S, CCFlags cond, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { - _assert_msg_(DYNA_REC, IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); bool is_double = IsDouble(Rd); Rd = DecodeReg(Rd); @@ -1779,7 +1828,7 @@ void ARM64FloatEmitter::EmitCondSelect(bool M, bool S, CCFlags cond, ARM64Reg Rd void ARM64FloatEmitter::EmitPermute(u32 size, u32 op, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { - _assert_msg_(DYNA_REC, IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__); bool quad = IsQuad(Rd); @@ -1801,7 +1850,7 @@ void ARM64FloatEmitter::EmitPermute(u32 size, u32 op, ARM64Reg Rd, ARM64Reg Rn, void ARM64FloatEmitter::EmitScalarImm(bool M, bool S, u32 type, u32 imm5, ARM64Reg Rd, u32 imm) { - _assert_msg_(DYNA_REC, IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); bool is_double = !IsSingle(Rd); @@ -1815,7 +1864,7 @@ void ARM64FloatEmitter::EmitShiftImm(bool U, u32 immh, u32 immb, u32 opcode, ARM { bool quad = IsQuad(Rd); - _assert_msg_(DYNA_REC, !immh, "%s bad encoding! Can't have zero immh", __FUNCTION__); + _assert_msg_(DYNA_REC, immh, "%s bad encoding! Can't have zero immh", __FUNCTION__); Rd = DecodeReg(Rd); Rn = DecodeReg(Rn); @@ -1844,7 +1893,7 @@ void ARM64FloatEmitter::EmitLoadStoreMultipleStructure(u32 size, bool L, u32 opc void ARM64FloatEmitter::EmitScalar1Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn) { - _assert_msg_(DYNA_REC, IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); + _assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__); Rd = DecodeReg(Rd); Rn = DecodeReg(Rn); @@ -1853,6 +1902,27 @@ void ARM64FloatEmitter::EmitScalar1Source(bool M, bool S, u32 type, u32 opcode, (opcode << 15) | (1 << 14) | (Rn << 5) | Rd); } +void ARM64FloatEmitter::EmitVectorxElement(bool U, u32 size, bool L, u32 opcode, bool H, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) +{ + bool quad = IsQuad(Rd); + + Rd = DecodeReg(Rd); + Rn = DecodeReg(Rn); + Rm = DecodeReg(Rm); + + Write32((quad << 30) | (U << 29) | (0b01111 << 24) | (size << 22) | (L << 21) | \ + (Rm << 16) | (opcode << 12) | (H << 11) | (Rn << 5) | Rd); +} + +void ARM64FloatEmitter::EmitLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + _assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s received too large offset: %d", __FUNCTION__, imm); + Rt = DecodeReg(Rt); + Rn = DecodeReg(Rn); + + Write32((size << 30) | (0b1111 << 26) | (op << 22) | ((imm & 0x1FF) << 12) | (Rn << 5) | Rt); +} + void ARM64FloatEmitter::LDR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm) { EmitLoadStoreImmediate(size, 1, type, Rt, Rn, imm); @@ -1862,6 +1932,75 @@ void ARM64FloatEmitter::STR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s EmitLoadStoreImmediate(size, 0, type, Rt, Rn, imm); } +// Loadstore unscaled +void ARM64FloatEmitter::LDUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + u32 encoded_size = 0; + u32 encoded_op = 0; + + if (size == 8) + { + encoded_size = 0; + encoded_op = 1; + } + else if (size == 16) + { + encoded_size = 1; + encoded_op = 1; + } + else if (size == 32) + { + encoded_size = 2; + encoded_op = 1; + } + else if (size == 64) + { + encoded_size = 3; + encoded_op = 1; + } + else if (size == 128) + { + encoded_size = 0; + encoded_op = 3; + } + + EmitLoadStoreUnscaled(encoded_size, encoded_op, Rt, Rn, imm); +} +void ARM64FloatEmitter::STUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm) +{ + u32 encoded_size = 0; + u32 encoded_op = 0; + + if (size == 8) + { + encoded_size = 0; + encoded_op = 0; + } + else if (size == 16) + { + encoded_size = 1; + encoded_op = 0; + } + else if (size == 32) + { + encoded_size = 2; + encoded_op = 0; + } + else if (size == 64) + { + encoded_size = 3; + encoded_op = 0; + } + else if (size == 128) + { + encoded_size = 0; + encoded_op = 2; + } + + EmitLoadStoreUnscaled(encoded_size, encoded_op, Rt, Rn, imm); + +} + // Loadstore single structure void ARM64FloatEmitter::LD1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn) { @@ -2083,7 +2222,7 @@ void ARM64FloatEmitter::ST1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn, ARM64Re // Loadstore multiple structure void ARM64FloatEmitter::LD1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn) { - _assert_msg_(DYNA_REC, count == 0 || count > 4, "%s must have a count of 1 to 4 registers!", __FUNCTION__); + _assert_msg_(DYNA_REC, !(count == 0 || count > 4), "%s must have a count of 1 to 4 registers!", __FUNCTION__); u32 opcode = 0; if (count == 1) opcode = 0b111; @@ -2095,6 +2234,21 @@ void ARM64FloatEmitter::LD1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn) opcode = 0b0010; EmitLoadStoreMultipleStructure(size, 1, opcode, Rt, Rn); } +void ARM64FloatEmitter::ST1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn) +{ + _assert_msg_(DYNA_REC, !(count == 0 || count > 4), "%s must have a count of 1 to 4 registers!", __FUNCTION__); + u32 opcode = 0; + if (count == 1) + opcode = 0b111; + else if (count == 2) + opcode = 0b1010; + else if (count == 3) + opcode = 0b0110; + else if (count == 4) + opcode = 0b0010; + EmitLoadStoreMultipleStructure(size, 0, opcode, Rt, Rn); +} + // Scalar - 1 Source void ARM64FloatEmitter::FABS(ARM64Reg Rd, ARM64Reg Rn) { @@ -2317,8 +2471,8 @@ void ARM64FloatEmitter::INS(u8 size, ARM64Reg Rd, u8 index1, ARM64Reg Rn, u8 ind void ARM64FloatEmitter::UMOV(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index) { bool b64Bit = Is64Bit(Rd); - _assert_msg_(DYNA_REC, Rd > SP, "%s destination must be a GPR!", __FUNCTION__); - _assert_msg_(DYNA_REC, b64Bit && size != 64, "%s must have a size of 64 when destination is 64bit!", __FUNCTION__); + _assert_msg_(DYNA_REC, Rd < SP, "%s destination must be a GPR!", __FUNCTION__); + _assert_msg_(DYNA_REC, !(b64Bit && size != 64), "%s must have a size of 64 when destination is 64bit!", __FUNCTION__); u32 imm5 = 0; if (size == 8) @@ -2347,8 +2501,8 @@ void ARM64FloatEmitter::UMOV(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index) void ARM64FloatEmitter::SMOV(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index) { bool b64Bit = Is64Bit(Rd); - _assert_msg_(DYNA_REC, Rd > SP, "%s destination must be a GPR!", __FUNCTION__); - _assert_msg_(DYNA_REC, size == 64, "%s doesn't support 64bit destination. Use UMOV!", __FUNCTION__); + _assert_msg_(DYNA_REC, Rd < SP, "%s destination must be a GPR!", __FUNCTION__); + _assert_msg_(DYNA_REC, size != 64, "%s doesn't support 64bit destination. Use UMOV!", __FUNCTION__); u32 imm5 = 0; if (size == 8) @@ -2513,7 +2667,7 @@ void ARM64FloatEmitter::ZIP2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) // Shift by immediate void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) { - _assert_msg_(DYNA_REC, shift >= src_size, "%s shift amount must less than the element size!", __FUNCTION__); + _assert_msg_(DYNA_REC, shift < src_size, "%s shift amount must less than the element size!", __FUNCTION__); u32 immh = 0; u32 immb = shift & 0xFFF; @@ -2534,7 +2688,7 @@ void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) void ARM64FloatEmitter::USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) { - _assert_msg_(DYNA_REC, shift >= src_size, "%s shift amount must less than the element size!", __FUNCTION__); + _assert_msg_(DYNA_REC, shift < src_size, "%s shift amount must less than the element size!", __FUNCTION__); u32 immh = 0; u32 immb = shift & 0xFFF; @@ -2555,7 +2709,7 @@ void ARM64FloatEmitter::USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) void ARM64FloatEmitter::SHRN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift) { - _assert_msg_(DYNA_REC, shift >= dest_size, "%s shift amount must less than the element size!", __FUNCTION__); + _assert_msg_(DYNA_REC, shift < dest_size, "%s shift amount must less than the element size!", __FUNCTION__); u32 immh = 0; u32 immb = shift & 0xFFF; @@ -2584,6 +2738,27 @@ void ARM64FloatEmitter::UXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn) USHLL(src_size, Rd, Rn, 0); } +// vector x indexed element +void ARM64FloatEmitter::FMUL(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u8 index) +{ + _assert_msg_(DYNA_REC, size == 32 || size == 64, "%s only supports 32bit or 64bit size!", __FUNCTION__); + + bool L = false; + bool H = false; + + if (size == 32) + { + L = index & 1; + H = (index >> 1) & 1; + } + else if (size == 64) + { + H = index == 1; + } + + EmitVectorxElement(0, 2 | (size >> 6), L, 0b1001, H, Rd, Rn, Rm); +} + void ARM64FloatEmitter::ABI_PushRegisters(BitSet32 registers) { for (auto it : registers) diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h index a7c65e413..bb3bf770c 100644 --- a/Source/Core/Common/Arm64Emitter.h +++ b/Source/Core/Common/Arm64Emitter.h @@ -4,6 +4,8 @@ #pragma once +#include + #include "Common/ArmCommon.h" #include "Common/BitSet.h" #include "Common/CodeBlock.h" @@ -76,8 +78,8 @@ enum ARM64Reg }; inline bool Is64Bit(ARM64Reg reg) { return reg & 0x20; } -inline bool IsSingle(ARM64Reg reg) { return reg & 0x40; } -inline bool IsDouble(ARM64Reg reg) { return reg & 0x80; } +inline bool IsSingle(ARM64Reg reg) { return (reg & 0xC0) == 0x40; } +inline bool IsDouble(ARM64Reg reg) { return (reg & 0xC0) == 0x80; } inline bool IsQuad(ARM64Reg reg) { return (reg & 0xC0) == 0xC0; } inline bool IsVector(ARM64Reg reg) { return (reg & 0xC0) != 0; } inline ARM64Reg DecodeReg(ARM64Reg reg) { return (ARM64Reg)(reg & 0x1F); } @@ -332,6 +334,7 @@ private: void EncodeLogicalImmInst(u32 op, ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms); void EncodeLoadStorePair(u32 op, u32 load, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm); void EncodeAddressInst(u32 op, ARM64Reg Rd, s32 imm); + void EncodeLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm); protected: inline void Write32(u32 value) @@ -477,6 +480,7 @@ public: void MADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra); void MSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra); void SMADDL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra); + void SMULL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm); void SMSUBL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra); void SMULH(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm); void UMADDL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra); @@ -582,6 +586,17 @@ public: void LDRSW(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm); void PRFM(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm); + // Load/Store register (unscaled offset) + void STURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void LDURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void LDURSB(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void STURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void LDURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void LDURSH(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void STUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void LDUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void LDURSW(ARM64Reg Rt, ARM64Reg Rn, s32 imm); + // Load/Store pair void LDP(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm); void LDPSW(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm); @@ -597,6 +612,29 @@ public: // ABI related void ABI_PushRegisters(BitSet32 registers); void ABI_PopRegisters(BitSet32 registers, BitSet32 ignore_mask = BitSet32(0)); + + // Utility to generate a call to a std::function object. + // + // Unfortunately, calling operator() directly is undefined behavior in C++ + // (this method might be a thunk in the case of multi-inheritance) so we + // have to go through a trampoline function. + template + static void CallLambdaTrampoline(const std::function* f, + Args... args) + { + (*f)(args...); + } + + // This function expects you to have set up the state. + // Overwrites X0 and X30 + template + ARM64Reg ABI_SetupLambda(const std::function* f) + { + auto trampoline = &ARM64XEmitter::CallLambdaTrampoline; + MOVI2R(X30, (u64)trampoline); + MOVI2R(X0, (u64)const_cast((const void*)f)); + return X30; + } }; class ARM64FloatEmitter @@ -607,6 +645,10 @@ public: void LDR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm); void STR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm); + // Loadstore unscaled + void LDUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm); + void STUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm); + // Loadstore single structure void LD1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn); void LD1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn, ARM64Reg Rm); @@ -616,6 +658,7 @@ public: // Loadstore multiple structure void LD1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn); + void ST1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn); // Scalar - 1 Source void FABS(ARM64Reg Rd, ARM64Reg Rn); @@ -700,6 +743,9 @@ public: void SXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn); void UXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn); + // vector x indexed element + void FMUL(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u8 index); + // ABI related void ABI_PushRegisters(BitSet32 registers); void ABI_PopRegisters(BitSet32 registers, BitSet32 ignore_mask = BitSet32(0)); @@ -725,6 +771,8 @@ private: void EmitShiftImm(bool U, u32 immh, u32 immb, u32 opcode, ARM64Reg Rd, ARM64Reg Rn); void EmitLoadStoreMultipleStructure(u32 size, bool L, u32 opcode, ARM64Reg Rt, ARM64Reg Rn); void EmitScalar1Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn); + void EmitVectorxElement(bool U, u32 size, bool L, u32 opcode, bool H, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm); + void EmitLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm); }; class ARM64CodeBlock : public CodeBlock @@ -733,7 +781,7 @@ private: void PoisonMemory() override { u32* ptr = (u32*)region; - u32* maxptr = (u32*)region + region_size; + u32* maxptr = (u32*)(region + region_size); // If our memory isn't a multiple of u32 then this won't write the last remaining bytes with anything // Less than optimal, but there would be nothing we could do but throw a runtime warning anyway. // AArch64: 0xD4200000 = BRK 0 diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h index 1f9ee751b..f04232d68 100644 --- a/Source/Core/Common/ArmEmitter.h +++ b/Source/Core/Common/ArmEmitter.h @@ -689,7 +689,7 @@ private: void PoisonMemory() override { u32* ptr = (u32*)region; - u32* maxptr = (u32*)region + region_size; + u32* maxptr = (u32*)(region + region_size); // If our memory isn't a multiple of u32 then this won't write the last remaining bytes with anything // Less than optimal, but there would be nothing we could do but throw a runtime warning anyway. // ARM: 0x01200070 = BKPT 0 diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index b47e03a72..ef892997c 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -147,4 +147,4 @@ - \ No newline at end of file + diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index ff13d2af2..4440ddb14 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -72,7 +72,6 @@ - @@ -119,10 +118,8 @@ - - - + - \ No newline at end of file + diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 2f8e3cf9d..92add5a9c 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -75,6 +75,7 @@ #define WII_SYSCONF_DIR "shared2" DIR_SEP "sys" #define WII_WC24CONF_DIR "shared2" DIR_SEP "wc24" #define THEMES_DIR "Themes" +#define ANAGLYPH_DIR "Anaglyph" // Filenames // Files in the directory returned by GetUserPath(D_CONFIG_IDX) diff --git a/Source/Core/Common/JitRegister.h b/Source/Core/Common/JitRegister.h index 6cb107218..ce63aeace 100644 --- a/Source/Core/Common/JitRegister.h +++ b/Source/Core/Common/JitRegister.h @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #pragma once +#include #include "Common/CommonTypes.h" namespace JitRegister @@ -27,7 +28,7 @@ inline void Register(const void* start, const void* end, { va_list args; va_start(args, format); - u32 code_size = (u32)((const char*)end - (const char*)start); + u32 code_size = (u32) ((const char*) end - (const char*) start); RegisterV(start, code_size, format, args); va_end(args); } diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 544f9354c..fc910daf9 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -127,12 +127,12 @@ void MemArena::ReleaseView(void* view, size_t size) } -u8* MemArena::Find4GBBase() +u8* MemArena::FindMemoryBase() { #if _ARCH_64 #ifdef _WIN32 // 64 bit - u8* base = (u8*)VirtualAlloc(0, 0xE1000000, MEM_RESERVE, PAGE_READWRITE); + u8* base = (u8*)VirtualAlloc(0, 0x400000000, MEM_RESERVE, PAGE_READWRITE); VirtualFree(base, 0, MEM_RELEASE); return base; #else @@ -250,7 +250,7 @@ u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena arena->GrabSHMSegment(total_mem); // Now, create views in high memory where there's plenty of space. - u8 *base = MemArena::Find4GBBase(); + u8 *base = MemArena::FindMemoryBase(); // This really shouldn't fail - in 64-bit, there will always be enough // address space. if (!Memory_TryBase(base, views, num_views, flags, arena)) diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h index 67482432f..c458e8630 100644 --- a/Source/Core/Common/MemArena.h +++ b/Source/Core/Common/MemArena.h @@ -24,8 +24,8 @@ public: void *CreateView(s64 offset, size_t size, void *base = nullptr); void ReleaseView(void *view, size_t size); - // This only finds 1 GB in 32-bit - static u8 *Find4GBBase(); + // This finds 1 GB in 32-bit, 16 GB in 64-bit. + static u8 *FindMemoryBase(); private: #ifdef _WIN32 @@ -44,7 +44,7 @@ enum { struct MemoryView { u8** out_ptr; - u32 virtual_address; + u64 virtual_address; u32 size; u32 flags; void* mapped_ptr; diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 025fddeba..d1da786a5 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -25,10 +25,14 @@ u32 Timer::GetTimeMs() { #ifdef _WIN32 return timeGetTime(); -#else +#elif defined __APPLE__ struct timeval t; (void)gettimeofday(&t, nullptr); return ((u32)(t.tv_sec * 1000 + t.tv_usec / 1000)); +#else + struct timespec t; + (void)clock_gettime(CLOCK_MONOTONIC, &t); + return ((u32)(t.tv_sec * 1000 + t.tv_nsec / 1000000)); #endif } @@ -48,10 +52,14 @@ u64 Timer::GetTimeUs() static double freq = GetFreq(); QueryPerformanceCounter(&time); return u64(double(time.QuadPart) * freq); -#else +#elif defined __APPLE__ struct timeval t; (void)gettimeofday(&t, nullptr); return ((u64)(t.tv_sec * 1000000 + t.tv_usec)); +#else + struct timespec t; + (void)clock_gettime(CLOCK_MONOTONIC, &t); + return ((u64)(t.tv_sec * 1000000 + t.tv_nsec / 1000)); #endif } @@ -205,10 +213,14 @@ std::string Timer::GetTimeFormatted() struct timeb tp; (void)::ftime(&tp); return StringFromFormat("%s:%03i", tmp, tp.millitm); -#else +#elif defined __APPLE__ struct timeval t; (void)gettimeofday(&t, nullptr); return StringFromFormat("%s:%03d", tmp, (int)(t.tv_usec / 1000)); +#else + struct timespec t; + (void)clock_gettime(CLOCK_MONOTONIC, &t); + return StringFromFormat("%s:%03d", tmp, (int)(t.tv_nsec / 1000000)); #endif } @@ -219,9 +231,12 @@ double Timer::GetDoubleTime() #ifdef _WIN32 struct timeb tp; (void)::ftime(&tp); -#else +#elif defined __APPLE__ struct timeval t; (void)gettimeofday(&t, nullptr); +#else + struct timespec t; + (void)clock_gettime(CLOCK_MONOTONIC, &t); #endif // Get continuous timestamp u64 TmpSeconds = Common::Timer::GetTimeSinceJan1970(); @@ -236,8 +251,10 @@ double Timer::GetDoubleTime() u32 Seconds = (u32)TmpSeconds; #ifdef _WIN32 double ms = tp.millitm / 1000.0 / 1000.0; -#else +#elif defined __APPLE__ double ms = t.tv_usec / 1000000.0; +#else + double ms = t.tv_nsec / 1000000000.0; #endif double TmpTime = Seconds + ms; diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp index 51dd2e25f..e77af7f5c 100644 --- a/Source/Core/Core/ActionReplay.cpp +++ b/Source/Core/Core/ActionReplay.cpp @@ -30,7 +30,7 @@ #include "Core/ARDecrypt.h" #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" namespace ActionReplay { @@ -320,7 +320,7 @@ static bool Subtype_RamWriteAndFill(const ARAddr& addr, const u32 data) u32 repeat = data >> 8; for (u32 i = 0; i <= repeat; ++i) { - Memory::Write_U8(data & 0xFF, new_addr + i); + PowerPC::HostWrite_U8(data & 0xFF, new_addr + i); LogInfo("Wrote %08x to address %08x", data & 0xFF, new_addr + i); } LogInfo("--------"); @@ -334,7 +334,7 @@ static bool Subtype_RamWriteAndFill(const ARAddr& addr, const u32 data) u32 repeat = data >> 16; for (u32 i = 0; i <= repeat; ++i) { - Memory::Write_U16(data & 0xFFFF, new_addr + i * 2); + PowerPC::HostWrite_U16(data & 0xFFFF, new_addr + i * 2); LogInfo("Wrote %08x to address %08x", data & 0xFFFF, new_addr + i * 2); } LogInfo("--------"); @@ -345,7 +345,7 @@ static bool Subtype_RamWriteAndFill(const ARAddr& addr, const u32 data) case DATATYPE_32BIT: // Dword write LogInfo("32-bit Write"); LogInfo("--------"); - Memory::Write_U32(data, new_addr); + PowerPC::HostWrite_U32(data, new_addr); LogInfo("Wrote %08x to address %08x", data, new_addr); LogInfo("--------"); break; @@ -364,7 +364,7 @@ static bool Subtype_RamWriteAndFill(const ARAddr& addr, const u32 data) static bool Subtype_WriteToPointer(const ARAddr& addr, const u32 data) { const u32 new_addr = addr.GCAddress(); - const u32 ptr = Memory::Read_U32(new_addr); + const u32 ptr = PowerPC::HostRead_U32(new_addr); LogInfo("Hardware Address: %08x", new_addr); LogInfo("Size: %08x", addr.size); @@ -380,7 +380,7 @@ static bool Subtype_WriteToPointer(const ARAddr& addr, const u32 data) LogInfo("Pointer: %08x", ptr); LogInfo("Byte: %08x", thebyte); LogInfo("Offset: %08x", offset); - Memory::Write_U8(thebyte, ptr + offset); + PowerPC::HostWrite_U8(thebyte, ptr + offset); LogInfo("Wrote %08x to address %08x", thebyte, ptr + offset); LogInfo("--------"); break; @@ -395,7 +395,7 @@ static bool Subtype_WriteToPointer(const ARAddr& addr, const u32 data) LogInfo("Pointer: %08x", ptr); LogInfo("Byte: %08x", theshort); LogInfo("Offset: %08x", offset); - Memory::Write_U16(theshort, ptr + offset); + PowerPC::HostWrite_U16(theshort, ptr + offset); LogInfo("Wrote %08x to address %08x", theshort, ptr + offset); LogInfo("--------"); break; @@ -405,7 +405,7 @@ static bool Subtype_WriteToPointer(const ARAddr& addr, const u32 data) case DATATYPE_32BIT: LogInfo("Write 32-bit to pointer"); LogInfo("--------"); - Memory::Write_U32(data, ptr); + PowerPC::HostWrite_U32(data, ptr); LogInfo("Wrote %08x to address %08x", data, ptr); LogInfo("--------"); break; @@ -433,24 +433,24 @@ static bool Subtype_AddCode(const ARAddr& addr, const u32 data) case DATATYPE_8BIT: LogInfo("8-bit Add"); LogInfo("--------"); - Memory::Write_U8(Memory::Read_U8(new_addr) + data, new_addr); - LogInfo("Wrote %08x to address %08x", Memory::Read_U8(new_addr) + (data & 0xFF), new_addr); + PowerPC::HostWrite_U8(PowerPC::HostRead_U8(new_addr) + data, new_addr); + LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U8(new_addr) + (data & 0xFF), new_addr); LogInfo("--------"); break; case DATATYPE_16BIT: LogInfo("16-bit Add"); LogInfo("--------"); - Memory::Write_U16(Memory::Read_U16(new_addr) + data, new_addr); - LogInfo("Wrote %08x to address %08x", Memory::Read_U16(new_addr) + (data & 0xFFFF), new_addr); + PowerPC::HostWrite_U16(PowerPC::HostRead_U16(new_addr) + data, new_addr); + LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U16(new_addr) + (data & 0xFFFF), new_addr); LogInfo("--------"); break; case DATATYPE_32BIT: LogInfo("32-bit Add"); LogInfo("--------"); - Memory::Write_U32(Memory::Read_U32(new_addr) + data, new_addr); - LogInfo("Wrote %08x to address %08x", Memory::Read_U32(new_addr) + data, new_addr); + PowerPC::HostWrite_U32(PowerPC::HostRead_U32(new_addr) + data, new_addr); + LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U32(new_addr) + data, new_addr); LogInfo("--------"); break; @@ -459,10 +459,10 @@ static bool Subtype_AddCode(const ARAddr& addr, const u32 data) LogInfo("32-bit floating Add"); LogInfo("--------"); - const u32 read = Memory::Read_U32(new_addr); + const u32 read = PowerPC::HostRead_U32(new_addr); const float fread = *((float*)&read) + (float)data; // data contains an integer value const u32 newval = *((u32*)&fread); - Memory::Write_U32(newval, new_addr); + PowerPC::HostWrite_U32(newval, new_addr); LogInfo("Old Value %08x", read); LogInfo("Increment %08x", data); LogInfo("New value %08x", newval); @@ -517,7 +517,7 @@ static bool ZeroCode_FillAndSlide(const u32 val_last, const ARAddr& addr, const LogInfo("--------"); for (int i = 0; i < write_num; ++i) { - Memory::Write_U8(val & 0xFF, curr_addr); + PowerPC::HostWrite_U8(val & 0xFF, curr_addr); curr_addr += addr_incr; val += val_incr; LogInfo("Write %08x to address %08x", val & 0xFF, curr_addr); @@ -533,7 +533,7 @@ static bool ZeroCode_FillAndSlide(const u32 val_last, const ARAddr& addr, const LogInfo("--------"); for (int i=0; i < write_num; ++i) { - Memory::Write_U16(val & 0xFFFF, curr_addr); + PowerPC::HostWrite_U16(val & 0xFFFF, curr_addr); LogInfo("Write %08x to address %08x", val & 0xFFFF, curr_addr); curr_addr += addr_incr * 2; val += val_incr; @@ -548,7 +548,7 @@ static bool ZeroCode_FillAndSlide(const u32 val_last, const ARAddr& addr, const LogInfo("--------"); for (int i = 0; i < write_num; ++i) { - Memory::Write_U32(val, curr_addr); + PowerPC::HostWrite_U32(val, curr_addr); LogInfo("Write %08x to address %08x", val, curr_addr); curr_addr += addr_incr * 4; val += val_incr; @@ -586,8 +586,8 @@ static bool ZeroCode_MemoryCopy(const u32 val_last, const ARAddr& addr, const u3 LogInfo("--------"); for (int i = 0; i < 138; ++i) { - Memory::Write_U8(Memory::Read_U8(addr_src + i), addr_dest + i); - LogInfo("Wrote %08x to address %08x", Memory::Read_U8(addr_src + i), addr_dest + i); + PowerPC::HostWrite_U8(PowerPC::HostRead_U8(addr_src + i), addr_dest + i); + LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U8(addr_src + i), addr_dest + i); } LogInfo("--------"); } @@ -597,8 +597,8 @@ static bool ZeroCode_MemoryCopy(const u32 val_last, const ARAddr& addr, const u3 LogInfo("--------"); for (int i=0; i < num_bytes; ++i) { - Memory::Write_U8(Memory::Read_U8(addr_src + i), addr_dest + i); - LogInfo("Wrote %08x to address %08x", Memory::ReadUnchecked_U8(addr_src + i), addr_dest + i); + PowerPC::HostWrite_U8(PowerPC::HostRead_U8(addr_src + i), addr_dest + i); + LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U8(addr_src + i), addr_dest + i); } LogInfo("--------"); return true; @@ -709,16 +709,16 @@ static bool ConditionalCode(const ARAddr& addr, const u32 data, int* const pSkip switch (addr.size) { case DATATYPE_8BIT: - result = CompareValues((u32)Memory::Read_U8(new_addr), (data & 0xFF), addr.type); + result = CompareValues((u32)PowerPC::HostRead_U8(new_addr), (data & 0xFF), addr.type); break; case DATATYPE_16BIT: - result = CompareValues((u32)Memory::Read_U16(new_addr), (data & 0xFFFF), addr.type); + result = CompareValues((u32)PowerPC::HostRead_U16(new_addr), (data & 0xFFFF), addr.type); break; case DATATYPE_32BIT_FLOAT: case DATATYPE_32BIT: - result = CompareValues(Memory::Read_U32(new_addr), data, addr.type); + result = CompareValues(PowerPC::HostRead_U32(new_addr), data, addr.type); break; default: diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index d2c8d5384..aecfe96ac 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -39,10 +39,10 @@ void CBoot::Load_FST(bool _bIsWii) return; // copy first 20 bytes of disc to start of Mem 1 - VolumeHandler::ReadToPtr(Memory::GetPointer(0x80000000), 0, 0x20, false); + DVDInterface::DVDRead(/*offset*/0, /*address*/0, /*length*/0x20, false); // copy of game id - Memory::Write_U32(Memory::Read_U32(0x80000000), 0x80003180); + Memory::Write_U32(Memory::Read_U32(0x0000), 0x3180); u32 shift = 0; if (_bIsWii) @@ -56,7 +56,7 @@ void CBoot::Load_FST(bool _bIsWii) Memory::Write_U32(arenaHigh, 0x00000034); // load FST - VolumeHandler::ReadToPtr(Memory::GetPointer(arenaHigh), fstOffset, fstSize, _bIsWii); + DVDInterface::DVDRead(fstOffset, arenaHigh, fstSize, _bIsWii); Memory::Write_U32(arenaHigh, 0x00000038); Memory::Write_U32(maxFstSize, 0x0000003c); } @@ -188,9 +188,9 @@ bool CBoot::Load_BS2(const std::string& _rBootROMFilename) // Run the descrambler over the encrypted section containing BS1/BS2 CEXIIPL::Descrambler((u8*)data.data()+0x100, 0x1AFE00); - Memory::CopyToEmu(0x81200000, data.data() + 0x100, 0x700); - Memory::CopyToEmu(0x81300000, data.data() + 0x820, 0x1AFE00); - PC = 0x81200000; + Memory::CopyToEmu(0x01200000, data.data() + 0x100, 0x700); + Memory::CopyToEmu(0x01300000, data.data() + 0x820, 0x1AFE00); + PC = 0x01200000; return true; } @@ -255,7 +255,7 @@ bool CBoot::BootUp() } // Scan for common HLE functions - if (_StartupPara.bSkipIdle && !_StartupPara.bEnableDebugging) + if (_StartupPara.bSkipIdle && _StartupPara.bHLE_BS2 && !_StartupPara.bEnableDebugging) { PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); SignatureDB db; @@ -309,6 +309,25 @@ bool CBoot::BootUp() if (!BS2Success) { + // Set up MSR and the BAT SPR registers. + UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); + m_MSR.FP = 1; + m_MSR.DR = 1; + m_MSR.IR = 1; + m_MSR.EE = 1; + PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff; + PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002; + PowerPC::ppcState.spr[SPR_IBAT4U] = 0x90001fff; + PowerPC::ppcState.spr[SPR_IBAT4L] = 0x10000002; + PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff; + PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002; + PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff; + PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a; + PowerPC::ppcState.spr[SPR_DBAT4U] = 0x90001fff; + PowerPC::ppcState.spr[SPR_DBAT4L] = 0x10000002; + PowerPC::ppcState.spr[SPR_DBAT5U] = 0xd0001fff; + PowerPC::ppcState.spr[SPR_DBAT5L] = 0x1000002a; + dolLoader.Load(); PC = dolLoader.GetEntryPoint(); } @@ -403,7 +422,7 @@ bool CBoot::BootUp() if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) { HLE::Patch(0x80001800, "HBReload"); - Memory::CopyToEmu(0x80001804, "STUBHAXX", 8); + Memory::CopyToEmu(0x00001804, "STUBHAXX", 8); } // Not part of the binary itself, but either we or Gecko OS might insert diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index 260ae4c67..8b7f52e5e 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -41,6 +41,9 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader) // Set up MSR and the BAT SPR registers. UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); m_MSR.FP = 1; + m_MSR.DR = 1; + m_MSR.IR = 1; + m_MSR.EE = 1; PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff; PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002; PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff; @@ -54,28 +57,28 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader) // Write necessary values // Here we write values to memory that the apploader does not take care of. Game info goes // to 0x80000000 according to YAGCD 4.2. - DVDInterface::DVDRead(0x00000000, 0x80000000, 0x20, false); // write disc info + DVDInterface::DVDRead(/*offset*/0x00000000, /*address*/0x00000000, 0x20, false); // write disc info - Memory::Write_U32(0x0D15EA5E, 0x80000020); // Booted from bootrom. 0xE5207C22 = booted from jtag - Memory::Write_U32(Memory::REALRAM_SIZE, 0x80000028); // Physical Memory Size (24MB on retail) + PowerPC::HostWrite_U32(0x0D15EA5E, 0x80000020); // Booted from bootrom. 0xE5207C22 = booted from jtag + PowerPC::HostWrite_U32(Memory::REALRAM_SIZE, 0x80000028); // Physical Memory Size (24MB on retail) // TODO determine why some games fail when using a retail ID. (Seem to take different EXI paths, see Ikaruga for example) - Memory::Write_U32(0x10000006, 0x8000002C); // Console type - DevKit (retail ID == 0x00000003) see YAGCD 4.2.1.1.2 + PowerPC::HostWrite_U32(0x10000006, 0x8000002C); // Console type - DevKit (retail ID == 0x00000003) see YAGCD 4.2.1.1.2 - Memory::Write_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC + PowerPC::HostWrite_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC ? 0 : 1, 0x800000CC); // Fake the VI Init of the IPL (YAGCD 4.2.1.4) - Memory::Write_U32(0x01000000, 0x800000d0); // ARAM Size. 16MB main + 4/16/32MB external (retail consoles have no external ARAM) + PowerPC::HostWrite_U32(0x01000000, 0x800000d0); // ARAM Size. 16MB main + 4/16/32MB external (retail consoles have no external ARAM) - Memory::Write_U32(0x09a7ec80, 0x800000F8); // Bus Clock Speed - Memory::Write_U32(0x1cf7c580, 0x800000FC); // CPU Clock Speed + PowerPC::HostWrite_U32(0x09a7ec80, 0x800000F8); // Bus Clock Speed + PowerPC::HostWrite_U32(0x1cf7c580, 0x800000FC); // CPU Clock Speed - Memory::Write_U32(0x4c000064, 0x80000300); // Write default DFI Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000800); // Write default FPU Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000C00); // Write default Syscall Handler: rfi + PowerPC::HostWrite_U32(0x4c000064, 0x80000300); // Write default DFI Handler: rfi + PowerPC::HostWrite_U32(0x4c000064, 0x80000800); // Write default FPU Handler: rfi + PowerPC::HostWrite_U32(0x4c000064, 0x80000C00); // Write default Syscall Handler: rfi - Memory::Write_U64((u64)CEXIIPL::GetGCTime() * (u64)40500000, 0x800030D8); // Preset time base ticks + PowerPC::HostWrite_U64((u64)CEXIIPL::GetGCTime() * (u64)40500000, 0x800030D8); // Preset time base ticks // HIO checks this - //Memory::Write_U16(0x8200, 0x000030e6); // Console type + //PowerPC::HostWrite_U16(0x8200, 0x000030e6); // Console type HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader @@ -89,7 +92,7 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader) INFO_LOG(BOOT, "GC BS2: Not running apploader!"); return false; } - VolumeHandler::ReadToPtr(Memory::GetPointer(0x81200000), iAppLoaderOffset + 0x20, iAppLoaderSize, false); + DVDInterface::DVDRead(iAppLoaderOffset + 0x20, 0x01200000, iAppLoaderSize, false); // Setup pointers like real BS2 does if (SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC) @@ -114,9 +117,9 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader) PowerPC::ppcState.gpr[4] = iAppLoaderFuncAddr + 4; PowerPC::ppcState.gpr[5] = iAppLoaderFuncAddr + 8; RunFunction(iAppLoaderEntry); - u32 iAppLoaderInit = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr + 0); - u32 iAppLoaderMain = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr + 4); - u32 iAppLoaderClose = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr + 8); + u32 iAppLoaderInit = PowerPC::Read_U32(iAppLoaderFuncAddr + 0); + u32 iAppLoaderMain = PowerPC::Read_U32(iAppLoaderFuncAddr + 4); + u32 iAppLoaderClose = PowerPC::Read_U32(iAppLoaderFuncAddr + 8); // iAppLoaderInit DEBUG_LOG(MASTER_LOG, "Call iAppLoaderInit"); @@ -135,9 +138,9 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader) RunFunction(iAppLoaderMain); - u32 iRamAddress = Memory::ReadUnchecked_U32(0x81300004); - u32 iLength = Memory::ReadUnchecked_U32(0x81300008); - u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c); + u32 iRamAddress = PowerPC::Read_U32(0x81300004); + u32 iLength = PowerPC::Read_U32(0x81300008); + u32 iDVDOffset = PowerPC::Read_U32(0x8130000c); INFO_LOG(MASTER_LOG, "DVDRead: offset: %08x memOffset: %08x length: %i", iDVDOffset, iRamAddress, iLength); DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength, false); @@ -239,7 +242,7 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country) 0x80000060 Copyright code */ - DVDInterface::DVDRead(0x00000000, 0x00000000, 0x20, false); // Game Code + DVDInterface::DVDRead(0x00000000, 0x00000000, 0x20, false); // Game Code Memory::Write_U32(0x0D15EA5E, 0x00000020); // Another magic word Memory::Write_U32(0x00000001, 0x00000024); // Unknown Memory::Write_U32(Memory::REALRAM_SIZE, 0x00000028); // MEM1 size 24MB @@ -253,12 +256,12 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country) Memory::Write_U32(0x8179b500, 0x000000f4); // __start Memory::Write_U32(0x0e7be2c0, 0x000000f8); // Bus speed Memory::Write_U32(0x2B73A840, 0x000000fc); // CPU speed - Memory::Write_U16(0x0000, 0x000030e6); // Console type + Memory::Write_U16(0x0000, 0x000030e6); // Console type Memory::Write_U32(0x00000000, 0x000030c0); // EXI Memory::Write_U32(0x00000000, 0x000030c4); // EXI Memory::Write_U32(0x00000000, 0x000030dc); // Time Memory::Write_U32(0x00000000, 0x000030d8); // Time - Memory::Write_U16(0x8201, 0x000030e6); // Dev console / debug capable + Memory::Write_U16(0x8201, 0x000030e6); // Dev console / debug capable Memory::Write_U32(0x00000000, 0x000030f0); // Apploader Memory::Write_U32(0x01800000, 0x00003100); // BAT Memory::Write_U32(0x01800000, 0x00003104); // BAT @@ -275,7 +278,7 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country) // 40 is copied from 88 after running apploader Memory::Write_U32(0x00090204, 0x00003140); // IOS revision (IOS9, v2.4) Memory::Write_U32(0x00062507, 0x00003144); // IOS date in USA format (June 25, 2007) - Memory::Write_U16(0x0113, 0x0000315e); // Apploader + Memory::Write_U16(0x0113, 0x0000315e); // Apploader Memory::Write_U32(0x0000FF16, 0x00003158); // DDR ram vendor code Memory::Write_U32(0x00000000, 0x00003160); // Init semaphore (sysmenu waits for this to clear) Memory::Write_U32(0x00090204, 0x00003188); // Expected IOS revision @@ -290,7 +293,7 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country) // Clear exception handler. Why? Don't we begin with only zeros? for (int i = 0x3000; i <= 0x3038; i += 4) { - Memory::Write_U32(0x00000000, 0x80000000 + i); + Memory::Write_U32(0x00000000, i); } return true; } @@ -314,7 +317,7 @@ bool CBoot::EmulatedBS2_Wii() // values as the game boots. This location keep the 4 byte ID for as long // as the game is running. The 6 byte ID at 0x00 is overwritten sometime // after this check during booting. - VolumeHandler::ReadToPtr(Memory::GetPointer(0x3180), 0, 4, true); + DVDInterface::DVDRead(0, 0x3180, 4, true); // Execute the apploader bool apploaderRan = false; @@ -323,9 +326,12 @@ bool CBoot::EmulatedBS2_Wii() // Set up MSR and the BAT SPR registers. UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); m_MSR.FP = 1; + m_MSR.DR = 1; + m_MSR.IR = 1; + m_MSR.EE = 1; PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff; PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002; - PowerPC::ppcState.spr[SPR_IBAT4L] = 0x90001fff; + PowerPC::ppcState.spr[SPR_IBAT4U] = 0x90001fff; PowerPC::ppcState.spr[SPR_IBAT4L] = 0x10000002; PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff; PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002; @@ -336,9 +342,9 @@ bool CBoot::EmulatedBS2_Wii() PowerPC::ppcState.spr[SPR_DBAT5U] = 0xd0001fff; PowerPC::ppcState.spr[SPR_DBAT5L] = 0x1000002a; - Memory::Write_U32(0x4c000064, 0x80000300); // Write default DFI Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000800); // Write default FPU Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000C00); // Write default Syscall Handler: rfi + Memory::Write_U32(0x4c000064, 0x00000300); // Write default DSI Handler: rfi + Memory::Write_U32(0x4c000064, 0x00000800); // Write default FPU Handler: rfi + Memory::Write_U32(0x4c000064, 0x00000C00); // Write default Syscall Handler: rfi HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader @@ -354,7 +360,7 @@ bool CBoot::EmulatedBS2_Wii() ERROR_LOG(BOOT, "Invalid apploader. Probably your image is corrupted."); return false; } - VolumeHandler::ReadToPtr(Memory::GetPointer(0x81200000), iAppLoaderOffset + 0x20, iAppLoaderSize, true); + DVDInterface::DVDRead(iAppLoaderOffset + 0x20, 0x01200000, iAppLoaderSize, true); //call iAppLoaderEntry DEBUG_LOG(BOOT, "Call iAppLoaderEntry"); @@ -364,9 +370,9 @@ bool CBoot::EmulatedBS2_Wii() PowerPC::ppcState.gpr[4] = iAppLoaderFuncAddr + 4; PowerPC::ppcState.gpr[5] = iAppLoaderFuncAddr + 8; RunFunction(iAppLoaderEntry); - u32 iAppLoaderInit = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr+0); - u32 iAppLoaderMain = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr+4); - u32 iAppLoaderClose = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr+8); + u32 iAppLoaderInit = PowerPC::Read_U32(iAppLoaderFuncAddr + 0); + u32 iAppLoaderMain = PowerPC::Read_U32(iAppLoaderFuncAddr + 4); + u32 iAppLoaderClose = PowerPC::Read_U32(iAppLoaderFuncAddr + 8); // iAppLoaderInit DEBUG_LOG(BOOT, "Run iAppLoaderInit"); @@ -387,9 +393,9 @@ bool CBoot::EmulatedBS2_Wii() RunFunction(iAppLoaderMain); - u32 iRamAddress = Memory::ReadUnchecked_U32(0x81300004); - u32 iLength = Memory::ReadUnchecked_U32(0x81300008); - u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c) << 2; + u32 iRamAddress = PowerPC::Read_U32(0x81300004); + u32 iLength = PowerPC::Read_U32(0x81300008); + u32 iDVDOffset = PowerPC::Read_U32(0x8130000c) << 2; INFO_LOG(BOOT, "DVDRead: offset: %08x memOffset: %08x length: %i", iDVDOffset, iRamAddress, iLength); DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength, true); @@ -404,8 +410,8 @@ bool CBoot::EmulatedBS2_Wii() // Pass the "#002 check" // Apploader writes the IOS version and revision here, we copy it // Fake IOSv9 r2.4 if no version is found (elf loading) - u32 firmwareVer = Memory::Read_U32(0x80003188); - Memory::Write_U32(firmwareVer ? firmwareVer : 0x00090204, 0x00003140); + u32 firmwareVer = PowerPC::Read_U32(0x80003188); + PowerPC::Write_U32(firmwareVer ? firmwareVer : 0x00090204, 0x80003140); // Load patches and run startup patches PatchEngine::LoadPatches(); diff --git a/Source/Core/Core/Boot/Boot_DOL.cpp b/Source/Core/Core/Boot/Boot_DOL.cpp index 31050df12..fbfa70e0c 100644 --- a/Source/Core/Core/Boot/Boot_DOL.cpp +++ b/Source/Core/Core/Boot/Boot_DOL.cpp @@ -9,6 +9,7 @@ #include "Core/Boot/Boot_DOL.h" #include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" CDolLoader::CDolLoader(u8* _pBuffer, u32 _Size) : m_isWii(false) diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp index f1afd7a82..386ee3185 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp @@ -107,7 +107,7 @@ bool CBoot::Boot_WiiWAD(const std::string& _pFilename) pDolLoader = std::make_unique(pContent->m_Filename); } pDolLoader->Load(); - PC = pDolLoader->GetEntryPoint() | 0x80000000; + PC = pDolLoader->GetEntryPoint(); // Pass the "#002 check" // Apploader should write the IOS version and revision to 0x3140, and compare it diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index e2ab62344..0a2b95b22 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -47,8 +47,8 @@ namespace BootManager // Apply fire liberally struct ConfigCache { - bool valid, bCPUThread, bSkipIdle, bFPRF, bBAT, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread, - bDoubleVideoRate, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2, bProgressive; + bool valid, bCPUThread, bSkipIdle, bFPRF, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread, + bDoubleVideoRate, bSyncGPU, bFastDiscSpeed, bDSPHLE, bHLE_BS2, bProgressive; int iCPUCore, Volume; int iWiimoteSource[MAX_BBMOTES]; SIDevices Pads[MAX_SI_CHANNELS]; @@ -96,16 +96,7 @@ bool BootCore(const std::string& _rFilename) return false; // Load game specific settings - std::string unique_id = StartUp.GetUniqueID(); - std::string revision_specific = StartUp.m_strRevisionSpecificUniqueID; - StartUp.m_strGameIniDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + unique_id + ".ini"; - if (revision_specific != "") - StartUp.m_strGameIniDefaultRevisionSpecific = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + revision_specific + ".ini"; - else - StartUp.m_strGameIniDefaultRevisionSpecific = ""; - StartUp.m_strGameIniLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + unique_id + ".ini"; - - if (unique_id.size() == 6) + if (StartUp.GetUniqueID().size() == 6) { IniFile game_ini = StartUp.LoadGameIni(); @@ -114,13 +105,11 @@ bool BootCore(const std::string& _rFilename) config_cache.bSkipIdle = StartUp.bSkipIdle; config_cache.iCPUCore = StartUp.iCPUCore; config_cache.bFPRF = StartUp.bFPRF; - config_cache.bBAT = StartUp.bBAT; config_cache.bMMU = StartUp.bMMU; config_cache.bDCBZOFF = StartUp.bDCBZOFF; config_cache.bDoubleVideoRate = StartUp.bDoubleVideoRate; config_cache.bSyncGPU = StartUp.bSyncGPU; config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed; - config_cache.bMergeBlocks = StartUp.bMergeBlocks; config_cache.bDSPHLE = StartUp.bDSPHLE; config_cache.strBackend = StartUp.m_strVideoBackend; config_cache.m_strGPUDeterminismMode = StartUp.m_strGPUDeterminismMode; @@ -156,13 +145,11 @@ bool BootCore(const std::string& _rFilename) core_section->Get("CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); core_section->Get("SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle); core_section->Get("FPRF", &StartUp.bFPRF, StartUp.bFPRF); - core_section->Get("BAT", &StartUp.bBAT, StartUp.bBAT); core_section->Get("MMU", &StartUp.bMMU, StartUp.bMMU); core_section->Get("DCBZ", &StartUp.bDCBZOFF, StartUp.bDCBZOFF); core_section->Get("DoubleVideoRate", &StartUp.bDoubleVideoRate, StartUp.bDoubleVideoRate); core_section->Get("SyncGPU", &StartUp.bSyncGPU, StartUp.bSyncGPU); core_section->Get("FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); - core_section->Get("BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); core_section->Get("DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); core_section->Get("GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend); core_section->Get("CPUCore", &StartUp.iCPUCore, StartUp.iCPUCore); @@ -285,13 +272,11 @@ void Stop() StartUp.bSkipIdle = config_cache.bSkipIdle; StartUp.iCPUCore = config_cache.iCPUCore; StartUp.bFPRF = config_cache.bFPRF; - StartUp.bBAT = config_cache.bBAT; StartUp.bMMU = config_cache.bMMU; StartUp.bDCBZOFF = config_cache.bDCBZOFF; StartUp.bDoubleVideoRate = config_cache.bDoubleVideoRate; StartUp.bSyncGPU = config_cache.bSyncGPU; StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; - StartUp.bMergeBlocks = config_cache.bMergeBlocks; StartUp.bDSPHLE = config_cache.bDSPHLE; StartUp.m_strVideoBackend = config_cache.strBackend; StartUp.m_strGPUDeterminismMode = config_cache.m_strGPUDeterminismMode; diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 396cfa2a8..b3c0ec8fb 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -109,7 +109,6 @@ set(SRCS ActionReplay.cpp HW/GPFifo.cpp HW/HW.cpp HW/Memmap.cpp - HW/MemmapFunctions.cpp HW/MemoryInterface.cpp HW/MMIO.cpp HW/ProcessorInterface.cpp @@ -153,6 +152,7 @@ set(SRCS ActionReplay.cpp IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp IPC_HLE/WII_IPC_HLE_WiiMote.cpp IPC_HLE/WiiMote_HID_Attr.cpp + PowerPC/MMU.cpp PowerPC/PowerPC.cpp PowerPC/PPCAnalyst.cpp PowerPC/PPCCache.cpp diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 238580601..1a1d85e2b 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -8,6 +8,7 @@ #include "Common/IniFile.h" #include "Core/ConfigManager.h" #include "Core/HW/SI.h" +#include "Core/PowerPC/PowerPC.h" #include "DiscIO/NANDContentLoader.h" SConfig* SConfig::m_Instance; @@ -18,128 +19,128 @@ static const struct const int DefaultKey; const int DefaultModifier; } g_HKData[] = { - { "Open", 79 /* 'O' */, 2 /* wxMOD_CONTROL */}, - { "ChangeDisc", 0, 0 /* wxMOD_NONE */ }, - { "RefreshList", 0, 0 /* wxMOD_NONE */ }, + { "Open", 79 /* 'O' */, 2 /* wxMOD_CONTROL */ }, + { "ChangeDisc", 0, 0 /* wxMOD_NONE */ }, + { "RefreshList", 0, 0 /* wxMOD_NONE */ }, #ifdef __APPLE__ - { "PlayPause", 80 /* 'P' */, 2 /* wxMOD_CMD */ }, - { "Stop", 87 /* 'W' */, 2 /* wxMOD_CMD */ }, - { "Reset", 0, 0 /* wxMOD_NONE */ }, - { "FrameAdvance", 0, 0 /* wxMOD_NONE */ }, + { "PlayPause", 80 /* 'P' */, 2 /* wxMOD_CMD */ }, + { "Stop", 87 /* 'W' */, 2 /* wxMOD_CMD */ }, + { "Reset", 0, 0 /* wxMOD_NONE */ }, + { "FrameAdvance", 0, 0 /* wxMOD_NONE */ }, - { "StartRecording", 0, 0 /* wxMOD_NONE */ }, - { "PlayRecording", 0, 0 /* wxMOD_NONE */ }, - { "ExportRecording", 0, 0 /* wxMOD_NONE */ }, - { "Readonlymode", 0, 0 /* wxMOD_NONE */ }, + { "StartRecording", 0, 0 /* wxMOD_NONE */ }, + { "PlayRecording", 0, 0 /* wxMOD_NONE */ }, + { "ExportRecording", 0, 0 /* wxMOD_NONE */ }, + { "Readonlymode", 0, 0 /* wxMOD_NONE */ }, - { "ToggleFullscreen", 70 /* 'F' */, 2 /* wxMOD_CMD */ }, - { "Screenshot", 83 /* 'S' */, 2 /* wxMOD_CMD */ }, - { "Exit", 0, 0 /* wxMOD_NONE */ }, + { "ToggleFullscreen", 70 /* 'F' */, 2 /* wxMOD_CMD */ }, + { "Screenshot", 83 /* 'S' */, 2 /* wxMOD_CMD */ }, + { "Exit", 0, 0 /* wxMOD_NONE */ }, - { "Wiimote1Connect", 49 /* '1' */, 2 /* wxMOD_CMD */ }, - { "Wiimote2Connect", 50 /* '2' */, 2 /* wxMOD_CMD */ }, - { "Wiimote3Connect", 51 /* '3' */, 2 /* wxMOD_CMD */ }, - { "Wiimote4Connect", 52 /* '4' */, 2 /* wxMOD_CMD */ }, - { "BalanceBoardConnect", 53 /* '4' */, 2 /* wxMOD_CMD */ }, + { "Wiimote1Connect", 49 /* '1' */, 2 /* wxMOD_CMD */ }, + { "Wiimote2Connect", 50 /* '2' */, 2 /* wxMOD_CMD */ }, + { "Wiimote3Connect", 51 /* '3' */, 2 /* wxMOD_CMD */ }, + { "Wiimote4Connect", 52 /* '4' */, 2 /* wxMOD_CMD */ }, + { "BalanceBoardConnect", 53 /* '4' */, 2 /* wxMOD_CMD */ }, #else - { "PlayPause", 349 /* WXK_F10 */, 0 /* wxMOD_NONE */ }, - { "Stop", 27 /* WXK_ESCAPE */, 0 /* wxMOD_NONE */ }, - { "Reset", 0, 0 /* wxMOD_NONE */ }, - { "FrameAdvance", 0, 0 /* wxMOD_NONE */ }, + { "PlayPause", 349 /* WXK_F10 */, 0 /* wxMOD_NONE */ }, + { "Stop", 27 /* WXK_ESCAPE */, 0 /* wxMOD_NONE */ }, + { "Reset", 0, 0 /* wxMOD_NONE */ }, + { "FrameAdvance", 0, 0 /* wxMOD_NONE */ }, - { "StartRecording", 0, 0 /* wxMOD_NONE */ }, - { "PlayRecording", 0, 0 /* wxMOD_NONE */ }, - { "ExportRecording", 0, 0 /* wxMOD_NONE */ }, - { "Readonlymode", 0, 0 /* wxMOD_NONE */ }, + { "StartRecording", 0, 0 /* wxMOD_NONE */ }, + { "PlayRecording", 0, 0 /* wxMOD_NONE */ }, + { "ExportRecording", 0, 0 /* wxMOD_NONE */ }, + { "Readonlymode", 0, 0 /* wxMOD_NONE */ }, - { "ToggleFullscreen", 13 /* WXK_RETURN */, 1 /* wxMOD_ALT */ }, - { "Screenshot", 348 /* WXK_F9 */, 0 /* wxMOD_NONE */ }, - { "Exit", 0, 0 /* wxMOD_NONE */ }, + { "ToggleFullscreen", 13 /* WXK_RETURN */, 1 /* wxMOD_ALT */ }, + { "Screenshot", 348 /* WXK_F9 */, 0 /* wxMOD_NONE */ }, + { "Exit", 0, 0 /* wxMOD_NONE */ }, - { "Wiimote1Connect", 344 /* WXK_F5 */, 1 /* wxMOD_ALT */ }, - { "Wiimote2Connect", 345 /* WXK_F6 */, 1 /* wxMOD_ALT */ }, - { "Wiimote3Connect", 346 /* WXK_F7 */, 1 /* wxMOD_ALT */ }, - { "Wiimote4Connect", 347 /* WXK_F8 */, 1 /* wxMOD_ALT */ }, - { "BalanceBoardConnect",348 /* WXK_F9 */, 1 /* wxMOD_ALT */ }, + { "Wiimote1Connect", 344 /* WXK_F5 */, 1 /* wxMOD_ALT */ }, + { "Wiimote2Connect", 345 /* WXK_F6 */, 1 /* wxMOD_ALT */ }, + { "Wiimote3Connect", 346 /* WXK_F7 */, 1 /* wxMOD_ALT */ }, + { "Wiimote4Connect", 347 /* WXK_F8 */, 1 /* wxMOD_ALT */ }, + { "BalanceBoardConnect", 348 /* WXK_F9 */, 1 /* wxMOD_ALT */ }, #endif - { "VolumeDown", 0, 0 /* wxMOD_NONE */ }, - { "VolumeUp", 0, 0 /* wxMOD_NONE */ }, - { "VolumeToggleMute", 0, 0 /* wxMOD_NONE */ }, + { "VolumeDown", 0, 0 /* wxMOD_NONE */ }, + { "VolumeUp", 0, 0 /* wxMOD_NONE */ }, + { "VolumeToggleMute", 0, 0 /* wxMOD_NONE */ }, - { "ToggleIR", 0, 0 /* wxMOD_NONE */ }, - { "ToggleAspectRatio", 0, 0 /* wxMOD_NONE */ }, - { "ToggleEFBCopies", 0, 0 /* wxMOD_NONE */ }, - { "ToggleFog", 0, 0 /* wxMOD_NONE */ }, - { "ToggleThrottle", 9 /* '\t' */, 0 /* wxMOD_NONE */ }, - { "DecreaseFrameLimit", 0, 0 /* wxMOD_NONE */ }, - { "IncreaseFrameLimit", 0, 0 /* wxMOD_NONE */ }, + { "ToggleIR", 0, 0 /* wxMOD_NONE */ }, + { "ToggleAspectRatio", 0, 0 /* wxMOD_NONE */ }, + { "ToggleEFBCopies", 0, 0 /* wxMOD_NONE */ }, + { "ToggleFog", 0, 0 /* wxMOD_NONE */ }, + { "ToggleThrottle", 9 /* '\t' */, 0 /* wxMOD_NONE */ }, + { "DecreaseFrameLimit", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseFrameLimit", 0, 0 /* wxMOD_NONE */ }, - { "FreelookDecreaseSpeed",49 /* '1' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookIncreaseSpeed",50 /* '2' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookResetSpeed", 70 /* 'F' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookUp", 69 /* 'E' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookDown", 81 /* 'Q' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookLeft", 65 /* 'A' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookRight", 68 /* 'D' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookZoomIn", 87 /* 'W' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookZoomOut", 83 /* 'S' */, 4 /* wxMOD_SHIFT */ }, - { "FreelookReset", 82 /* 'R' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookDecreaseSpeed", 49 /* '1' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookIncreaseSpeed", 50 /* '2' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookResetSpeed", 70 /* 'F' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookUp", 69 /* 'E' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookDown", 81 /* 'Q' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookLeft", 65 /* 'A' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookRight", 68 /* 'D' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookZoomIn", 87 /* 'W' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookZoomOut", 83 /* 'S' */, 4 /* wxMOD_SHIFT */ }, + { "FreelookReset", 82 /* 'R' */, 4 /* wxMOD_SHIFT */ }, - { "DecreaseDepth", 0, 0 /* wxMOD_NONE */ }, - { "IncreaseDepth", 0, 0 /* wxMOD_NONE */ }, - { "DecreaseConvergence", 0, 0 /* wxMOD_NONE */ }, - { "IncreaseConvergence", 0, 0 /* wxMOD_NONE */ }, + { "DecreaseDepth", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseDepth", 0, 0 /* wxMOD_NONE */ }, + { "DecreaseConvergence", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseConvergence", 0, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot1", 340 /* WXK_F1 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot2", 341 /* WXK_F2 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot3", 342 /* WXK_F3 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot4", 343 /* WXK_F4 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot5", 344 /* WXK_F5 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot6", 345 /* WXK_F6 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot7", 346 /* WXK_F7 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot8", 347 /* WXK_F8 */, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot9", 0, 0 /* wxMOD_NONE */ }, - { "LoadStateSlot10", 0, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot1", 340 /* WXK_F1 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot2", 341 /* WXK_F2 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot3", 342 /* WXK_F3 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot4", 343 /* WXK_F4 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot5", 344 /* WXK_F5 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot6", 345 /* WXK_F6 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot7", 346 /* WXK_F7 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot8", 347 /* WXK_F8 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot9", 0, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot10", 0, 0 /* wxMOD_NONE */ }, - { "SaveStateSlot1", 340 /* WXK_F1 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot2", 341 /* WXK_F2 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot3", 342 /* WXK_F3 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot4", 343 /* WXK_F4 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot5", 344 /* WXK_F5 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot6", 345 /* WXK_F6 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot7", 346 /* WXK_F7 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot8", 347 /* WXK_F8 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateSlot9", 0, 0 /* wxMOD_NONE */ }, - { "SaveStateSlot10", 0, 0 /* wxMOD_NONE */ }, + { "SaveStateSlot1", 340 /* WXK_F1 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot2", 341 /* WXK_F2 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot3", 342 /* WXK_F3 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot4", 343 /* WXK_F4 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot5", 344 /* WXK_F5 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot6", 345 /* WXK_F6 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot7", 346 /* WXK_F7 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot8", 347 /* WXK_F8 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot9", 0, 0 /* wxMOD_NONE */ }, + { "SaveStateSlot10", 0, 0 /* wxMOD_NONE */ }, - { "SelectStateSlot1", 0 , 0 }, - { "SelectStateSlot2", 0 , 0 }, - { "SelectStateSlot3", 0, 0 }, - { "SelectStateSlot4", 0 , 0 }, - { "SelectStateSlot5", 0 , 0 }, - { "SelectStateSlot6", 0 , 0 }, - { "SelectStateSlot7", 0 , 0 }, - { "SelectStateSlot8", 0 , 0 }, - { "SelectStateSlot9", 0 , 0 }, - { "SelectStateSlot10", 0 , 0 }, - { "SaveSelectedSlot", 0 , 0 }, - { "LoadSelectedSlot", 0 , 0 }, + { "SelectStateSlot1", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot2", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot3", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot4", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot5", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot6", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot7", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot8", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot9", 0, 0 /* wxMOD_NONE */ }, + { "SelectStateSlot10", 0, 0 /* wxMOD_NONE */ }, + { "SaveSelectedSlot", 0, 0 /* wxMOD_NONE */ }, + { "LoadSelectedSlot", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState1", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState2", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState3", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState4", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState5", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState6", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState7", 0, 0 /* wxMOD_NONE */ }, - { "LoadLastState8", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState1", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState2", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState3", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState4", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState5", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState6", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState7", 0, 0 /* wxMOD_NONE */ }, + { "LoadLastState8", 0, 0 /* wxMOD_NONE */ }, - { "SaveFirstState", 0, 0 /* wxMOD_NONE */ }, - { "UndoLoadState", 351 /* WXK_F12 */, 0 /* wxMOD_NONE */ }, - { "UndoSaveState", 351 /* WXK_F12 */, 4 /* wxMOD_SHIFT */ }, - { "SaveStateFile", 0, 0 /* wxMOD_NONE */ }, - { "LoadStateFile", 0, 0 /* wxMOD_NONE */ }, + { "SaveFirstState", 0, 0 /* wxMOD_NONE */ }, + { "UndoLoadState", 351 /* WXK_F12 */, 0 /* wxMOD_NONE */ }, + { "UndoSaveState", 351 /* WXK_F12 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateFile", 0, 0 /* wxMOD_NONE */ }, + { "LoadStateFile", 0, 0 /* wxMOD_NONE */ }, }; SConfig::SConfig() @@ -363,6 +364,7 @@ void SConfig::SaveMovieSettings(IniFile& ini) movie->Set("PauseMovie", m_PauseMovie); movie->Set("Author", m_strMovieAuthor); movie->Set("DumpFrames", m_DumpFrames); + movie->Set("DumpFramesSilent", m_DumpFramesSilent); movie->Set("ShowInputDisplay", m_ShowInputDisplay); } @@ -542,13 +544,13 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("HLE_BS2", &m_LocalCoreStartupParameter.bHLE_BS2, false); #ifdef _M_X86 - core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_JIT64); + core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, PowerPC::CORE_JIT64); #elif _M_ARM_32 - core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_JITARM); + core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, PowerPC::CORE_JITARM); #elif _M_ARM_64 - core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_JITARM64); + core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, PowerPC::CORE_JITARM64); #else - core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_INTERPRETER); + core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, PowerPC::CORE_INTERPRETER); #endif core->Get("Fastmem", &m_LocalCoreStartupParameter.bFastmem, true); core->Get("DSPHLE", &m_LocalCoreStartupParameter.bDSPHLE, true); @@ -606,6 +608,7 @@ void SConfig::LoadMovieSettings(IniFile& ini) movie->Get("PauseMovie", &m_PauseMovie, false); movie->Get("Author", &m_strMovieAuthor, ""); movie->Get("DumpFrames", &m_DumpFrames, false); + movie->Get("DumpFramesSilent", &m_DumpFramesSilent, false); movie->Get("ShowInputDisplay", &m_ShowInputDisplay, false); } diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 5b0517785..4bad3f8ba 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -101,6 +101,7 @@ struct SConfig : NonCopyable std::string m_strMovieAuthor; unsigned int m_FrameSkip; bool m_DumpFrames; + bool m_DumpFramesSilent; bool m_ShowInputDisplay; // DSP settings diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index c9c52de98..ba3654a85 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -401,7 +401,7 @@ void EmuThread() CBoot::BootUp(); // Setup our core, but can't use dynarec if we are compare server - if (core_parameter.iCPUCore != SCoreStartupParameter::CORE_INTERPRETER + if (core_parameter.iCPUCore != PowerPC::CORE_INTERPRETER && (!core_parameter.bRunCompareServer || core_parameter.bRunCompareClient)) { PowerPC::SetMode(PowerPC::MODE_JIT); @@ -640,7 +640,7 @@ void VideoThrottle() if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDoubleVideoRate) { update_ss_speed = s_drawn_video & 1; - } +} // Update the audio timestretcher with the current speed if (g_sound_stream && update_ss_speed) { diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 2ca9bf923..7865a481c 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -94,6 +94,7 @@ + @@ -139,7 +140,6 @@ - @@ -245,6 +245,7 @@ + @@ -307,6 +308,7 @@ + @@ -446,7 +448,7 @@ {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - + {349ee8f9-7d25-4909-aaf5-ff3fade72187} @@ -486,4 +488,4 @@ - \ No newline at end of file + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 29ecb1898..f67948aea 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -136,6 +136,9 @@ {827afa93-1a80-4835-93ae-b5516d95867f} + + {81956f71-d9fe-454f-96a6-855195d611c4} + @@ -144,6 +147,7 @@ + @@ -511,9 +515,6 @@ HW %28Flipper/Hollywood%29 - - HW %28Flipper/Hollywood%29 - HW %28Flipper/Hollywood%29 @@ -718,15 +719,24 @@ IPC HLE %28IOS/Starlet%29 - - HW %28Flipper/Hollywood%29\GCKeyboard HW %28Flipper/Hollywood%29\GCKeyboard - + + PowerPC + + + HW %28Flipper/Hollywood%29\SI - Serial Interface + + + PowerPC\JitCommon + + + PowerPC\Jit64Common + @@ -736,6 +746,7 @@ + @@ -1227,7 +1238,6 @@ PowerPC\JitILCommon - IPC HLE %28IOS/Starlet%29 @@ -1238,9 +1248,14 @@ HW %28Flipper/Hollywood%29\GCKeyboard - + + HW %28Flipper/Hollywood%29\SI - Serial Interface + + + PowerPC\Jit64Common + - \ No newline at end of file + diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index d9d4206bb..c36de536e 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -17,6 +17,7 @@ #include "Core/Boot/Boot.h" #include "Core/Boot/Boot_DOL.h" #include "Core/FifoPlayer/FifoDataFile.h" +#include "Core/PowerPC/PowerPC.h" #include "DiscIO/NANDContentLoader.h" #include "DiscIO/VolumeCreator.h" @@ -36,10 +37,10 @@ SCoreStartupParameter::SCoreStartupParameter() bCPUThread(true), bDSPThread(false), bDSPHLE(true), bSkipIdle(true), bSyncGPUOnSkipIdleHack(true), bNTSC(false), bForceNTSCJ(false), bHLE_BS2(true), bEnableCheats(false), - bMergeBlocks(false), bEnableMemcardSaving(true), + bEnableMemcardSaving(true), bDPL2Decoder(false), bTimeStretching(false), iLatency(14), bRunCompareServer(false), bRunCompareClient(false), - bBAT(false), bMMU(false), bDCBZOFF(false), + bMMU(false), bDCBZOFF(false), iBBDumpPort(0), bDoubleVideoRate(false), bSyncGPU(false), bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), @@ -66,7 +67,7 @@ void SCoreStartupParameter::LoadDefaults() iGDBPort = -1; #endif - iCPUCore = CORE_JIT64; + iCPUCore = PowerPC::CORE_JIT64; bCPUThread = false; bSkipIdle = false; bSyncGPUOnSkipIdleHack = true; @@ -74,14 +75,12 @@ void SCoreStartupParameter::LoadDefaults() bDSPHLE = true; bFastmem = true; bFPRF = false; - bBAT = false; bMMU = false; bDCBZOFF = false; iBBDumpPort = -1; bDoubleVideoRate = false; bSyncGPU = false; bFastDiscSpeed = false; - bMergeBlocks = false; bEnableMemcardSaving = true; SelectedLanguage = 0; bWii = false; @@ -109,9 +108,39 @@ void SCoreStartupParameter::LoadDefaults() m_strUniqueID = "00000000"; } +static const char* GetRegionOfCountry(DiscIO::IVolume::ECountry country) +{ + switch (country) + { + case DiscIO::IVolume::COUNTRY_USA: + return USA_DIR; + + case DiscIO::IVolume::COUNTRY_TAIWAN: + case DiscIO::IVolume::COUNTRY_KOREA: + // TODO: Should these have their own Region Dir? + case DiscIO::IVolume::COUNTRY_JAPAN: + return JAP_DIR; + + case DiscIO::IVolume::COUNTRY_AUSTRALIA: + case DiscIO::IVolume::COUNTRY_EUROPE: + case DiscIO::IVolume::COUNTRY_FRANCE: + case DiscIO::IVolume::COUNTRY_GERMANY: + case DiscIO::IVolume::COUNTRY_INTERNATIONAL: + case DiscIO::IVolume::COUNTRY_ITALY: + case DiscIO::IVolume::COUNTRY_NETHERLANDS: + case DiscIO::IVolume::COUNTRY_RUSSIA: + case DiscIO::IVolume::COUNTRY_SPAIN: + return EUR_DIR; + + case DiscIO::IVolume::COUNTRY_UNKNOWN: + default: + return nullptr; + } +} + bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) { - std::string Region(EUR_DIR); + std::string set_region_dir(EUR_DIR); switch (_BootBS2) { @@ -151,56 +180,27 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) } m_strName = pVolume->GetName(); m_strUniqueID = pVolume->GetUniqueID(); - m_strRevisionSpecificUniqueID = pVolume->GetRevisionSpecificUniqueID(); + m_revision = pVolume->GetRevision(); // Check if we have a Wii disc bWii = pVolume.get()->IsWiiDisc(); - switch (pVolume->GetCountry()) + + const char* retrieved_region_dir = GetRegionOfCountry(pVolume->GetCountry()); + if (!retrieved_region_dir) { - case DiscIO::IVolume::COUNTRY_USA: - bNTSC = true; - Region = USA_DIR; - break; - - case DiscIO::IVolume::COUNTRY_TAIWAN: - case DiscIO::IVolume::COUNTRY_KOREA: - // TODO: Should these have their own Region Dir? - case DiscIO::IVolume::COUNTRY_JAPAN: - bNTSC = true; - Region = JAP_DIR; - break; - - case DiscIO::IVolume::COUNTRY_AUSTRALIA: - case DiscIO::IVolume::COUNTRY_EUROPE: - case DiscIO::IVolume::COUNTRY_FRANCE: - case DiscIO::IVolume::COUNTRY_INTERNATIONAL: - case DiscIO::IVolume::COUNTRY_ITALY: - case DiscIO::IVolume::COUNTRY_NETHERLANDS: - case DiscIO::IVolume::COUNTRY_RUSSIA: - case DiscIO::IVolume::COUNTRY_SPAIN: - bNTSC = false; - Region = EUR_DIR; - break; - - case DiscIO::IVolume::COUNTRY_UNKNOWN: - default: - if (PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)." - "\nContinue with PAL region?")) - { - bNTSC = false; - Region = EUR_DIR; - break; - } - else - { + if (!PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)." + "\nContinue with PAL region?")) return false; - } + retrieved_region_dir = EUR_DIR; } + + set_region_dir = retrieved_region_dir; + bNTSC = set_region_dir == USA_DIR || set_region_dir == JAP_DIR; } else if (!strcasecmp(Extension.c_str(), ".elf")) { bWii = CBoot::IsElfWii(m_strFilename); - Region = USA_DIR; + set_region_dir = USA_DIR; m_BootType = BOOT_ELF; bNTSC = true; } @@ -208,14 +208,14 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) { CDolLoader dolfile(m_strFilename); bWii = dolfile.IsWii(); - Region = USA_DIR; + set_region_dir = USA_DIR; m_BootType = BOOT_DOL; bNTSC = true; } else if (!strcasecmp(Extension.c_str(), ".dff")) { bWii = true; - Region = USA_DIR; + set_region_dir = USA_DIR; bNTSC = true; m_BootType = BOOT_DFF; @@ -240,37 +240,9 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) return false; //do not boot } - switch (ContentLoader.GetCountry()) - { - case DiscIO::IVolume::COUNTRY_USA: - bNTSC = true; - Region = USA_DIR; - break; - - case DiscIO::IVolume::COUNTRY_TAIWAN: - case DiscIO::IVolume::COUNTRY_KOREA: - // TODO: Should these have their own Region Dir? - case DiscIO::IVolume::COUNTRY_JAPAN: - bNTSC = true; - Region = JAP_DIR; - break; - - case DiscIO::IVolume::COUNTRY_AUSTRALIA: - case DiscIO::IVolume::COUNTRY_EUROPE: - case DiscIO::IVolume::COUNTRY_FRANCE: - case DiscIO::IVolume::COUNTRY_INTERNATIONAL: - case DiscIO::IVolume::COUNTRY_ITALY: - case DiscIO::IVolume::COUNTRY_RUSSIA: - bNTSC = false; - Region = EUR_DIR; - break; - - case DiscIO::IVolume::COUNTRY_UNKNOWN: - default: - bNTSC = false; - Region = EUR_DIR; - break; - } + const char* retrieved_region_dir = GetRegionOfCountry(ContentLoader.GetCountry()); + set_region_dir = retrieved_region_dir ? retrieved_region_dir : EUR_DIR; + bNTSC = set_region_dir == USA_DIR || set_region_dir == JAP_DIR; bWii = true; m_BootType = BOOT_WII_NAND; @@ -310,35 +282,35 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) break; case BOOT_BS2_USA: - Region = USA_DIR; + set_region_dir = USA_DIR; m_strFilename.clear(); bNTSC = true; break; case BOOT_BS2_JAP: - Region = JAP_DIR; + set_region_dir = JAP_DIR; m_strFilename.clear(); bNTSC = true; break; case BOOT_BS2_EUR: - Region = EUR_DIR; + set_region_dir = EUR_DIR; m_strFilename.clear(); bNTSC = false; break; } // Setup paths - CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, Region, true); - CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, Region, false); + CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, set_region_dir, true); + CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, set_region_dir, false); m_strSRAM = File::GetUserPath(F_GCSRAM_IDX); if (!bWii) { if (!bHLE_BS2) { - m_strBootROM = File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + Region + DIR_SEP GC_IPL; + m_strBootROM = File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + set_region_dir + DIR_SEP GC_IPL; if (!File::Exists(m_strBootROM)) - m_strBootROM = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + Region + DIR_SEP GC_IPL; + m_strBootROM = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + set_region_dir + DIR_SEP GC_IPL; if (!File::Exists(m_strBootROM)) { @@ -403,28 +375,60 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri } } -IniFile SCoreStartupParameter::LoadGameIni() const -{ - IniFile game_ini; - game_ini.Load(m_strGameIniDefault); - if (m_strGameIniDefaultRevisionSpecific != "") - game_ini.Load(m_strGameIniDefaultRevisionSpecific, true); - game_ini.Load(m_strGameIniLocal, true); - return game_ini; -} - IniFile SCoreStartupParameter::LoadDefaultGameIni() const { IniFile game_ini; - game_ini.Load(m_strGameIniDefault); - if (m_strGameIniDefaultRevisionSpecific != "") - game_ini.Load(m_strGameIniDefaultRevisionSpecific, true); + LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, GetUniqueID(), m_revision); return game_ini; } IniFile SCoreStartupParameter::LoadLocalGameIni() const { IniFile game_ini; - game_ini.Load(m_strGameIniLocal); + LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), GetUniqueID(), m_revision); return game_ini; } + +IniFile SCoreStartupParameter::LoadGameIni() const +{ + IniFile game_ini; + LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, GetUniqueID(), m_revision); + LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), GetUniqueID(), m_revision); + return game_ini; +} + +IniFile SCoreStartupParameter::LoadDefaultGameIni(const std::string& id, int revision) +{ + IniFile game_ini; + LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, id, revision); + return game_ini; +} + +IniFile SCoreStartupParameter::LoadLocalGameIni(const std::string& id, int revision) +{ + IniFile game_ini; + LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), id, revision); + return game_ini; +} + +IniFile SCoreStartupParameter::LoadGameIni(const std::string& id, int revision) +{ + IniFile game_ini; + LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, id, revision); + LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), id, revision); + return game_ini; +} + +void SCoreStartupParameter::LoadGameIni(IniFile* game_ini, const std::string& path, + const std::string& id, int revision) +{ + // INIs that match all regions + if (id.size() >= 4) + game_ini->Load(path + id.substr(0, 3) + ".ini", true); + + // Regular INIs + game_ini->Load(path + id + ".ini", true); + + // INIs with specific revisions + game_ini->Load(path + id + StringFromFormat("r%d", revision) + ".ini", true); +} diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index a5a822f56..fc43a2efb 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -136,14 +136,6 @@ struct SCoreStartupParameter bool bAutomaticStart; bool bBootToPause; - enum - { - CORE_INTERPRETER, - CORE_JIT64, - CORE_JITIL64, - CORE_JITARM, - CORE_JITARM64 - }; int iCPUCore; // JIT (shared between JIT and JITIL) @@ -172,7 +164,6 @@ struct SCoreStartupParameter bool bForceNTSCJ; bool bHLE_BS2; bool bEnableCheats; - bool bMergeBlocks; bool bEnableMemcardSaving; bool bDPL2Decoder; @@ -182,7 +173,6 @@ struct SCoreStartupParameter bool bRunCompareServer; bool bRunCompareClient; - bool bBAT; bool bMMU; bool bDCBZOFF; int iBBDumpPort; @@ -248,11 +238,8 @@ struct SCoreStartupParameter std::string m_strDVDRoot; std::string m_strApploader; std::string m_strUniqueID; - std::string m_strRevisionSpecificUniqueID; std::string m_strName; - std::string m_strGameIniDefault; - std::string m_strGameIniDefaultRevisionSpecific; - std::string m_strGameIniLocal; + int m_revision; std::string m_perfDir; @@ -262,8 +249,16 @@ struct SCoreStartupParameter void LoadDefaults(); bool AutoSetup(EBootBS2 _BootBS2); const std::string &GetUniqueID() const { return m_strUniqueID; } - void CheckMemcardPath(std::string& memcardPath, std::string Region, bool isSlotA); + void CheckMemcardPath(std::string& memcardPath, std::string gameRegion, bool isSlotA); + IniFile LoadDefaultGameIni() const; IniFile LoadLocalGameIni() const; IniFile LoadGameIni() const; + + static IniFile LoadDefaultGameIni(const std::string& id, int revision); + static IniFile LoadLocalGameIni(const std::string& id, int revision); + static IniFile LoadGameIni(const std::string& id, int revision); + +private: + static void LoadGameIni(IniFile* game_ini, const std::string& path, const std::string& id, int revision); }; diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp index c6c349711..5e75c27b0 100644 --- a/Source/Core/Core/CoreTiming.cpp +++ b/Source/Core/Core/CoreTiming.cpp @@ -224,6 +224,8 @@ u64 GetIdleTicks() // schedule things to be executed on the main thread. void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata) { + // TODO: Fix UI thread safety problems, and enable this assertion + // _assert_msg_(POWERPC, !Core::IsCPUThread(), "ScheduleEvent_Threadsafe from wrong thread"); std::lock_guard lk(tsWriteLock); Event ne; ne.time = globalTimer + cyclesIntoFuture; @@ -232,8 +234,14 @@ void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata tsQueue.Push(ne); } +// Executes an event immediately, then returns. +void ScheduleEvent_Immediate(int event_type, u64 userdata) +{ + event_types[event_type].callback(userdata, 0); +} + // Same as ScheduleEvent_Threadsafe(0, ...) EXCEPT if we are already on the CPU thread -// in which case the event will get handled immediately, before returning. +// in which case this is the same as ScheduleEvent_Immediate. void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata) { if (Core::IsCPUThread()) @@ -279,6 +287,8 @@ static void AddEventToQueue(Event* ne) // than Advance void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata) { + // TODO: Fix UI thread safety problems, and enable this assertion + //_assert_msg_(POWERPC, Core::IsCPUThread(), "ScheduleEvent from wrong thread"); Event *ne = GetNewEvent(); ne->userdata = userdata; ne->type = event_type; diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h index 1de5b92ce..fdd5fe14e 100644 --- a/Source/Core/Core/CoreTiming.h +++ b/Source/Core/Core/CoreTiming.h @@ -43,11 +43,11 @@ void DoState(PointerWrap &p); int RegisterEvent(const std::string& name, TimedCallback callback); void UnregisterAllEvents(); -// userdata MAY NOT CONTAIN POINTERS. userdata might get written and reloaded from disk, -// when we implement state saves. -void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata=0); -void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata=0); -void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata=0); +// userdata MAY NOT CONTAIN POINTERS. userdata might get written and reloaded from savestates. +void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata = 0); +void ScheduleEvent_Immediate(int event_type, u64 userdata = 0); +void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata = 0); +void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata = 0); // We only permit one event of each type in the queue at a time. void RemoveEvent(int event_type); diff --git a/Source/Core/Core/DSPEmulator.cpp b/Source/Core/Core/DSPEmulator.cpp index a15f5be6e..61f6e8e34 100644 --- a/Source/Core/Core/DSPEmulator.cpp +++ b/Source/Core/Core/DSPEmulator.cpp @@ -10,11 +10,7 @@ DSPEmulator *CreateDSPEmulator(bool HLE) { if (HLE) - { return new DSPHLE(); - } else - { return new DSPLLE(); - } } diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp index 29255a307..4a9ec9811 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp @@ -39,27 +39,27 @@ void AddAutoBreakpoints() // Returns true if the address is not a valid RAM address or NULL. static bool IsStackBottom(u32 addr) { - return !addr || !Memory::IsRAMAddress(addr); + return !addr || !PowerPC::HostIsRAMAddress(addr); } static void WalkTheStack(const std::function& stack_step) { if (!IsStackBottom(PowerPC::ppcState.gpr[1])) { - u32 addr = Memory::ReadUnchecked_U32(PowerPC::ppcState.gpr[1]); // SP + u32 addr = PowerPC::HostRead_U32(PowerPC::ppcState.gpr[1]); // SP // Walk the stack chain for (int count = 0; !IsStackBottom(addr + 4) && (count++ < 20); ++count) { - u32 func_addr = Memory::ReadUnchecked_U32(addr + 4); + u32 func_addr = PowerPC::HostRead_U32(addr + 4); stack_step(func_addr); if (IsStackBottom(addr)) break; - addr = Memory::ReadUnchecked_U32(addr); + addr = PowerPC::HostRead_U32(addr); } } } @@ -69,7 +69,7 @@ static void WalkTheStack(const std::function& stack_step) // instead of "pointing ahead" bool GetCallstack(std::vector &output) { - if (!Core::IsRunning() || !Memory::IsRAMAddress(PowerPC::ppcState.gpr[1])) + if (!Core::IsRunning() || !PowerPC::HostIsRAMAddress(PowerPC::ppcState.gpr[1])) return false; if (LR == 0) diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp index 1434fdb5b..2a70213d3 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp +++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp @@ -19,26 +19,22 @@ std::string PPCDebugInterface::Disassemble(unsigned int address) { - // Memory::ReadUnchecked_U32 seemed to crash on shutdown + // PowerPC::HostRead_U32 seemed to crash on shutdown if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return ""; - if (Core::GetState() != Core::CORE_UNINITIALIZED) + if (Core::GetState() == Core::CORE_PAUSE) { - if (!Memory::IsRAMAddress(address, true, true)) + if (!PowerPC::HostIsRAMAddress(address)) { - if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU || !((address & JIT_ICACHE_VMEM_BIT) && - Memory::TranslateAddress(address))) - { - return "(No RAM here)"; - } + return "(No RAM here)"; } - u32 op = Memory::Read_Instruction(address); + u32 op = PowerPC::HostRead_Instruction(address); std::string disasm = GekkoDisassembler::Disassemble(op, address); UGeckoInstruction inst; - inst.hex = Memory::ReadUnchecked_U32(address); + inst.hex = PowerPC::HostRead_U32(address); if (inst.OPCD == 1) { @@ -57,7 +53,7 @@ void PPCDebugInterface::GetRawMemoryString(int memory, unsigned int address, cha { if (Core::GetState() != Core::CORE_UNINITIALIZED) { - if (memory || Memory::IsRAMAddress(address, true, true)) + if (memory || PowerPC::HostIsRAMAddress(address)) { snprintf(dest, max_size, "%08X%s", ReadExtraMemory(memory, address), memory ? " (ARAM)" : ""); } @@ -74,7 +70,7 @@ void PPCDebugInterface::GetRawMemoryString(int memory, unsigned int address, cha unsigned int PPCDebugInterface::ReadMemory(unsigned int address) { - return Memory::ReadUnchecked_U32(address); + return PowerPC::HostRead_U32(address); } unsigned int PPCDebugInterface::ReadExtraMemory(int memory, unsigned int address) @@ -82,7 +78,7 @@ unsigned int PPCDebugInterface::ReadExtraMemory(int memory, unsigned int address switch (memory) { case 0: - return Memory::ReadUnchecked_U32(address); + return PowerPC::HostRead_U32(address); case 1: return (DSP::ReadARAM(address) << 24) | (DSP::ReadARAM(address + 1) << 16) | @@ -95,7 +91,7 @@ unsigned int PPCDebugInterface::ReadExtraMemory(int memory, unsigned int address unsigned int PPCDebugInterface::ReadInstruction(unsigned int address) { - return Memory::Read_Instruction(address); + return PowerPC::HostRead_Instruction(address); } bool PPCDebugInterface::IsAlive() @@ -170,7 +166,7 @@ void PPCDebugInterface::ToggleMemCheck(unsigned int address) void PPCDebugInterface::InsertBLR(unsigned int address, unsigned int value) { - Memory::Write_U32(value, address); + PowerPC::HostWrite_U32(value, address); } void PPCDebugInterface::BreakNow() @@ -184,7 +180,9 @@ void PPCDebugInterface::BreakNow() // ------------- int PPCDebugInterface::GetColor(unsigned int address) { - if (!Memory::IsRAMAddress(address, true, true)) + if (!IsAlive()) + return 0xFFFFFF; + if (!PowerPC::HostIsRAMAddress(address)) return 0xeeeeee; static const int colors[6] = { diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index fc33bb755..deb1d01bb 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -348,6 +348,17 @@ void FifoPlayer::SetupFifo() void FifoPlayer::LoadMemory() { + UReg_MSR newMSR; + newMSR.DR = 1; + newMSR.IR = 1; + MSR = newMSR.Hex; + PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff; + PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002; + PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff; + PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002; + PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff; + PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a; + Memory::Clear(); SetupFifo(); @@ -391,12 +402,12 @@ void FifoPlayer::LoadMemory() void FifoPlayer::WriteCP(u32 address, u16 value) { - Memory::Write_U16(value, 0xCC000000 | address); + PowerPC::Write_U16(value, 0xCC000000 | address); } void FifoPlayer::WritePI(u32 address, u32 value) { - Memory::Write_U32(value, 0xCC003000 | address); + PowerPC::Write_U32(value, 0xCC003000 | address); } void FifoPlayer::FlushWGP() diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 47d5b7f17..9fd347050 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -90,16 +90,17 @@ static bool InstallCodeHandler() } // Install code handler - Memory::CopyToEmu(INSTALLER_BASE_ADDRESS, data.data(), data.length()); + for (size_t i = 0, e = data.length(); i < e; ++i) + PowerPC::HostWrite_U8(data[i], (u32)(INSTALLER_BASE_ADDRESS + i)); // Patch the code handler to the system starting up for (unsigned int h = 0; h < data.length(); h += 4) { // Patch MMIO address - if (Memory::ReadUnchecked_U32(INSTALLER_BASE_ADDRESS + h) == (0x3f000000u | ((mmioAddr ^ 1) << 8))) + if (PowerPC::HostRead_U32(INSTALLER_BASE_ADDRESS + h) == (0x3f000000u | ((mmioAddr ^ 1) << 8))) { NOTICE_LOG(ACTIONREPLAY, "Patching MMIO access at %08x", INSTALLER_BASE_ADDRESS + h); - Memory::Write_U32(0x3f000000u | mmioAddr << 8, INSTALLER_BASE_ADDRESS + h); + PowerPC::HostWrite_U32(0x3f000000u | mmioAddr << 8, INSTALLER_BASE_ADDRESS + h); } } @@ -107,11 +108,11 @@ static bool InstallCodeHandler() u32 codelist_end_address = INSTALLER_END_ADDRESS; // Write a magic value to 'gameid' (codehandleronly does not actually read this). - Memory::Write_U32(0xd01f1bad, INSTALLER_BASE_ADDRESS); + PowerPC::HostWrite_U32(0xd01f1bad, INSTALLER_BASE_ADDRESS); // Create GCT in memory - Memory::Write_U32(0x00d0c0de, codelist_base_address); - Memory::Write_U32(0x00d0c0de, codelist_base_address + 4); + PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address); + PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address + 4); std::lock_guard lk(active_codes_lock); @@ -126,19 +127,19 @@ static bool InstallCodeHandler() // Make sure we have enough memory to hold the code list if ((codelist_base_address + 24 + i) < codelist_end_address) { - Memory::Write_U32(code.address, codelist_base_address + 8 + i); - Memory::Write_U32(code.data, codelist_base_address + 12 + i); + PowerPC::HostWrite_U32(code.address, codelist_base_address + 8 + i); + PowerPC::HostWrite_U32(code.data, codelist_base_address + 12 + i); i += 8; } } } } - Memory::Write_U32(0xff000000, codelist_base_address + 8 + i); - Memory::Write_U32(0x00000000, codelist_base_address + 12 + i); + PowerPC::HostWrite_U32(0xff000000, codelist_base_address + 8 + i); + PowerPC::HostWrite_U32(0x00000000, codelist_base_address + 12 + i); // Turn on codes - Memory::Write_U8(1, INSTALLER_BASE_ADDRESS + 7); + PowerPC::HostWrite_U8(1, INSTALLER_BASE_ADDRESS + 7); // Invalidate the icache and any asm codes for (unsigned int j = 0; j < (INSTALLER_END_ADDRESS - INSTALLER_BASE_ADDRESS); j += 32) @@ -156,7 +157,7 @@ void RunCodeHandler() { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats && active_codes.size() > 0) { - if (!code_handler_installed || Memory::Read_U32(INSTALLER_BASE_ADDRESS) - 0xd01f1bad > 5) + if (!code_handler_installed || PowerPC::HostRead_U32(INSTALLER_BASE_ADDRESS) - 0xd01f1bad > 5) code_handler_installed = InstallCodeHandler(); if (!code_handler_installed) diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp index b3b18fb43..2b480f76b 100644 --- a/Source/Core/Core/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/HLE/HLE_Misc.cpp @@ -63,7 +63,7 @@ void HLEGeckoCodehandler() // robust alternative would be to actually detect memory writes, but that // would be even uglier.) u32 magic = 0xd01f1bad; - u32 existing = Memory::Read_U32(0x80001800); + u32 existing = PowerPC::HostRead_U32(0x80001800); if (existing - magic == 5) { return; @@ -72,7 +72,7 @@ void HLEGeckoCodehandler() { existing = magic; } - Memory::Write_U32(existing + 1, 0x80001800); + PowerPC::HostWrite_U32(existing + 1, 0x80001800); PowerPC::ppcState.iCache.Reset(); } diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index 08d131539..ff8ab56da 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -32,7 +32,7 @@ void HLE_OSPanic() void HLE_GeneralDebugPrint() { std::string ReportMessage; - if (Memory::Read_U32(GPR(3)) > 0x80000000) + if (PowerPC::HostRead_U32(GPR(3)) > 0x80000000) { GetStringVA(ReportMessage, 4); } @@ -63,7 +63,7 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg) std::string ArgumentBuffer = ""; u32 ParameterCounter = strReg+1; u32 FloatingParameterCounter = 1; - std::string string = Memory::GetString(GPR(strReg)); + std::string string = PowerPC::HostGetString(GPR(strReg)); for(u32 i = 0; i < string.size(); i++) { @@ -84,7 +84,7 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg) u64 Parameter; if (ParameterCounter > 10) { - Parameter = Memory::Read_U32(GPR(1) + 0x8 + ((ParameterCounter - 11) * 4)); + Parameter = PowerPC::HostRead_U32(GPR(1) + 0x8 + ((ParameterCounter - 11) * 4)); } else { @@ -101,7 +101,7 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg) switch (string[i]) { case 's': - _rOutBuffer += StringFromFormat(ArgumentBuffer.c_str(), Memory::GetString((u32)Parameter).c_str()); + _rOutBuffer += StringFromFormat(ArgumentBuffer.c_str(), PowerPC::HostGetString((u32)Parameter).c_str()); break; case 'd': @@ -135,7 +135,7 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg) _rOutBuffer += string[i]; } } - if (_rOutBuffer[_rOutBuffer.length() - 1] == '\n') + if (!_rOutBuffer.empty() && _rOutBuffer[_rOutBuffer.length() - 1] == '\n') _rOutBuffer.resize(_rOutBuffer.length() - 1); } diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index 616481719..2c810d8a1 100644 --- a/Source/Core/Core/HW/CPU.cpp +++ b/Source/Core/Core/HW/CPU.cpp @@ -42,7 +42,6 @@ void CCPU::Run() while (true) { -reswitch: switch (PowerPC::GetState()) { case PowerPC::CPU_RUNNING: @@ -60,7 +59,7 @@ reswitch: if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return; if (PowerPC::GetState() != PowerPC::CPU_STEPPING) - goto reswitch; + continue; //3: do a step PowerPC::SingleStep(); diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp index b0e410b30..b32b99adc 100644 --- a/Source/Core/Core/HW/DSP.cpp +++ b/Source/Core/Core/HW/DSP.cpp @@ -427,7 +427,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) // We make the samples ready as soon as possible void *address = Memory::GetPointer(g_audioDMA.SourceAddress); AudioCommon::SendAIBuffer((short*)address, g_audioDMA.AudioDMAControl.NumBlocks * 8); - CoreTiming::ScheduleEvent_Threadsafe(80, et_GenerateDSPInterrupt, INT_AID); + CoreTiming::ScheduleEvent(80, et_GenerateDSPInterrupt, INT_AID); } }) ); @@ -477,6 +477,7 @@ static void GenerateDSPInterrupt(u64 DSPIntType, int cyclesLate) // CALLED FROM DSP EMULATOR, POSSIBLY THREADED void GenerateDSPInterruptFromDSPEmu(DSPInterruptType type) { + // TODO: Maybe rethink this? ScheduleEvent_Threadsafe has unpredictable timing. CoreTiming::ScheduleEvent_Threadsafe_Immediate(et_GenerateDSPInterrupt, type); } @@ -543,7 +544,7 @@ static void Do_ARAM_DMA() if (instant_dma) ticksToTransfer = 0; - CoreTiming::ScheduleEvent_Threadsafe(ticksToTransfer, et_CompleteARAM); + CoreTiming::ScheduleEvent(ticksToTransfer, et_CompleteARAM); if (instant_dma) CoreTiming::ForceExceptionCheck(100); diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp index 3ccd46a58..6da9abec2 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp @@ -58,12 +58,12 @@ void DSPDebugInterface::GetRawMemoryString(int memory, unsigned int address, cha unsigned int DSPDebugInterface::ReadMemory(unsigned int address) { - return 0; //Memory::ReadUnchecked_U32(address); + return 0; } unsigned int DSPDebugInterface::ReadInstruction(unsigned int address) { - return 0; //Memory::Read_Instruction(address); + return 0; } bool DSPDebugInterface::IsAlive() diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index adbcc2475..f809b0488 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -185,7 +185,9 @@ bool DSPLLE::Initialize(bool bWii, bool bDSPThread) return false; // DSPLLE directly accesses the fastmem arena. - g_dsp.cpu_ram = Memory::base; + // TODO: The fastmem arena is only supposed to be used by the JIT: + // among other issues, its size is only 1GB on 32-bit targets. + g_dsp.cpu_ram = Memory::physical_base; DSPCore_Reset(); InitInstructionTable(); diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index 00274bd5f..223b4ee80 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -213,6 +213,22 @@ union UDICFG UDICFG(u32 _hex) {Hex = _hex;} }; +struct DVDReadCommand +{ + bool is_valid; + + u64 DVD_offset; + u32 output_address; + u32 length; + bool decrypt; + + DIInterruptType interrupt_type; + + // Used to notify emulated software after executing command. + // Pointers don't work with savestates, so CoreTiming events are used instead + int callback_event_type; +}; + // STATE_TO_SAVE // hardware registers @@ -225,6 +241,8 @@ static UDICR m_DICR; static UDIIMMBUF m_DIIMMBUF; static UDICFG m_DICFG; +static DVDReadCommand current_read_command; + static u32 AudioPos; static u32 CurrentStart; static u32 CurrentLength; @@ -236,7 +254,8 @@ static u32 g_ErrorCode = 0; static bool g_bDiscInside = false; bool g_bStream = false; static bool g_bStopAtTrackEnd = false; -static int tc = 0; +static int finish_execute_command = 0; +static int finish_execute_read_command = 0; static int dtk = 0; static u64 g_last_read_offset; @@ -257,8 +276,8 @@ void UpdateInterrupts(); void GenerateDIInterrupt(DIInterruptType _DVDInterrupt); void WriteImmediate(u32 value, u32 output_address, bool write_to_DIIMMBUF); -DVDCommandResult ExecuteReadCommand(u64 DVD_offset, u32 output_address, - u32 DVD_length, u32 output_length, bool decrypt); +DVDReadCommand ExecuteReadCommand(u64 DVD_offset, u32 output_address, u32 DVD_length, u32 output_length, + bool decrypt, DIInterruptType* interrupt_type, u64* ticks_until_completion); u64 SimulateDiscReadTime(u64 offset, u32 length); s64 CalculateRawDiscReadTime(u64 offset, s64 length); @@ -274,6 +293,8 @@ void DoState(PointerWrap &p) p.Do(m_DIIMMBUF); p.DoPOD(m_DICFG); + p.Do(current_read_command); + p.Do(NextStart); p.Do(AudioPos); p.Do(NextLength); @@ -291,7 +312,7 @@ void DoState(PointerWrap &p) p.Do(g_bStopAtTrackEnd); } -static void TransferComplete(u64 userdata, int cyclesLate) +static void FinishExecuteCommand(u64 userdata, int cyclesLate) { if (m_DICR.TSTART) { @@ -301,6 +322,30 @@ static void TransferComplete(u64 userdata, int cyclesLate) } } +static void FinishExecuteReadCommand(u64 userdata, int cyclesLate) +{ + if (!current_read_command.is_valid) + { + PanicAlertT("DVDInterface tried to execute non-existing command"); + } + else + { + // Here is the actual disc reading + if (!DVDRead(current_read_command.DVD_offset, current_read_command.output_address, + current_read_command.length, current_read_command.decrypt)) + { + PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error"); + } + } + + // The command is marked as invalid because it shouldn't be used again + current_read_command.is_valid = false; + + // The final step is to notify the emulated software that the command has been executed + CoreTiming::ScheduleEvent_Immediate(current_read_command.callback_event_type, + current_read_command.interrupt_type); +} + static u32 ProcessDTKSamples(short *tempPCM, u32 num_samples) { u32 samples_processed = 0; @@ -379,6 +424,8 @@ void Init() m_DICFG.Hex = 0; m_DICFG.CONFIG = 1; // Disable bootrom descrambler + current_read_command.is_valid = false; + AudioPos = 0; NextStart = 0; NextLength = 0; @@ -396,7 +443,8 @@ void Init() ejectDisc = CoreTiming::RegisterEvent("EjectDisc", EjectDiscCallback); insertDisc = CoreTiming::RegisterEvent("InsertDisc", InsertDiscCallback); - tc = CoreTiming::RegisterEvent("TransferComplete", TransferComplete); + finish_execute_command = CoreTiming::RegisterEvent("FinishExecuteCommand", FinishExecuteCommand); + finish_execute_read_command = CoreTiming::RegisterEvent("FinishExecuteReadCommand", FinishExecuteReadCommand); dtk = CoreTiming::RegisterEvent("StreamingTimer", DTKStreamingCallback); CoreTiming::ScheduleEvent(0, dtk); @@ -450,6 +498,7 @@ void ChangeDisc(const std::string& newFileName) std::string* _FileName = new std::string(newFileName); CoreTiming::ScheduleEvent_Threadsafe(0, ejectDisc); CoreTiming::ScheduleEvent_Threadsafe(500000000, insertDisc, (u64)_FileName); + // TODO: We shouldn't be modifying movie state from the GUI thread. if (Movie::IsRecordingInput()) { Movie::g_bDiscChange = true; @@ -472,7 +521,7 @@ void SetLidOpen(bool _bOpen) bool DVDRead(u64 _iDVDOffset, u32 _iRamAddress, u32 _iLength, bool decrypt) { - return VolumeHandler::ReadToPtr(Memory::GetPointer(_iRamAddress), _iDVDOffset, _iLength, decrypt); + return VolumeHandler::ReadToPtr(Memory::GetPointer(_iRamAddress), _iDVDOffset, _iLength, decrypt); } void RegisterMMIO(MMIO::Mapping* mmio, u32 base) @@ -544,21 +593,8 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) m_DICR.Hex = val & 7; if (m_DICR.TSTART) { - DVDCommandResult result = ExecuteCommand( - m_DICMDBUF[0].Hex, m_DICMDBUF[1].Hex, m_DICMDBUF[2].Hex, - m_DIMAR.Hex, m_DILENGTH.Hex, true); - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed) - { - // Make sure fast disc speed performs "instant" reads; in addition - // to being used to speed up games, fast disc speed is used as a - // workaround for crashes in Star Wars Rogue Leader. - TransferComplete(result.interrupt_type, 0); - } - else - { - // The transfer is finished after a delay - CoreTiming::ScheduleEvent((int)result.ticks_until_completion, tc, result.interrupt_type); - } + ExecuteCommand(m_DICMDBUF[0].Hex, m_DICMDBUF[1].Hex, m_DICMDBUF[2].Hex, + m_DIMAR.Hex, m_DILENGTH.Hex, true, finish_execute_command); } }) ); @@ -614,38 +650,51 @@ void WriteImmediate(u32 value, u32 output_address, bool write_to_DIIMMBUF) Memory::Write_U32(value, output_address); } -DVDCommandResult ExecuteReadCommand(u64 DVD_offset, u32 output_address, - u32 DVD_length, u32 output_length, bool decrypt) +// If the returned DVDReadCommand has is_valid set to true, +// FinishExecuteReadCommand must be used to finish executing it +DVDReadCommand ExecuteReadCommand(u64 DVD_offset, u32 output_address, u32 DVD_length, u32 output_length, + bool decrypt, DIInterruptType* interrupt_type, u64* ticks_until_completion) { + DVDReadCommand command; + + if (!g_bDiscInside) + { + g_ErrorCode = ERROR_NO_DISK | ERROR_COVER_H; + *interrupt_type = INT_DEINT; + command.is_valid = false; + return command; + } + if (DVD_length > output_length) { WARN_LOG(DVDINTERFACE, "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp."); DVD_length = output_length; } - DVDCommandResult result; - result.ticks_until_completion = SimulateDiscReadTime(DVD_offset, DVD_length); + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed) + *ticks_until_completion = 0; // An optional hack to speed up loading times + else + *ticks_until_completion = SimulateDiscReadTime(DVD_offset, DVD_length); - if (!g_bDiscInside) - { - g_ErrorCode = ERROR_NO_DISK | ERROR_COVER_H; - result.interrupt_type = INT_DEINT; - return result; - } - - if (!DVDRead(DVD_offset, output_address, DVD_length, decrypt)) - PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error"); - - result.interrupt_type = INT_TCINT; - return result; + *interrupt_type = INT_TCINT; + command.is_valid = true; + command.DVD_offset = DVD_offset; + command.output_address = output_address; + command.length = DVD_length; + command.decrypt = decrypt; + return command; } -DVDCommandResult ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, - u32 output_address, u32 output_length, bool write_to_DIIMMBUF) +// When the command has finished executing, callback_event_type +// will be called using CoreTiming::ScheduleEvent, +// with the userdata set to the interrupt type. +void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_address, u32 output_length, + bool write_to_DIIMMBUF, int callback_event_type) { - DVDCommandResult result; - result.interrupt_type = INT_TCINT; - result.ticks_until_completion = SystemTimers::GetTicksPerSecond() / 15000; + DIInterruptType interrupt_type = INT_TCINT; + u64 ticks_until_completion = SystemTimers::GetTicksPerSecond() / 15000; + DVDReadCommand read_command; + read_command.is_valid = false; bool GCAM = (SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_AM_BASEBOARD) && (SConfig::GetInstance().m_EXIDevice[2] == EXIDEVICE_AM_BASEBOARD); @@ -690,19 +739,21 @@ DVDCommandResult ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, // Only seems to be used from WII_IPC, not through direct access case DVDLowReadDiskID: INFO_LOG(DVDINTERFACE, "DVDLowReadDiskID"); - result = ExecuteReadCommand(0, output_address, 0x20, output_length, false); + read_command = ExecuteReadCommand(0, output_address, 0x20, output_length, + false, &interrupt_type, &ticks_until_completion); break; // Only used from WII_IPC. This is the only read command that decrypts data case DVDLowRead: INFO_LOG(DVDINTERFACE, "DVDLowRead: DVDAddr: 0x%09" PRIx64 ", Size: 0x%x", (u64)command_2 << 2, command_1); - result = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length, true); + read_command = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length, + true, &interrupt_type, &ticks_until_completion); break; // Probably only used by Wii case DVDLowWaitForCoverClose: INFO_LOG(DVDINTERFACE, "DVDLowWaitForCoverClose"); - result.interrupt_type = (DIInterruptType)4; // ??? + interrupt_type = (DIInterruptType)4; // ??? break; // "Set Extension"...not sure what it does. GC only? @@ -775,14 +826,15 @@ DVDCommandResult ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, (command_2 > 0x7ed40000 && command_2 < 0x7ed40008) || (((command_2 + command_1) > 0x7ed40000) && (command_2 + command_1) < 0x7ed40008))) { - result = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length, false); + read_command = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length, + false, &interrupt_type, &ticks_until_completion); } else { WARN_LOG(DVDINTERFACE, "DVDLowUnencryptedRead: trying to read out of bounds @ %09" PRIx64, (u64)command_2 << 2); g_ErrorCode = ERROR_READY | ERROR_BLOCK_OOB; // Should cause software to call DVDLowRequestError - result.interrupt_type = INT_BRKINT; + interrupt_type = INT_BRKINT; } break; @@ -807,7 +859,7 @@ DVDCommandResult ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, // Does not work on retail discs/drives // Retail games send this command to see if they are running on real retail hw g_ErrorCode = ERROR_READY | ERROR_INV_CMD; - result.interrupt_type = INT_BRKINT; + interrupt_type = INT_BRKINT; break; // DMA Read from Disc. Only seems to be used through direct access, not WII_IPC @@ -871,13 +923,15 @@ DVDCommandResult ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, } } - result = ExecuteReadCommand(iDVDOffset, output_address, command_2, output_length, false); + read_command = ExecuteReadCommand(iDVDOffset, output_address, command_2, output_length, + false, &interrupt_type, &ticks_until_completion); } break; case 0x40: // Read DiscID INFO_LOG(DVDINTERFACE, "Read DiscID %08x", Memory::Read_U32(output_address)); - result = ExecuteReadCommand(0, output_address, 0x20, output_length, false); + read_command = ExecuteReadCommand(0, output_address, 0x20, output_length, + false, &interrupt_type, &ticks_until_completion); break; default: @@ -1212,7 +1266,23 @@ DVDCommandResult ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, break; } - return result; + // The command will finish executing after a delay, + // to simulate the speed of a real disc drive + if (read_command.is_valid) + { + // We schedule a FinishExecuteReadCommand (which will call the actual callback + // once it's done) so that the data transfer isn't completed too early. + // Most games don't care about it, but if it's done wrong, Resident Evil 3 + // plays some extra noise when playing the menu selection sound effect. + read_command.callback_event_type = callback_event_type; + read_command.interrupt_type = interrupt_type; + current_read_command = read_command; + CoreTiming::ScheduleEvent((int)ticks_until_completion, finish_execute_read_command); + } + else + { + CoreTiming::ScheduleEvent((int)ticks_until_completion, callback_event_type, interrupt_type); + } } // Simulates the timing aspects of reading data from a disc. diff --git a/Source/Core/Core/HW/DVDInterface.h b/Source/Core/Core/HW/DVDInterface.h index 5b8a249fe..3f9337a9e 100644 --- a/Source/Core/Core/HW/DVDInterface.h +++ b/Source/Core/Core/HW/DVDInterface.h @@ -85,12 +85,6 @@ enum DIInterruptType INT_CVRINT = 3, }; -struct DVDCommandResult -{ - DIInterruptType interrupt_type; - u64 ticks_until_completion; -}; - void Init(); void Shutdown(); void DoState(PointerWrap &p); @@ -105,7 +99,7 @@ void ChangeDisc(const std::string& fileName); // DVD Access Functions bool DVDRead(u64 _iDVDOffset, u32 _iRamAddress, u32 _iLength, bool decrypt); extern bool g_bStream; -DVDCommandResult ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, - u32 output_address, u32 output_length, bool write_to_DIIMMBUF); +void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_address, u32 output_length, + bool write_to_DIIMMBUF, int callback_event_type); } // end of namespace DVDInterface diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI_DeviceAGP.cpp index f4a96b927..2aeb266ee 100644 --- a/Source/Core/Core/HW/EXI_DeviceAGP.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAGP.cpp @@ -90,6 +90,7 @@ void CEXIAgp::LoadFileToROM(const std::string& filename) void CEXIAgp::LoadFileToEEPROM(const std::string& filename) { + // Technically one of EEPROM, Flash, SRAM, FRAM File::IOFile pStream(filename, "rb"); if (pStream) { @@ -98,9 +99,31 @@ void CEXIAgp::LoadFileToEEPROM(const std::string& filename) m_eeprom_mask = (m_eeprom_size - 1); m_eeprom.resize(m_eeprom_size); - pStream.ReadBytes(m_eeprom.data(), filesize); + if ((m_eeprom_size == 512) || (m_eeprom_size == 8192)) + { + // Handle endian read - could be done with byte access in 0xAE commands instead + for (u32 index = 0; index < (m_eeprom_size / 8); index++) + { + u64 NewVal = 0; + for (u32 indexb = 0; indexb < 8; indexb++) + NewVal = (NewVal << 0x8) | m_eeprom[index * 8 + indexb]; + ((u64*)(m_eeprom.data()))[index] = NewVal; + } + m_eeprom_add_end = (m_eeprom_size == 512 ? (2 + 6) : (2 + 14)); + m_eeprom_add_mask = (m_eeprom_size == 512 ? 0x3F : 0x3FF); + m_eeprom_read_mask = (m_eeprom_size == 512 ? 0x80 : 0x8000); + m_eeprom_status_mask = (m_rom_size == 0x2000000 ? 0x1FFFF00 : 0x1000000); + } + else + m_eeprom_status_mask = 0; } + else + { + m_eeprom_size = 0; + m_eeprom.clear(); + } + } void CEXIAgp::SaveFileFromEEPROM(const std::string& filename) @@ -108,47 +131,60 @@ void CEXIAgp::SaveFileFromEEPROM(const std::string& filename) File::IOFile pStream(filename, "wb"); if (pStream) { - pStream.WriteBytes(m_eeprom.data(), m_eeprom_size); + if ((m_eeprom_size == 512) || (m_eeprom_size == 8192)) + { + // Handle endian write - could be done with byte access in 0xAE commands instead + std::vector temp_eeprom(m_eeprom_size); + for (u32 index = 0; index < (m_eeprom_size / 8); index++) + { + u64 NewVal = ((u64*)(m_eeprom.data()))[index]; + for (u32 indexb = 0; indexb < 8; indexb++) + temp_eeprom[index * 8 + (7-indexb)] = (NewVal >> (indexb * 8)) & 0xFF; + } + pStream.WriteBytes(temp_eeprom.data(), m_eeprom_size); + } + else + { + pStream.WriteBytes(m_eeprom.data(), m_eeprom_size); + } } } u32 CEXIAgp::ImmRead(u32 _uSize) { - // We don't really care about _uSize - (void)_uSize; u32 uData = 0; u8 RomVal1, RomVal2, RomVal3, RomVal4; switch (m_current_cmd) { - case 0xAE000000: + case 0xAE000000: // Clock handshake? uData = 0x5AAA5517; // 17 is precalculated hash m_current_cmd = 0; break; - case 0xAE010000: + case 0xAE010000: // Init? uData = (m_return_pos == 0) ? 0x01020304 : 0xF0020304; // F0 is precalculated hash, 020304 is left over if (m_return_pos == 1) m_current_cmd = 0; else m_return_pos = 1; break; - case 0xAE020000: - if (m_rw_offset == 0x8000000) + case 0xAE020000: // Read 2 bytes with 24 bit address + if (m_eeprom_write_status && ((m_rw_offset & m_eeprom_status_mask) == m_eeprom_status_mask) && (m_eeprom_status_mask != 0)) { - RomVal1 = 0x0; - RomVal2 = 0x1; + RomVal1 = 0x1; + RomVal2 = 0x0; } else { - RomVal1 = m_rom[m_rw_offset++]; - RomVal2 = m_rom[m_rw_offset++]; + RomVal1 = m_rom[(m_rw_offset++) & m_rom_mask]; + RomVal2 = m_rom[(m_rw_offset++) & m_rom_mask]; } CRC8(&RomVal2, 1); CRC8(&RomVal1, 1); uData = (RomVal2 << 24) | (RomVal1 << 16) | (m_hash << 8); m_current_cmd = 0; break; - case 0xAE030000: + case 0xAE030000: // read the next 4 bytes out of 0x10000 group if (_uSize == 1) { uData = 0xFF000000; @@ -156,10 +192,10 @@ u32 CEXIAgp::ImmRead(u32 _uSize) } else { - RomVal1 = m_rom[m_rw_offset++]; - RomVal2 = m_rom[m_rw_offset++]; - RomVal3 = m_rom[m_rw_offset++]; - RomVal4 = m_rom[m_rw_offset++]; + RomVal1 = m_rom[(m_rw_offset++) & m_rom_mask]; + RomVal2 = m_rom[(m_rw_offset++) & m_rom_mask]; + RomVal3 = m_rom[(m_rw_offset++) & m_rom_mask]; + RomVal4 = m_rom[(m_rw_offset++) & m_rom_mask]; CRC8(&RomVal2, 1); CRC8(&RomVal1, 1); CRC8(&RomVal4, 1); @@ -167,8 +203,25 @@ u32 CEXIAgp::ImmRead(u32 _uSize) uData = (RomVal2 << 24) | (RomVal1 << 16) | (RomVal4 << 8) | (RomVal3); } break; - case 0xAE0B0000: - RomVal1 = m_eeprom_pos < 4 ? 0xA : (((u64*)m_eeprom.data())[(m_eeprom_cmd >> 1) & 0x3F] >> (m_eeprom_pos - 4)) & 0x1; + case 0xAE040000: // read 1 byte from 16 bit address + // ToDo: Flash special handling + if (m_eeprom_size == 0) + RomVal1 = 0xFF; + else + RomVal1 = (m_eeprom.data())[m_eeprom_pos]; + CRC8(&RomVal1, 1); + uData = (RomVal1 << 24) | (m_hash << 16); + m_current_cmd = 0; + break; + case 0xAE0B0000: // read 1 bit from DMA with 6 or 14 bit address + // Change to byte access instead of endian file access? + RomVal1 = EE_READ_FALSE; + if ((m_eeprom_size != 0) + && (m_eeprom_pos >= EE_IGNORE_BITS) + && ((((u64*)m_eeprom.data())[(m_eeprom_cmd >> 1) & m_eeprom_add_mask]) >> ((EE_DATA_BITS - 1) - (m_eeprom_pos - EE_IGNORE_BITS))) & 0x1) + { + RomVal1 = EE_READ_TRUE; + } RomVal2 = 0; CRC8(&RomVal2, 1); CRC8(&RomVal1, 1); @@ -176,7 +229,8 @@ u32 CEXIAgp::ImmRead(u32 _uSize) m_eeprom_pos++; m_current_cmd = 0; break; - case 0xAE0C0000: + case 0xAE070000: // complete write 1 byte from 16 bit address + case 0xAE0C0000: // complete write 1 bit from dma with 6 or 14 bit address uData = m_hash << 24; m_current_cmd = 0; break; @@ -191,6 +245,7 @@ u32 CEXIAgp::ImmRead(u32 _uSize) void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize) { + // 0x00 = Execute current command? if ((_uSize == 1) && ((_uData & 0xFF000000) == 0)) return; @@ -199,9 +254,10 @@ void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize) INFO_LOG(EXPANSIONINTERFACE, "AGP command %x", _uData); switch (m_current_cmd) { - case 0xAE020000: - case 0xAE030000: - m_rw_offset = ((_uData & 0xFFFFFF00) >> 7) & m_rom_mask; + case 0xAE020000: // set up 24 bit address for read 2 bytes + case 0xAE030000: // set up 24 bit address for read (0x10000 byte group) + // 25 bit address shifted one bit right = 24 bits + m_rw_offset = ((_uData & 0xFFFFFF00) >> (8 - 1)); m_return_pos = 0; HashCmd = (_uData & 0xFF000000) >> 24; CRC8(&HashCmd, 1); @@ -210,20 +266,45 @@ void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize) HashCmd = (_uData & 0x0000FF00) >> 8; CRC8(&HashCmd, 1); break; - case 0xAE0C0000: - if ((m_eeprom_pos < 0x8) || (m_eeprom_pos == ((m_eeprom_cmd & EE_READ) ? 0x8 : 0x48))) + case 0xAE040000: // set up 16 bit address for read 1 byte + // ToDo: Flash special handling + m_eeprom_pos = ((_uData & 0xFFFF0000) >> 0x10) & m_eeprom_mask; + HashCmd = (_uData & 0xFF000000) >> 24; + CRC8(&HashCmd, 1); + HashCmd = (_uData & 0x00FF0000) >> 16; + CRC8(&HashCmd, 1); + break; + case 0xAE070000: // write 1 byte from 16 bit address + // ToDo: Flash special handling + m_eeprom_pos = ((_uData & 0xFFFF0000) >> 0x10) & m_eeprom_mask; + if (m_eeprom_size != 0) + ((m_eeprom.data()))[(m_eeprom_pos)] = (_uData & 0x0000FF00) >> 0x8; + HashCmd = (_uData & 0xFF000000) >> 24; + CRC8(&HashCmd, 1); + HashCmd = (_uData & 0x00FF0000) >> 16; + CRC8(&HashCmd, 1); + HashCmd = (_uData & 0x0000FF00) >> 8; + CRC8(&HashCmd, 1); + break; + case 0xAE0C0000: // write 1 bit from dma with 6 or 14 bit address + if ((m_eeprom_pos < m_eeprom_add_end) || (m_eeprom_pos == ((m_eeprom_cmd & m_eeprom_read_mask) ? m_eeprom_add_end : m_eeprom_add_end + EE_DATA_BITS))) { - Mask = (u64)(1 << (0x8-(m_eeprom_pos > 0x8 ? 0x8 : m_eeprom_pos))); + Mask = (1ULL << (m_eeprom_add_end - std::min(m_eeprom_pos, m_eeprom_add_end))); if ((_uData >> 16) & 0x1) m_eeprom_cmd |= Mask; else m_eeprom_cmd &= ~Mask; - if (m_eeprom_pos == 0x48) - ((u64*)(m_eeprom.data()))[(m_eeprom_cmd >> 1) & 0x3F] = m_eeprom_data; + if (m_eeprom_pos == m_eeprom_add_end + EE_DATA_BITS) + { + // Change to byte access instead of endian file access? + if (m_eeprom_size != 0) + ((u64*)(m_eeprom.data()))[(m_eeprom_cmd >> 1) & m_eeprom_add_mask] = m_eeprom_data; + m_eeprom_write_status = true; + } } else { - Mask = (u64)(1 << (0x47 - m_eeprom_pos)); + Mask = (1ULL << (m_eeprom_add_end + EE_DATA_BITS - 1 - m_eeprom_pos)); if ((_uData >> 16) & 0x1) m_eeprom_data |= Mask; else @@ -237,13 +318,17 @@ void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize) CRC8(&HashCmd, 1); break; case 0xAE0B0000: + m_eeprom_write_status = false; break; case 0xAE000000: case 0xAE010000: - case 0xAE090000: - case 0xAE0A0000: - default: + case 0xAE090000: // start DMA + m_eeprom_write_status = false; //ToDo: Verify with hardware which commands disable EEPROM CS + // Fall-through intentional + case 0xAE0A0000: // end DMA m_eeprom_pos = 0; + // Fall-through intentional + default: m_current_cmd = _uData; m_return_pos = 0; m_hash = 0xFF; @@ -264,6 +349,11 @@ void CEXIAgp::DoState(PointerWrap &p) p.Do(m_eeprom_mask); p.Do(m_eeprom_pos); p.Do(m_eeprom_size); + p.Do(m_eeprom_add_end); + p.Do(m_eeprom_add_mask); + p.Do(m_eeprom_read_mask); + p.Do(m_eeprom_status_mask); + p.Do(m_eeprom_write_status); p.Do(m_hash); p.Do(m_position); p.Do(m_return_pos); diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.h b/Source/Core/Core/HW/EXI_DeviceAGP.h index d28807088..6ecf30c66 100644 --- a/Source/Core/Core/HW/EXI_DeviceAGP.h +++ b/Source/Core/Core/HW/EXI_DeviceAGP.h @@ -23,7 +23,10 @@ public: private: enum { - EE_READ = 0x80 + EE_IGNORE_BITS = 0x4, + EE_DATA_BITS = 0x40, + EE_READ_FALSE = 0xA, + EE_READ_TRUE = 0xB, }; int m_slot; @@ -41,8 +44,13 @@ private: u32 m_address = 0; u32 m_rw_offset = 0; u64 m_eeprom_data = 0; - u8 m_eeprom_pos = 0; - u16 m_eeprom_cmd = 0; + u16 m_eeprom_pos = 0; + u32 m_eeprom_cmd = 0; + u16 m_eeprom_add_end = 0; + u16 m_eeprom_add_mask = 0; + u16 m_eeprom_read_mask = 0; + u32 m_eeprom_status_mask = 0; + bool m_eeprom_write_status = false; void LoadFileToROM(const std::string& filename); void LoadFileToEEPROM(const std::string& filename); diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index adc04468d..72e5e265e 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -53,7 +53,8 @@ static bool bMMU = false; // Init() declarations // ---------------- // Store the MemArena here -u8* base = nullptr; +u8* physical_base = nullptr; +u8* logical_base = nullptr; // The MemArena class static MemArena g_arena; @@ -102,17 +103,73 @@ bool IsInitialized() } -// We don't declare the IO region in here since its handled by other means. +// Dolphin allocates memory to represent four regions: +// - 32MB RAM (actually 24MB on hardware), available on Gamecube and Wii +// - 64MB "EXRAM", RAM only available on Wii +// - 32MB FakeVMem, allocated when MMU support is turned off. This is used +// to approximate the behavior of a common library which pages memory to +// and from the DSP's dedicated RAM, which isn't directly addressable on +// GameCube. +// - 256KB Locked L1, to represent cache lines allocated out of the L1 data +// cache in Locked L1 mode. Dolphin does not emulate this hardware feature +// accurately; it just pretends there is extra memory at 0xE0000000. +// +// The 4GB starting at physical_base represents access from the CPU +// with address translation turned off. (This is only used by the CPU; +// other devices, like the GPU, use other rules, approximated by +// Memory::GetPointer.) This memory is laid out as follows: +// [0x00000000, 0x02000000) - 32MB RAM +// [0x02000000, 0x08000000) - Mirrors of 32MB RAM +// [0x08000000, 0x0C000000) - EFB "mapping" (not handled here) +// [0x0C000000, 0x0E000000) - MMIO etc. (not handled here) +// [0x10000000, 0x14000000) - 64MB RAM (Wii-only; slightly slower) +// +// The 4GB starting at logical_base represents access from the CPU +// with address translation turned on. Instead of changing the mapping +// based on the BAT registers, we approximate the common BAT configuration +// used by games: +// [0x00000000, 0x02000000) - 32MB RAM, cached access, normally only mapped +// during startup by Wii WADs +// [0x02000000, 0x08000000) - Mirrors of 32MB RAM (not implemented here) +// [0x40000000, 0x50000000) - FakeVMEM +// [0x70000000, 0x80000000) - FakeVMEM +// [0x80000000, 0x82000000) - 32MB RAM, cached access +// [0x82000000, 0x88000000) - Mirrors of 32MB RAM (not implemented here) +// [0x90000000, 0x94000000) - 64MB RAM, Wii-only, cached access +// [0xC0000000, 0xC2000000) - 32MB RAM, uncached access +// [0xC2000000, 0xC8000000) - Mirrors of 32MB RAM (not implemented here) +// [0xC8000000, 0xCC000000) - EFB "mapping" (not handled here) +// [0xCC000000, 0xCE000000) - MMIO etc. (not handled here) +// [0xD0000000, 0xD4000000) - 64MB RAM, Wii-only, uncached access +// [0xE0000000, 0xE0040000) - 256KB locked L1 +// +// TODO: We shouldn't hardcode this mapping; we can generate it dynamically +// based on the BAT registers. +// +// Each of these 4GB regions is followed by 4GB of empty space so overflows +// in address computation in the JIT don't access the wrong memory. +// +// The neighboring mirrors of RAM ([0x02000000, 0x08000000), etc.) exist because +// the bus masks off the bits in question for RAM accesses; using them is a +// terrible idea because the CPU cache won't handle them correctly, but a +// few buggy games (notably Rogue Squadron 2) use them by accident. They +// aren't backed by memory mappings because they are used very rarely. +// +// Dolphin doesn't emulate the difference between cached and uncached access. +// +// TODO: The actual size of RAM is REALRAM_SIZE (24MB); the other 8MB shouldn't +// be backed by actual memory. static MemoryView views[] = { {&m_pRAM, 0x00000000, RAM_SIZE, 0}, - {nullptr, 0x80000000, RAM_SIZE, MV_MIRROR_PREVIOUS}, - {nullptr, 0xC0000000, RAM_SIZE, MV_MIRROR_PREVIOUS}, - {&m_pL1Cache, 0xE0000000, L1_CACHE_SIZE, 0}, - {&m_pFakeVMEM, 0x7E000000, FAKEVMEM_SIZE, MV_FAKE_VMEM}, + {nullptr, 0x200000000, RAM_SIZE, MV_MIRROR_PREVIOUS}, + {nullptr, 0x280000000, RAM_SIZE, MV_MIRROR_PREVIOUS}, + {nullptr, 0x2C0000000, RAM_SIZE, MV_MIRROR_PREVIOUS}, + {&m_pL1Cache, 0x2E0000000, L1_CACHE_SIZE, 0}, + {&m_pFakeVMEM, 0x27E000000, FAKEVMEM_SIZE, MV_FAKE_VMEM}, {&m_pEXRAM, 0x10000000, EXRAM_SIZE, MV_WII_ONLY}, - {nullptr, 0x90000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS}, - {nullptr, 0xD0000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS}, + {nullptr, 0x290000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS}, + {nullptr, 0x2D0000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS}, }; static const int num_views = sizeof(views) / sizeof(MemoryView); @@ -129,7 +186,10 @@ void Init() u32 flags = 0; if (wii) flags |= MV_WII_ONLY; if (bFakeVMEM) flags |= MV_FAKE_VMEM; - base = MemoryMap_Setup(views, num_views, flags, &g_arena); + physical_base = MemoryMap_Setup(views, num_views, flags, &g_arena); +#ifndef _ARCH_32 + logical_base = physical_base + 0x200000000; +#endif mmio_mapping = new MMIO::Mapping(); @@ -164,7 +224,8 @@ void Shutdown() if (bFakeVMEM) flags |= MV_FAKE_VMEM; MemoryMap_Shutdown(views, num_views, flags, &g_arena); g_arena.ReleaseSHMSegment(); - base = nullptr; + physical_base = nullptr; + logical_base = nullptr; delete mmio_mapping; INFO_LOG(MEMMAP, "Memory system shut down."); } @@ -188,12 +249,6 @@ bool AreMemoryBreakpointsActivated() #endif } -u32 Read_Instruction(const u32 address) -{ - UGeckoInstruction inst = ReadUnchecked_U32(address); - return inst.hex; -} - static inline bool ValidCopyRange(u32 address, size_t size) { return (GetPointer(address) != nullptr && @@ -228,19 +283,6 @@ void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength) { memset(ptr,_iValue,_iLength); } - else - { - for (u32 i = 0; i < _iLength; i++) - Write_U8(_iValue, _Address + i); - } -} - -void ClearCacheLine(const u32 address) -{ - // FIXME: does this do the right thing if dcbz is run on hardware memory, e.g. - // the FIFO? Do games even do that? Probably not, but we should try to be correct... - for (u32 i = 0; i < 32; i += 8) - Write_U64(0, address + i); } std::string GetString(u32 em_address, size_t size) @@ -260,93 +302,73 @@ std::string GetString(u32 em_address, size_t size) } } -// GetPointer must always return an address in the bottom 32 bits of address space, so that 64-bit -// programs don't have problems directly addressing any part of memory. -// TODO re-think with respect to other BAT setups... -u8* GetPointer(const u32 address) +u8* GetPointer(u32 address) { - switch (address >> 28) + // TODO: Should we be masking off more bits here? Can all devices access + // EXRAM? + address &= 0x3FFFFFFF; + if (address < REALRAM_SIZE) + return m_pRAM + address; + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) { - case 0x0: - case 0x8: - if ((address & 0xfffffff) < REALRAM_SIZE) - return m_pRAM + (address & RAM_MASK); - break; - case 0xc: - switch (address >> 24) - { - case 0xcc: - case 0xcd: - _dbg_assert_msg_(MEMMAP, 0, "GetPointer from IO Bridge doesnt work"); - break; - case 0xc8: - // EFB. We don't want to return a pointer here since we have no memory mapped for it. - break; - - default: - if ((address & 0xfffffff) < REALRAM_SIZE) - return m_pRAM + (address & RAM_MASK); - } - break; - - case 0x1: - case 0x9: - case 0xd: - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) - { - if ((address & 0xfffffff) < EXRAM_SIZE) - return m_pEXRAM + (address & EXRAM_MASK); - } - break; - - case 0xe: - if (address < (0xE0000000 + L1_CACHE_SIZE)) - return m_pL1Cache + (address & L1_CACHE_MASK); - else - break; - - default: - if (bFakeVMEM) - return m_pFakeVMEM + (address & FAKEVMEM_MASK); - break; + if ((address >> 28) == 0x1 && (address & 0x0fffffff) < EXRAM_SIZE) + return m_pEXRAM + (address & EXRAM_MASK); } - ERROR_LOG(MEMMAP, "Unknown Pointer %#8x PC %#8x LR %#8x", address, PC, LR); + PanicAlert("Unknown Pointer 0x%08x PC 0x%08x LR 0x%08x", address, PC, LR); return nullptr; } -bool IsRAMAddress(const u32 address, bool allow_locked_cache, bool allow_fake_vmem) +u8 Read_U8(u32 address) { - switch ((address >> 24) & 0xFC) - { - case 0x00: - case 0x80: - case 0xC0: - if ((address & 0x1FFFFFFF) < RAM_SIZE) - return true; - else - return false; - case 0x10: - case 0x90: - case 0xD0: - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && (address & 0x0FFFFFFF) < EXRAM_SIZE) - return true; - else - return false; - case 0xE0: - if (allow_locked_cache && address - 0xE0000000 < L1_CACHE_SIZE) - return true; - else - return false; - case 0x7C: - if (allow_fake_vmem && bFakeVMEM && address >= 0x7E000000) - return true; - else - return false; - default: - return false; - } + return *GetPointer(address); +} + +u16 Read_U16(u32 address) +{ + return Common::swap16(GetPointer(address)); +} + +u32 Read_U32(u32 address) +{ + return Common::swap32(GetPointer(address)); +} + +u64 Read_U64(u32 address) +{ + return Common::swap64(GetPointer(address)); +} + +void Write_U8(u8 value, u32 address) +{ + *GetPointer(address) = value; +} + +void Write_U16(u16 value, u32 address) +{ + *(u16*)GetPointer(address) = Common::swap16(value); +} + +void Write_U32(u32 value, u32 address) +{ + *(u32*)GetPointer(address) = Common::swap32(value); +} + +void Write_U64(u64 value, u32 address) +{ + *(u64*)GetPointer(address) = Common::swap64(value); +} + +void Write_U32_Swap(u32 value, u32 address) +{ + *(u32*)GetPointer(address) = value; +} + +void Write_U64_Swap(u64 value, u32 address) +{ + *(u64*)GetPointer(address) = value; } } // namespace diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h index f7915367c..1cbb56f16 100644 --- a/Source/Core/Core/HW/Memmap.h +++ b/Source/Core/Core/HW/Memmap.h @@ -27,7 +27,8 @@ namespace Memory // In 64-bit, this might point to "high memory" (above the 32-bit limit), // so be sure to load it into a 64-bit register. -extern u8* base; +extern u8* physical_base; +extern u8* logical_base; // These are guaranteed to point to "low memory" addresses (sub-32-bit). extern u8* m_pRAM; @@ -73,70 +74,22 @@ void DoState(PointerWrap &p); void Clear(); bool AreMemoryBreakpointsActivated(); -// ONLY for use by GUI -u8 ReadUnchecked_U8(const u32 address); -u32 ReadUnchecked_U32(const u32 address); - -void WriteUnchecked_U8(const u8 var, const u32 address); -void WriteUnchecked_U32(const u32 var, const u32 address); - -bool IsRAMAddress(const u32 address, bool allow_locked_cache = false, bool allow_fake_vmem = false); - -// used by interpreter to read instructions, uses iCache -u32 Read_Opcode(const u32 address); -// this is used by Debugger a lot. -// For now, just reads from memory! -u32 Read_Instruction(const u32 address); - - -// For use by emulator - +// Routines to access physically addressed memory, designed for use by +// emulated hardware outside the CPU. Use "Device_" prefix. +std::string GetString(u32 em_address, size_t size = 0); +u8* GetPointer(const u32 address); +void CopyFromEmu(void* data, u32 address, size_t size); +void CopyToEmu(u32 address, const void* data, size_t size); +void Memset(const u32 address, const u8 var, const u32 length); u8 Read_U8(const u32 address); u16 Read_U16(const u32 address); u32 Read_U32(const u32 address); u64 Read_U64(const u32 address); - -// Useful helper functions, used by ARM JIT -float Read_F32(const u32 address); -double Read_F64(const u32 address); - -// used by JIT. Return zero-extended 32bit values -u32 Read_U8_ZX(const u32 address); -u32 Read_U16_ZX(const u32 address); - void Write_U8(const u8 var, const u32 address); void Write_U16(const u16 var, const u32 address); void Write_U32(const u32 var, const u32 address); void Write_U64(const u64 var, const u32 address); - -void Write_U16_Swap(const u16 var, const u32 address); void Write_U32_Swap(const u32 var, const u32 address); void Write_U64_Swap(const u64 var, const u32 address); -// Useful helper functions, used by ARM JIT -void Write_F64(const double var, const u32 address); - -std::string GetString(u32 em_address, size_t size = 0); - -u8* GetPointer(const u32 address); -void DMA_LCToMemory(const u32 memAddr, const u32 cacheAddr, const u32 numBlocks); -void DMA_MemoryToLC(const u32 cacheAddr, const u32 memAddr, const u32 numBlocks); -void CopyFromEmu(void* data, u32 address, size_t size); -void CopyToEmu(u32 address, const void* data, size_t size); -void Memset(const u32 address, const u8 var, const u32 length); -void ClearCacheLine(const u32 address); // Zeroes 32 bytes; address should be 32-byte-aligned - -// TLB functions -void SDRUpdated(); -enum XCheckTLBFlag -{ - FLAG_NO_EXCEPTION, - FLAG_READ, - FLAG_WRITE, - FLAG_OPCODE, -}; -template u32 TranslateAddress(const u32 address); -void InvalidateTLBEntry(u32 address); -extern u32 pagetable_base; -extern u32 pagetable_hashmask; } diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp index 27306988d..26f19a871 100644 --- a/Source/Core/Core/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/HW/ProcessorInterface.cpp @@ -8,6 +8,7 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" +#include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/HW/CPU.h" #include "Core/HW/GPFifo.h" @@ -159,9 +160,9 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) void UpdateException() { if ((m_InterruptCause & m_InterruptMask) != 0) - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_EXTERNAL_INT); + PowerPC::ppcState.Exceptions |= EXCEPTION_EXTERNAL_INT; else - Common::AtomicAnd(PowerPC::ppcState.Exceptions, ~EXCEPTION_EXTERNAL_INT); + PowerPC::ppcState.Exceptions &= ~EXCEPTION_EXTERNAL_INT; } static const char *Debug_GetInterruptName(u32 _causemask) @@ -190,7 +191,7 @@ static const char *Debug_GetInterruptName(u32 _causemask) void SetInterrupt(u32 _causemask, bool _bSet) { - // TODO(ector): add sanity check that current thread id is CPU thread + _dbg_assert_msg_(POWERPC, Core::IsCPUThread(), "SetInterrupt from wrong thread"); if (_bSet && !(m_InterruptCause & _causemask)) { diff --git a/Source/Core/Core/HW/SI.cpp b/Source/Core/Core/HW/SI.cpp index a25c956f8..513f16da2 100644 --- a/Source/Core/Core/HW/SI.cpp +++ b/Source/Core/Core/HW/SI.cpp @@ -492,6 +492,7 @@ void ChangeDevice(SIDevices device, int channel) { // Called from GUI, so we need to make it thread safe. // Let the hardware see no device for .5b cycles + // TODO: Calling GetDeviceType here isn't threadsafe. if (GetDeviceType(channel) != device) { CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | SIDEVICE_NONE); diff --git a/Source/Core/Core/HW/SI_GCAdapter.cpp b/Source/Core/Core/HW/SI_GCAdapter.cpp index 655d76b06..c1ff3a493 100644 --- a/Source/Core/Core/HW/SI_GCAdapter.cpp +++ b/Source/Core/Core/HW/SI_GCAdapter.cpp @@ -55,9 +55,10 @@ extern "C" static void HandleEvents() { + timeval tv = {1, 0}; while (s_adapter_thread_running.IsSet()) { - libusb_handle_events(NULL); + libusb_handle_events_timeout_completed(s_libusb_context, &tv, NULL); Common::YieldCPU(); } } @@ -92,12 +93,6 @@ void Init() s_libusb_driver_not_supported = false; - for (int i = 0; i < MAX_SI_CHANNELS; i++) - { - s_controller_type[i] = CONTROLLER_NONE; - s_controller_rumble[i] = 0; - } - int ret = libusb_init(&s_libusb_context); if (ret) @@ -107,129 +102,176 @@ void Init() } else { - libusb_device** list; - ssize_t cnt = libusb_get_device_list(nullptr, &list); - for (int d = 0; d < cnt; d++) + Setup(); + } +} + +void Setup() +{ + int ret; + libusb_device** list; + ssize_t cnt = libusb_get_device_list(s_libusb_context, &list); + + for (int i = 0; i < MAX_SI_CHANNELS; i++) + { + s_controller_type[i] = CONTROLLER_NONE; + s_controller_rumble[i] = 0; + } + + + for (int d = 0; d < cnt; d++) + { + libusb_device* device = list[d]; + libusb_device_descriptor desc; + int dRet = libusb_get_device_descriptor(device, &desc); + if (dRet) { - libusb_device* device = list[d]; - libusb_device_descriptor desc; - int dRet = libusb_get_device_descriptor(device, &desc); - if (dRet) - { - // could not aquire the descriptor, no point in trying to use it. - ERROR_LOG(SERIALINTERFACE, "libusb_get_device_descriptor failed with error: %d", dRet); - continue; - } + // could not aquire the descriptor, no point in trying to use it. + ERROR_LOG(SERIALINTERFACE, "libusb_get_device_descriptor failed with error: %d", dRet); + continue; + } - if (desc.idVendor == 0x057e && desc.idProduct == 0x0337) - { - NOTICE_LOG(SERIALINTERFACE, "Found GC Adapter with Vendor: %X Product: %X Devnum: %d", desc.idVendor, desc.idProduct, 1); + if (desc.idVendor == 0x057e && desc.idProduct == 0x0337) + { + NOTICE_LOG(SERIALINTERFACE, "Found GC Adapter with Vendor: %X Product: %X Devnum: %d", desc.idVendor, desc.idProduct, 1); - u8 bus = libusb_get_bus_number(device); - u8 port = libusb_get_device_address(device); - ret = libusb_open(device, &s_handle); - if (ret) + u8 bus = libusb_get_bus_number(device); + u8 port = libusb_get_device_address(device); + ret = libusb_open(device, &s_handle); + if (ret) + { + if (ret == LIBUSB_ERROR_ACCESS) { - if (ret == LIBUSB_ERROR_ACCESS) + if (dRet) { - if (dRet) - { - ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device %03d: ID ????:???? (couldn't get id).", - bus, - port - ); - } - else - { - ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device %03d: ID %04X:%04X.", - bus, - port, - desc.idVendor, - desc.idProduct - ); - } + ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device %03d: ID ????:???? (couldn't get id).", + bus, + port + ); } else { - ERROR_LOG(SERIALINTERFACE, "libusb_open failed to open device with error = %d", ret); - if (ret == LIBUSB_ERROR_NOT_SUPPORTED) - s_libusb_driver_not_supported = true; - } - Shutdown(); - } - else if ((ret = libusb_kernel_driver_active(s_handle, 0)) == 1) - { - if ((ret = libusb_detach_kernel_driver(s_handle, 0)) && ret != LIBUSB_ERROR_NOT_SUPPORTED) - { - ERROR_LOG(SERIALINTERFACE, "libusb_detach_kernel_driver failed with error: %d", ret); - Shutdown(); + ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device %03d: ID %04X:%04X.", + bus, + port, + desc.idVendor, + desc.idProduct + ); } } - else if (ret != 0 && ret != LIBUSB_ERROR_NOT_SUPPORTED) + else { - ERROR_LOG(SERIALINTERFACE, "libusb_kernel_driver_active error ret = %d", ret); - Shutdown(); + ERROR_LOG(SERIALINTERFACE, "libusb_open failed to open device with error = %d", ret); + if (ret == LIBUSB_ERROR_NOT_SUPPORTED) + s_libusb_driver_not_supported = true; } - else if ((ret = libusb_claim_interface(s_handle, 0))) + Shutdown(); + } + else if ((ret = libusb_kernel_driver_active(s_handle, 0)) == 1) + { + if ((ret = libusb_detach_kernel_driver(s_handle, 0)) && ret != LIBUSB_ERROR_NOT_SUPPORTED) { - ERROR_LOG(SERIALINTERFACE, "libusb_claim_interface failed with error: %d", ret); + ERROR_LOG(SERIALINTERFACE, "libusb_detach_kernel_driver failed with error: %d", ret); Shutdown(); } else { - libusb_config_descriptor *config = nullptr; - libusb_get_config_descriptor(device, 0, &config); - for (u8 ic = 0; ic < config->bNumInterfaces; ic++) - { - const libusb_interface *interfaceContainer = &config->interface[ic]; - for (int i = 0; i < interfaceContainer->num_altsetting; i++) - { - const libusb_interface_descriptor *interface = &interfaceContainer->altsetting[i]; - for (int e = 0; e < (int)interface->bNumEndpoints; e++) - { - const libusb_endpoint_descriptor *endpoint = &interface->endpoint[e]; - if (endpoint->bEndpointAddress & LIBUSB_ENDPOINT_IN) - s_endpoint_in = endpoint->bEndpointAddress; - else - s_endpoint_out = endpoint->bEndpointAddress; - } - } - } - - int tmp = 0; - unsigned char payload = 0x13; - libusb_interrupt_transfer(s_handle, s_endpoint_out, &payload, sizeof(payload), &tmp, 16); - - if (SConfig::GetInstance().m_GameCubeAdapterThread) - { - s_adapter_thread_running.Set(true); - s_adapter_thread = std::thread(Read); - } - else - { - s_irq_transfer_read = libusb_alloc_transfer(0); - s_irq_transfer_write = libusb_alloc_transfer(0); - libusb_fill_interrupt_transfer(s_irq_transfer_read, s_handle, s_endpoint_in, s_controller_payload_swap, sizeof(s_controller_payload_swap), read_callback, NULL, 16); - libusb_submit_transfer(s_irq_transfer_read); - - s_adapter_thread_running.Set(true); - s_adapter_thread = std::thread(HandleEvents); - } - - s_detected = true; + AddGCAdapter(device); } } + else if ((ret != 0 && ret != LIBUSB_ERROR_NOT_SUPPORTED)) + { + ERROR_LOG(SERIALINTERFACE, "libusb_kernel_driver_active error ret = %d", ret); + Shutdown(); + } + else if ((ret = libusb_claim_interface(s_handle, 0))) + { + ERROR_LOG(SERIALINTERFACE, "libusb_claim_interface failed with error: %d", ret); + Shutdown(); + } + else + { + AddGCAdapter(device); + } } - - libusb_free_device_list(list, 1); } + + libusb_free_device_list(list, 1); +} + + +void AddGCAdapter(libusb_device* device) +{ + libusb_config_descriptor *config = nullptr; + libusb_get_config_descriptor(device, 0, &config); + for (u8 ic = 0; ic < config->bNumInterfaces; ic++) + { + const libusb_interface *interfaceContainer = &config->interface[ic]; + for (int i = 0; i < interfaceContainer->num_altsetting; i++) + { + const libusb_interface_descriptor *interface = &interfaceContainer->altsetting[i]; + for (u8 e = 0; e < interface->bNumEndpoints; e++) + { + const libusb_endpoint_descriptor *endpoint = &interface->endpoint[e]; + if (endpoint->bEndpointAddress & LIBUSB_ENDPOINT_IN) + s_endpoint_in = endpoint->bEndpointAddress; + else + s_endpoint_out = endpoint->bEndpointAddress; + } + } + } + + int tmp = 0; + unsigned char payload = 0x13; + libusb_interrupt_transfer(s_handle, s_endpoint_out, &payload, sizeof(payload), &tmp, 16); + + if (SConfig::GetInstance().m_GameCubeAdapterThread) + { + s_adapter_thread_running.Set(true); + s_adapter_thread = std::thread(Read); + } + else + { + s_irq_transfer_read = libusb_alloc_transfer(0); + s_irq_transfer_write = libusb_alloc_transfer(0); + libusb_fill_interrupt_transfer(s_irq_transfer_read, s_handle, s_endpoint_in, s_controller_payload_swap, sizeof(s_controller_payload_swap), read_callback, NULL, 0); + libusb_submit_transfer(s_irq_transfer_read); + + s_adapter_thread_running.Set(true); + s_adapter_thread = std::thread(HandleEvents); + } + + s_detected = true; } void Shutdown() +{ + + Reset(); + + if (s_libusb_context) + { + libusb_exit(s_libusb_context); + s_libusb_context = nullptr; + } + + s_libusb_driver_not_supported = false; +} + +void Reset() { if (!SConfig::GetInstance().m_GameCubeAdapter) return; + if (!SConfig::GetInstance().m_GameCubeAdapterThread) + { + + if (s_irq_transfer_read) + libusb_cancel_transfer(s_irq_transfer_read); + if (s_irq_transfer_write) + libusb_cancel_transfer(s_irq_transfer_write); + } + if (s_adapter_thread_running.TestAndClear()) { s_adapter_thread.join(); @@ -251,16 +293,9 @@ void Shutdown() for (int i = 0; i < MAX_SI_CHANNELS; i++) s_controller_type[i] = CONTROLLER_NONE; - - if (s_libusb_context) - { - libusb_exit(s_libusb_context); - s_libusb_context = nullptr; - } - - s_libusb_driver_not_supported = false; } + void Input(int chan, GCPadStatus* pad) { if (!SConfig::GetInstance().m_GameCubeAdapter) diff --git a/Source/Core/Core/HW/SI_GCAdapter.h b/Source/Core/Core/HW/SI_GCAdapter.h index 4e11dd663..925e044b9 100644 --- a/Source/Core/Core/HW/SI_GCAdapter.h +++ b/Source/Core/Core/HW/SI_GCAdapter.h @@ -4,6 +4,8 @@ #pragma once +struct libusb_device; + #include "Common/Thread.h" #include "Core/HW/SI.h" #include "InputCommon/GCPadStatus.h" @@ -12,7 +14,10 @@ namespace SI_GCAdapter { void Init(); +void Reset(); +void Setup(); void Shutdown(); +void AddGCAdapter(libusb_device* device); void Input(int chan, GCPadStatus* pad); void Output(int chan, u8 rumble_command); bool IsDetected(); diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index 64fcf99aa..72d1dc871 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -157,7 +157,7 @@ static void CPCallback(u64 userdata, int cyclesLate) static void DecrementerCallback(u64 userdata, int cyclesLate) { PowerPC::ppcState.spr[SPR_DEC] = 0xFFFFFFFF; - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DECREMENTER); + PowerPC::ppcState.Exceptions |= EXCEPTION_DECREMENTER; } void DecrementerSet() @@ -194,7 +194,6 @@ static void PatchEngineCallback(u64 userdata, int cyclesLate) { // Patch mem and run the Action Replay PatchEngine::ApplyFramePatches(); - PatchEngine::ApplyARPatches(); CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame() - cyclesLate, et_PatchEngine); } @@ -246,6 +245,7 @@ void Init() // System internal sample rate is fixed at 32KHz * 4 (16bit Stereo) / 32 bytes DMA AUDIO_DMA_PERIOD = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32); + // Emulated gekko <-> flipper bus speed ratio (CPU clock / flipper clock) CP_PERIOD = GetTicksPerSecond() / 10000; diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index 608ed9802..0fe66db5a 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -473,7 +473,7 @@ void UpdateParameters() if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDoubleVideoRate) { TargetRefreshRate *= 2; - } +} TicksPerFrame = SystemTimers::GetTicksPerSecond() / TargetRefreshRate; } diff --git a/Source/Core/Core/HW/WII_IPC.cpp b/Source/Core/Core/HW/WII_IPC.cpp index a423d7a87..56019ddf5 100644 --- a/Source/Core/Core/HW/WII_IPC.cpp +++ b/Source/Core/Core/HW/WII_IPC.cpp @@ -162,7 +162,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) if (ctrl.X1) WII_IPC_HLE_Interface::EnqueueRequest(ppc_msg); WII_IPC_HLE_Interface::Update(); - CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0); + CoreTiming::ScheduleEvent(0, updateInterrupts, 0); }) ); @@ -176,7 +176,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) MMIO::ComplexWrite([](u32, u32 val) { ppc_irq_flags &= ~val; WII_IPC_HLE_Interface::Update(); - CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0); + CoreTiming::ScheduleEvent(0, updateInterrupts, 0); }) ); @@ -187,7 +187,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) if (ppc_irq_masks & INT_CAUSE_IPC_BROADWAY) // wtf? Reset(); WII_IPC_HLE_Interface::Update(); - CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0); + CoreTiming::ScheduleEvent(0, updateInterrupts, 0); }) ); @@ -228,7 +228,7 @@ void GenerateAck(u32 _Address) ctrl.Y2 = 1; INFO_LOG(WII_IPC, "GenerateAck: %08x | %08x [R:%i A:%i E:%i]", ppc_msg,_Address, ctrl.Y1, ctrl.Y2, ctrl.X1); - CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0); + CoreTiming::ScheduleEvent(0, updateInterrupts, 0); } void GenerateReply(u32 _Address) diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index 47f194478..b16dbce96 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -32,13 +32,14 @@ auto const PI = TAU / 2.0; namespace WiimoteEmu { -/* An example of a factory default first bytes of the Eeprom memory. There are differences between - different Wiimotes, my Wiimote had different neutral values for the accelerometer. */ static const u8 eeprom_data_0[] = { // IR, maybe more // assuming last 2 bytes are checksum 0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00, // messing up the checksum on purpose 0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00, + // Accelerometer + ACCEL_ZERO_G, ACCEL_ZERO_G, ACCEL_ZERO_G, 0, ACCEL_ONE_G, ACCEL_ONE_G, ACCEL_ONE_G, 0, 0, 0, + ACCEL_ZERO_G, ACCEL_ZERO_G, ACCEL_ZERO_G, 0, ACCEL_ONE_G, ACCEL_ONE_G, ACCEL_ONE_G, 0, 0, 0, }; static const u8 motion_plus_id[] = { 0x00, 0x00, 0xA6, 0x20, 0x00, 0x05 }; @@ -422,11 +423,13 @@ void Wiimote::GetAccelData(u8* const data, const ReportFeatures& rptf) core.acc_y_lsb = (y >> 1) & 0x1; core.acc_z_lsb = (z >> 1) & 0x1; } -#define kCutoffFreq 5.0 -inline void LowPassFilter(double & var, double newval, double period) + +inline void LowPassFilter(double& var, double newval, double period) { - double RC=1.0/kCutoffFreq; - double alpha=period/(period+RC); + static const double CUTOFF_FREQUENCY = 5.0; + + double RC = 1.0 / CUTOFF_FREQUENCY; + double alpha = period / (period + RC); var = newval * alpha + var * (1.0 - alpha); } diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 039160265..685602732 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -85,6 +85,13 @@ inline double trim(double a) return a; } +enum +{ + ACCEL_ZERO_G = 0x80, + ACCEL_ONE_G = 0x9A, + ACCEL_RANGE = (ACCEL_ONE_G - ACCEL_ZERO_G), +}; + class Wiimote : public ControllerEmu { friend class WiimoteReal::Wiimote; @@ -106,13 +113,6 @@ public: BUTTON_HOME = 0x8000, }; - enum - { - ACCEL_ZERO_G = 0x80, - ACCEL_ONE_G = 0x9A, - ACCEL_RANGE = (ACCEL_ONE_G - ACCEL_ZERO_G), - }; - Wiimote(const unsigned int index); std::string GetName() const override; diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp new file mode 100644 index 000000000..00aad63d5 --- /dev/null +++ b/Source/Core/Core/HotkeyManager.cpp @@ -0,0 +1,549 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "Core/ConfigManager.h" +#include "Core/CoreParameter.h" +#include "Core/HotkeyManager.h" + +static const u32 hotkey_bitmasks[] = +{ + 1 << 0, + 1 << 1, + 1 << 2, + 1 << 3, + 1 << 4, + 1 << 5, + 1 << 6, + 1 << 7, + 1 << 8, + 1 << 9, + 1 << 10, + 1 << 11, + 1 << 12, + 1 << 13, + 1 << 14, + 1 << 15, + 1 << 16, + 1 << 17, + 1 << 18, + 1 << 19, + 1 << 20, + 1 << 21, + 1 << 22, + 1 << 23, + 1 << 24, + 1 << 25, + 1 << 26, + 1 << 27, + 1 << 28, + 1 << 29, + 1 << 30, + 1u << 31u +}; + +const std::string hotkey_labels[] = +{ + _trans("Open"), + _trans("Change Disc"), + _trans("Refresh List"), + + _trans("Toggle Pause"), + _trans("Stop"), + _trans("Reset"), + _trans("Frame Advance"), + + _trans("Start Recording"), + _trans("Play Recording"), + _trans("Export Recording"), + _trans("Read-only mode"), + + _trans("Toggle Fullscreen"), + _trans("Take Screenshot"), + _trans("Exit"), + + _trans("Connect Wiimote 1"), + _trans("Connect Wiimote 2"), + _trans("Connect Wiimote 3"), + _trans("Connect Wiimote 4"), + _trans("Connect Balance Board"), + + _trans("Volume Up"), + _trans("Volume Down"), + _trans("Volume Toggle Mute"), + + _trans("Toggle IR"), + _trans("Toggle Aspect Ratio"), + _trans("Toggle EFB Copies"), + _trans("Toggle Fog"), + _trans("Toggle Frame limit"), + _trans("Increase Frame limit"), + _trans("Decrease Frame limit"), + + _trans("Freelook Decrease Speed"), + _trans("Freelook Increase Speed"), + _trans("Freelook Reset Speed"), + _trans("Freelook Move Up"), + _trans("Freelook Move Down"), + _trans("Freelook Move Left"), + _trans("Freelook Move Right"), + _trans("Freelook Zoom In"), + _trans("Freelook Zoom Out"), + _trans("Freelook Reset"), + + _trans("Increase Depth"), + _trans("Decrease Depth"), + _trans("Increase Convergence"), + _trans("Decrease Convergence"), + + _trans("Load State Slot 1"), + _trans("Load State Slot 2"), + _trans("Load State Slot 3"), + _trans("Load State Slot 4"), + _trans("Load State Slot 5"), + _trans("Load State Slot 6"), + _trans("Load State Slot 7"), + _trans("Load State Slot 8"), + _trans("Load State Slot 9"), + _trans("Load State Slot 10"), + + _trans("Save State Slot 1"), + _trans("Save State Slot 2"), + _trans("Save State Slot 3"), + _trans("Save State Slot 4"), + _trans("Save State Slot 5"), + _trans("Save State Slot 6"), + _trans("Save State Slot 7"), + _trans("Save State Slot 8"), + _trans("Save State Slot 9"), + _trans("Save State Slot 10"), + + _trans("Select State Slot 1"), + _trans("Select State Slot 2"), + _trans("Select State Slot 3"), + _trans("Select State Slot 4"), + _trans("Select State Slot 5"), + _trans("Select State Slot 6"), + _trans("Select State Slot 7"), + _trans("Select State Slot 8"), + _trans("Select State Slot 9"), + _trans("Select State Slot 10"), + + _trans("Save to selected slot"), + _trans("Load from selected slot"), + + _trans("Load State Last 1"), + _trans("Load State Last 2"), + _trans("Load State Last 3"), + _trans("Load State Last 4"), + _trans("Load State Last 5"), + _trans("Load State Last 6"), + _trans("Load State Last 7"), + _trans("Load State Last 8"), + + _trans("Save Oldest State"), + _trans("Undo Load State"), + _trans("Undo Save State"), + _trans("Save State"), + _trans("Load State"), +}; + +const int num_hotkeys = (sizeof(hotkey_labels) / sizeof(hotkey_labels[0])); + +namespace HotkeyManagerEmu +{ + +static u32 hotkeyDown[6]; + +static InputConfig s_config("Hotkeys", _trans("Hotkeys"), "Hotkeys"); +InputConfig* GetConfig() +{ + return &s_config; +} + +void GetStatus(u8 _port, HotkeyStatus* _pHotkeyStatus) +{ + memset(_pHotkeyStatus, 0, sizeof(*_pHotkeyStatus)); + _pHotkeyStatus->err = PAD_ERR_NONE; + + std::unique_lock lk(s_config.controls_lock, std::try_to_lock); + + if (!lk.owns_lock()) + { + // if gui has lock (messing with controls), skip this input cycle + for (int i = 0; i < 6; i++) + _pHotkeyStatus->button[i] = 0; + + return; + } + + // get input + ((HotkeyManager*)s_config.controllers[_port])->GetInput(_pHotkeyStatus); +} + +bool IsPressed(int Id, bool held) +{ + HotkeyStatus hotkey; + memset(&hotkey, 0, sizeof(hotkey)); + GetStatus(0, &hotkey); + unsigned int set = Id / 32; + unsigned int setKey = Id % 32; + if (hotkey.button[set] & (1 << setKey)) + { + hotkeyDown[set] |= (1 << setKey); + if (held) + return true; + } + else + { + bool pressed = !!(hotkeyDown[set] & (1 << setKey)); + hotkeyDown[set] &= ~(1 << setKey); + if (pressed) + return true; + } + + return false; +} + +void Initialize(void* const hwnd) +{ + if (s_config.controllers.empty()) + s_config.controllers.push_back(new HotkeyManager()); + + g_controller_interface.Initialize(hwnd); + + // load the saved controller config + s_config.LoadConfig(true); + + for (unsigned int i = 0; i < 6; ++i) + hotkeyDown[i] = 0; +} + +void Shutdown() +{ + std::vector::const_iterator + i = s_config.controllers.begin(), + e = s_config.controllers.end(); + for (; i != e; ++i) + delete *i; + s_config.controllers.clear(); + + g_controller_interface.Shutdown(); +} + +} + +HotkeyManager::HotkeyManager() +{ + for (int set = 0; set < 6; set++) + { + // buttons + if ((set * 32) < num_hotkeys) + groups.emplace_back(m_keys[set] = new Buttons(_trans("Keys"))); + + for (int key = 0; key < 32; key++) + { + if ((set * 32 + key) < num_hotkeys) + { + m_keys[set]->controls.emplace_back(new ControlGroup::Input(hotkey_labels[set * 32 + key])); + } + } + } + + groups.emplace_back(m_options = new ControlGroup(_trans("Options"))); + m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input"))); + m_options->settings.emplace_back(new ControlGroup::IterateUI(_trans("Iterative Input"))); +} + +HotkeyManager::~HotkeyManager() +{ +} + +std::string HotkeyManager::GetName() const +{ + return std::string("Hotkeys") + char('1' + 0); +} + +void HotkeyManager::GetInput(HotkeyStatus* const kb) +{ + for (int set = 0; set < 6; set++) + if ((set * 32) < num_hotkeys) + m_keys[set]->GetState(&kb->button[set], hotkey_bitmasks); +} + +void HotkeyManager::LoadDefaults(const ControllerInterface& ciface) +{ +#define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str) + + ControllerEmu::LoadDefaults(ciface); + + // Buttons +#ifdef _WIN32 + set_control(m_keys[0], 0, "(LCONTROL | RCONTROL) & L"); // Open + set_control(m_keys[0], 1, ""); // ChangeDisc + set_control(m_keys[0], 2, ""); // RefreshList + set_control(m_keys[0], 3, "F10"); // PlayPause + set_control(m_keys[0], 4, "ESCAPE"); // Stop + set_control(m_keys[0], 5, ""); // Reset + set_control(m_keys[0], 6, ""); // FrameAdvance + set_control(m_keys[0], 7, ""); // StartRecording + set_control(m_keys[0], 8, ""); // PlayRecording + set_control(m_keys[0], 9, ""); // ExportRecording + set_control(m_keys[0], 10, ""); // Readonlymode + set_control(m_keys[0], 11, "(LMENU | RMENU) & RETURN"); // ToggleFullscreen + set_control(m_keys[0], 12, "`F9` & !(LMENU | RMENU)"); // Screenshot + set_control(m_keys[0], 13, ""); // Exit + set_control(m_keys[0], 14, "(LMENU | RMENU) & `F5`"); // Wiimote1Connect + set_control(m_keys[0], 15, "(LMENU | RMENU) & `F6`"); // Wiimote2Connect + set_control(m_keys[0], 16, "(LMENU | RMENU) & `F7`"); // Wiimote3Connect + set_control(m_keys[0], 17, "(LMENU | RMENU) & `F8`"); // Wiimote4Connect + set_control(m_keys[0], 18, "(LMENU | RMENU) & `F9`"); // BalanceBoardConnect + set_control(m_keys[0], 19, ""); // VolumeDown + set_control(m_keys[0], 20, ""); // VolumeUp + set_control(m_keys[0], 21, ""); // VolumeToggleMute + set_control(m_keys[0], 22, ""); // ToggleIR + set_control(m_keys[0], 23, ""); // ToggleAspectRatio + set_control(m_keys[0], 24, ""); // ToggleEFBCopies + set_control(m_keys[0], 25, ""); // ToggleFog + set_control(m_keys[0], 26, "TAB"); // ToggleThrottle + set_control(m_keys[0], 27, ""); // DecreaseFrameLimit + set_control(m_keys[0], 28, ""); // IncreaseFrameLimit + set_control(m_keys[0], 29, "1"); // FreelookDecreaseSpeed + set_control(m_keys[0], 30, "2"); // FreelookIncreaseSpeed + set_control(m_keys[0], 31, "F"); // FreelookResetSpeed + set_control(m_keys[1], 0, "E"); // FreelookUp + set_control(m_keys[1], 1, "Q"); // FreelookDown + set_control(m_keys[1], 2, "A"); // FreelookLeft + set_control(m_keys[1], 3, "D"); // FreelookRight + set_control(m_keys[1], 4, "W"); // FreelookZoomIn + set_control(m_keys[1], 5, "S"); // FreelookZoomOut + set_control(m_keys[1], 6, "R"); // FreelookReset + set_control(m_keys[1], 7, ""); // DecreaseDepth + set_control(m_keys[1], 8, ""); // IncreaseDepth + set_control(m_keys[1], 9, ""); // DecreaseConvergence + set_control(m_keys[1], 10, ""); // IncreaseConvergence + set_control(m_keys[1], 11, "`F1` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot1 + set_control(m_keys[1], 12, "`F2` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot2 + set_control(m_keys[1], 13, "`F3` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot3 + set_control(m_keys[1], 14, "`F4` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot4 + set_control(m_keys[1], 15, "`F5` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot5 + set_control(m_keys[1], 16, "`F6` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot6 + set_control(m_keys[1], 17, "`F7` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot7 + set_control(m_keys[1], 18, "`F8` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot8 + set_control(m_keys[1], 19, ""); // LoadStateSlot9 + set_control(m_keys[1], 20, ""); // LoadStateSlot10 + set_control(m_keys[1], 21, "(LSHIFT | RSHIFT) & `F1`"); // SaveStateSlot1 + set_control(m_keys[1], 22, "(LSHIFT | RSHIFT) & `F2`"); // SaveStateSlot2 + set_control(m_keys[1], 23, "(LSHIFT | RSHIFT) & `F3`"); // SaveStateSlot3 + set_control(m_keys[1], 24, "(LSHIFT | RSHIFT) & `F4`"); // SaveStateSlot4 + set_control(m_keys[1], 25, "(LSHIFT | RSHIFT) & `F5`"); // SaveStateSlot5 + set_control(m_keys[1], 26, "(LSHIFT | RSHIFT) & `F6`"); // SaveStateSlot6 + set_control(m_keys[1], 27, "(LSHIFT | RSHIFT) & `F7`"); // SaveStateSlot7 + set_control(m_keys[1], 28, "(LSHIFT | RSHIFT) & `F8`"); // SaveStateSlot8 + set_control(m_keys[1], 29, ""); // SaveStateSlot9 + set_control(m_keys[1], 30, ""); // SaveStateSlot10 + set_control(m_keys[1], 31, ""); // SelectStateSlot1 + set_control(m_keys[2], 0, ""); // SelectStateSlot2 + set_control(m_keys[2], 1, ""); // SelectStateSlot3 + set_control(m_keys[2], 2, ""); // SelectStateSlot4 + set_control(m_keys[2], 3, ""); // SelectStateSlot5 + set_control(m_keys[2], 4, ""); // SelectStateSlot6 + set_control(m_keys[2], 5, ""); // SelectStateSlot7 + set_control(m_keys[2], 6, ""); // SelectStateSlot8 + set_control(m_keys[2], 7, ""); // SelectStateSlot9 + set_control(m_keys[2], 8, ""); // SelectStateSlot10 + set_control(m_keys[2], 9, ""); // SaveSelectedSlot + set_control(m_keys[2], 10, ""); // LoadSelectedSlot + set_control(m_keys[2], 11, ""); // LoadLastState1 + set_control(m_keys[2], 12, ""); // LoadLastState2 + set_control(m_keys[2], 13, ""); // LoadLastState3 + set_control(m_keys[2], 14, ""); // LoadLastState4 + set_control(m_keys[2], 15, ""); // LoadLastState5 + set_control(m_keys[2], 16, ""); // LoadLastState6 + set_control(m_keys[2], 17, ""); // LoadLastState7 + set_control(m_keys[2], 18, ""); // LoadLastState8 + set_control(m_keys[2], 19, ""); // SaveFirstState + set_control(m_keys[2], 20, "`F12` & !(LSHIFT | RSHIFT)"); // UndoLoadState + set_control(m_keys[2], 21, "(LSHIFT | RSHIFT) & `F12`"); // UndoSaveState + set_control(m_keys[2], 22, ""); // SaveStateFile + set_control(m_keys[2], 23, ""); // LoadStateFile +#elif __APPLE__ + set_control(m_keys[0], 0, "(`Left Command` | `Right Command`) & `O`"); // Open + set_control(m_keys[0], 1, ""); // ChangeDisc + set_control(m_keys[0], 2, ""); // RefreshList + set_control(m_keys[0], 3, "(`Left Command` | `Right Command`) & `P`"); // PlayPause + set_control(m_keys[0], 4, "(`Left Command` | `Right Command`) & `W`"); // Stop + set_control(m_keys[0], 5, ""); // Reset + set_control(m_keys[0], 6, ""); // FrameAdvance + set_control(m_keys[0], 7, ""); // StartRecording + set_control(m_keys[0], 8, ""); // PlayRecording + set_control(m_keys[0], 9, ""); // ExportRecording + set_control(m_keys[0], 10, ""); // Readonlymode + set_control(m_keys[0], 11, "(`Left Command` | `Right Command`) & `F`"); // ToggleFullscreen + set_control(m_keys[0], 12, "(`Left Command` | `Right Command`) & `S`"); // Screenshot + set_control(m_keys[0], 13, ""); // Exit + set_control(m_keys[0], 14, "(`Left Command` | `Right Command`) & `1`"); // Wiimote1Connect + set_control(m_keys[0], 15, "(`Left Command` | `Right Command`) & `2`"); // Wiimote2Connect + set_control(m_keys[0], 16, "(`Left Command` | `Right Command`) & `3`"); // Wiimote3Connect + set_control(m_keys[0], 17, "(`Left Command` | `Right Command`) & `4`"); // Wiimote4Connect + set_control(m_keys[0], 18, "(`Left Command` | `Right Command`) & `5`"); // BalanceBoardConnect + set_control(m_keys[0], 19, ""); // VolumeDown + set_control(m_keys[0], 20, ""); // VolumeUp + set_control(m_keys[0], 21, ""); // VolumeToggleMute + set_control(m_keys[0], 22, ""); // ToggleIR + set_control(m_keys[0], 23, ""); // ToggleAspectRatio + set_control(m_keys[0], 24, ""); // ToggleEFBCopies + set_control(m_keys[0], 25, ""); // ToggleFog + set_control(m_keys[0], 26, "Tab"); // ToggleThrottle + set_control(m_keys[0], 27, ""); // DecreaseFrameLimit + set_control(m_keys[0], 28, ""); // IncreaseFrameLimit + set_control(m_keys[0], 29, "`1` & !(`Left Command` | `Right Command`)"); // FreelookDecreaseSpeed + set_control(m_keys[0], 30, "`2` & !(`Left Command` | `Right Command`)"); // FreelookIncreaseSpeed + set_control(m_keys[0], 31, "`F` & !(`Left Command` | `Right Command`)"); // FreelookResetSpeed + set_control(m_keys[1], 0, "`E` & !(`Left Command` | `Right Command`)"); // FreelookUp + set_control(m_keys[1], 1, "`Q` & !(`Left Command` | `Right Command`)"); // FreelookDown + set_control(m_keys[1], 2, "`A` & !(`Left Command` | `Right Command`)"); // FreelookLeft + set_control(m_keys[1], 3, "`D` & !(`Left Command` | `Right Command`)"); // FreelookRight + set_control(m_keys[1], 4, "`W` & !(`Left Command` | `Right Command`)"); // FreelookZoomIn + set_control(m_keys[1], 5, "`S` & !(`Left Command` | `Right Command`)"); // FreelookZoomOut + set_control(m_keys[1], 6, "`R` & !(`Left Command` | `Right Command`)"); // FreelookReset + set_control(m_keys[1], 7, ""); // DecreaseDepth + set_control(m_keys[1], 8, ""); // IncreaseDepth + set_control(m_keys[1], 9, ""); // DecreaseConvergence + set_control(m_keys[1], 10, ""); // IncreaseConvergence + set_control(m_keys[1], 11, "`F1` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot1 + set_control(m_keys[1], 12, "`F2` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot2 + set_control(m_keys[1], 13, "`F3` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot3 + set_control(m_keys[1], 14, "`F4` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot4 + set_control(m_keys[1], 15, "`F5` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot5 + set_control(m_keys[1], 16, "`F6` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot6 + set_control(m_keys[1], 17, "`F7` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot7 + set_control(m_keys[1], 18, "`F8` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot8 + set_control(m_keys[1], 19, ""); // LoadStateSlot9 + set_control(m_keys[1], 20, ""); // LoadStateSlot10 + set_control(m_keys[1], 21, "(`Left Shift` | `Right Shift`) & `F1`"); // SaveStateSlot1 + set_control(m_keys[1], 22, "(`Left Shift` | `Right Shift`) & `F2`"); // SaveStateSlot2 + set_control(m_keys[1], 23, "(`Left Shift` | `Right Shift`) & `F3`"); // SaveStateSlot3 + set_control(m_keys[1], 24, "(`Left Shift` | `Right Shift`) & `F4`"); // SaveStateSlot4 + set_control(m_keys[1], 25, "(`Left Shift` | `Right Shift`) & `F5`"); // SaveStateSlot5 + set_control(m_keys[1], 26, "(`Left Shift` | `Right Shift`) & `F6`"); // SaveStateSlot6 + set_control(m_keys[1], 27, "(`Left Shift` | `Right Shift`) & `F7`"); // SaveStateSlot7 + set_control(m_keys[1], 28, "(`Left Shift` | `Right Shift`) & `F8`"); // SaveStateSlot8 + set_control(m_keys[1], 29, ""); // SaveStateSlot9 + set_control(m_keys[1], 30, ""); // SaveStateSlot10 + set_control(m_keys[1], 31, ""); // SelectStateSlot1 + set_control(m_keys[2], 0, ""); // SelectStateSlot2 + set_control(m_keys[2], 1, ""); // SelectStateSlot3 + set_control(m_keys[2], 2, ""); // SelectStateSlot4 + set_control(m_keys[2], 3, ""); // SelectStateSlot5 + set_control(m_keys[2], 4, ""); // SelectStateSlot6 + set_control(m_keys[2], 5, ""); // SelectStateSlot7 + set_control(m_keys[2], 6, ""); // SelectStateSlot8 + set_control(m_keys[2], 7, ""); // SelectStateSlot9 + set_control(m_keys[2], 8, ""); // SelectStateSlot10 + set_control(m_keys[2], 9, ""); // SaveSelectedSlot + set_control(m_keys[2], 10, ""); // LoadSelectedSlot + set_control(m_keys[2], 11, ""); // LoadLastState1 + set_control(m_keys[2], 12, ""); // LoadLastState2 + set_control(m_keys[2], 13, ""); // LoadLastState3 + set_control(m_keys[2], 14, ""); // LoadLastState4 + set_control(m_keys[2], 15, ""); // LoadLastState5 + set_control(m_keys[2], 16, ""); // LoadLastState6 + set_control(m_keys[2], 17, ""); // LoadLastState7 + set_control(m_keys[2], 18, ""); // LoadLastState8 + set_control(m_keys[2], 19, ""); // SaveFirstState + set_control(m_keys[2], 20, "`F12` & !(`Left Shift` | `Right Shift`)"); // UndoLoadState + set_control(m_keys[2], 21, "(`Left Shift` | `Right Shift`) & `F12`"); // UndoSaveState + set_control(m_keys[2], 22, ""); // SaveStateFile + set_control(m_keys[2], 23, ""); // LoadStateFile +#else // linux + set_control(m_keys[0], 0, "(Control_L | Control_R) & `O`"); // Open + set_control(m_keys[0], 1, ""); // ChangeDisc + set_control(m_keys[0], 2, ""); // RefreshList + set_control(m_keys[0], 3, "F10"); // PlayPause + set_control(m_keys[0], 4, "Escape"); // Stop + set_control(m_keys[0], 5, ""); // Reset + set_control(m_keys[0], 6, ""); // FrameAdvance + set_control(m_keys[0], 7, ""); // StartRecording + set_control(m_keys[0], 8, ""); // PlayRecording + set_control(m_keys[0], 9, ""); // ExportRecording + set_control(m_keys[0], 10, ""); // Readonlymode + set_control(m_keys[0], 11, "(Alt_L | Alt_R) & `Return`"); // ToggleFullscreen + set_control(m_keys[0], 12, "`F9` & !(Alt_L | Alt_R)"); // Screenshot + set_control(m_keys[0], 13, ""); // Exit + set_control(m_keys[0], 14, "(Alt_L | Alt_R) & `F5`"); // Wiimote1Connect + set_control(m_keys[0], 15, "(Alt_L | Alt_R) & `F6`"); // Wiimote2Connect + set_control(m_keys[0], 16, "(Alt_L | Alt_R) & `F7`"); // Wiimote3Connect + set_control(m_keys[0], 17, "(Alt_L | Alt_R) & `F8`"); // Wiimote4Connect + set_control(m_keys[0], 18, "(Alt_L | Alt_R) & `F9`"); // BalanceBoardConnect + set_control(m_keys[0], 19, ""); // VolumeDown + set_control(m_keys[0], 20, ""); // VolumeUp + set_control(m_keys[0], 21, ""); // VolumeToggleMute + set_control(m_keys[0], 22, ""); // ToggleIR + set_control(m_keys[0], 23, ""); // ToggleAspectRatio + set_control(m_keys[0], 24, ""); // ToggleEFBCopies + set_control(m_keys[0], 25, ""); // ToggleFog + set_control(m_keys[0], 26, "Tab"); // ToggleThrottle + set_control(m_keys[0], 27, ""); // DecreaseFrameLimit + set_control(m_keys[0], 28, ""); // IncreaseFrameLimit + set_control(m_keys[0], 29, "1"); // FreelookDecreaseSpeed + set_control(m_keys[0], 30, "2"); // FreelookIncreaseSpeed + set_control(m_keys[0], 31, "F"); // FreelookResetSpeed + set_control(m_keys[1], 0, "E"); // FreelookUp + set_control(m_keys[1], 1, "Q"); // FreelookDown + set_control(m_keys[1], 2, "A"); // FreelookLeft + set_control(m_keys[1], 3, "D"); // FreelookRight + set_control(m_keys[1], 4, "W"); // FreelookZoomIn + set_control(m_keys[1], 5, "S"); // FreelookZoomOut + set_control(m_keys[1], 6, "R"); // FreelookReset + set_control(m_keys[1], 7, ""); // DecreaseDepth + set_control(m_keys[1], 8, ""); // IncreaseDepth + set_control(m_keys[1], 9, ""); // DecreaseConvergence + set_control(m_keys[1], 10, ""); // IncreaseConvergence + set_control(m_keys[1], 11, "`F1` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot1 + set_control(m_keys[1], 12, "`F2` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot2 + set_control(m_keys[1], 13, "`F3` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot3 + set_control(m_keys[1], 14, "`F4` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot4 + set_control(m_keys[1], 15, "`F5` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot5 + set_control(m_keys[1], 16, "`F6` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot6 + set_control(m_keys[1], 17, "`F7` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot7 + set_control(m_keys[1], 18, "`F8` & !(Shift_L | Shift_R) & !(Alt_L | Alt_R)"); // LoadStateSlot8 + set_control(m_keys[1], 19, ""); // LoadStateSlot9 + set_control(m_keys[1], 20, ""); // LoadStateSlot10 + set_control(m_keys[1], 21, "(Shift_L | Shift_R) & `F1`"); // SaveStateSlot1 + set_control(m_keys[1], 22, "(Shift_L | Shift_R) & `F2`"); // SaveStateSlot2 + set_control(m_keys[1], 23, "(Shift_L | Shift_R) & `F3`"); // SaveStateSlot3 + set_control(m_keys[1], 24, "(Shift_L | Shift_R) & `F4`"); // SaveStateSlot4 + set_control(m_keys[1], 25, "(Shift_L | Shift_R) & `F5`"); // SaveStateSlot5 + set_control(m_keys[1], 26, "(Shift_L | Shift_R) & `F6`"); // SaveStateSlot6 + set_control(m_keys[1], 27, "(Shift_L | Shift_R) & `F7`"); // SaveStateSlot7 + set_control(m_keys[1], 28, "(Shift_L | Shift_R) & `F8`"); // SaveStateSlot8 + set_control(m_keys[1], 29, ""); // SaveStateSlot9 + set_control(m_keys[1], 30, ""); // SaveStateSlot10 + set_control(m_keys[1], 31, ""); // SelectStateSlot1 + set_control(m_keys[2], 0, ""); // SelectStateSlot2 + set_control(m_keys[2], 1, ""); // SelectStateSlot3 + set_control(m_keys[2], 2, ""); // SelectStateSlot4 + set_control(m_keys[2], 3, ""); // SelectStateSlot5 + set_control(m_keys[2], 4, ""); // SelectStateSlot6 + set_control(m_keys[2], 5, ""); // SelectStateSlot7 + set_control(m_keys[2], 6, ""); // SelectStateSlot8 + set_control(m_keys[2], 7, ""); // SelectStateSlot9 + set_control(m_keys[2], 8, ""); // SelectStateSlot10 + set_control(m_keys[2], 9, ""); // SaveSelectedSlot + set_control(m_keys[2], 10, ""); // LoadSelectedSlot + set_control(m_keys[2], 11, ""); // LoadLastState1 + set_control(m_keys[2], 12, ""); // LoadLastState2 + set_control(m_keys[2], 13, ""); // LoadLastState3 + set_control(m_keys[2], 14, ""); // LoadLastState4 + set_control(m_keys[2], 15, ""); // LoadLastState5 + set_control(m_keys[2], 16, ""); // LoadLastState6 + set_control(m_keys[2], 17, ""); // LoadLastState7 + set_control(m_keys[2], 18, ""); // LoadLastState8 + set_control(m_keys[2], 19, ""); // SaveFirstState + set_control(m_keys[2], 20, "`F12` & !(Shift_L | Shift_R)"); // UndoLoadState + set_control(m_keys[2], 21, "(Shift_L | Shift_R) & `F12`"); // UndoSaveState + set_control(m_keys[2], 22, ""); // SaveStateFile + set_control(m_keys[2], 23, ""); // LoadStateFile +#endif +} diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h new file mode 100644 index 000000000..1e03163de --- /dev/null +++ b/Source/Core/Core/HotkeyManager.h @@ -0,0 +1,39 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "Core/CoreParameter.h" +#include "InputCommon/InputConfig.h" + +struct HotkeyStatus +{ + u32 button[6]; + s8 err; +}; + +class HotkeyManager : public ControllerEmu +{ +public: + HotkeyManager(); + ~HotkeyManager(); + + std::string GetName() const; + void GetInput(HotkeyStatus* const hk); + void LoadDefaults(const ControllerInterface& ciface); + +private: + Buttons* m_keys[6]; + ControlGroup* m_options; +}; + +namespace HotkeyManagerEmu +{ + void Initialize(void* const hwnd); + void Shutdown(); + + InputConfig* GetConfig(); + void GetStatus(u8 _port, HotkeyStatus* _pKeyboardStatus); + bool IsPressed(int Id, bool held); +} diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index e7b83d249..59b4ba524 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -86,7 +86,7 @@ static u64 last_reply_time; static const u64 ENQUEUE_REQUEST_FLAG = 0x100000000ULL; static const u64 ENQUEUE_ACKNOWLEDGEMENT_FLAG = 0x200000000ULL; -static void EnqueueEventCallback(u64 userdata, int) +static void EnqueueEvent(u64 userdata, int cycles_late = 0) { if (userdata & ENQUEUE_ACKNOWLEDGEMENT_FLAG) { @@ -149,7 +149,7 @@ void Init() g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, "/dev/usb/oh1"); i++; g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, "_Unimplemented_Device_"); i++; - event_enqueue = CoreTiming::RegisterEvent("IPCEvent", EnqueueEventCallback); + event_enqueue = CoreTiming::RegisterEvent("IPCEvent", EnqueueEvent); } void Reset(bool _bHard) @@ -568,6 +568,11 @@ void EnqueueReply_Threadsafe(u32 address, int cycles_in_future) CoreTiming::ScheduleEvent_Threadsafe(cycles_in_future, event_enqueue, address); } +void EnqueueReply_Immediate(u32 address) +{ + EnqueueEvent(address); +} + void EnqueueCommandAcknowledgement(u32 address, int cycles_in_future) { CoreTiming::ScheduleEvent(cycles_in_future, event_enqueue, diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h index 1175462dc..3383642b7 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h @@ -80,6 +80,7 @@ void ExecuteCommand(u32 _Address); void EnqueueRequest(u32 address); void EnqueueReply(u32 address, int cycles_in_future = 0); void EnqueueReply_Threadsafe(u32 address, int cycles_in_future = 0); +void EnqueueReply_Immediate(u32 address); void EnqueueCommandAcknowledgement(u32 _Address, int cycles_in_future = 0); } // end of namespace WII_IPC_HLE_Interface diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 9628afde9..07a22b79a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -9,6 +9,7 @@ #include "Common/Logging/LogManager.h" #include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" #include "Core/VolumeHandler.h" #include "Core/HW/DVDInterface.h" #include "Core/HW/Memmap.h" @@ -17,14 +18,38 @@ #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" -using namespace DVDInterface; +static CWII_IPC_HLE_Device_di* g_di_pointer; +static int ioctl_callback; -CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName ) +static void IOCtlCallback(u64 userdata, int cycles_late) +{ + if (g_di_pointer != nullptr) + g_di_pointer->FinishIOCtl((DVDInterface::DIInterruptType)userdata); + + // If g_di_pointer == nullptr, IOS was probably shut down, + // so the command shouldn't be completed +} + +CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName) -{} +{ + if (g_di_pointer == nullptr) + ERROR_LOG(WII_IPC_DVD, "Trying to run two DI devices at once. IOCtl may not behave as expected."); + + g_di_pointer = this; + ioctl_callback = CoreTiming::RegisterEvent("IOCtlCallbackDI", IOCtlCallback); +} CWII_IPC_HLE_Device_di::~CWII_IPC_HLE_Device_di() -{} +{ + g_di_pointer = nullptr; +} + +void CWII_IPC_HLE_Device_di::DoState(PointerWrap& p) +{ + DoStateShared(p); + p.Do(m_commands_to_execute); +} IPCCommandResult CWII_IPC_HLE_Device_di::Open(u32 _CommandAddress, u32 _Mode) { @@ -43,10 +68,29 @@ IPCCommandResult CWII_IPC_HLE_Device_di::Close(u32 _CommandAddress, bool _bForce IPCCommandResult CWII_IPC_HLE_Device_di::IOCtl(u32 _CommandAddress) { - u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); - u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14); - u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); - u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C); + // DI IOCtls are handled in a special way by Dolphin + // compared to other WII_IPC_HLE functions. + // This is a wrapper around DVDInterface's ExecuteCommand, + // which will execute commands more or less asynchronously. + // Only one command can be executed at a time, so commands + // are queued until DVDInterface is ready to handle them. + + bool ready_to_execute = m_commands_to_execute.empty(); + m_commands_to_execute.push_back(_CommandAddress); + if (ready_to_execute) + StartIOCtl(_CommandAddress); + + // DVDInterface handles the timing, and we handle the reply, + // so WII_IPC_HLE shouldn't do any of that. + return IPC_NO_REPLY; +} + +void CWII_IPC_HLE_Device_di::StartIOCtl(u32 command_address) +{ + u32 BufferIn = Memory::Read_U32(command_address + 0x10); + u32 BufferInSize = Memory::Read_U32(command_address + 0x14); + u32 BufferOut = Memory::Read_U32(command_address + 0x18); + u32 BufferOutSize = Memory::Read_U32(command_address + 0x1C); u32 command_0 = Memory::Read_U32(BufferIn); u32 command_1 = Memory::Read_U32(BufferIn + 4); @@ -63,14 +107,38 @@ IPCCommandResult CWII_IPC_HLE_Device_di::IOCtl(u32 _CommandAddress) Memory::Memset(BufferOut, 0, BufferOutSize); } - DVDCommandResult result = ExecuteCommand(command_0, command_1, command_2, - BufferOut, BufferOutSize, false); - Memory::Write_U32(result.interrupt_type, _CommandAddress + 0x4); + // DVDInterface's ExecuteCommand handles most of the work. + // The IOCtl callback is used to generate a reply afterwards. + DVDInterface::ExecuteCommand(command_0, command_1, command_2, BufferOut, BufferOutSize, + false, ioctl_callback); +} - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed) - result.ticks_until_completion = 0; // An optional hack to speed up loading times +void CWII_IPC_HLE_Device_di::FinishIOCtl(DVDInterface::DIInterruptType interrupt_type) +{ + if (m_commands_to_execute.empty()) + { + PanicAlertT("WII_IPC_HLE_Device_DI tried to reply to non-existing command"); + return; + } - return { true, result.ticks_until_completion }; + // This command has been executed, so it's removed from the queue + u32 command_address = m_commands_to_execute.front(); + m_commands_to_execute.pop_front(); + + // The DI interrupt type is used as a return value + Memory::Write_U32(interrupt_type, command_address + 4); + + // The original hardware overwrites the command type with the async reply type. + Memory::Write_U32(IPC_REP_ASYNC, command_address); + // IOS also seems to write back the command that was responded to in the FD field. + Memory::Write_U32(Memory::Read_U32(command_address), command_address + 8); + // Generate a reply to the IPC command + WII_IPC_HLE_Interface::EnqueueReply_Immediate(command_address); + + // DVDInterface is now ready to execute another command, + // so we start executing a command from the queue if there is one + if (!m_commands_to_execute.empty()) + StartIOCtl(m_commands_to_execute.front()); } IPCCommandResult CWII_IPC_HLE_Device_di::IOCtlV(u32 _CommandAddress) @@ -88,7 +156,7 @@ IPCCommandResult CWII_IPC_HLE_Device_di::IOCtlV(u32 _CommandAddress) u32 ReturnValue = 0; switch (CommandBuffer.Parameter) { - case DVDLowOpenPartition: + case DVDInterface::DVDLowOpenPartition: { _dbg_assert_msg_(WII_IPC_DVD, CommandBuffer.InBuffer[1].m_Address == 0, "DVDLowOpenPartition with ticket"); _dbg_assert_msg_(WII_IPC_DVD, CommandBuffer.InBuffer[2].m_Address == 0, "DVDLowOpenPartition with cert chain"); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h index 6c10e8f25..4ca874ed1 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -4,14 +4,10 @@ #pragma once +#include +#include "Core/HW/DVDInterface.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" -namespace DiscIO -{ - class IVolume; - class IFileSystem; -} - class CWII_IPC_HLE_Device_di : public IWII_IPC_HLE_Device { public: @@ -20,9 +16,18 @@ public: virtual ~CWII_IPC_HLE_Device_di(); + void DoState(PointerWrap& p) override; + IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override; IPCCommandResult IOCtl(u32 _CommandAddress) override; IPCCommandResult IOCtlV(u32 _CommandAddress) override; + + void FinishIOCtl(DVDInterface::DIInterruptType interrupt_type); +private: + + void StartIOCtl(u32 command_address); + + std::deque m_commands_to_execute; }; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp index af4efbbdc..7c53f8faf 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -925,7 +925,7 @@ IPCCommandResult CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) pDolLoader = std::make_unique(pContent->m_Filename); } pDolLoader->Load(); // TODO: Check why sysmenu does not load the DOL correctly - PC = pDolLoader->GetEntryPoint() | 0x80000000; + PC = pDolLoader->GetEntryPoint(); IOSv = ContentLoader.GetIosVersion(); bSuccess = true; } diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp index 13029f245..4c20ca287 100644 --- a/Source/Core/Core/MemTools.cpp +++ b/Source/Core/Core/MemTools.cpp @@ -136,7 +136,7 @@ static void ExceptionThread(mach_port_t port) mach_msg_header_t *send_msg = nullptr; mach_msg_size_t send_size = 0; mach_msg_option_t option = MACH_RCV_MSG; - while (1) + while (true) { // If this isn't the first run, send the reply message. Then, receive // a message: either a mach_exception_raise_state RPC due to diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 6280e49d4..09f0700e7 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -79,8 +79,6 @@ static u32 s_DSPcoefHash = 0; static bool s_bRecordingFromSaveState = false; static bool s_bPolled = false; -static std::string tmpStateFilename = File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav"; - static std::string s_InputDisplay[8]; static GCManipFunction gcmfunc = nullptr; @@ -469,10 +467,11 @@ bool BeginRecordingInput(int controllers) if (Core::IsRunningAndStarted()) { - if (File::Exists(tmpStateFilename)) - File::Delete(tmpStateFilename); + const std::string save_path = File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav"; + if (File::Exists(save_path)) + File::Delete(save_path); - State::SaveAs(tmpStateFilename); + State::SaveAs(save_path); s_bRecordingFromSaveState = true; // This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp. @@ -1214,6 +1213,7 @@ void SaveRecording(const std::string& filename) header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable; header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable; header.bCopyEFBToTexture = g_ActiveConfig.bCopyEFBToTexture; + header.bEFBCopyCacheEnable = false; header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges; header.bUseXFB = g_ActiveConfig.bUseXFB; header.bUseRealXFB = g_ActiveConfig.bUseRealXFB; @@ -1241,7 +1241,7 @@ void SaveRecording(const std::string& filename) if (success && s_bRecordingFromSaveState) { std::string stateFilename = filename + ".sav"; - success = File::Copy(tmpStateFilename, stateFilename); + success = File::Copy(File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav", stateFilename); } if (success) diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index 01b496435..255635810 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -32,7 +32,7 @@ typedef std::vector NetWiimote; #define NETPLAY_VERSION "Dolphin NetPlay 2014-01-08" -const int NETPLAY_INITIAL_GCTIME = 1272737767; +static const int NETPLAY_INITIAL_GCTIME = 1272737767; // messages diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp index e66e7ae2f..0ac3787d7 100644 --- a/Source/Core/Core/PatchEngine.cpp +++ b/Source/Core/Core/PatchEngine.cpp @@ -30,7 +30,7 @@ #include "Core/GeckoCode.h" #include "Core/GeckoCodeConfig.h" #include "Core/PatchEngine.h" -#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" using namespace Common; @@ -188,13 +188,13 @@ static void ApplyPatches(const std::vector &patches) switch (entry.type) { case PATCH_8BIT: - Memory::Write_U8((u8)value, addr); + PowerPC::HostWrite_U8((u8)value, addr); break; case PATCH_16BIT: - Memory::Write_U16((u16)value, addr); + PowerPC::HostWrite_U16((u16)value, addr); break; case PATCH_32BIT: - Memory::Write_U32(value, addr); + PowerPC::HostWrite_U32(value, addr); break; default: //unknown patchtype @@ -207,15 +207,20 @@ static void ApplyPatches(const std::vector &patches) void ApplyFramePatches() { + // TODO: Messing with MSR this way is really, really, evil; we should + // probably be using some sort of Gecko OS-style hooking mechanism + // so the emulated CPU is in a predictable state when we process cheats. + u32 oldMSR = MSR; + UReg_MSR newMSR = oldMSR; + newMSR.IR = 1; + newMSR.DR = 1; + MSR = newMSR.Hex; ApplyPatches(onFrame); // Run the Gecko code handler Gecko::RunCodeHandler(); -} - -void ApplyARPatches() -{ ActionReplay::RunAllActive(); + MSR = oldMSR; } void Shutdown() diff --git a/Source/Core/Core/PatchEngine.h b/Source/Core/Core/PatchEngine.h index 8b35db873..73039eb8b 100644 --- a/Source/Core/Core/PatchEngine.h +++ b/Source/Core/Core/PatchEngine.h @@ -45,7 +45,6 @@ void LoadPatchSection(const std::string& section, std::vector &patches, IniFile &globalIni, IniFile &localIni); void LoadPatches(); void ApplyFramePatches(); -void ApplyARPatches(); void Shutdown(); inline int GetPatchTypeCharLength(PatchType type) diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index 749205201..55be20411 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -107,7 +107,7 @@ int Interpreter::SingleStepInner() #endif NPC = PC + sizeof(UGeckoInstruction); - instCode.hex = Memory::Read_Opcode(PC); + instCode.hex = PowerPC::Read_Opcode(PC); // Uncomment to trace the interpreter //if ((PC & 0xffffff)>=0x0ab54c && (PC & 0xffffff)<=0x0ab624) @@ -146,7 +146,7 @@ int Interpreter::SingleStepInner() } else { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_FPU_UNAVAILABLE); + PowerPC::ppcState.Exceptions |= EXCEPTION_FPU_UNAVAILABLE; PowerPC::CheckExceptions(); m_EndBlock = true; } @@ -281,14 +281,10 @@ void Interpreter::Run() void Interpreter::unknown_instruction(UGeckoInstruction _inst) { - if (_inst.hex != 0) - { - std::string disasm = GekkoDisassembler::Disassemble(Memory::ReadUnchecked_U32(last_pc), last_pc); - NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm.c_str()); - Dolphin_Debugger::PrintCallstack(); - _assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instruction %08x at PC = %08x last_PC = %08x LR = %08x\n", _inst.hex, PC, last_pc, LR); - } - + std::string disasm = GekkoDisassembler::Disassemble(PowerPC::HostRead_U32(last_pc), last_pc); + NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm.c_str()); + Dolphin_Debugger::PrintCallstack(); + _assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instruction %08x at PC = %08x last_PC = %08x LR = %08x\n", _inst.hex, PC, last_pc, LR); } void Interpreter::ClearCache() diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp index a7fe02bcb..497f06fb8 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp @@ -124,7 +124,7 @@ void Interpreter::rfid(UGeckoInstruction _inst) // We do it anyway, though :P void Interpreter::sc(UGeckoInstruction _inst) { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_SYSCALL); + PowerPC::ppcState.Exceptions |= EXCEPTION_SYSCALL; PowerPC::CheckExceptions(); m_EndBlock = true; } diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index 66264aaab..31850a1c2 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -5,18 +5,12 @@ #include #include -#ifdef _WIN32 -#include -#endif - #include "Common/MathUtil.h" #include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" using namespace MathUtil; -void UpdateSSEState(); - // Extremely rare - actually, never seen. // Star Wars : Rogue Leader spams that at some point :| void Interpreter::Helper_UpdateCR1() diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp index 954cc2620..7f7c8b3ed 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp @@ -157,7 +157,7 @@ void Interpreter::twi(UGeckoInstruction _inst) (((u32)a <(u32)b) && (TO & 0x02)) || (((u32)a >(u32)b) && (TO & 0x01))) { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_PROGRAM); + PowerPC::ppcState.Exceptions |= EXCEPTION_PROGRAM; PowerPC::CheckExceptions(); m_EndBlock = true; // Dunno about this } @@ -423,7 +423,7 @@ void Interpreter::tw(UGeckoInstruction _inst) (((u32)a <(u32)b) && (TO & 0x02)) || (((u32)a >(u32)b) && (TO & 0x01))) { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_PROGRAM); + PowerPC::ppcState.Exceptions |= EXCEPTION_PROGRAM; PowerPC::CheckExceptions(); m_EndBlock = true; // Dunno about this } diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 2bcbab581..823b5e716 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -36,7 +36,7 @@ u32 Interpreter::Helper_Get_EA_UX(const UGeckoInstruction _inst) void Interpreter::lbz(UGeckoInstruction _inst) { - u32 temp = (u32)Memory::Read_U8(Helper_Get_EA(_inst)); + u32 temp = (u32)PowerPC::Read_U8(Helper_Get_EA(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) rGPR[_inst.RD] = temp; } @@ -44,7 +44,7 @@ void Interpreter::lbz(UGeckoInstruction _inst) void Interpreter::lbzu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - u32 temp = (u32)Memory::Read_U8(uAddress); + u32 temp = (u32)PowerPC::Read_U8(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -54,7 +54,7 @@ void Interpreter::lbzu(UGeckoInstruction _inst) void Interpreter::lfd(UGeckoInstruction _inst) { - u64 temp = Memory::Read_U64(Helper_Get_EA(_inst)); + u64 temp = PowerPC::Read_U64(Helper_Get_EA(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) riPS0(_inst.FD) = temp; } @@ -62,7 +62,7 @@ void Interpreter::lfd(UGeckoInstruction _inst) void Interpreter::lfdu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - u64 temp = Memory::Read_U64(uAddress); + u64 temp = PowerPC::Read_U64(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { riPS0(_inst.FD) = temp; @@ -73,7 +73,7 @@ void Interpreter::lfdu(UGeckoInstruction _inst) void Interpreter::lfdux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - u64 temp = Memory::Read_U64(uAddress); + u64 temp = PowerPC::Read_U64(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { riPS0(_inst.FD) = temp; @@ -83,14 +83,14 @@ void Interpreter::lfdux(UGeckoInstruction _inst) void Interpreter::lfdx(UGeckoInstruction _inst) { - u64 temp = Memory::Read_U64(Helper_Get_EA_X(_inst)); + u64 temp = PowerPC::Read_U64(Helper_Get_EA_X(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) riPS0(_inst.FD) = temp; } void Interpreter::lfs(UGeckoInstruction _inst) { - u32 uTemp = Memory::Read_U32(Helper_Get_EA(_inst)); + u32 uTemp = PowerPC::Read_U32(Helper_Get_EA(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { u64 value = ConvertToDouble(uTemp); @@ -102,7 +102,7 @@ void Interpreter::lfs(UGeckoInstruction _inst) void Interpreter::lfsu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - u32 uTemp = Memory::Read_U32(uAddress); + u32 uTemp = PowerPC::Read_U32(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { u64 value = ConvertToDouble(uTemp); @@ -116,7 +116,7 @@ void Interpreter::lfsu(UGeckoInstruction _inst) void Interpreter::lfsux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - u32 uTemp = Memory::Read_U32(uAddress); + u32 uTemp = PowerPC::Read_U32(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { u64 value = ConvertToDouble(uTemp); @@ -128,7 +128,7 @@ void Interpreter::lfsux(UGeckoInstruction _inst) void Interpreter::lfsx(UGeckoInstruction _inst) { - u32 uTemp = Memory::Read_U32(Helper_Get_EA_X(_inst)); + u32 uTemp = PowerPC::Read_U32(Helper_Get_EA_X(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { u64 value = ConvertToDouble(uTemp); @@ -139,7 +139,7 @@ void Interpreter::lfsx(UGeckoInstruction _inst) void Interpreter::lha(UGeckoInstruction _inst) { - u32 temp = (u32)(s32)(s16)Memory::Read_U16(Helper_Get_EA(_inst)); + u32 temp = (u32)(s32)(s16)PowerPC::Read_U16(Helper_Get_EA(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -149,7 +149,7 @@ void Interpreter::lha(UGeckoInstruction _inst) void Interpreter::lhau(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - u32 temp = (u32)(s32)(s16)Memory::Read_U16(uAddress); + u32 temp = (u32)(s32)(s16)PowerPC::Read_U16(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -159,7 +159,7 @@ void Interpreter::lhau(UGeckoInstruction _inst) void Interpreter::lhz(UGeckoInstruction _inst) { - u32 temp = (u32)(u16)Memory::Read_U16(Helper_Get_EA(_inst)); + u32 temp = (u32)(u16)PowerPC::Read_U16(Helper_Get_EA(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -169,7 +169,7 @@ void Interpreter::lhz(UGeckoInstruction _inst) void Interpreter::lhzu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - u32 temp = (u32)(u16)Memory::Read_U16(uAddress); + u32 temp = (u32)(u16)PowerPC::Read_U16(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -183,7 +183,7 @@ void Interpreter::lmw(UGeckoInstruction _inst) u32 uAddress = Helper_Get_EA(_inst); for (int iReg = _inst.RD; iReg <= 31; iReg++, uAddress += 4) { - u32 TempReg = Memory::Read_U32(uAddress); + u32 TempReg = PowerPC::Read_U32(uAddress); if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) { PanicAlert("DSI exception in lmw"); @@ -203,7 +203,7 @@ void Interpreter::stmw(UGeckoInstruction _inst) u32 uAddress = Helper_Get_EA(_inst); for (int iReg = _inst.RS; iReg <= 31; iReg++, uAddress+=4) { - Memory::Write_U32(rGPR[iReg], uAddress); + PowerPC::Write_U32(rGPR[iReg], uAddress); if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) { PanicAlert("DSI exception in stmw"); @@ -216,7 +216,7 @@ void Interpreter::stmw(UGeckoInstruction _inst) void Interpreter::lwz(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA(_inst); - u32 temp = Memory::Read_U32(uAddress); + u32 temp = PowerPC::Read_U32(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -226,7 +226,7 @@ void Interpreter::lwz(UGeckoInstruction _inst) void Interpreter::lwzu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - u32 temp = Memory::Read_U32(uAddress); + u32 temp = PowerPC::Read_U32(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -236,13 +236,13 @@ void Interpreter::lwzu(UGeckoInstruction _inst) void Interpreter::stb(UGeckoInstruction _inst) { - Memory::Write_U8((u8)rGPR[_inst.RS], Helper_Get_EA(_inst)); + PowerPC::Write_U8((u8)rGPR[_inst.RS], Helper_Get_EA(_inst)); } void Interpreter::stbu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - Memory::Write_U8((u8)rGPR[_inst.RS], uAddress); + PowerPC::Write_U8((u8)rGPR[_inst.RS], uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -251,13 +251,13 @@ void Interpreter::stbu(UGeckoInstruction _inst) void Interpreter::stfd(UGeckoInstruction _inst) { - Memory::Write_U64(riPS0(_inst.FS), Helper_Get_EA(_inst)); + PowerPC::Write_U64(riPS0(_inst.FS), Helper_Get_EA(_inst)); } void Interpreter::stfdu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - Memory::Write_U64(riPS0(_inst.FS), uAddress); + PowerPC::Write_U64(riPS0(_inst.FS), uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -266,13 +266,13 @@ void Interpreter::stfdu(UGeckoInstruction _inst) void Interpreter::stfs(UGeckoInstruction _inst) { - Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA(_inst)); + PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA(_inst)); } void Interpreter::stfsu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress); + PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -281,13 +281,13 @@ void Interpreter::stfsu(UGeckoInstruction _inst) void Interpreter::sth(UGeckoInstruction _inst) { - Memory::Write_U16((u16)rGPR[_inst.RS], Helper_Get_EA(_inst)); + PowerPC::Write_U16((u16)rGPR[_inst.RS], Helper_Get_EA(_inst)); } void Interpreter::sthu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - Memory::Write_U16((u16)rGPR[_inst.RS], uAddress); + PowerPC::Write_U16((u16)rGPR[_inst.RS], uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -296,13 +296,13 @@ void Interpreter::sthu(UGeckoInstruction _inst) void Interpreter::stw(UGeckoInstruction _inst) { - Memory::Write_U32(rGPR[_inst.RS], Helper_Get_EA(_inst)); + PowerPC::Write_U32(rGPR[_inst.RS], Helper_Get_EA(_inst)); } void Interpreter::stwu(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_U(_inst); - Memory::Write_U32(rGPR[_inst.RS], uAddress); + PowerPC::Write_U32(rGPR[_inst.RS], uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -318,8 +318,8 @@ void Interpreter::dcbf(UGeckoInstruction _inst) { //This should tell GFX backend to throw out any cached data here // !!! SPEEDUP HACK for OSProtectRange !!! -/* u32 tmp1 = Memory::Read_U32(PC+4); - u32 tmp2 = Memory::Read_U32(PC+8); +/* u32 tmp1 = PowerPC::HostRead_U32(PC+4); + u32 tmp2 = PowerPC::HostRead_U32(PC+8); if ((tmp1 == 0x38630020) && (tmp2 == 0x4200fff8)) @@ -377,7 +377,7 @@ void Interpreter::dcbz(UGeckoInstruction _inst) { // HACK but works... we think if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bDCBZOFF) - Memory::ClearCacheLine(Helper_Get_EA_X(_inst) & (~31)); + PowerPC::ClearCacheLine(Helper_Get_EA_X(_inst) & (~31)); if (!JitInterface::GetCore()) PowerPC::CheckExceptions(); } @@ -395,15 +395,15 @@ void Interpreter::eciwx(UGeckoInstruction _inst) if (!(PowerPC::ppcState.spr[SPR_EAR] & 0x80000000)) { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DSI); + PowerPC::ppcState.Exceptions |= EXCEPTION_DSI; } if (EA & 3) - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_ALIGNMENT); + PowerPC::ppcState.Exceptions |= EXCEPTION_ALIGNMENT; // _assert_msg_(POWERPC,0,"eciwx - fill r%i with word @ %08x from device %02x", // _inst.RS, EA, PowerPC::ppcState.spr[SPR_EAR] & 0x1f); - rGPR[_inst.RS] = Memory::Read_U32(EA); + rGPR[_inst.RS] = PowerPC::Read_U32(EA); } void Interpreter::ecowx(UGeckoInstruction _inst) @@ -417,15 +417,15 @@ void Interpreter::ecowx(UGeckoInstruction _inst) if (!(PowerPC::ppcState.spr[SPR_EAR] & 0x80000000)) { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DSI); + PowerPC::ppcState.Exceptions |= EXCEPTION_DSI; } if (EA & 3) - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_ALIGNMENT); + PowerPC::ppcState.Exceptions |= EXCEPTION_ALIGNMENT; // _assert_msg_(POWERPC,0,"ecowx - send stw request (%08x@%08x) to device %02x", // rGPR[_inst.RS], EA, PowerPC::ppcState.spr[SPR_EAR] & 0x1f); - Memory::Write_U32(rGPR[_inst.RS], EA); + PowerPC::Write_U32(rGPR[_inst.RS], EA); } void Interpreter::eieio(UGeckoInstruction _inst) @@ -445,7 +445,7 @@ void Interpreter::icbi(UGeckoInstruction _inst) void Interpreter::lbzux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - u32 temp = (u32)Memory::Read_U8(uAddress); + u32 temp = (u32)PowerPC::Read_U8(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -455,7 +455,7 @@ void Interpreter::lbzux(UGeckoInstruction _inst) void Interpreter::lbzx(UGeckoInstruction _inst) { - u32 temp = (u32)Memory::Read_U8(Helper_Get_EA_X(_inst)); + u32 temp = (u32)PowerPC::Read_U8(Helper_Get_EA_X(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -465,7 +465,7 @@ void Interpreter::lbzx(UGeckoInstruction _inst) void Interpreter::lhaux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - s32 temp = (s32)(s16)Memory::Read_U16(uAddress); + s32 temp = (s32)(s16)PowerPC::Read_U16(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -475,7 +475,7 @@ void Interpreter::lhaux(UGeckoInstruction _inst) void Interpreter::lhax(UGeckoInstruction _inst) { - s32 temp = (s32)(s16)Memory::Read_U16(Helper_Get_EA_X(_inst)); + s32 temp = (s32)(s16)PowerPC::Read_U16(Helper_Get_EA_X(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -484,7 +484,7 @@ void Interpreter::lhax(UGeckoInstruction _inst) void Interpreter::lhbrx(UGeckoInstruction _inst) { - u32 temp = (u32)Common::swap16(Memory::Read_U16(Helper_Get_EA_X(_inst))); + u32 temp = (u32)Common::swap16(PowerPC::Read_U16(Helper_Get_EA_X(_inst))); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -494,7 +494,7 @@ void Interpreter::lhbrx(UGeckoInstruction _inst) void Interpreter::lhzux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - u32 temp = (u32)Memory::Read_U16(uAddress); + u32 temp = (u32)PowerPC::Read_U16(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -504,7 +504,7 @@ void Interpreter::lhzux(UGeckoInstruction _inst) void Interpreter::lhzx(UGeckoInstruction _inst) { - u32 temp = (u32)Memory::Read_U16(Helper_Get_EA_X(_inst)); + u32 temp = (u32)PowerPC::Read_U16(Helper_Get_EA_X(_inst)); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -525,7 +525,7 @@ void Interpreter::lswx(UGeckoInstruction _inst) rGPR[r] = 0; do { - u32 TempValue = Memory::Read_U8(EA) << (24 - i); + u32 TempValue = PowerPC::Read_U8(EA) << (24 - i); if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) { PanicAlert("DSI exception in lswx."); @@ -549,7 +549,7 @@ void Interpreter::lswx(UGeckoInstruction _inst) void Interpreter::lwbrx(UGeckoInstruction _inst) { - u32 temp = Common::swap32(Memory::Read_U32(Helper_Get_EA_X(_inst))); + u32 temp = Common::swap32(PowerPC::Read_U32(Helper_Get_EA_X(_inst))); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -559,7 +559,7 @@ void Interpreter::lwbrx(UGeckoInstruction _inst) void Interpreter::lwzux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - u32 temp = Memory::Read_U32(uAddress); + u32 temp = PowerPC::Read_U32(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -570,7 +570,7 @@ void Interpreter::lwzux(UGeckoInstruction _inst) void Interpreter::lwzx(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_X(_inst); - u32 temp = Memory::Read_U32(uAddress); + u32 temp = PowerPC::Read_U32(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -580,7 +580,7 @@ void Interpreter::lwzx(UGeckoInstruction _inst) void Interpreter::stbux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - Memory::Write_U8((u8)rGPR[_inst.RS], uAddress); + PowerPC::Write_U8((u8)rGPR[_inst.RS], uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -589,13 +589,13 @@ void Interpreter::stbux(UGeckoInstruction _inst) void Interpreter::stbx(UGeckoInstruction _inst) { - Memory::Write_U8((u8)rGPR[_inst.RS], Helper_Get_EA_X(_inst)); + PowerPC::Write_U8((u8)rGPR[_inst.RS], Helper_Get_EA_X(_inst)); } void Interpreter::stfdux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - Memory::Write_U64(riPS0(_inst.FS), uAddress); + PowerPC::Write_U64(riPS0(_inst.FS), uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -604,7 +604,7 @@ void Interpreter::stfdux(UGeckoInstruction _inst) void Interpreter::stfdx(UGeckoInstruction _inst) { - Memory::Write_U64(riPS0(_inst.FS), Helper_Get_EA_X(_inst)); + PowerPC::Write_U64(riPS0(_inst.FS), Helper_Get_EA_X(_inst)); } // Stores Floating points into Integers indeXed @@ -612,14 +612,14 @@ void Interpreter::stfiwx(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_X(_inst); - Memory::Write_U32((u32)riPS0(_inst.FS), uAddress); + PowerPC::Write_U32((u32)riPS0(_inst.FS), uAddress); } void Interpreter::stfsux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress); + PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -628,18 +628,18 @@ void Interpreter::stfsux(UGeckoInstruction _inst) void Interpreter::stfsx(UGeckoInstruction _inst) { - Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA_X(_inst)); + PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA_X(_inst)); } void Interpreter::sthbrx(UGeckoInstruction _inst) { - Memory::Write_U16(Common::swap16((u16)rGPR[_inst.RS]), Helper_Get_EA_X(_inst)); + PowerPC::Write_U16(Common::swap16((u16)rGPR[_inst.RS]), Helper_Get_EA_X(_inst)); } void Interpreter::sthux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - Memory::Write_U16((u16)rGPR[_inst.RS], uAddress); + PowerPC::Write_U16((u16)rGPR[_inst.RS], uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -648,7 +648,7 @@ void Interpreter::sthux(UGeckoInstruction _inst) void Interpreter::sthx(UGeckoInstruction _inst) { - Memory::Write_U16((u16)rGPR[_inst.RS], Helper_Get_EA_X(_inst)); + PowerPC::Write_U16((u16)rGPR[_inst.RS], Helper_Get_EA_X(_inst)); } // __________________________________________________________________________________________________ @@ -679,7 +679,7 @@ void Interpreter::lswi(UGeckoInstruction _inst) rGPR[r] = 0; } - u32 TempValue = Memory::Read_U8(EA) << (24 - i); + u32 TempValue = PowerPC::Read_U8(EA) << (24 - i); if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) { PanicAlert("DSI exception in lsw."); @@ -723,7 +723,7 @@ void Interpreter::stswi(UGeckoInstruction _inst) r++; r &= 31; } - Memory::Write_U8((rGPR[r] >> (24 - i)) & 0xFF, EA); + PowerPC::Write_U8((rGPR[r] >> (24 - i)) & 0xFF, EA); if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) { return; @@ -747,7 +747,7 @@ void Interpreter::stswx(UGeckoInstruction _inst) while (n > 0) { - Memory::Write_U8((rGPR[r] >> (24 - i)) & 0xFF, EA); + PowerPC::Write_U8((rGPR[r] >> (24 - i)) & 0xFF, EA); EA++; n--; @@ -763,7 +763,7 @@ void Interpreter::stswx(UGeckoInstruction _inst) void Interpreter::stwbrx(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_X(_inst); - Memory::Write_U32(Common::swap32(rGPR[_inst.RS]), uAddress); + PowerPC::Write_U32(Common::swap32(rGPR[_inst.RS]), uAddress); } @@ -773,7 +773,7 @@ void Interpreter::stwbrx(UGeckoInstruction _inst) void Interpreter::lwarx(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_X(_inst); - u32 temp = Memory::Read_U32(uAddress); + u32 temp = PowerPC::Read_U32(uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RD] = temp; @@ -792,7 +792,7 @@ void Interpreter::stwcxd(UGeckoInstruction _inst) if (uAddress == g_reserveAddr) { - Memory::Write_U32(rGPR[_inst.RS], uAddress); + PowerPC::Write_U32(rGPR[_inst.RS], uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { g_bReserve = false; @@ -808,7 +808,7 @@ void Interpreter::stwcxd(UGeckoInstruction _inst) void Interpreter::stwux(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_UX(_inst); - Memory::Write_U32(rGPR[_inst.RS], uAddress); + PowerPC::Write_U32(rGPR[_inst.RS], uAddress); if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI)) { rGPR[_inst.RA] = uAddress; @@ -818,7 +818,7 @@ void Interpreter::stwux(UGeckoInstruction _inst) void Interpreter::stwx(UGeckoInstruction _inst) { u32 uAddress = Helper_Get_EA_X(_inst); - Memory::Write_U32(rGPR[_inst.RS], uAddress); + PowerPC::Write_U32(rGPR[_inst.RS], uAddress); } void Interpreter::sync(UGeckoInstruction _inst) @@ -838,7 +838,7 @@ void Interpreter::tlbie(UGeckoInstruction _inst) { // Invalidate TLB entry u32 _Address = rGPR[_inst.RB]; - Memory::InvalidateTLBEntry(_Address); + PowerPC::InvalidateTLBEntry(_Address); } void Interpreter::tlbsync(UGeckoInstruction _inst) diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp index a5c6ea978..1382fb31b 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp @@ -53,7 +53,7 @@ void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, const E switch (_quantizeType) { case QUANTIZE_FLOAT: - Memory::Write_U32(ConvertToSingleFTZ(*(u64*)&_fValue), _Addr); + PowerPC::Write_U32(ConvertToSingleFTZ(*(u64*)&_fValue), _Addr); break; // used for THP player @@ -61,7 +61,7 @@ void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, const E { float fResult = (float)_fValue * m_quantizeTable[_uScale]; MathUtil::Clamp(&fResult, 0.0f, 255.0f); - Memory::Write_U8((u8)fResult, _Addr); + PowerPC::Write_U8((u8)fResult, _Addr); } break; @@ -69,7 +69,7 @@ void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, const E { float fResult = (float)_fValue * m_quantizeTable[_uScale]; MathUtil::Clamp(&fResult, 0.0f, 65535.0f); - Memory::Write_U16((u16)fResult, _Addr); + PowerPC::Write_U16((u16)fResult, _Addr); } break; @@ -77,7 +77,7 @@ void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, const E { float fResult = (float)_fValue * m_quantizeTable[_uScale]; MathUtil::Clamp(&fResult, -128.0f, 127.0f); - Memory::Write_U8((u8)(s8)fResult, _Addr); + PowerPC::Write_U8((u8)(s8)fResult, _Addr); } break; @@ -85,7 +85,7 @@ void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, const E { float fResult = (float)_fValue * m_quantizeTable[_uScale]; MathUtil::Clamp(&fResult, -32768.0f, 32767.0f); - Memory::Write_U16((u16)(s16)fResult, _Addr); + PowerPC::Write_U16((u16)(s16)fResult, _Addr); } break; @@ -103,26 +103,26 @@ float Interpreter::Helper_Dequantize(const u32 _Addr, const EQuantizeType _quant { case QUANTIZE_FLOAT: { - u32 dwValue = Memory::Read_U32(_Addr); + u32 dwValue = PowerPC::Read_U32(_Addr); fResult = *(float*)&dwValue; } break; case QUANTIZE_U8: - fResult = static_cast(Memory::Read_U8(_Addr)) * m_dequantizeTable[_uScale]; + fResult = static_cast(PowerPC::Read_U8(_Addr)) * m_dequantizeTable[_uScale]; break; case QUANTIZE_U16: - fResult = static_cast(Memory::Read_U16(_Addr)) * m_dequantizeTable[_uScale]; + fResult = static_cast(PowerPC::Read_U16(_Addr)) * m_dequantizeTable[_uScale]; break; case QUANTIZE_S8: - fResult = static_cast((s8)Memory::Read_U8(_Addr)) * m_dequantizeTable[_uScale]; + fResult = static_cast((s8)PowerPC::Read_U8(_Addr)) * m_dequantizeTable[_uScale]; break; // used for THP player case QUANTIZE_S16: - fResult = static_cast((s16)Memory::Read_U16(_Addr)) * m_dequantizeTable[_uScale]; + fResult = static_cast((s16)PowerPC::Read_U16(_Addr)) * m_dequantizeTable[_uScale]; break; default: diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp index 2803af0b0..d67e54c63 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp @@ -425,5 +425,5 @@ void Interpreter::ps_cmpo1(UGeckoInstruction _inst) void Interpreter::dcbz_l(UGeckoInstruction _inst) { //FAKE: clear memory instead of clearing the cache block - Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); + PowerPC::ClearCacheLine(Helper_Get_EA_X(_inst) & (~31)); } diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index e181d1603..1a4cab0d7 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -2,10 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifdef _WIN32 -#include -#endif - #include "Common/CPUDetect.h" #include "Common/FPURoundMode.h" #include "Core/HW/GPFifo.h" @@ -329,9 +325,9 @@ void Interpreter::mtspr(UGeckoInstruction _inst) if (iLength == 0) iLength = 128; if (DMAL.DMA_LD) - Memory::DMA_MemoryToLC(dwCacheAddress, dwMemAddress, iLength); + PowerPC::DMA_MemoryToLC(dwCacheAddress, dwMemAddress, iLength); else - Memory::DMA_LCToMemory(dwMemAddress, dwCacheAddress, iLength); + PowerPC::DMA_LCToMemory(dwMemAddress, dwCacheAddress, iLength); } DMAL.DMA_T = 0; break; @@ -344,14 +340,14 @@ void Interpreter::mtspr(UGeckoInstruction _inst) if (!(oldValue >> 31) && (rGPR[_inst.RD]>>31)) //top bit from 0 to 1 { PanicAlert("Interesting - Software triggered Decrementer exception"); - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DECREMENTER); + PowerPC::ppcState.Exceptions |= EXCEPTION_DECREMENTER; } SystemTimers::DecrementerSet(); break; // Page table base etc case SPR_SDR: - Memory::SDRUpdated(); + PowerPC::SDRUpdated(); break; case SPR_XER: diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp index 639a899f5..25db379d2 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -13,6 +13,8 @@ struct GekkoOPTemplate GekkoOPInfo opinfo; }; +static GekkoOPInfo unknownopinfo = { "unknown_instruction", OPTYPE_UNKNOWN, FL_ENDBLOCK, 0, 0, 0, 0 }; + static GekkoOPTemplate primarytable[] = { {4, Interpreter::RunTable4, {"RunTable4", OPTYPE_SUBTABLE | (4<<24), 0, 0, 0, 0, 0}}, @@ -29,7 +31,7 @@ static GekkoOPTemplate primarytable[] = {3, Interpreter::twi, {"twi", OPTYPE_SYSTEM, FL_ENDBLOCK, 1, 0, 0, 0}}, {17, Interpreter::sc, {"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 2, 0, 0, 0}}, - {7, Interpreter::mulli, {"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 3, 0, 0, 0}}, + {7, Interpreter::mulli, {"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A, 3, 0, 0, 0}}, {8, Interpreter::subfic, {"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA, 1, 0, 0, 0}}, {10, Interpreter::cmpli, {"cmpli", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn, 1, 0, 0, 0}}, {11, Interpreter::cmpi, {"cmpi", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn, 1, 0, 0, 0}}, @@ -85,14 +87,6 @@ static GekkoOPTemplate primarytable[] = {61, Interpreter::psq_stu, {"psq_stu", OPTYPE_STOREPS, FL_IN_FLOAT_S | FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}}, //missing: 0, 5, 6, 9, 22, 30, 62, 58 - {0, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, - {5, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, - {6, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, - {9, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, - {22, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, - {30, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, - {62, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, - {58, Interpreter::unknown_instruction, {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}}, }; static GekkoOPTemplate table4[] = @@ -364,10 +358,16 @@ void InitTables() return; //clear + for (int i = 0; i < 64; i++) + { + Interpreter::m_opTable[i] = Interpreter::unknown_instruction; + m_infoTable[i] = &unknownopinfo; + } + for (int i = 0; i < 32; i++) { Interpreter::m_opTable59[i] = Interpreter::unknown_instruction; - m_infoTable59[i] = nullptr; + m_infoTable59[i] = &unknownopinfo; } for (int i = 0; i < 1024; i++) @@ -376,10 +376,10 @@ void InitTables() Interpreter::m_opTable19[i] = Interpreter::unknown_instruction; Interpreter::m_opTable31[i] = Interpreter::unknown_instruction; Interpreter::m_opTable63[i] = Interpreter::unknown_instruction; - m_infoTable4[i] = nullptr; - m_infoTable19[i] = nullptr; - m_infoTable31[i] = nullptr; - m_infoTable63[i] = nullptr; + m_infoTable4[i] = &unknownopinfo; + m_infoTable19[i] = &unknownopinfo; + m_infoTable31[i] = &unknownopinfo; + m_infoTable63[i] = &unknownopinfo; } for (auto& tpl : primarytable) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 4e2824515..187cb1fda 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -180,6 +180,7 @@ void Jit64::Init() jo.accurateSinglePrecision = true; js.memcheck = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU; js.fastmemLoadStore = NULL; + js.compilerPC = 0; gpr.SetEmitter(this); fpr.SetEmitter(this); @@ -245,11 +246,6 @@ void Jit64::WriteCallInterpreter(UGeckoInstruction inst) ABI_PopRegistersAndAdjustStack({}, 0); } -void Jit64::unknown_instruction(UGeckoInstruction inst) -{ - PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex); -} - void Jit64::FallBackToInterpreter(UGeckoInstruction _inst) { WriteCallInterpreter(_inst.hex); @@ -539,6 +535,7 @@ void Jit64::Jit(u32 em_address) NPC = nextPC; PowerPC::ppcState.Exceptions |= EXCEPTION_ISI; PowerPC::CheckExceptions(); + WARN_LOG(POWERPC, "ISI exception at 0x%08x", nextPC); return; } diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index 7da231d70..323358bac 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -152,7 +152,6 @@ public: void FloatCompare(UGeckoInstruction inst, bool upper = false); // OPCODES - void unknown_instruction(UGeckoInstruction _inst); void FallBackToInterpreter(UGeckoInstruction _inst); void DoNothing(UGeckoInstruction _inst); void HLEFunction(UGeckoInstruction _inst); @@ -240,7 +239,7 @@ public: void negx(UGeckoInstruction inst); void slwx(UGeckoInstruction inst); void srwx(UGeckoInstruction inst); - void dcbst(UGeckoInstruction inst); + void dcbt(UGeckoInstruction inst); void dcbz(UGeckoInstruction inst); void subfic(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp index 636a9b239..cbeb9c5ed 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp @@ -197,10 +197,10 @@ static GekkoOPTemplate table31[] = {824, &Jit64::srawix}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_SET_CA | FL_RC_BIT}}, {24, &Jit64::slwx}, //"slwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, - {54, &Jit64::dcbst}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, + {54, &Jit64::FallBackToInterpreter}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, {86, &Jit64::FallBackToInterpreter}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, - {246, &Jit64::DoNothing}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, - {278, &Jit64::DoNothing}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, + {246, &Jit64::dcbt }, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, + {278, &Jit64::dcbt }, //"dcbt", OPTYPE_DCACHE, 0, 1}}, {470, &Jit64::FallBackToInterpreter}, //"dcbi", OPTYPE_DCACHE, 0, 4}}, {758, &Jit64::DoNothing}, //"dcba", OPTYPE_DCACHE, 0, 4}}, {1014, &Jit64::dcbz}, //"dcbz", OPTYPE_DCACHE, 0, 4}}, @@ -398,15 +398,15 @@ void InitTables() //clear for (auto& tpl : dynaOpTable59) { - tpl = &Jit64::unknown_instruction; + tpl = &Jit64::FallBackToInterpreter; } for (int i = 0; i < 1024; i++) { - dynaOpTable4 [i] = &Jit64::unknown_instruction; - dynaOpTable19[i] = &Jit64::unknown_instruction; - dynaOpTable31[i] = &Jit64::unknown_instruction; - dynaOpTable63[i] = &Jit64::unknown_instruction; + dynaOpTable4 [i] = &Jit64::FallBackToInterpreter; + dynaOpTable19[i] = &Jit64::FallBackToInterpreter; + dynaOpTable31[i] = &Jit64::FallBackToInterpreter; + dynaOpTable63[i] = &Jit64::FallBackToInterpreter; } for (auto& tpl : primarytable) diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp index b8d732bd8..a8d2445eb 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp @@ -39,7 +39,7 @@ void Jit64AsmRoutineManager::Generate() MOV(64, MDisp(RSP, 8), Imm32((u32)-1)); // Two statically allocated registers. - MOV(64, R(RMEM), Imm64((u64)Memory::base)); + //MOV(64, R(RMEM), Imm64((u64)Memory::physical_base)); MOV(64, R(RPPCSTATE), Imm64((u64)&PowerPC::ppcState + 0x80)); const u8* outerLoop = GetCodePtr(); @@ -83,8 +83,26 @@ void Jit64AsmRoutineManager::Generate() SetJumpTarget(skipToRealDispatch); dispatcherNoCheck = GetCodePtr(); + + // Switch to the correct memory base, in case MSR.DR has changed. + // TODO: Is there a more efficient place to put this? We don't + // need to do this for indirect jumps, just exceptions etc. + TEST(32, PPCSTATE(msr), Imm32(1 << (31 - 27))); + FixupBranch physmem = J_CC(CC_NZ); + MOV(64, R(RMEM), Imm64((u64)Memory::physical_base)); + FixupBranch membaseend = J(); + SetJumpTarget(physmem); + MOV(64, R(RMEM), Imm64((u64)Memory::logical_base)); + SetJumpTarget(membaseend); + MOV(32, R(RSCRATCH), PPCSTATE(pc)); + // TODO: We need to handle code which executes the same PC with + // different values of MSR.IR. It probably makes sense to handle + // MSR.DR here too, to allow IsOptimizableRAMAddress-based + // optimizations safe, because IR and DR are usually set/cleared together. + // TODO: Branching based on the 20 most significant bits of instruction + // addresses without translating them is wrong. u64 icache = (u64)jit->GetBlockCache()->iCache.data(); u64 icacheVmem = (u64)jit->GetBlockCache()->iCacheVMEM.data(); u64 icacheEx = (u64)jit->GetBlockCache()->iCacheEx.data(); @@ -171,7 +189,7 @@ void Jit64AsmRoutineManager::Generate() // Jit might have cleared the code cache ResetStack(); - JMP(dispatcherNoCheck); // no point in special casing this + JMP(dispatcherNoCheck, true); // no point in special casing this SetJumpTarget(bail); doTiming = GetCodePtr(); @@ -251,5 +269,5 @@ void Jit64AsmRoutineManager::GenerateCommon() ADD(32, 1, M(&m_gatherPipeCount)); RET(); SetJumpTarget(skip_fast_write); - CALL((void *)&Memory::Write_U8);*/ + CALL((void *)&PowerPC::Write_U8);*/ } diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp index 334c46379..04ca25517 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp @@ -48,41 +48,6 @@ void RegCache::Start() //But only preload IF written OR reads >= 3 } -// these are powerpc reg indices -void RegCache::Lock(int p1, int p2, int p3, int p4) -{ - regs[p1].locked = true; - - if (p2 != 0xFF) - regs[p2].locked = true; - - if (p3 != 0xFF) - regs[p3].locked = true; - - if (p4 != 0xFF) - regs[p4].locked = true; -} - -// these are x64 reg indices -void RegCache::LockX(int x1, int x2, int x3, int x4) -{ - if (xregs[x1].locked) - { - PanicAlert("RegCache: x %i already locked!", x1); - } - - xregs[x1].locked = true; - - if (x2 != 0xFF) - xregs[x2].locked = true; - - if (x3 != 0xFF) - xregs[x3].locked = true; - - if (x4 != 0xFF) - xregs[x4].locked = true; -} - void RegCache::UnlockAll() { for (auto& reg : regs) diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h index 0e2f2ea68..c9ceab2f1 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h @@ -109,8 +109,35 @@ public: virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0; // Register locking. - void Lock(int p1, int p2=0xff, int p3=0xff, int p4=0xff); - void LockX(int x1, int x2=0xff, int x3=0xff, int x4=0xff); + + // these are powerpc reg indices + template + void Lock(T p) + { + regs[p].locked = true; + } + template + void Lock(T first, Args... args) + { + Lock(first); + Lock(args...); + } + + // these are x64 reg indices + template + void LockX(T x) + { + if (xregs[x].locked) + PanicAlert("RegCache: x %i already locked!", x); + xregs[x].locked = true; + } + template + void LockX(T first, Args... args) + { + LockX(first); + LockX(args...); + } + void UnlockAll(); void UnlockAllX(); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp index 2b1123bd1..6c25c1f75 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp @@ -108,13 +108,16 @@ void Jit64::lXXx(UGeckoInstruction inst) // (mb2): I agree, // IMHO those Idles should always be skipped and replaced by a more controllable "native" Idle methode // ... maybe the throttle one already do that :p + // TODO: We shouldn't use a debug read here. It should be possible to get + // the following instructions out of the JIT state. if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && PowerPC::GetState() != PowerPC::CPU_STEPPING && inst.OPCD == 32 && + MergeAllowedNextInstructions(2) && (inst.hex & 0xFFFF0000) == 0x800D0000 && - (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || - (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && - Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) + (js.op[1].inst.hex == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && js.op[1].inst.hex == 0x2C000000)) && + js.op[2].inst.hex == 0x4182fff8) { // TODO(LinesPrower): // - Rewrite this! @@ -284,16 +287,24 @@ void Jit64::lXXx(UGeckoInstruction inst) gpr.UnlockAllX(); } -void Jit64::dcbst(UGeckoInstruction inst) +void Jit64::dcbt(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITLoadStoreOff); - // If the dcbst instruction is preceded by dcbt, it is flushing a prefetched - // memory location. Do not invalidate the JIT cache in this case as the memory - // will be the same. - // dcbt = 0x7c00022c - FALLBACK_IF((Memory::ReadUnchecked_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c); + // Prefetch. Since we don't emulate the data cache, we don't need to do anything. + + // If a dcbst follows a dcbt, it probably isn't a case of dynamic code + // modification, so don't bother invalidating the jit block cache. + // This is important because invalidating the block cache when we don't + // need to is terrible for performance. + // (Invalidating the jit block cache on dcbst is a heuristic.) + if (MergeAllowedNextInstructions(1) && + js.op[1].inst.OPCD == 31 && js.op[1].inst.SUBOP10 == 54 && + js.op[1].inst.RA == inst.RA && js.op[1].inst.RB == inst.RB) + { + js.skipInstructions = 1; + } } // Zero cache line. @@ -326,7 +337,7 @@ void Jit64::dcbz(UGeckoInstruction inst) MOV(32, M(&PC), Imm32(jit->js.compilerPC)); BitSet32 registersInUse = CallerSavedRegistersInUse(); ABI_PushRegistersAndAdjustStack(registersInUse, 0); - ABI_CallFunctionR((void *)&Memory::ClearCacheLine, RSCRATCH); + ABI_CallFunctionR((void *)&PowerPC::ClearCacheLine, RSCRATCH); ABI_PopRegistersAndAdjustStack(registersInUse, 0); FixupBranch exit = J(true); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp index 46aaddb1f..4c6aa6d3f 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -380,9 +380,8 @@ void Jit64::mtmsr(UGeckoInstruction inst) SetJumpTarget(noExceptionsPending); SetJumpTarget(eeDisabled); - WriteExit(js.compilerPC + 4); - - js.firstFPInstructionFound = false; + MOV(32, R(RSCRATCH), Imm32(js.compilerPC + 4)); + WriteExitDestInRSCRATCH(); } void Jit64::mfmsr(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp index 034d4a38a..c714067b8 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp @@ -13,7 +13,7 @@ #define QUANTIZED_REGS_TO_SAVE \ (ABI_ALL_CALLER_SAVED & ~BitSet32 { \ RSCRATCH, RSCRATCH2, RSCRATCH_EXTRA, XMM0+16, XMM1+16 \ - }) + }) #define QUANTIZED_REGS_TO_SAVE_LOAD (QUANTIZED_REGS_TO_SAVE | BitSet32 { RSCRATCH2 }) @@ -207,7 +207,7 @@ void CommonAsmRoutines::GenMfcr() } // Safe + Fast Quantizers, originally from JITIL by magumagu -static const float GC_ALIGNED16(m_65535[4]) = { 65535.0f, 65535.0f, 65535.0f, 65535.0f }; +static const float GC_ALIGNED16(m_65535[4]) = {65535.0f, 65535.0f, 65535.0f, 65535.0f}; static const float GC_ALIGNED16(m_32767) = 32767.0f; static const float GC_ALIGNED16(m_m32768) = -32768.0f; static const float GC_ALIGNED16(m_255) = 255.0f; diff --git a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp index 4196a231b..1e870b57b 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp @@ -502,7 +502,7 @@ static void regMarkMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, unsigned OpNum if (isImm(*AI)) { unsigned addr = RI.Build->GetImmValue(AI); - if (Memory::IsRAMAddress(addr)) + if (PowerPC::IsOptimizableRAMAddress(addr)) return; } @@ -522,7 +522,7 @@ static std::pair regBuildMemAddress(RegInfo& RI, InstLoc I, InstLoc if (isImm(*AI)) { unsigned addr = RI.Build->GetImmValue(AI); - if (Memory::IsRAMAddress(addr)) + if (PowerPC::IsOptimizableRAMAddress(addr)) { if (dest) *dest = regFindFreeReg(RI); diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index c3dfafdc4..07ff7fe4b 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -305,12 +305,6 @@ void JitIL::WriteCallInterpreter(UGeckoInstruction inst) } } -void JitIL::unknown_instruction(UGeckoInstruction inst) -{ - // CCPU::Break(); - PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex); -} - void JitIL::FallBackToInterpreter(UGeckoInstruction _inst) { ibuild.EmitFallBackToInterpreter( @@ -521,6 +515,7 @@ void JitIL::Jit(u32 em_address) NPC = nextPC; PowerPC::ppcState.Exceptions |= EXCEPTION_ISI; PowerPC::CheckExceptions(); + WARN_LOG(POWERPC, "ISI exception at 0x%08x", nextPC); return; } diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h index d846c7af1..27b048727 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h @@ -99,7 +99,6 @@ public: void WriteCode(u32 exitAddress); // OPCODES - void unknown_instruction(UGeckoInstruction _inst) override; void FallBackToInterpreter(UGeckoInstruction _inst) override; void DoNothing(UGeckoInstruction _inst) override; void HLEFunction(UGeckoInstruction _inst) override; diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp index 28aaa157e..19df5e161 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -403,15 +403,15 @@ void InitTables() //clear for (auto& tpl : dynaOpTable59) { - tpl = &JitIL::unknown_instruction; + tpl = &JitIL::FallBackToInterpreter; } for (int i = 0; i < 1024; i++) { - dynaOpTable4 [i] = &JitIL::unknown_instruction; - dynaOpTable19[i] = &JitIL::unknown_instruction; - dynaOpTable31[i] = &JitIL::unknown_instruction; - dynaOpTable63[i] = &JitIL::unknown_instruction; + dynaOpTable4 [i] = &JitIL::FallBackToInterpreter; + dynaOpTable19[i] = &JitIL::FallBackToInterpreter; + dynaOpTable31[i] = &JitIL::FallBackToInterpreter; + dynaOpTable63[i] = &JitIL::FallBackToInterpreter; } for (auto& tpl : primarytable) diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp index ab796df34..5f96418dd 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp @@ -64,10 +64,6 @@ void JitArm::WriteCallInterpreter(UGeckoInstruction inst) MOVI2R(R12, (u32)instr); BL(R12); } -void JitArm::unknown_instruction(UGeckoInstruction inst) -{ - PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex); -} void JitArm::FallBackToInterpreter(UGeckoInstruction _inst) { diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.h b/Source/Core/Core/PowerPC/JitArm32/Jit.h index 2d961a20f..fe9537b1f 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.h @@ -134,7 +134,6 @@ public: void SafeLoadToReg(ArmGen::ARMReg dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse, bool update); // OPCODES - void unknown_instruction(UGeckoInstruction _inst); void FallBackToInterpreter(UGeckoInstruction _inst); void DoNothing(UGeckoInstruction _inst); void HLEFunction(UGeckoInstruction _inst); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp index 607bb7896..3a87784fd 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp @@ -189,7 +189,7 @@ bool JitArm::DisasmLoadStore(const u8* ptr, u32* flags, ARMReg* rD, ARMReg* V1) bool JitArm::HandleFault(uintptr_t access_address, SContext* ctx) { - if (access_address < (uintptr_t)Memory::base) + if (access_address < (uintptr_t)Memory::physical_base) PanicAlertT("Exception handler - access below memory space. 0x%08x", access_address); return BackPatch(ctx); } @@ -323,12 +323,12 @@ u32 JitArm::EmitBackpatchRoutine(ARMXEmitter* emit, u32 flags, bool fastmem, boo emit->MOV(R1, addr); emit->VCVT(S0, RS, 0); emit->VMOV(R0, S0); - emit->MOVI2R(temp, (u32)&Memory::Write_U32); + emit->MOVI2R(temp, (u32)&PowerPC::Write_U32); emit->BL(temp); } else { - emit->MOVI2R(temp, (u32)&Memory::Write_F64); + emit->MOVI2R(temp, (u32)&PowerPC::Write_F64); #if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1 emit->VMOV(R0, RS); emit->MOV(R2, addr); @@ -347,7 +347,7 @@ u32 JitArm::EmitBackpatchRoutine(ARMXEmitter* emit, u32 flags, bool fastmem, boo emit->MOV(R0, addr); if (flags & BackPatchInfo::FLAG_SIZE_F32) { - emit->MOVI2R(temp, (u32)&Memory::Read_U32); + emit->MOVI2R(temp, (u32)&PowerPC::Read_U32); emit->BL(temp); emit->VMOV(S0, R0); emit->VCVT(RS, S0, 0); @@ -355,7 +355,7 @@ u32 JitArm::EmitBackpatchRoutine(ARMXEmitter* emit, u32 flags, bool fastmem, boo } else { - emit->MOVI2R(temp, (u32)&Memory::Read_F64); + emit->MOVI2R(temp, (u32)&PowerPC::Read_F64); emit->BL(temp); #if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1 @@ -373,11 +373,11 @@ u32 JitArm::EmitBackpatchRoutine(ARMXEmitter* emit, u32 flags, bool fastmem, boo emit->MOV(R1, addr); if (flags & BackPatchInfo::FLAG_SIZE_32) - emit->MOVI2R(temp, (u32)&Memory::Write_U32); + emit->MOVI2R(temp, (u32)&PowerPC::Write_U32); else if (flags & BackPatchInfo::FLAG_SIZE_16) - emit->MOVI2R(temp, (u32)&Memory::Write_U16); + emit->MOVI2R(temp, (u32)&PowerPC::Write_U16); else - emit->MOVI2R(temp, (u32)&Memory::Write_U8); + emit->MOVI2R(temp, (u32)&PowerPC::Write_U8); emit->BL(temp); emit->POP(4, R0, R1, R2, R3); @@ -388,11 +388,11 @@ u32 JitArm::EmitBackpatchRoutine(ARMXEmitter* emit, u32 flags, bool fastmem, boo emit->MOV(R0, addr); if (flags & BackPatchInfo::FLAG_SIZE_32) - emit->MOVI2R(temp, (u32)&Memory::Read_U32); + emit->MOVI2R(temp, (u32)&PowerPC::Read_U32); else if (flags & BackPatchInfo::FLAG_SIZE_16) - emit->MOVI2R(temp, (u32)&Memory::Read_U16); + emit->MOVI2R(temp, (u32)&PowerPC::Read_U16); else if (flags & BackPatchInfo::FLAG_SIZE_8) - emit->MOVI2R(temp, (u32)&Memory::Read_U8); + emit->MOVI2R(temp, (u32)&PowerPC::Read_U8); emit->BL(temp); emit->MOV(temp, R0); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp index 678223b7a..353a56066 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -145,7 +145,7 @@ void JitArm::SafeStoreFromReg(s32 dest, u32 value, s32 regOffset, int accessSize STR(R11, R14); jit->js.fifoBytesThisBlock += accessSize >> 3; } - else if (Memory::IsRAMAddress(imm_addr)) + else if (PowerPC::IsOptimizableRAMAddress(imm_addr)) { MOVI2R(rA, imm_addr); EmitBackpatchRoutine(this, flags, SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem, true, RS); @@ -450,9 +450,9 @@ void JitArm::lXX(UGeckoInstruction inst) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && inst.OPCD == 32 && (inst.hex & 0xFFFF0000) == 0x800D0000 && - (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || - (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && - Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) + (PowerPC::HostRead_U32(js.compilerPC + 4) == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && PowerPC::HostRead_U32(js.compilerPC + 4) == 0x2C000000)) && + PowerPC::HostRead_U32(js.compilerPC + 8) == 0x4182fff8) { // if it's still 0, we can wait until the next event TST(RD, RD); @@ -536,7 +536,7 @@ void JitArm::dcbst(UGeckoInstruction inst) // memory location. Do not invalidate the JIT cache in this case as the memory // will be the same. // dcbt = 0x7c00022c - FALLBACK_IF((Memory::ReadUnchecked_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c); + FALLBACK_IF((PowerPC::HostRead_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c); } void JitArm::icbi(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index e0c95152c..ec232915b 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -183,7 +183,7 @@ void JitArm::lfXX(UGeckoInstruction inst) EmitBackpatchRoutine(this, flags, SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem, - !(is_immediate && Memory::IsRAMAddress(imm_addr)), v0, v1); + !(is_immediate && PowerPC::IsOptimizableRAMAddress(imm_addr)), v0, v1); SetJumpTarget(DoNotLoad); } @@ -384,7 +384,7 @@ void JitArm::stfXX(UGeckoInstruction inst) jit->js.fifoBytesThisBlock += accessSize >> 3; } - else if (Memory::IsRAMAddress(imm_addr)) + else if (PowerPC::IsOptimizableRAMAddress(imm_addr)) { MOVI2R(addr, imm_addr); EmitBackpatchRoutine(this, flags, SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem, false, v0); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp index 79a7399d6..6d1099d6b 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp @@ -402,15 +402,15 @@ void InitTables() //clear for (int i = 0; i < 32; i++) { - dynaOpTable59[i] = &JitArm::unknown_instruction; + dynaOpTable59[i] = &JitArm::FallBackToInterpreter; } for (int i = 0; i < 1024; i++) { - dynaOpTable4 [i] = &JitArm::unknown_instruction; - dynaOpTable19[i] = &JitArm::unknown_instruction; - dynaOpTable31[i] = &JitArm::unknown_instruction; - dynaOpTable63[i] = &JitArm::unknown_instruction; + dynaOpTable4 [i] = &JitArm::FallBackToInterpreter; + dynaOpTable19[i] = &JitArm::FallBackToInterpreter; + dynaOpTable31[i] = &JitArm::FallBackToInterpreter; + dynaOpTable63[i] = &JitArm::FallBackToInterpreter; } for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++) diff --git a/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp index ff65bf639..13b97d6cb 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp @@ -29,20 +29,20 @@ JitArmAsmRoutineManager asm_routines; static void WriteDual32(u32 value1, u32 value2, u32 address) { - Memory::Write_U32(value1, address); - Memory::Write_U32(value2, address + 4); + PowerPC::Write_U32(value1, address); + PowerPC::Write_U32(value2, address + 4); } static void WriteDual16(u32 value1, u32 value2, u32 address) { - Memory::Write_U16(value1, address); - Memory::Write_U16(value2, address + 2); + PowerPC::Write_U16(value1, address); + PowerPC::Write_U16(value2, address + 2); } static void WriteDual8(u32 value1, u32 value2, u32 address) { - Memory::Write_U8(value1, address); - Memory::Write_U8(value2, address + 1); + PowerPC::Write_U8(value1, address); + PowerPC::Write_U8(value2, address + 1); } void JitArmAsmRoutineManager::Generate() @@ -56,7 +56,7 @@ void JitArmAsmRoutineManager::Generate() SUB(_SP, _SP, 4); MOVI2R(R9, (u32)&PowerPC::ppcState.spr[0]); - MOVI2R(R8, (u32)Memory::base); + MOVI2R(R8, (u32)Memory::physical_base); FixupBranch skipToRealDispatcher = B(); dispatcher = GetCodePtr(); @@ -399,7 +399,6 @@ void JitArmAsmRoutineManager::GenerateCommon() POP(5, R0, R1, R2, R3, _PC); } const u8* storePairedU8 = GetCodePtr(); - const u8* storePairedS8 = GetCodePtr(); { // R10 is the addr // R11 is the scale @@ -424,8 +423,32 @@ void JitArmAsmRoutineManager::GenerateCommon() POP(5, R0, R1, R2, R3, _PC); } + const u8* storePairedS8 = GetCodePtr(); + { + // R10 is the addr + // R11 is the scale + // R12 is scratch + // S0, S1 is the values + PUSH(5, R0, R1, R2, R3, _LR); + + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO | IS_SIGNED); + VCVT(S1, S1, TO_INT | ROUND_TO_ZERO | IS_SIGNED); + + VMOV(R0, S0); + VMOV(R1, S1); + MOV(R2, R10); + MOVI2R(R12, (u32)&WriteDual8); + BL(R12); + + POP(5, R0, R1, R2, R3, _PC); + } const u8* storePairedU16 = GetCodePtr(); - const u8* storePairedS16 = GetCodePtr(); { PUSH(5, R0, R1, R2, R3, _LR); @@ -446,6 +469,27 @@ void JitArmAsmRoutineManager::GenerateCommon() POP(5, R0, R1, R2, R3, _PC); } + const u8* storePairedS16 = GetCodePtr(); + { + PUSH(5, R0, R1, R2, R3, _LR); + + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO | IS_SIGNED); + VCVT(S1, S1, TO_INT | ROUND_TO_ZERO | IS_SIGNED); + + VMOV(R0, S0); + VMOV(R1, S1); + MOV(R2, R10); + MOVI2R(R12, (u32)&WriteDual16); + BL(R12); + + POP(5, R0, R1, R2, R3, _PC); + } const u8* storeSingleIllegal = GetCodePtr(); BKPT(0x27); const u8* storeSingleFloat = GetCodePtr(); @@ -465,13 +509,12 @@ void JitArmAsmRoutineManager::GenerateCommon() PUSH(5, R0, R1, R2, R3, _LR); VMOV(R0, S0); MOV(R1, R10); - MOVI2R(R10, (u32)&Memory::Write_U32); + MOVI2R(R10, (u32)&PowerPC::Write_U32); BL(R10); POP(5, R0, R1, R2, R3, _PC); } const u8* storeSingleU8 = GetCodePtr(); // Used by MKWii - const u8* storeSingleS8 = GetCodePtr(); { MOVI2R(R12, (u32)&m_quantizeTableS); ADD(R12, R12, R11); @@ -490,6 +533,32 @@ void JitArmAsmRoutineManager::GenerateCommon() SetJumpTarget(argh); + PUSH(5, R0, R1, R2, R3, _LR); + VMOV(R0, S0); + MOV(R1, R10); + MOVI2R(R10, (u32)&PowerPC::Write_U8); + BL(R10); + POP(5, R0, R1, R2, R3, _PC); + } + const u8* storeSingleS8 = GetCodePtr(); + { + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + + TST(R10, arghmask); + FixupBranch argh = B_CC(CC_NEQ); + BIC(R10, R10, mask); + ADD(R10, R10, R8); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO | IS_SIGNED); + VMOV(R12, S0); + STRB(R12, R10); + MOV(_PC, _LR); + + SetJumpTarget(argh); + PUSH(5, R0, R1, R2, R3, _LR); VMOV(R0, S0); MOV(R1, R10); @@ -498,7 +567,6 @@ void JitArmAsmRoutineManager::GenerateCommon() POP(5, R0, R1, R2, R3, _PC); } const u8* storeSingleU16 = GetCodePtr(); // Used by MKWii - const u8* storeSingleS16 = GetCodePtr(); { MOVI2R(R12, (u32)&m_quantizeTableS); ADD(R12, R12, R11); @@ -518,6 +586,34 @@ void JitArmAsmRoutineManager::GenerateCommon() SetJumpTarget(argh); + PUSH(5, R0, R1, R2, R3, _LR); + VMOV(R0, S0); + MOV(R1, R10); + MOVI2R(R10, (u32)&PowerPC::Write_U16); + BL(R10); + + POP(5, R0, R1, R2, R3, _PC); + } + const u8* storeSingleS16 = GetCodePtr(); + { + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + + TST(R10, arghmask); + FixupBranch argh = B_CC(CC_NEQ); + BIC(R10, R10, mask); + ADD(R10, R10, R8); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO | IS_SIGNED); + VMOV(R12, S0); + REV16(R12, R12); + STRH(R12, R10); + MOV(_PC, _LR); + + SetJumpTarget(argh); + PUSH(5, R0, R1, R2, R3, _LR); VMOV(R0, S0); MOV(R1, R10); diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index ff67956cd..6d2c0ddf7 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -43,11 +43,6 @@ void JitArm64::Shutdown() asm_routines.Shutdown(); } -void JitArm64::unknown_instruction(UGeckoInstruction inst) -{ - WARN_LOG(DYNA_REC, "unknown_instruction %08x - Fix me ;)", inst.hex); -} - void JitArm64::FallBackToInterpreter(UGeckoInstruction inst) { gpr.Flush(FlushMode::FLUSH_INTERPRETER, js.op); diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h index 87e09ce17..d9d212a3a 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h @@ -57,7 +57,6 @@ public: } // OPCODES - void unknown_instruction(UGeckoInstruction inst); void FallBackToInterpreter(UGeckoInstruction inst); void DoNothing(UGeckoInstruction inst); void HLEFunction(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp index 7075a3a81..2a1548317 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp @@ -8,6 +8,7 @@ #include "Common/StringUtil.h" #include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitArmCommon/BackPatch.h" @@ -127,7 +128,8 @@ u32 JitArm64::EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, if (fastmem) { - MOVK(addr, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + u8* base = UReg_MSR(MSR).DR ? Memory::logical_base : Memory::physical_base; + MOVK(addr, ((u64)base >> 32) & 0xFFFF, SHIFT_32); if (flags & BackPatchInfo::FLAG_STORE && flags & (BackPatchInfo::FLAG_SIZE_F32 | BackPatchInfo::FLAG_SIZE_F64)) @@ -135,7 +137,7 @@ u32 JitArm64::EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, ARM64FloatEmitter float_emit(emit); if (flags & BackPatchInfo::FLAG_SIZE_F32) { - float_emit.FCVT(32, 64, Q0, RS); + float_emit.FCVT(32, 64, D0, RS); float_emit.REV32(8, D0, D0); trouble_offset = (emit->GetCodePtr() - code_base) / 4; float_emit.STR(32, INDEX_UNSIGNED, D0, addr, 0); @@ -213,14 +215,14 @@ u32 JitArm64::EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, ARM64FloatEmitter float_emit(emit); if (flags & BackPatchInfo::FLAG_SIZE_F32) { - float_emit.FCVT(32, 64, Q0, RS); + float_emit.FCVT(32, 64, D0, RS); float_emit.UMOV(32, W0, Q0, 0); - emit->MOVI2R(X30, (u64)&Memory::Write_U32); + emit->MOVI2R(X30, (u64)&PowerPC::Write_U32); emit->BLR(X30); } else { - emit->MOVI2R(X30, (u64)&Memory::Write_U64); + emit->MOVI2R(X30, (u64)&PowerPC::Write_U64); float_emit.UMOV(64, X0, RS, 0); emit->BLR(X30); } @@ -232,14 +234,14 @@ u32 JitArm64::EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, ARM64FloatEmitter float_emit(emit); if (flags & BackPatchInfo::FLAG_SIZE_F32) { - emit->MOVI2R(X30, (u64)&Memory::Read_U32); + emit->MOVI2R(X30, (u64)&PowerPC::Read_U32); emit->BLR(X30); float_emit.DUP(32, RS, X0); float_emit.FCVTL(64, RS, RS); } else { - emit->MOVI2R(X30, (u64)&Memory::Read_F64); + emit->MOVI2R(X30, (u64)&PowerPC::Read_F64); emit->BLR(X30); float_emit.INS(64, RS, 0, X0); } @@ -249,22 +251,22 @@ u32 JitArm64::EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, emit->MOV(W0, RS); if (flags & BackPatchInfo::FLAG_SIZE_32) - emit->MOVI2R(X30, (u64)&Memory::Write_U32); + emit->MOVI2R(X30, (u64)&PowerPC::Write_U32); else if (flags & BackPatchInfo::FLAG_SIZE_16) - emit->MOVI2R(X30, (u64)&Memory::Write_U16); + emit->MOVI2R(X30, (u64)&PowerPC::Write_U16); else - emit->MOVI2R(X30, (u64)&Memory::Write_U8); + emit->MOVI2R(X30, (u64)&PowerPC::Write_U8); emit->BLR(X30); } else { if (flags & BackPatchInfo::FLAG_SIZE_32) - emit->MOVI2R(X30, (u64)&Memory::Read_U32); + emit->MOVI2R(X30, (u64)&PowerPC::Read_U32); else if (flags & BackPatchInfo::FLAG_SIZE_16) - emit->MOVI2R(X30, (u64)&Memory::Read_U16); + emit->MOVI2R(X30, (u64)&PowerPC::Read_U16); else if (flags & BackPatchInfo::FLAG_SIZE_8) - emit->MOVI2R(X30, (u64)&Memory::Read_U8); + emit->MOVI2R(X30, (u64)&PowerPC::Read_U8); emit->BLR(X30); @@ -302,9 +304,10 @@ u32 JitArm64::EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, bool JitArm64::HandleFault(uintptr_t access_address, SContext* ctx) { - if (access_address < (uintptr_t)Memory::base) + if (!(access_address >= (uintptr_t)Memory::physical_base && access_address < (uintptr_t)Memory::physical_base + 0x100010000) && + !(access_address >= (uintptr_t)Memory::logical_base && access_address < (uintptr_t)Memory::logical_base + 0x100010000)) { - ERROR_LOG(DYNA_REC, "Exception handler - access below memory space. PC: 0x%016llx 0x%016lx < 0x%016lx", ctx->CTX_PC, access_address, (uintptr_t)Memory::base); + ERROR_LOG(DYNA_REC, "Exception handler - access below memory space. PC: 0x%016llx 0x%016lx < 0x%016lx", ctx->CTX_PC, access_address, (uintptr_t)Memory::physical_base); DoBacktrace(access_address, ctx); return false; diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp index 51b4f32fc..352a94a2c 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp @@ -147,7 +147,7 @@ void JitArm64::SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, u32 flags, s32 o if (update) MOV(gpr.R(addr), addr_reg); - if (is_immediate && Memory::IsRAMAddress(imm_addr)) + if (is_immediate && PowerPC::IsOptimizableRAMAddress(imm_addr)) { EmitBackpatchRoutine(this, flags, true, false, dest_reg, XA); } @@ -288,7 +288,7 @@ void JitArm64::SafeStoreFromReg(s32 dest, u32 value, s32 regOffset, u32 flags, s ARM64Reg XA = EncodeRegTo64(addr_reg); - if (is_immediate && Memory::IsRAMAddress(imm_addr)) + if (is_immediate && PowerPC::IsOptimizableRAMAddress(imm_addr)) { MOVI2R(XA, imm_addr); @@ -401,9 +401,9 @@ void JitArm64::lXX(UGeckoInstruction inst) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && inst.OPCD == 32 && (inst.hex & 0xFFFF0000) == 0x800D0000 && - (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || - (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && - Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) + (PowerPC::HostRead_U32(js.compilerPC + 4) == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && PowerPC::HostRead_U32(js.compilerPC + 4) == 0x2C000000)) && + PowerPC::HostRead_U32(js.compilerPC + 8) == 0x4182fff8) { // if it's still 0, we can wait until the next event FixupBranch noIdle = CBNZ(gpr.R(d)); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp index 392854b7f..21b8cbd89 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp @@ -181,7 +181,7 @@ void JitArm64::lfXX(UGeckoInstruction inst) fprs_in_use[0] = 0; // Q0 fprs_in_use[VD - Q0] = 0; - if (is_immediate && Memory::IsRAMAddress(imm_addr)) + if (is_immediate && PowerPC::IsOptimizableRAMAddress(imm_addr)) { EmitBackpatchRoutine(this, flags, true, false, VD, XA); } @@ -390,7 +390,7 @@ void JitArm64::stfXX(UGeckoInstruction inst) } else if (accessSize == 32) { - m_float_emit.FCVT(32, 64, Q0, V0); + m_float_emit.FCVT(32, 64, D0, EncodeRegToDouble(V0)); m_float_emit.REV32(8, D0, D0); m_float_emit.STR(32, INDEX_UNSIGNED, D0, X1, 0); } @@ -399,7 +399,7 @@ void JitArm64::stfXX(UGeckoInstruction inst) jit->js.fifoBytesThisBlock += accessSize >> 3; } - else if (Memory::IsRAMAddress(imm_addr)) + else if (PowerPC::IsOptimizableRAMAddress(imm_addr)) { EmitBackpatchRoutine(this, flags, true, false, V0, XA); } diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp index 0abcb29ab..d94a61149 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp @@ -46,14 +46,14 @@ u32 Arm64RegCache::GetUnlockedRegisterCount() void Arm64RegCache::LockRegister(ARM64Reg host_reg) { auto reg = std::find(m_host_registers.begin(), m_host_registers.end(), host_reg); - _assert_msg_(DYNA_REC, reg == m_host_registers.end(), "Don't try locking a register that isn't in the cache"); + _assert_msg_(DYNA_REC, reg != m_host_registers.end(), "Don't try locking a register that isn't in the cache. Reg %d", host_reg); reg->Lock(); } void Arm64RegCache::UnlockRegister(ARM64Reg host_reg) { auto reg = std::find(m_host_registers.begin(), m_host_registers.end(), host_reg); - _assert_msg_(DYNA_REC, reg == m_host_registers.end(), "Don't try unlocking a register that isn't in the cache"); + _assert_msg_(DYNA_REC, reg != m_host_registers.end(), "Don't try unlocking a register that isn't in the cache. Reg %d", host_reg); reg->Unlock(); } diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp index b5997e9f7..17cc7164a 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp @@ -400,15 +400,15 @@ void InitTables() //clear for (int i = 0; i < 32; i++) { - dynaOpTable59[i] = &JitArm64::unknown_instruction; + dynaOpTable59[i] = &JitArm64::FallBackToInterpreter; } for (int i = 0; i < 1024; i++) { - dynaOpTable4 [i] = &JitArm64::unknown_instruction; - dynaOpTable19[i] = &JitArm64::unknown_instruction; - dynaOpTable31[i] = &JitArm64::unknown_instruction; - dynaOpTable63[i] = &JitArm64::unknown_instruction; + dynaOpTable4 [i] = &JitArm64::FallBackToInterpreter; + dynaOpTable19[i] = &JitArm64::FallBackToInterpreter; + dynaOpTable31[i] = &JitArm64::FallBackToInterpreter; + dynaOpTable63[i] = &JitArm64::FallBackToInterpreter; } for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp index f1f4510d1..62cce8374 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp @@ -113,14 +113,14 @@ void JitArm64AsmRoutineManager::GenerateCommon() BRK(100); const u8* loadPairedFloatTwo = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LD1(32, 1, D0, addr_reg); float_emit.REV32(8, D0, D0); RET(X30); } const u8* loadPairedU8Two = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0); float_emit.UXTL(8, D0, D0); float_emit.UXTL(16, D0, D0); @@ -128,13 +128,13 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } const u8* loadPairedS8Two = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0); float_emit.SXTL(8, D0, D0); float_emit.SXTL(16, D0, D0); @@ -142,13 +142,13 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } const u8* loadPairedU16Two = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LD1(16, 1, D0, addr_reg); float_emit.REV16(8, D0, D0); float_emit.UXTL(16, D0, D0); @@ -156,13 +156,13 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } const u8* loadPairedS16Two = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LD1(16, 1, D0, addr_reg); float_emit.REV16(8, D0, D0); float_emit.SXTL(16, D0, D0); @@ -170,21 +170,21 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } const u8* loadPairedFloatOne = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LDR(32, INDEX_UNSIGNED, D0, addr_reg, 0); float_emit.REV32(8, D0, D0); RET(X30); } const u8* loadPairedU8One = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LDR(8, INDEX_UNSIGNED, D0, addr_reg, 0); float_emit.UXTL(8, D0, D0); float_emit.UXTL(16, D0, D0); @@ -192,13 +192,13 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } const u8* loadPairedS8One = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LDR(8, INDEX_UNSIGNED, D0, addr_reg, 0); float_emit.SXTL(8, D0, D0); float_emit.SXTL(16, D0, D0); @@ -206,13 +206,13 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } const u8* loadPairedU16One = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0); float_emit.REV16(8, D0, D0); float_emit.UXTL(16, D0, D0); @@ -220,13 +220,13 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } const u8* loadPairedS16One = GetCodePtr(); { - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0); float_emit.REV16(8, D0, D0); float_emit.SXTL(16, D0, D0); @@ -234,8 +234,8 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(addr_reg, (u64)&m_dequantizeTableS); ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); RET(X30); } @@ -272,7 +272,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() FixupBranch argh = B(CC_NEQ); float_emit.REV32(8, D0, D0); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.ST1(64, Q0, 0, addr_reg, SP); RET(X30); @@ -282,7 +282,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() float_emit.ABI_PushRegisters(fprs); float_emit.UMOV(64, X0, Q0, 0); ORR(X0, SP, X0, ArithOption(X0, ST_ROR, 32)); - MOVI2R(X30, (u64)Memory::Write_U64); + MOVI2R(X30, (u64)PowerPC::Write_U64); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -295,8 +295,8 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(X2, (u64)&m_quantizeTableS); ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); float_emit.FCVTZU(32, D0, D0); float_emit.XTN(16, D0, D0); float_emit.XTN(8, D0, D0); @@ -304,7 +304,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.ST1(16, Q0, 0, addr_reg, SP); RET(X30); @@ -313,7 +313,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() float_emit.ABI_PushRegisters(fprs); float_emit.UMOV(16, W0, Q0, 0); REV16(W0, W0); - MOVI2R(X30, (u64)Memory::Write_U16); + MOVI2R(X30, (u64)PowerPC::Write_U16); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -326,8 +326,8 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(X2, (u64)&m_quantizeTableS); ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); float_emit.FCVTZS(32, D0, D0); float_emit.XTN(16, D0, D0); float_emit.XTN(8, D0, D0); @@ -335,7 +335,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.ST1(16, Q0, 0, addr_reg, SP); RET(X30); @@ -344,7 +344,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() float_emit.ABI_PushRegisters(fprs); float_emit.UMOV(16, W0, Q0, 0); REV16(W0, W0); - MOVI2R(X30, (u64)Memory::Write_U16); + MOVI2R(X30, (u64)PowerPC::Write_U16); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -358,15 +358,15 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(X2, (u64)&m_quantizeTableS); ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); float_emit.FCVTZU(32, D0, D0); float_emit.XTN(16, D0, D0); float_emit.REV16(8, D0, D0); TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.ST1(32, Q0, 0, addr_reg, SP); RET(X30); @@ -375,7 +375,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() float_emit.ABI_PushRegisters(fprs); float_emit.REV32(8, D0, D0); float_emit.UMOV(32, W0, Q0, 0); - MOVI2R(X30, (u64)Memory::Write_U32); + MOVI2R(X30, (u64)PowerPC::Write_U32); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -388,15 +388,15 @@ void JitArm64AsmRoutineManager::GenerateCommon() MOVI2R(X2, (u64)&m_quantizeTableS); ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3)); - float_emit.LD1R(32, D1, scale_reg); - float_emit.FMUL(32, D0, D0, D1); + float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0); + float_emit.FMUL(32, D0, D0, D1, 0); float_emit.FCVTZS(32, D0, D0); float_emit.XTN(16, D0, D0); float_emit.REV16(8, D0, D0); TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.ST1(32, Q0, 0, addr_reg, SP); RET(X30); @@ -405,7 +405,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() float_emit.ABI_PushRegisters(fprs); float_emit.REV32(8, D0, D0); float_emit.UMOV(32, W0, Q0, 0); - MOVI2R(X30, (u64)Memory::Write_U32); + MOVI2R(X30, (u64)PowerPC::Write_U32); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -421,7 +421,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() FixupBranch argh = B(CC_NEQ); float_emit.REV32(8, D0, D0); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.STR(32, INDEX_UNSIGNED, D0, addr_reg, 0); RET(X30); @@ -430,7 +430,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() ABI_PushRegisters(gprs); float_emit.ABI_PushRegisters(fprs); float_emit.UMOV(32, W0, Q0, 0); - MOVI2R(X30, (u64)&Memory::Write_U32); + MOVI2R(X30, (u64)&PowerPC::Write_U32); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -451,7 +451,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.ST1(8, Q0, 0, addr_reg); RET(X30); @@ -459,7 +459,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() ABI_PushRegisters(gprs); float_emit.ABI_PushRegisters(fprs); float_emit.UMOV(32, W0, Q0, 0); - MOVI2R(X30, (u64)&Memory::Write_U8); + MOVI2R(X30, (u64)&PowerPC::Write_U8); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -480,7 +480,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.ST1(8, Q0, 0, addr_reg); RET(X30); @@ -488,7 +488,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() ABI_PushRegisters(gprs); float_emit.ABI_PushRegisters(fprs); float_emit.SMOV(32, W0, Q0, 0); - MOVI2R(X30, (u64)&Memory::Write_U8); + MOVI2R(X30, (u64)&PowerPC::Write_U8); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -508,7 +508,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.REV16(8, D0, D0); float_emit.ST1(16, Q0, 0, addr_reg); RET(X30); @@ -517,7 +517,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() ABI_PushRegisters(gprs); float_emit.ABI_PushRegisters(fprs); float_emit.UMOV(32, W0, Q0, 0); - MOVI2R(X30, (u64)&Memory::Write_U16); + MOVI2R(X30, (u64)&PowerPC::Write_U16); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); @@ -537,7 +537,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() TST(DecodeReg(addr_reg), 6, 1); FixupBranch argh = B(CC_NEQ); - MOVK(addr_reg, ((u64)Memory::base >> 32) & 0xFFFF, SHIFT_32); + MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32); float_emit.REV16(8, D0, D0); float_emit.ST1(16, Q0, 0, addr_reg); RET(X30); @@ -546,7 +546,7 @@ void JitArm64AsmRoutineManager::GenerateCommon() ABI_PushRegisters(gprs); float_emit.ABI_PushRegisters(fprs); float_emit.SMOV(32, W0, Q0, 0); - MOVI2R(X30, (u64)&Memory::Write_U16); + MOVI2R(X30, (u64)&PowerPC::Write_U16); BLR(X30); float_emit.ABI_PopRegisters(fprs); ABI_PopRegisters(gprs); diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp index eac028922..6f2ad2747 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp @@ -30,8 +30,11 @@ static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress) bool Jitx86Base::HandleFault(uintptr_t access_address, SContext* ctx) { // TODO: do we properly handle off-the-end? - if (access_address >= (uintptr_t)Memory::base && access_address < (uintptr_t)Memory::base + 0x100010000) - return BackPatch((u32)(access_address - (uintptr_t)Memory::base), ctx); + if (access_address >= (uintptr_t)Memory::physical_base && access_address < (uintptr_t)Memory::physical_base + 0x100010000) + return BackPatch((u32)(access_address - (uintptr_t)Memory::physical_base), ctx); + if (access_address >= (uintptr_t)Memory::logical_base && access_address < (uintptr_t)Memory::logical_base + 0x100010000) + return BackPatch((u32)(access_address - (uintptr_t)Memory::logical_base), ctx); + return false; } diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index 99ae32e01..f15f606d8 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -71,12 +71,12 @@ u8 *EmuCodeBlock::UnsafeLoadToReg(X64Reg reg_value, OpArg opAddress, int accessS opAddress = R(reg_value); offset = 0; } - memOperand = MComplex(RMEM, opAddress.GetSimpleReg(), SCALE_1, offset); } else if (opAddress.IsImm()) { - memOperand = MDisp(RMEM, (opAddress.offset + offset) & 0x3FFFFFFF); + MOV(32, R(reg_value), Imm32((u32)(opAddress.offset + offset))); + memOperand = MRegSum(RMEM, reg_value); } else { @@ -308,9 +308,9 @@ void EmuCodeBlock::SafeLoadToReg(X64Reg reg_value, const Gen::OpArg & opAddress, // access the RAM buffer and load from there). // 2. If the address is in the MMIO range, find the appropriate // MMIO handler and generate the code to load using the handler. - // 3. Otherwise, just generate a call to Memory::Read_* with the + // 3. Otherwise, just generate a call to PowerPC::Read_* with the // address hardcoded. - if (Memory::IsRAMAddress(address)) + if (PowerPC::IsOptimizableRAMAddress(address)) { UnsafeLoadToReg(reg_value, opAddress, accessSize, offset, signExtend); } @@ -324,10 +324,10 @@ void EmuCodeBlock::SafeLoadToReg(X64Reg reg_value, const Gen::OpArg & opAddress, ABI_PushRegistersAndAdjustStack(registersInUse, 0); switch (accessSize) { - case 64: ABI_CallFunctionC((void *)&Memory::Read_U64, address); break; - case 32: ABI_CallFunctionC((void *)&Memory::Read_U32, address); break; - case 16: ABI_CallFunctionC((void *)&Memory::Read_U16_ZX, address); break; - case 8: ABI_CallFunctionC((void *)&Memory::Read_U8_ZX, address); break; + case 64: ABI_CallFunctionC((void *)&PowerPC::Read_U64, address); break; + case 32: ABI_CallFunctionC((void *)&PowerPC::Read_U32, address); break; + case 16: ABI_CallFunctionC((void *)&PowerPC::Read_U16_ZX, address); break; + case 8: ABI_CallFunctionC((void *)&PowerPC::Read_U8_ZX, address); break; } ABI_PopRegistersAndAdjustStack(registersInUse, 0); @@ -366,16 +366,16 @@ void EmuCodeBlock::SafeLoadToReg(X64Reg reg_value, const Gen::OpArg & opAddress, switch (accessSize) { case 64: - ABI_CallFunctionR((void *)&Memory::Read_U64, reg_addr); + ABI_CallFunctionR((void *)&PowerPC::Read_U64, reg_addr); break; case 32: - ABI_CallFunctionR((void *)&Memory::Read_U32, reg_addr); + ABI_CallFunctionR((void *)&PowerPC::Read_U32, reg_addr); break; case 16: - ABI_CallFunctionR((void *)&Memory::Read_U16_ZX, reg_addr); + ABI_CallFunctionR((void *)&PowerPC::Read_U16_ZX, reg_addr); break; case 8: - ABI_CallFunctionR((void *)&Memory::Read_U8_ZX, reg_addr); + ABI_CallFunctionR((void *)&PowerPC::Read_U8_ZX, reg_addr); break; } ABI_PopRegistersAndAdjustStack(registersInUse, rsp_alignment); @@ -490,7 +490,7 @@ bool EmuCodeBlock::WriteToConstAddress(int accessSize, OpArg arg, u32 address, B UnsafeWriteGatherPipe(accessSize); return false; } - else if (Memory::IsRAMAddress(address)) + else if (PowerPC::IsOptimizableRAMAddress(address)) { WriteToConstRamAddress(accessSize, arg, address); return false; @@ -504,16 +504,16 @@ bool EmuCodeBlock::WriteToConstAddress(int accessSize, OpArg arg, u32 address, B switch (accessSize) { case 64: - ABI_CallFunctionAC(64, (void *)&Memory::Write_U64, arg, address); + ABI_CallFunctionAC(64, (void *)&PowerPC::Write_U64, arg, address); break; case 32: - ABI_CallFunctionAC(32, (void *)&Memory::Write_U32, arg, address); + ABI_CallFunctionAC(32, (void *)&PowerPC::Write_U32, arg, address); break; case 16: - ABI_CallFunctionAC(16, (void *)&Memory::Write_U16, arg, address); + ABI_CallFunctionAC(16, (void *)&PowerPC::Write_U16, arg, address); break; case 8: - ABI_CallFunctionAC(8, (void *)&Memory::Write_U8, arg, address); + ABI_CallFunctionAC(8, (void *)&PowerPC::Write_U8, arg, address); break; } ABI_PopRegistersAndAdjustStack(registersInUse, 0); @@ -599,16 +599,16 @@ void EmuCodeBlock::SafeWriteRegToReg(OpArg reg_value, X64Reg reg_addr, int acces switch (accessSize) { case 64: - ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U64) : ((void *)&Memory::Write_U64_Swap), reg, reg_addr); + ABI_CallFunctionRR(swap ? ((void *)&PowerPC::Write_U64) : ((void *)&PowerPC::Write_U64_Swap), reg, reg_addr); break; case 32: - ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), reg, reg_addr); + ABI_CallFunctionRR(swap ? ((void *)&PowerPC::Write_U32) : ((void *)&PowerPC::Write_U32_Swap), reg, reg_addr); break; case 16: - ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U16) : ((void *)&Memory::Write_U16_Swap), reg, reg_addr); + ABI_CallFunctionRR(swap ? ((void *)&PowerPC::Write_U16) : ((void *)&PowerPC::Write_U16_Swap), reg, reg_addr); break; case 8: - ABI_CallFunctionRR((void *)&Memory::Write_U8, reg, reg_addr); + ABI_CallFunctionRR((void *)&PowerPC::Write_U8, reg, reg_addr); break; } ABI_PopRegistersAndAdjustStack(registersInUse, rsp_alignment); @@ -626,7 +626,8 @@ void EmuCodeBlock::WriteToConstRamAddress(int accessSize, OpArg arg, u32 address if (arg.IsImm()) { arg = SwapImmediate(accessSize, arg); - MOV(accessSize, MDisp(RMEM, address & 0x3FFFFFFF), arg); + MOV(32, R(RSCRATCH), Imm32(address)); + MOV(accessSize, MRegSum(RMEM, RSCRATCH), arg); return; } @@ -640,10 +641,11 @@ void EmuCodeBlock::WriteToConstRamAddress(int accessSize, OpArg arg, u32 address reg = arg.GetSimpleReg(); } + MOV(32, R(RSCRATCH2), Imm32(address)); if (swap) - SwapAndStore(accessSize, MDisp(RMEM, address & 0x3FFFFFFF), reg); + SwapAndStore(accessSize, MRegSum(RMEM, RSCRATCH2), reg); else - MOV(accessSize, MDisp(RMEM, address & 0x3FFFFFFF), R(reg)); + MOV(accessSize, MRegSum(RMEM, RSCRATCH2), R(reg)); } void EmuCodeBlock::ForceSinglePrecisionS(X64Reg output, X64Reg input) diff --git a/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp index 89ebfdea9..783b3d7ed 100644 --- a/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp @@ -66,16 +66,16 @@ const u8* TrampolineCache::GenerateReadTrampoline(const InstructionInfo &info, B switch (info.operandSize) { case 8: - CALL((void *)&Memory::Read_U64); + CALL((void*)&PowerPC::Read_U64); break; case 4: - CALL((void *)&Memory::Read_U32); + CALL((void*)&PowerPC::Read_U32); break; case 2: - CALL((void *)&Memory::Read_U16); + CALL((void*)&PowerPC::Read_U16); break; case 1: - CALL((void *)&Memory::Read_U8); + CALL((void*)&PowerPC::Read_U8); break; } @@ -154,16 +154,16 @@ const u8* TrampolineCache::GenerateWriteTrampoline(const InstructionInfo &info, switch (info.operandSize) { case 8: - CALL((void *)&Memory::Write_U64); + CALL((void *)&PowerPC::Write_U64); break; case 4: - CALL((void *)&Memory::Write_U32); + CALL((void *)&PowerPC::Write_U32); break; case 2: - CALL((void *)&Memory::Write_U16); + CALL((void *)&PowerPC::Write_U16); break; case 1: - CALL((void *)&Memory::Write_U8); + CALL((void *)&PowerPC::Write_U8); break; } diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h index 16a3f9769..70bd92f41 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h @@ -32,7 +32,6 @@ public: virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0; // OPCODES - virtual void unknown_instruction(UGeckoInstruction inst) = 0; virtual void FallBackToInterpreter(UGeckoInstruction inst) = 0; virtual void DoNothing(UGeckoInstruction inst) = 0; virtual void HLEFunction(UGeckoInstruction inst) = 0; diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp index e694fc23c..13a5710bb 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp @@ -142,11 +142,12 @@ void JitILBase::bcx(UGeckoInstruction inst) // The main Idle skipping is done in the LoadStore code, but there is an optimization here. // If idle skipping is enabled, then this branch will only be reached when the branch is not // taken. + // TODO: We shouldn't use debug reads here. if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && inst.hex == 0x4182fff8 && - (Memory::ReadUnchecked_U32(js.compilerPC - 8) & 0xFFFF0000) == 0x800D0000 && - (Memory::ReadUnchecked_U32(js.compilerPC - 4) == 0x28000000 || - (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC - 4) == 0x2C000000)) + (PowerPC::HostRead_U32(js.compilerPC - 8) & 0xFFFF0000) == 0x800D0000 && + (PowerPC::HostRead_U32(js.compilerPC - 4) == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && PowerPC::HostRead_U32(js.compilerPC - 4) == 0x2C000000)) ) { // Uh, Do nothing. diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp index 4dbc9aeda..58e886bb9 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp @@ -34,15 +34,17 @@ void JitILBase::lXz(UGeckoInstruction inst) IREmitter::InstLoc val; - // Idle Skipping. This really should be done somewhere else. - // Either lower in the IR or higher in PPCAnalyist + // Idle Skipping. + // TODO: This really should be done somewhere else. Either lower in the IR + // or higher in PPCAnalyst + // TODO: We shouldn't use debug reads here. if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && PowerPC::GetState() != PowerPC::CPU_STEPPING && inst.OPCD == 32 && // Lwx (inst.hex & 0xFFFF0000) == 0x800D0000 && - (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || - (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && - Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) + (PowerPC::HostRead_U32(js.compilerPC + 4) == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && PowerPC::HostRead_U32(js.compilerPC + 4) == 0x2C000000)) && + PowerPC::HostRead_U32(js.compilerPC + 8) == 0x4182fff8) { val = ibuild.EmitLoad32(addr); ibuild.EmitIdleBranch(val, ibuild.EmitIntConst(js.compilerPC)); @@ -138,7 +140,9 @@ void JitILBase::dcbst(UGeckoInstruction inst) // memory location. Do not invalidate the JIT cache in this case as the memory // will be the same. // dcbt = 0x7c00022c - FALLBACK_IF((Memory::ReadUnchecked_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c); + // TODO: We shouldn't use a debug read here; it should be possible to get the + // previous instruction from the JIT state. + FALLBACK_IF((PowerPC::HostRead_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c); } // Zero cache line. diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index 9d3a04f76..876812e0b 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -15,6 +15,7 @@ #include "Core/ConfigManager.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/Profiler.h" #include "Core/PowerPC/JitCommon/JitBase.h" @@ -54,38 +55,28 @@ namespace JitInterface CPUCoreBase *ptr = nullptr; switch (core) { - #if _M_X86 - case 1: - { - ptr = new Jit64(); - break; - } - case 2: - { - ptr = new JitIL(); - break; - } - #endif - #if _M_ARM_32 - case 3: - { - ptr = new JitArm(); - break; - } - #endif - #if _M_ARM_64 - case 4: - { - ptr = new JitArm64(); - break; - } - #endif - default: - { - PanicAlert("Unrecognizable cpu_core: %d", core); - jit = nullptr; - return nullptr; - } + #if _M_X86 + case PowerPC::CORE_JIT64: + ptr = new Jit64(); + break; + case PowerPC::CORE_JITIL64: + ptr = new JitIL(); + break; + #endif + #if _M_ARM_32 + case PowerPC::CORE_JITARM: + ptr = new JitArm(); + break; + #endif + #if _M_ARM_64 + case PowerPC::CORE_JITARM64: + ptr = new JitArm64(); + break; + #endif + default: + PanicAlert("Unrecognizable cpu_core: %d", core); + jit = nullptr; + return nullptr; } jit = static_cast(ptr); jit->Init(); @@ -95,37 +86,27 @@ namespace JitInterface { switch (core) { - #if _M_X86 - case 1: - { - Jit64Tables::InitTables(); - break; - } - case 2: - { - JitILTables::InitTables(); - break; - } - #endif - #if _M_ARM_32 - case 3: - { - JitArmTables::InitTables(); - break; - } - #endif - #if _M_ARM_64 - case 4: - { - JitArm64Tables::InitTables(); - break; - } - #endif - default: - { - PanicAlert("Unrecognizable cpu_core: %d", core); - break; - } + #if _M_X86 + case PowerPC::CORE_JIT64: + Jit64Tables::InitTables(); + break; + case PowerPC::CORE_JITIL64: + JitILTables::InitTables(); + break; + #endif + #if _M_ARM_32 + case PowerPC::CORE_JITARM: + JitArmTables::InitTables(); + break; + #endif + #if _M_ARM_64 + case PowerPC::CORE_JITARM64: + JitArm64Tables::InitTables(); + break; + #endif + default: + PanicAlert("Unrecognizable cpu_core: %d", core); + break; } } CPUCoreBase *GetCore() @@ -207,27 +188,6 @@ namespace JitInterface jit->GetBlockCache()->InvalidateICache(address, size, forced); } - u32 ReadOpcodeJIT(u32 _Address) - { - if (bMMU && !bFakeVMEM && (_Address & Memory::ADDR_MASK_MEM1)) - { - _Address = Memory::TranslateAddress(_Address); - if (_Address == 0) - { - return 0; - } - } - - u32 inst; - // Bypass the icache for the external interrupt exception handler - // -- this is stupid, should respect HID0 - if ( (_Address & 0x0FFFFF00) == 0x00000500 ) - inst = Memory::ReadUnchecked_U32(_Address); - else - inst = PowerPC::ppcState.iCache.ReadInstruction(_Address); - return inst; - } - void CompileExceptionCheck(ExceptionType type) { if (!jit) @@ -250,7 +210,7 @@ namespace JitInterface if (type == ExceptionType::EXCEPTIONS_FIFO_WRITE) { // Check in case the code has been replaced since: do we need to do this? - int optype = GetOpInfo(Memory::ReadUnchecked_U32(PC))->type; + int optype = GetOpInfo(PowerPC::HostRead_U32(PC))->type; if (optype != OPTYPE_STORE && optype != OPTYPE_STOREFP && (optype != OPTYPE_STOREPS)) return; } diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h index 3c56683af..f87bfda92 100644 --- a/Source/Core/Core/PowerPC/JitInterface.h +++ b/Source/Core/Core/PowerPC/JitInterface.h @@ -29,9 +29,6 @@ namespace JitInterface // Memory Utilities bool HandleFault(uintptr_t access_address, SContext* ctx); - // used by JIT to read instructions - u32 ReadOpcodeJIT(const u32 _Address); - // Clearing CodeCache void ClearCache(); diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp new file mode 100644 index 000000000..8a7e81915 --- /dev/null +++ b/Source/Core/Core/PowerPC/MMU.cpp @@ -0,0 +1,1052 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official Git repository and contact information can be found at +// https://github.com/dolphin-emu/dolphin + +#include "Common/Atomic.h" +#include "Common/BitSet.h" +#include "Common/CommonTypes.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoBackendBase.h" + +#ifdef USE_GDBSTUB +#include "Core/PowerPC/GDBStub.h" +#endif + +namespace PowerPC +{ + +#define HW_PAGE_SIZE 4096 + +// EFB RE +/* +GXPeekZ +80322de8: rlwinm r0, r3, 2, 14, 29 (0003fffc) a = x << 2 & 0x3fffc +80322dec: oris r0, r0, 0xC800 a |= 0xc8000000 +80322df0: rlwinm r3, r0, 0, 20, 9 (ffc00fff) x = a & 0xffc00fff +80322df4: rlwinm r0, r4, 12, 4, 19 (0ffff000) a = (y << 12) & 0x0ffff000; +80322df8: or r0, r3, r0 a |= x; +80322dfc: rlwinm r0, r0, 0, 10, 7 (ff3fffff) a &= 0xff3fffff +80322e00: oris r3, r0, 0x0040 x = a | 0x00400000 +80322e04: lwz r0, 0 (r3) r0 = *r3 +80322e08: stw r0, 0 (r5) z = +80322e0c: blr +*/ + + +// ================================= +// From Memmap.cpp +// ---------------- + +// Overloaded byteswap functions, for use within the templated functions below. +inline u8 bswap(u8 val) { return val; } +inline s8 bswap(s8 val) { return val; } +inline u16 bswap(u16 val) { return Common::swap16(val); } +inline s16 bswap(s16 val) { return Common::swap16(val); } +inline u32 bswap(u32 val) { return Common::swap32(val); } +inline u64 bswap(u64 val) { return Common::swap64(val); } +// ================= + +enum XCheckTLBFlag +{ + FLAG_NO_EXCEPTION, + FLAG_READ, + FLAG_WRITE, + FLAG_OPCODE, +}; +template static u32 TranslateAddress(const u32 address); + +// Nasty but necessary. Super Mario Galaxy pointer relies on this stuff. +static u32 EFB_Read(const u32 addr) +{ + u32 var = 0; + // Convert address to coordinates. It's possible that this should be done + // differently depending on color depth, especially regarding PEEK_COLOR. + int x = (addr & 0xfff) >> 2; + int y = (addr >> 12) & 0x3ff; + + if (addr & 0x00400000) + { + var = g_video_backend->Video_AccessEFB(PEEK_Z, x, y, 0); + DEBUG_LOG(MEMMAP, "EFB Z Read @ %i, %i\t= 0x%08x", x, y, var); + } + else + { + var = g_video_backend->Video_AccessEFB(PEEK_COLOR, x, y, 0); + DEBUG_LOG(MEMMAP, "EFB Color Read @ %i, %i\t= 0x%08x", x, y, var); + } + + return var; +} + +static void EFB_Write(u32 data, u32 addr) +{ + int x = (addr & 0xfff) >> 2; + int y = (addr >> 12) & 0x3ff; + + if (addr & 0x00400000) + { + g_video_backend->Video_AccessEFB(POKE_Z, x, y, data); + DEBUG_LOG(MEMMAP, "EFB Z Write %08x @ %i, %i", data, x, y); + } + else + { + g_video_backend->Video_AccessEFB(POKE_COLOR, x, y, data); + DEBUG_LOG(MEMMAP, "EFB Color Write %08x @ %i, %i", data, x, y); + } +} + + +static void GenerateDSIException(u32 _EffectiveAddress, bool _bWrite); + +template +__forceinline static T ReadFromHardware(const u32 em_address) +{ + int segment = em_address >> 28; + bool performTranslation = UReg_MSR(MSR).DR; + + // Quick check for an address that can't meet any of the following conditions, + // to speed up the MMU path. + if (!BitSet32(0xCFC)[segment] && performTranslation) + { + // TODO: Figure out the fastest order of tests for both read and write (they are probably different). + if (flag == FLAG_READ && (em_address & 0xF8000000) == 0xC8000000) + { + if (em_address < 0xcc000000) + return EFB_Read(em_address); + else + return (T)Memory::mmio_mapping->Read::type>(em_address); + } + if (segment == 0x0 || segment == 0x8 || segment == 0xC) + { + // Handle RAM; the masking intentionally discards bits (essentially creating + // mirrors of memory). + // TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory. + return bswap((*(const T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK])); + } + if (Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) + { + // Handle EXRAM. + // TODO: Is this supposed to be mirrored like main RAM? + return bswap((*(const T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF])); + } + if (segment == 0xE && (em_address < (0xE0000000 + Memory::L1_CACHE_SIZE))) + { + return bswap((*(const T*)&Memory::m_pL1Cache[em_address & 0x0FFFFFFF])); + } + } + + if (Memory::bFakeVMEM && performTranslation && (segment == 0x7 || segment == 0x4)) + { + // fake VMEM + return bswap((*(const T*)&Memory::m_pFakeVMEM[em_address & Memory::FAKEVMEM_MASK])); + } + + if (!performTranslation) + { + if (flag == FLAG_READ && (em_address & 0xF8000000) == 0x08000000) + { + if (em_address < 0x0c000000) + return EFB_Read(em_address); + else + return (T)Memory::mmio_mapping->Read::type>(em_address | 0xC0000000); + } + if (segment == 0x0) + { + // Handle RAM; the masking intentionally discards bits (essentially creating + // mirrors of memory). + // TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory. + return bswap((*(const T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK])); + } + if (Memory::m_pEXRAM && segment == 0x1 && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) + { + return bswap((*(const T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF])); + } + PanicAlert("Unable to resolve read address %x PC %x", em_address, PC); + return 0; + } + + // MMU: Do page table translation + u32 tlb_addr = TranslateAddress(em_address); + if (tlb_addr == 0) + { + if (flag == FLAG_READ) + GenerateDSIException(em_address, false); + return 0; + } + + // Handle loads that cross page boundaries (ewwww) + // The alignment check isn't strictly necessary, but since this is a rare slow path, it provides a faster + // (1 instruction on x86) bailout. + if (sizeof(T) > 1 && (em_address & (sizeof(T) - 1)) && (em_address & (HW_PAGE_SIZE - 1)) > HW_PAGE_SIZE - sizeof(T)) + { + // This could be unaligned down to the byte level... hopefully this is rare, so doing it this + // way isn't too terrible. + // TODO: floats on non-word-aligned boundaries should technically cause alignment exceptions. + // Note that "word" means 32-bit, so paired singles or doubles might still be 32-bit aligned! + u32 em_address_next_page = (em_address + sizeof(T) - 1) & ~(HW_PAGE_SIZE - 1); + u32 tlb_addr_next_page = TranslateAddress(em_address_next_page); + if (tlb_addr == 0 || tlb_addr_next_page == 0) + { + if (flag == FLAG_READ) + GenerateDSIException(em_address_next_page, false); + return 0; + } + T var = 0; + for (u32 addr = em_address; addr < em_address + sizeof(T); addr++, tlb_addr++) + { + if (addr == em_address_next_page) + tlb_addr = tlb_addr_next_page; + var = (var << 8) | Memory::physical_base[tlb_addr]; + } + return var; + } + + // The easy case! + return bswap(*(const T*)&Memory::physical_base[tlb_addr]); +} + + +template +__forceinline static void WriteToHardware(u32 em_address, const T data) +{ + int segment = em_address >> 28; + // Quick check for an address that can't meet any of the following conditions, + // to speed up the MMU path. + bool performTranslation = UReg_MSR(MSR).DR; + + if (!BitSet32(0xCFC)[segment] && performTranslation) + { + // First, let's check for FIFO writes, since they are probably the most common + // reason we end up in this function: + if (flag == FLAG_WRITE && (em_address & 0xFFFFF000) == 0xCC008000) + { + switch (sizeof(T)) + { + case 1: GPFifo::Write8((u8)data, em_address); return; + case 2: GPFifo::Write16((u16)data, em_address); return; + case 4: GPFifo::Write32((u32)data, em_address); return; + case 8: GPFifo::Write64((u64)data, em_address); return; + } + } + if (flag == FLAG_WRITE && (em_address & 0xF8000000) == 0xC8000000) + { + if (em_address < 0xcc000000) + { + // TODO: This only works correctly for 32-bit writes. + EFB_Write((u32)data, em_address); + return; + } + else + { + Memory::mmio_mapping->Write(em_address, data); + return; + } + } + if (segment == 0x0 || segment == 0x8 || segment == 0xC) + { + // Handle RAM; the masking intentionally discards bits (essentially creating + // mirrors of memory). + // TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory. + *(T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK] = bswap(data); + return; + } + if (Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) + { + // Handle EXRAM. + // TODO: Is this supposed to be mirrored like main RAM? + *(T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF] = bswap(data); + return; + } + if (segment == 0xE && (em_address < (0xE0000000 + Memory::L1_CACHE_SIZE))) + { + *(T*)&Memory::m_pL1Cache[em_address & 0x0FFFFFFF] = bswap(data); + return; + } + } + + if (Memory::bFakeVMEM && performTranslation && (segment == 0x7 || segment == 0x4)) + { + // fake VMEM + *(T*)&Memory::m_pFakeVMEM[em_address & Memory::FAKEVMEM_MASK] = bswap(data); + return; + } + + if (!performTranslation) + { + if (flag == FLAG_WRITE && (em_address & 0xFFFFF000) == 0x0C008000) + { + switch (sizeof(T)) + { + case 1: GPFifo::Write8((u8)data, em_address); return; + case 2: GPFifo::Write16((u16)data, em_address); return; + case 4: GPFifo::Write32((u32)data, em_address); return; + case 8: GPFifo::Write64((u64)data, em_address); return; + } + } + if (flag == FLAG_WRITE && (em_address & 0xF8000000) == 0x08000000) + { + if (em_address < 0x0c000000) + { + // TODO: This only works correctly for 32-bit writes. + EFB_Write((u32)data, em_address); + return; + } + else + { + Memory::mmio_mapping->Write(em_address | 0xC0000000, data); + return; + } + } + if (segment == 0x0) + { + // Handle RAM; the masking intentionally discards bits (essentially creating + // mirrors of memory). + // TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory. + *(T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK] = bswap(data); + return; + } + if (Memory::m_pEXRAM && segment == 0x1 && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) + { + *(T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF] = bswap(data); + return; + } + PanicAlert("Unable to resolve write address %x PC %x", em_address, PC); + return; + } + + // MMU: Do page table translation + u32 tlb_addr = TranslateAddress(em_address); + if (tlb_addr == 0) + { + if (flag == FLAG_WRITE) + GenerateDSIException(em_address, true); + return; + } + + // Handle stores that cross page boundaries (ewwww) + if (sizeof(T) > 1 && (em_address & (sizeof(T) - 1)) && (em_address & (HW_PAGE_SIZE - 1)) > HW_PAGE_SIZE - sizeof(T)) + { + T val = bswap(data); + + // We need to check both addresses before writing in case there's a DSI. + u32 em_address_next_page = (em_address + sizeof(T) - 1) & ~(HW_PAGE_SIZE - 1); + u32 tlb_addr_next_page = TranslateAddress(em_address_next_page); + if (tlb_addr_next_page == 0) + { + if (flag == FLAG_WRITE) + GenerateDSIException(em_address_next_page, true); + return; + } + for (u32 addr = em_address; addr < em_address + sizeof(T); addr++, tlb_addr++, val >>= 8) + { + if (addr == em_address_next_page) + tlb_addr = tlb_addr_next_page; + Memory::physical_base[tlb_addr] = (u8)val; + } + return; + } + + // The easy case! + *(T*)&Memory::physical_base[tlb_addr] = bswap(data); +} +// ===================== + + +// ================================= +/* These functions are primarily called by the Interpreter functions and are routed to the correct + location through ReadFromHardware and WriteToHardware */ +// ---------------- + +static void GenerateISIException(u32 effective_address); + +u32 Read_Opcode(u32 address) +{ + TryReadInstResult result = TryReadInstruction(address); + if (!result.valid) + { + GenerateISIException(address); + return 0; + } + return result.hex; +} + +TryReadInstResult TryReadInstruction(u32 address) +{ + bool from_bat = true; + if (UReg_MSR(MSR).IR) + { + // TODO: Use real translation. + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU && (address & Memory::ADDR_MASK_MEM1)) + { + u32 tlb_addr = TranslateAddress(address); + if (tlb_addr == 0) + { + return TryReadInstResult{ false, false, 0 }; + } + else + { + address = tlb_addr; + from_bat = false; + } + } + else + { + int segment = address >> 28; + if ((segment == 0x8 || segment == 0x0) && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE) + { + address = address & 0x3FFFFFFF; + } + else if (segment == 0x9 && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) + { + address = address & 0x3FFFFFFF; + } + else if (Memory::bFakeVMEM && (segment == 0x7 || segment == 0x4)) + { + u32 hex = bswap((*(const u32*)&Memory::m_pFakeVMEM[address & Memory::FAKEVMEM_MASK])); + return TryReadInstResult{ true, true, hex }; + } + else + { + return TryReadInstResult{ false, false, 0 }; + } + } + } + else + { + if (address & 0xC0000000) + ERROR_LOG(MEMMAP, "Strange program counter with address translation off: 0x%08x", address); + } + + u32 hex = PowerPC::ppcState.iCache.ReadInstruction(address); + return TryReadInstResult{ true, from_bat, hex }; +} + +u32 HostRead_Instruction(const u32 address) +{ + UGeckoInstruction inst = HostRead_U32(address); + return inst.hex; +} + +static __forceinline void Memcheck(u32 address, u32 var, bool write, int size) +{ +#ifdef ENABLE_MEM_CHECK + TMemCheck *mc = PowerPC::memchecks.GetMemCheck(address); + if (mc) + { + mc->numHits++; + mc->Action(&PowerPC::debug_interface, var, address, write, size, PC); + } +#endif +} + +u8 Read_U8(const u32 address) +{ + u8 var = ReadFromHardware(address); + Memcheck(address, var, false, 1); + return (u8)var; +} + +u16 Read_U16(const u32 address) +{ + u16 var = ReadFromHardware(address); + Memcheck(address, var, false, 2); + return (u16)var; +} + +u32 Read_U32(const u32 address) +{ + u32 var = ReadFromHardware(address); + Memcheck(address, var, false, 4); + return var; +} + +u64 Read_U64(const u32 address) +{ + u64 var = ReadFromHardware(address); + Memcheck(address, (u32)var, false, 8); + return var; +} + +double Read_F64(const u32 address) +{ + union + { + u64 i; + double d; + } cvt; + + cvt.i = Read_U64(address); + return cvt.d; +} + +float Read_F32(const u32 address) +{ + union + { + u32 i; + float d; + } cvt; + + cvt.i = Read_U32(address); + return cvt.d; +} + +u32 Read_U8_ZX(const u32 address) +{ + return (u32)Read_U8(address); +} + +u32 Read_U16_ZX(const u32 address) +{ + return (u32)Read_U16(address); +} + +void Write_U8(const u8 var, const u32 address) +{ + Memcheck(address, var, true, 1); + WriteToHardware(address, var); +} + +void Write_U16(const u16 var, const u32 address) +{ + Memcheck(address, var, true, 2); + WriteToHardware(address, var); +} +void Write_U16_Swap(const u16 var, const u32 address) +{ + Memcheck(address, var, true, 2); + Write_U16(Common::swap16(var), address); +} + + +void Write_U32(const u32 var, const u32 address) +{ + Memcheck(address, var, true, 4); + WriteToHardware(address, var); +} +void Write_U32_Swap(const u32 var, const u32 address) +{ + Memcheck(address, var, true, 4); + Write_U32(Common::swap32(var), address); +} + +void Write_U64(const u64 var, const u32 address) +{ + Memcheck(address, (u32)var, true, 8); + WriteToHardware(address, var); +} +void Write_U64_Swap(const u64 var, const u32 address) +{ + Memcheck(address, (u32)var, true, 8); + Write_U64(Common::swap64(var), address); +} + +void Write_F64(const double var, const u32 address) +{ + union + { + u64 i; + double d; + } cvt; + cvt.d = var; + Write_U64(cvt.i, address); +} + +u8 HostRead_U8(const u32 address) +{ + u8 var = ReadFromHardware(address); + return var; +} + +u16 HostRead_U16(const u32 address) +{ + u16 var = ReadFromHardware(address); + return var; +} + +u32 HostRead_U32(const u32 address) +{ + u32 var = ReadFromHardware(address); + return var; +} + +void HostWrite_U8(const u8 var, const u32 address) +{ + WriteToHardware(address, var); +} + +void HostWrite_U16(const u16 var, const u32 address) +{ + WriteToHardware(address, var); +} + +void HostWrite_U32(const u32 var, const u32 address) +{ + WriteToHardware(address, var); +} + +void HostWrite_U64(const u64 var, const u32 address) +{ + WriteToHardware(address, var); +} + +std::string HostGetString(u32 address, size_t size) +{ + std::string s; + do + { + if (!HostIsRAMAddress(address)) + break; + u8 res = HostRead_U8(address); + if (!res) + break; + ++address; + } while (size == 0 || s.length() < size); + return s; +} + +bool IsOptimizableRAMAddress(const u32 address) +{ + if (!UReg_MSR(MSR).DR) + return false; + + int segment = address >> 28; + + return (((segment == 0x8 || segment == 0xC || segment == 0x0) && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE) || + (Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) || + (segment == 0xE && (address < (0xE0000000 + Memory::L1_CACHE_SIZE)))); +} + +bool HostIsRAMAddress(u32 address) +{ + // TODO: This needs to be rewritten; it makes incorrect assumptions + // about BATs and page tables. + bool performTranslation = UReg_MSR(MSR).DR; + int segment = address >> 28; + if (performTranslation) + { + if ((segment == 0x8 || segment == 0xC || segment == 0x0) && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE) + return true; + else if (Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) + return true; + else if (Memory::bFakeVMEM && (segment == 0x7 || segment == 0x4)) + return true; + else if (segment == 0xE && (address < (0xE0000000 + Memory::L1_CACHE_SIZE))) + return true; + + address = TranslateAddress(address); + if (!address) + return false; + } + + if (segment == 0x0 && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE) + return true; + else if (Memory::m_pEXRAM && segment == 0x1 && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) + return true; + return false; + + +} + +void DMA_LCToMemory(const u32 memAddr, const u32 cacheAddr, const u32 numBlocks) +{ + // TODO: It's not completely clear this is the right spot for this code; + // what would happen if, for example, the DVD drive tried to write to the EFB? + // TODO: This is terribly slow. + // TODO: Refactor. + // Avatar: The Last Airbender (GC) uses this for videos. + if ((memAddr & 0x0F000000) == 0x08000000) + { + for (u32 i = 0; i < 32 * numBlocks; i += 4) + { + u32 data = bswap(*(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF))); + EFB_Write(data, memAddr + i); + } + return; + } + + // No known game uses this; here for completeness. + // TODO: Refactor. + if ((memAddr & 0x0F000000) == 0x0C000000) + { + for (u32 i = 0; i < 32 * numBlocks; i += 4) + { + u32 data = bswap(*(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF))); + Memory::mmio_mapping->Write(memAddr + i, data); + } + return; + } + + const u8* src = Memory::m_pL1Cache + (cacheAddr & 0x3FFFF); + u8* dst = Memory::GetPointer(memAddr); + if (dst == nullptr) + return; + + memcpy(dst, src, 32 * numBlocks); +} + +void DMA_MemoryToLC(const u32 cacheAddr, const u32 memAddr, const u32 numBlocks) +{ + const u8* src = Memory::GetPointer(memAddr); + u8* dst = Memory::m_pL1Cache + (cacheAddr & 0x3FFFF); + + // No known game uses this; here for completeness. + // TODO: Refactor. + if ((memAddr & 0x0F000000) == 0x08000000) + { + for (u32 i = 0; i < 32 * numBlocks; i += 4) + { + u32 data = EFB_Read(memAddr + i); + *(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF)) = bswap(data); + } + return; + } + + // No known game uses this. + // TODO: Refactor. + if ((memAddr & 0x0F000000) == 0x0C000000) + { + for (u32 i = 0; i < 32 * numBlocks; i += 4) + { + u32 data = Memory::mmio_mapping->Read(memAddr + i); + *(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF)) = bswap(data); + } + return; + } + + if (src == nullptr) + return; + + memcpy(dst, src, 32 * numBlocks); +} + +void ClearCacheLine(const u32 address) +{ + // FIXME: does this do the right thing if dcbz is run on hardware memory, e.g. + // the FIFO? Do games even do that? Probably not, but we should try to be correct... + for (u32 i = 0; i < 32; i += 8) + Write_U64(0, address + i); +} + +// ********************************************************************************* +// Warning: Test Area +// +// This code is for TESTING and it works in interpreter mode ONLY. Some games (like +// COD iirc) work thanks to this basic TLB emulation. +// It is just a small hack and we have never spend enough time to finalize it. +// Cheers PearPC! +// +// ********************************************************************************* + +/* +* PearPC +* ppc_mmu.cc +* +* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + + +#define PPC_EXC_DSISR_PAGE (1<<30) +#define PPC_EXC_DSISR_PROT (1<<27) +#define PPC_EXC_DSISR_STORE (1<<25) + +#define SDR1_HTABORG(v) (((v)>>16)&0xffff) +#define SDR1_HTABMASK(v) ((v)&0x1ff) +#define SDR1_PAGETABLE_BASE(v) ((v)&0xffff) +#define SR_T (1<<31) +#define SR_Ks (1<<30) +#define SR_Kp (1<<29) +#define SR_N (1<<28) +#define SR_VSID(v) ((v)&0xffffff) +#define SR_BUID(v) (((v)>>20)&0x1ff) +#define SR_CNTRL_SPEC(v) ((v)&0xfffff) + +#define EA_SR(v) (((v)>>28)&0xf) +#define EA_PageIndex(v) (((v)>>12)&0xffff) +#define EA_Offset(v) ((v)&0xfff) +#define EA_API(v) (((v)>>22)&0x3f) + +#define PA_RPN(v) (((v)>>12)&0xfffff) +#define PA_Offset(v) ((v)&0xfff) + +#define PTE1_V (1<<31) +#define PTE1_VSID(v) (((v)>>7)&0xffffff) +#define PTE1_H (1<<6) +#define PTE1_API(v) ((v)&0x3f) + +#define PTE2_RPN(v) ((v)&0xfffff000) +#define PTE2_R (1<<8) +#define PTE2_C (1<<7) +#define PTE2_WIMG(v) (((v)>>3)&0xf) +#define PTE2_PP(v) ((v)&3) + +// Hey! these duplicate a structure in Gekko.h +union UPTE1 +{ + struct + { + u32 API : 6; + u32 H : 1; + u32 VSID : 24; + u32 V : 1; + }; + u32 Hex; +}; + +union UPTE2 +{ + struct + { + u32 PP : 2; + u32 : 1; + u32 WIMG : 4; + u32 C : 1; + u32 R : 1; + u32 : 3; + u32 RPN : 20; + }; + u32 Hex; +}; + +static void GenerateDSIException(u32 effectiveAddress, bool write) +{ + // DSI exceptions are only supported in MMU mode. + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU) + { + PanicAlertT("Invalid %s to 0x%08x, PC = 0x%08x ", write ? "Write to" : "Read from", effectiveAddress, PC); + return; + } + + if (effectiveAddress) + PowerPC::ppcState.spr[SPR_DSISR] = PPC_EXC_DSISR_PAGE | PPC_EXC_DSISR_STORE; + else + PowerPC::ppcState.spr[SPR_DSISR] = PPC_EXC_DSISR_PAGE; + + PowerPC::ppcState.spr[SPR_DAR] = effectiveAddress; + + PowerPC::ppcState.Exceptions |= EXCEPTION_DSI; +} + + +static void GenerateISIException(u32 _EffectiveAddress) +{ + // Address of instruction could not be translated + NPC = _EffectiveAddress; + + PowerPC::ppcState.Exceptions |= EXCEPTION_ISI; +} + + +void SDRUpdated() +{ + u32 htabmask = SDR1_HTABMASK(PowerPC::ppcState.spr[SPR_SDR]); + u32 x = 1; + u32 xx = 0; + int n = 0; + while ((htabmask & x) && (n < 9)) + { + n++; + xx|=x; + x<<=1; + } + if (htabmask & ~xx) + { + return; + } + u32 htaborg = SDR1_HTABORG(PowerPC::ppcState.spr[SPR_SDR]); + if (htaborg & xx) + { + return; + } + PowerPC::ppcState.pagetable_base = htaborg<<16; + PowerPC::ppcState.pagetable_hashmask = ((xx<<10)|0x3ff); +} + +enum TLBLookupResult +{ + TLB_FOUND, + TLB_NOTFOUND, + TLB_UPDATE_C +}; + +static __forceinline TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, u32 *paddr) +{ + u32 tag = vpa >> HW_PAGE_INDEX_SHIFT; + PowerPC::tlb_entry *tlbe = &PowerPC::ppcState.tlb[flag == FLAG_OPCODE][tag & HW_PAGE_INDEX_MASK]; + if (tlbe->tag[0] == tag) + { + // Check if C bit requires updating + if (flag == FLAG_WRITE) + { + UPTE2 PTE2; + PTE2.Hex = tlbe->pte[0]; + if (PTE2.C == 0) + { + PTE2.C = 1; + tlbe->pte[0] = PTE2.Hex; + return TLB_UPDATE_C; + } + } + + if (flag != FLAG_NO_EXCEPTION) + tlbe->recent = 0; + + *paddr = tlbe->paddr[0] | (vpa & 0xfff); + + return TLB_FOUND; + } + if (tlbe->tag[1] == tag) + { + // Check if C bit requires updating + if (flag == FLAG_WRITE) + { + UPTE2 PTE2; + PTE2.Hex = tlbe->pte[1]; + if (PTE2.C == 0) + { + PTE2.C = 1; + tlbe->pte[1] = PTE2.Hex; + return TLB_UPDATE_C; + } + } + + if (flag != FLAG_NO_EXCEPTION) + tlbe->recent = 1; + + *paddr = tlbe->paddr[1] | (vpa & 0xfff); + + return TLB_FOUND; + } + return TLB_NOTFOUND; +} + +static __forceinline void UpdateTLBEntry(const XCheckTLBFlag flag, UPTE2 PTE2, const u32 address) +{ + if (flag == FLAG_NO_EXCEPTION) + return; + + int tag = address >> HW_PAGE_INDEX_SHIFT; + PowerPC::tlb_entry *tlbe = &PowerPC::ppcState.tlb[flag == FLAG_OPCODE][tag & HW_PAGE_INDEX_MASK]; + int index = tlbe->recent == 0 && tlbe->tag[0] != TLB_TAG_INVALID; + tlbe->recent = index; + tlbe->paddr[index] = PTE2.RPN << HW_PAGE_INDEX_SHIFT; + tlbe->pte[index] = PTE2.Hex; + tlbe->tag[index] = tag; +} + +void InvalidateTLBEntry(u32 address) +{ + PowerPC::tlb_entry *tlbe = &PowerPC::ppcState.tlb[0][(address >> HW_PAGE_INDEX_SHIFT) & HW_PAGE_INDEX_MASK]; + tlbe->tag[0] = TLB_TAG_INVALID; + tlbe->tag[1] = TLB_TAG_INVALID; + PowerPC::tlb_entry *tlbe_i = &PowerPC::ppcState.tlb[1][(address >> HW_PAGE_INDEX_SHIFT) & HW_PAGE_INDEX_MASK]; + tlbe_i->tag[0] = TLB_TAG_INVALID; + tlbe_i->tag[1] = TLB_TAG_INVALID; +} + +// Page Address Translation +static __forceinline u32 TranslatePageAddress(const u32 address, const XCheckTLBFlag flag) +{ + // TLB cache + // This catches 99%+ of lookups in practice, so the actual page table entry code below doesn't benefit + // much from optimization. + u32 translatedAddress = 0; + TLBLookupResult res = LookupTLBPageAddress(flag , address, &translatedAddress); + if (res == TLB_FOUND) + return translatedAddress; + + u32 sr = PowerPC::ppcState.sr[EA_SR(address)]; + + u32 offset = EA_Offset(address); // 12 bit + u32 page_index = EA_PageIndex(address); // 16 bit + u32 VSID = SR_VSID(sr); // 24 bit + u32 api = EA_API(address); // 6 bit (part of page_index) + + // hash function no 1 "xor" .360 + u32 hash = (VSID ^ page_index); + u32 pte1 = bswap((VSID << 7) | api | PTE1_V); + + for (int hash_func = 0; hash_func < 2; hash_func++) + { + // hash function no 2 "not" .360 + if (hash_func == 1) + { + hash = ~hash; + pte1 |= PTE1_H << 24; + } + + u32 pteg_addr = ((hash & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base; + + for (int i = 0; i < 8; i++, pteg_addr += 8) + { + if (pte1 == *(u32*)&Memory::physical_base[pteg_addr]) + { + UPTE2 PTE2; + PTE2.Hex = bswap((*(u32*)&Memory::physical_base[pteg_addr + 4])); + + // set the access bits + switch (flag) + { + case FLAG_NO_EXCEPTION: break; + case FLAG_READ: PTE2.R = 1; break; + case FLAG_WRITE: PTE2.R = 1; PTE2.C = 1; break; + case FLAG_OPCODE: PTE2.R = 1; break; + } + + if (flag != FLAG_NO_EXCEPTION) + *(u32*)&Memory::physical_base[pteg_addr + 4] = bswap(PTE2.Hex); + + // We already updated the TLB entry if this was caused by a C bit. + if (res != TLB_UPDATE_C) + UpdateTLBEntry(flag, PTE2, address); + + return (PTE2.RPN << 12) | offset; + } + } + } + return 0; +} + +// Translate effective address using BAT or PAT. Returns 0 if the address cannot be translated. +template +__forceinline u32 TranslateAddress(const u32 address) +{ + // TODO: Perform BAT translation. (At the moment, we hardcode an assumed BAT + // configuration, so there's no reason to actually check the registers.) + return TranslatePageAddress(address, flag); +} + +} // namespace diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp index 17c8c7f98..32105f468 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp @@ -96,7 +96,7 @@ bool AnalyzeFunction(u32 startAddr, Symbol &func, int max_size) if (func.size >= CODEBUFFER_SIZE * 4) //weird return false; - UGeckoInstruction instr = (UGeckoInstruction)Memory::ReadUnchecked_U32(addr); + UGeckoInstruction instr = (UGeckoInstruction)PowerPC::HostRead_U32(addr); if (max_size && func.size > max_size) { func.address = startAddr; @@ -275,7 +275,7 @@ static void FindFunctionsFromBranches(u32 startAddr, u32 endAddr, SymbolDB *func { for (u32 addr = startAddr; addr < endAddr; addr+=4) { - UGeckoInstruction instr = (UGeckoInstruction)Memory::ReadUnchecked_U32(addr); + UGeckoInstruction instr = (UGeckoInstruction)PowerPC::HostRead_U32(addr); if (PPCTables::IsValidInstruction(instr)) { @@ -288,7 +288,7 @@ static void FindFunctionsFromBranches(u32 startAddr, u32 endAddr, SymbolDB *func u32 target = SignExt26(instr.LI << 2); if (!instr.AA) target += addr; - if (Memory::IsRAMAddress(target)) + if (PowerPC::HostIsRAMAddress(target)) { func_db->AddFunction(target); } @@ -313,10 +313,10 @@ static void FindFunctionsAfterBLR(PPCSymbolDB *func_db) { while (true) { - // skip zeroes that sometimes pad function to 16 byte boundary (eg. Donkey Kong Country Returns) - while (Memory::Read_Instruction(location) == 0 && ((location & 0xf) != 0)) + // skip zeroes that sometimes pad function to 16 byte boundary (e.g. Donkey Kong Country Returns) + while (PowerPC::HostRead_Instruction(location) == 0 && ((location & 0xf) != 0)) location += 4; - if (PPCTables::IsValidInstruction(Memory::Read_Instruction(location))) + if (PPCTables::IsValidInstruction(PowerPC::HostRead_Instruction(location))) { //check if this function is already mapped Symbol *f = func_db->AddFunction(location); @@ -649,176 +649,151 @@ u32 PPCAnalyzer::Analyze(u32 address, CodeBlock *block, CodeBuffer *buffer, u32 block->m_num_instructions = 0; block->m_gqr_used = BitSet8(0); - if (address == 0) - { - // Memory exception occurred during instruction fetch - block->m_memory_exception = true; - return address; - } - - bool virtualAddr = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU && (address & JIT_ICACHE_VMEM_BIT); - if (virtualAddr) - { - if (!Memory::TranslateAddress(address)) - { - // Memory exception occurred during instruction fetch - block->m_memory_exception = true; - return address; - } - } - CodeOp *code = buffer->codebuffer; bool found_exit = false; u32 return_address = 0; u32 numFollows = 0; u32 num_inst = 0; + bool prev_inst_from_bat = true; for (u32 i = 0; i < blockSize; ++i) { - UGeckoInstruction inst = JitInterface::ReadOpcodeJIT(address); - - if (inst.hex != 0) + auto result = PowerPC::TryReadInstruction(address); + if (!result.valid) { - // Slight hack: the JIT block cache currently assumes all blocks end at the same place, - // but broken blocks due to page faults break this assumption. Avoid this by just ending - // all virtual memory instruction blocks at page boundaries. - // FIXME: improve the JIT block cache so we don't need to do this. - if (virtualAddr && i > 0 && (address & 0xfff) == 0) - { - break; - } - - num_inst++; - memset(&code[i], 0, sizeof(CodeOp)); - GekkoOPInfo *opinfo = GetOpInfo(inst); - if (!opinfo) - { - PanicAlert("Invalid PowerPC opcode: %x.", inst.hex); - Crash(); - } - - code[i].opinfo = opinfo; - code[i].address = address; - code[i].inst = inst; - code[i].branchTo = -1; - code[i].branchToIndex = -1; - code[i].skip = false; - block->m_stats->numCycles += opinfo->numCycles; - - SetInstructionStats(block, &code[i], opinfo, i); - - bool follow = false; - u32 destination = 0; - - bool conditional_continue = false; - - // Do we inline leaf functions? - if (HasOption(OPTION_LEAF_INLINE)) - { - if (inst.OPCD == 18 && blockSize > 1) - { - //Is bx - should we inline? yes! - if (inst.AA) - destination = SignExt26(inst.LI << 2); - else - destination = address + SignExt26(inst.LI << 2); - if (destination != block->m_address) - follow = true; - } - else if (inst.OPCD == 19 && inst.SUBOP10 == 16 && - (inst.BO & (1 << 4)) && (inst.BO & (1 << 2)) && - return_address != 0) - { - // bclrx with unconditional branch = return - follow = true; - destination = return_address; - return_address = 0; - - if (inst.LK) - return_address = address + 4; - } - else if (inst.OPCD == 31 && inst.SUBOP10 == 467) - { - // mtspr - const u32 index = (inst.SPRU << 5) | (inst.SPRL & 0x1F); - if (index == SPR_LR) - { - // We give up to follow the return address - // because we have to check the register usage. - return_address = 0; - } - } - - // TODO: Find the optimal value for FUNCTION_FOLLOWING_THRESHOLD. - // If it is small, the performance will be down. - // If it is big, the size of generated code will be big and - // cache clearning will happen many times. - // TODO: Investivate the reason why - // "0" is fastest in some games, MP2 for example. - if (numFollows > FUNCTION_FOLLOWING_THRESHOLD) - follow = false; - } - - if (HasOption(OPTION_CONDITIONAL_CONTINUE)) - { - if (inst.OPCD == 16 && - ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0)) - { - // bcx with conditional branch - conditional_continue = true; - } - else if (inst.OPCD == 19 && inst.SUBOP10 == 16 && - ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0)) - { - // bclrx with conditional branch - conditional_continue = true; - } - else if (inst.OPCD == 3 || - (inst.OPCD == 31 && inst.SUBOP10 == 4)) - { - // tw/twi tests and raises an exception - conditional_continue = true; - } - else if (inst.OPCD == 19 && inst.SUBOP10 == 528 && - (inst.BO_2 & BO_DONT_CHECK_CONDITION) == 0) - { - // Rare bcctrx with conditional branch - // Seen in NES games - conditional_continue = true; - } - } - - if (!follow) - { - address += 4; - if (!conditional_continue && opinfo->flags & FL_ENDBLOCK) //right now we stop early - { - found_exit = true; - break; - } - } - // XXX: We don't support inlining yet. -#if 0 - else - { - numFollows++; - // We don't "code[i].skip = true" here - // because bx may store a certain value to the link register. - // Instead, we skip a part of bx in Jit**::bx(). - address = destination; - merged_addresses[size_of_merged_addresses++] = address; - } -#endif - } - else - { - // ISI exception or other critical memory exception occured (game over) - // We can continue on in MMU mode though, so don't spam this error in that case. - if (!virtualAddr) - ERROR_LOG(DYNA_REC, "Instruction hex was 0!"); + if (i == 0) + block->m_memory_exception = true; break; } + UGeckoInstruction inst = result.hex; + + // Slight hack: the JIT block cache currently assumes all blocks end at the same place, + // but broken blocks due to page faults break this assumption. Avoid this by just ending + // all virtual memory instruction blocks at page boundaries. + // FIXME: improve the JIT block cache so we don't need to do this. + if ((!result.from_bat || !prev_inst_from_bat) && i > 0 && (address & 0xfff) == 0) + { + break; + } + prev_inst_from_bat = result.from_bat; + + num_inst++; + memset(&code[i], 0, sizeof(CodeOp)); + GekkoOPInfo *opinfo = GetOpInfo(inst); + + code[i].opinfo = opinfo; + code[i].address = address; + code[i].inst = inst; + code[i].branchTo = -1; + code[i].branchToIndex = -1; + code[i].skip = false; + block->m_stats->numCycles += opinfo->numCycles; + + SetInstructionStats(block, &code[i], opinfo, i); + + bool follow = false; + u32 destination = 0; + + bool conditional_continue = false; + + // Do we inline leaf functions? + if (HasOption(OPTION_LEAF_INLINE)) + { + if (inst.OPCD == 18 && blockSize > 1) + { + //Is bx - should we inline? yes! + if (inst.AA) + destination = SignExt26(inst.LI << 2); + else + destination = address + SignExt26(inst.LI << 2); + if (destination != block->m_address) + follow = true; + } + else if (inst.OPCD == 19 && inst.SUBOP10 == 16 && + (inst.BO & (1 << 4)) && (inst.BO & (1 << 2)) && + return_address != 0) + { + // bclrx with unconditional branch = return + follow = true; + destination = return_address; + return_address = 0; + + if (inst.LK) + return_address = address + 4; + } + else if (inst.OPCD == 31 && inst.SUBOP10 == 467) + { + // mtspr + const u32 index = (inst.SPRU << 5) | (inst.SPRL & 0x1F); + if (index == SPR_LR) + { + // We give up to follow the return address + // because we have to check the register usage. + return_address = 0; + } + } + + // TODO: Find the optimal value for FUNCTION_FOLLOWING_THRESHOLD. + // If it is small, the performance will be down. + // If it is big, the size of generated code will be big and + // cache clearning will happen many times. + // TODO: Investivate the reason why + // "0" is fastest in some games, MP2 for example. + if (numFollows > FUNCTION_FOLLOWING_THRESHOLD) + follow = false; + } + + if (HasOption(OPTION_CONDITIONAL_CONTINUE)) + { + if (inst.OPCD == 16 && + ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0)) + { + // bcx with conditional branch + conditional_continue = true; + } + else if (inst.OPCD == 19 && inst.SUBOP10 == 16 && + ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0)) + { + // bclrx with conditional branch + conditional_continue = true; + } + else if (inst.OPCD == 3 || + (inst.OPCD == 31 && inst.SUBOP10 == 4)) + { + // tw/twi tests and raises an exception + conditional_continue = true; + } + else if (inst.OPCD == 19 && inst.SUBOP10 == 528 && + (inst.BO_2 & BO_DONT_CHECK_CONDITION) == 0) + { + // Rare bcctrx with conditional branch + // Seen in NES games + conditional_continue = true; + } + } + + if (!follow) + { + address += 4; + if (!conditional_continue && opinfo->flags & FL_ENDBLOCK) //right now we stop early + { + found_exit = true; + break; + } + } + // XXX: We don't support inlining yet. +#if 0 + else + { + numFollows++; + // We don't "code[i].skip = true" here + // because bx may store a certain value to the link register. + // Instead, we skip a part of bx in Jit**::bx(). + address = destination; + merged_addresses[size_of_merged_addresses++] = address; + } +#endif } block->m_num_instructions = num_inst; diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp index 28e006f7b..313bb26bc 100644 --- a/Source/Core/Core/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/PowerPC/PPCCache.cpp @@ -100,7 +100,7 @@ namespace PowerPC u32 InstructionCache::ReadInstruction(u32 addr) { if (!HID0.ICE) // instruction cache is disabled - return Memory::ReadUnchecked_U32(addr); + return Memory::Read_U32(addr); u32 set = (addr >> 5) & 0x7f; u32 tag = addr >> 12; @@ -121,7 +121,7 @@ namespace PowerPC if (t == 0xff) // load to the cache { if (HID0.ILOCK) // instruction cache is locked - return Memory::ReadUnchecked_U32(addr); + return Memory::Read_U32(addr); // select a way if (valid[set] != 0xff) t = way_from_valid[valid[set]]; diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index 55d9cb1e5..9e779d8e3 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -86,7 +86,7 @@ void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const std::string& nam Symbol *PPCSymbolDB::GetSymbolFromAddr(u32 addr) { - if (!Memory::IsRAMAddress(addr)) + if (!PowerPC::HostIsRAMAddress(addr)) return nullptr; XFuncMap::iterator it = functions.find(addr); @@ -333,11 +333,11 @@ bool PPCSymbolDB::LoadMap(const std::string& filename, bool bad) if (!good) { // check for BLR before function - u32 opcode = Memory::Read_Instruction(vaddress - 4); + u32 opcode = PowerPC::HostRead_Instruction(vaddress - 4); if (opcode == 0x4e800020) { // check for BLR at end of function - opcode = Memory::Read_Instruction(vaddress + size - 4); + opcode = PowerPC::HostRead_Instruction(vaddress + size - 4); if (opcode == 0x4e800020) good = true; } diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index ab413a534..684d68190 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -11,6 +11,7 @@ #include "Common/StringUtil.h" #include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_Tables.h" @@ -93,68 +94,20 @@ Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst) namespace PPCTables { -bool UsesFPU(UGeckoInstruction _inst) +bool UsesFPU(UGeckoInstruction inst) { - switch (_inst.OPCD) - { - case 04: // PS - return _inst.SUBOP10 != 1014; + GekkoOPInfo* const info = GetOpInfo(inst); - case 48: // lfs - case 49: // lfsu - case 50: // lfd - case 51: // lfdu - case 52: // stfs - case 53: // stfsu - case 54: // stfd - case 55: // stfdu - case 56: // psq_l - case 57: // psq_lu - - case 59: // FPU-sgl - case 60: // psq_st - case 61: // psq_stu - case 63: // FPU-dbl - return true; - - case 31: - switch (_inst.SUBOP10) - { - case 535: - case 567: - case 599: - case 631: - case 663: - case 695: - case 727: - case 759: - case 983: - return true; - default: - return false; - } - default: - return false; - } + return (info->flags & FL_USE_FPU) != 0; } void InitTables(int cpu_core) { // Interpreter ALWAYS needs to be initialized InterpreterTables::InitTables(); - switch (cpu_core) - { - case 0: - { - // Interpreter - break; - } - default: - { - JitInterface::InitTables(cpu_core); - break; - } - } + + if (cpu_core != PowerPC::CORE_INTERPRETER) + JitInterface::InitTables(cpu_core); } #define OPLOG diff --git a/Source/Core/Core/PowerPC/PPCTables.h b/Source/Core/Core/PowerPC/PPCTables.h index ea6c2ac97..a28bc4b68 100644 --- a/Source/Core/Core/PowerPC/PPCTables.h +++ b/Source/Core/Core/PowerPC/PPCTables.h @@ -7,50 +7,51 @@ #include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/Interpreter/Interpreter.h" +// Flags that indicate what an instruction can do. enum { - FL_SET_CR0 = (1<<0), // - FL_SET_CR1 = (1<<1), // - FL_SET_CRn = (1<<2), // - FL_SET_CRx = FL_SET_CR0 | FL_SET_CR1 | FL_SET_CRn, // - FL_SET_CA = (1<<3), // carry - FL_READ_CA = (1<<4), // carry - FL_RC_BIT = (1<<5), - FL_RC_BIT_F = (1<<6), - FL_ENDBLOCK = (1<<7), - FL_IN_A = (1<<8), - FL_IN_A0 = (1<<9), - FL_IN_B = (1<<10), - FL_IN_C = (1<<11), - FL_IN_S = (1<<12), + FL_SET_CR0 = (1<<0), // Sets CR0. + FL_SET_CR1 = (1<<1), // Sets CR1. + FL_SET_CRn = (1<<2), // Encoding decides which CR can be set. + FL_SET_CRx = FL_SET_CR0 | FL_SET_CR1 | FL_SET_CRn, + FL_SET_CA = (1<<3), // Sets the carry flag. + FL_READ_CA = (1<<4), // Reads the carry flag. + FL_RC_BIT = (1<<5), // Sets the record bit. + FL_RC_BIT_F = (1<<6), // Sets the record bit. Used for floating point instructions that do this. + FL_ENDBLOCK = (1<<7), // Specifies that the instruction can be used as an exit point for a JIT block. + FL_IN_A = (1<<8), // Uses rA as an input. + FL_IN_A0 = (1<<9), // Uses rA as an input. Indicates that if rA is zero, the value zero is used, not the contents of r0. + FL_IN_B = (1<<10), // Uses rB as an input. + FL_IN_C = (1<<11), // Uses rC as an input. + FL_IN_S = (1<<12), // Uses rS as an input. FL_IN_AB = FL_IN_A | FL_IN_B, FL_IN_AC = FL_IN_A | FL_IN_C, FL_IN_ABC = FL_IN_A | FL_IN_B | FL_IN_C, FL_IN_SB = FL_IN_S | FL_IN_B, FL_IN_A0B = FL_IN_A0 | FL_IN_B, FL_IN_A0BC = FL_IN_A0 | FL_IN_B | FL_IN_C, - FL_OUT_D = (1<<13), - FL_OUT_S = FL_OUT_D, - FL_OUT_A = (1<<14), + FL_OUT_D = (1<<13), // rD is used as a destination. + FL_OUT_S = FL_OUT_D, // rS is used as a destination. + FL_OUT_A = (1<<14), // rA is used as a destination. FL_OUT_AD = FL_OUT_A | FL_OUT_D, - FL_TIMER = (1<<15), - FL_CHECKEXCEPTIONS = (1<<16), - FL_EVIL = (1<<17), - FL_USE_FPU = (1<<18), - FL_LOADSTORE = (1<<19), - FL_SET_FPRF = (1<<20), - FL_READ_FPRF = (1<<21), - FL_SET_OE = (1<<22), - FL_IN_FLOAT_A = (1<<23), - FL_IN_FLOAT_B = (1<<24), - FL_IN_FLOAT_C = (1<<25), - FL_IN_FLOAT_S = (1<<26), - FL_IN_FLOAT_D = (1<<27), + FL_TIMER = (1<<15), // Used only for mftb. + FL_CHECKEXCEPTIONS = (1<<16), // Used with rfi/rfid. + FL_EVIL = (1<<17), // Historically used to refer to instructions that messed up Super Monkey Ball. + FL_USE_FPU = (1<<18), // Used to indicate a floating point instruction. + FL_LOADSTORE = (1<<19), // Used to indicate a load/store instruction. + FL_SET_FPRF = (1<<20), // Sets bits in the FPRF. + FL_READ_FPRF = (1<<21), // Reads bits from the FPRF. + FL_SET_OE = (1<<22), // Sets the overflow flag. + FL_IN_FLOAT_A = (1<<23), // frA is used as an input. + FL_IN_FLOAT_B = (1<<24), // frB is used as an input. + FL_IN_FLOAT_C = (1<<25), // frC is used as an input. + FL_IN_FLOAT_S = (1<<26), // frS is used as an input. + FL_IN_FLOAT_D = (1<<27), // frD is used as an input. FL_IN_FLOAT_AB = FL_IN_FLOAT_A | FL_IN_FLOAT_B, FL_IN_FLOAT_AC = FL_IN_FLOAT_A | FL_IN_FLOAT_C, FL_IN_FLOAT_ABC = FL_IN_FLOAT_A | FL_IN_FLOAT_B | FL_IN_FLOAT_C, - FL_OUT_FLOAT_D = (1<<28), - FL_OUT_FLOAT_S = (1<<29), + FL_OUT_FLOAT_D = (1<<28), // frD is used as a destination. + FL_OUT_FLOAT_S = (1<<29), // frS is used as a destination. // Used in the case of double ops (they don't modify the top half of the output) FL_INOUT_FLOAT_D = FL_IN_FLOAT_D | FL_OUT_FLOAT_D, }; @@ -80,20 +81,6 @@ enum OPTYPE_UNKNOWN , }; -enum -{ - OPCD_HLEFUNCTION = 1, - OPCD_COMPILEDBLOCK = 2, - OPCD_BCx = 16, - OPCD_SC = 17, - OPCD_Bx = 18, -}; - -enum -{ - OP_BLR = 0x4e800020, -}; - struct GekkoOPInfo { const char *opname; @@ -118,8 +105,6 @@ extern int m_numInstructions; GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst); Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst); -class cJit64; - namespace PPCTables { diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index fca69f7bc..ce69bd7d0 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Atomic.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/FPURoundMode.h" @@ -144,18 +143,17 @@ void Init(int cpu_core) switch (cpu_core) { - case 0: + case PowerPC::CORE_INTERPRETER: + cpu_core_base = interpreter; + break; + + default: + cpu_core_base = JitInterface::InitJitCore(cpu_core); + if (!cpu_core_base) // Handle Situations where JIT core isn't available { + WARN_LOG(POWERPC, "Jit core %d not available. Defaulting to interpreter.", cpu_core); cpu_core_base = interpreter; - break; } - default: - cpu_core_base = JitInterface::InitJitCore(cpu_core); - if (!cpu_core_base) // Handle Situations where JIT core isn't available - { - WARN_LOG(POWERPC, "Jit core %d not available. Defaulting to interpreter.", cpu_core); - cpu_core_base = interpreter; - } break; } @@ -311,7 +309,6 @@ void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst) void CheckExceptions() { - // Read volatile data once u32 exceptions = ppcState.Exceptions; // Example procedure: @@ -341,7 +338,7 @@ void CheckExceptions() PC = NPC = 0x00000400; INFO_LOG(POWERPC, "EXCEPTION_ISI"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_ISI); + ppcState.Exceptions &= ~EXCEPTION_ISI; } else if (exceptions & EXCEPTION_PROGRAM) { @@ -353,7 +350,7 @@ void CheckExceptions() PC = NPC = 0x00000700; INFO_LOG(POWERPC, "EXCEPTION_PROGRAM"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_PROGRAM); + ppcState.Exceptions &= ~EXCEPTION_PROGRAM; } else if (exceptions & EXCEPTION_SYSCALL) { @@ -364,7 +361,7 @@ void CheckExceptions() PC = NPC = 0x00000C00; INFO_LOG(POWERPC, "EXCEPTION_SYSCALL (PC=%08x)", PC); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_SYSCALL); + ppcState.Exceptions &= ~EXCEPTION_SYSCALL; } else if (exceptions & EXCEPTION_FPU_UNAVAILABLE) { @@ -376,7 +373,7 @@ void CheckExceptions() PC = NPC = 0x00000800; INFO_LOG(POWERPC, "EXCEPTION_FPU_UNAVAILABLE"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_FPU_UNAVAILABLE); + ppcState.Exceptions &= ~EXCEPTION_FPU_UNAVAILABLE; } else if (exceptions & EXCEPTION_DSI) { @@ -388,7 +385,7 @@ void CheckExceptions() //DSISR and DAR regs are changed in GenerateDSIException() INFO_LOG(POWERPC, "EXCEPTION_DSI"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_DSI); + ppcState.Exceptions &= ~EXCEPTION_DSI; } else if (exceptions & EXCEPTION_ALIGNMENT) { @@ -403,7 +400,7 @@ void CheckExceptions() //TODO crazy amount of DSISR options to check out INFO_LOG(POWERPC, "EXCEPTION_ALIGNMENT"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_ALIGNMENT); + ppcState.Exceptions &= ~EXCEPTION_ALIGNMENT; } // EXTERNAL INTERRUPT @@ -419,7 +416,7 @@ void CheckExceptions() PC = NPC = 0x00000500; INFO_LOG(POWERPC, "EXCEPTION_EXTERNAL_INT"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_EXTERNAL_INT); + ppcState.Exceptions &= ~EXCEPTION_EXTERNAL_INT; _dbg_assert_msg_(POWERPC, (SRR1 & 0x02) != 0, "EXTERNAL_INT unrecoverable???"); } @@ -432,7 +429,7 @@ void CheckExceptions() PC = NPC = 0x00000F00; INFO_LOG(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_PERFORMANCE_MONITOR); + ppcState.Exceptions &= ~EXCEPTION_PERFORMANCE_MONITOR; } else if (exceptions & EXCEPTION_DECREMENTER) { @@ -443,14 +440,13 @@ void CheckExceptions() PC = NPC = 0x00000900; INFO_LOG(POWERPC, "EXCEPTION_DECREMENTER"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_DECREMENTER); + ppcState.Exceptions &= ~EXCEPTION_DECREMENTER; } } } void CheckExternalExceptions() { - // Read volatile data once u32 exceptions = ppcState.Exceptions; // EXTERNAL INTERRUPT @@ -466,7 +462,7 @@ void CheckExternalExceptions() PC = NPC = 0x00000500; INFO_LOG(POWERPC, "EXCEPTION_EXTERNAL_INT"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_EXTERNAL_INT); + ppcState.Exceptions &= ~EXCEPTION_EXTERNAL_INT; _dbg_assert_msg_(POWERPC, (SRR1 & 0x02) != 0, "EXTERNAL_INT unrecoverable???"); } @@ -479,7 +475,7 @@ void CheckExternalExceptions() PC = NPC = 0x00000F00; INFO_LOG(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_PERFORMANCE_MONITOR); + ppcState.Exceptions &= ~EXCEPTION_PERFORMANCE_MONITOR; } else if (exceptions & EXCEPTION_DECREMENTER) { @@ -490,7 +486,7 @@ void CheckExternalExceptions() PC = NPC = 0x00000900; INFO_LOG(POWERPC, "EXCEPTION_DECREMENTER"); - Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_DECREMENTER); + ppcState.Exceptions &= ~EXCEPTION_DECREMENTER; } else { diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index 5ac0d802a..ba613941a 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -21,6 +21,15 @@ extern CPUCoreBase *cpu_core_base; namespace PowerPC { +enum +{ + CORE_INTERPRETER, + CORE_JIT64, + CORE_JITIL64, + CORE_JITARM, + CORE_JITARM64 +}; + enum CoreMode { MODE_INTERPRETER, @@ -73,7 +82,7 @@ struct GC_ALIGNED64(PowerPCState) u32 fpscr; // floating point flags/status bits // Exception management. - volatile u32 Exceptions; + u32 Exceptions; // Downcount for determining when we need to do timing // This isn't quite the right location for it, but it is here to accelerate the ARM JIT @@ -192,6 +201,75 @@ void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst); #define riPS0(i) (*(u64*)(&PowerPC::ppcState.ps[i][0])) #define riPS1(i) (*(u64*)(&PowerPC::ppcState.ps[i][1])) +// Routines for debugger UI, cheats, etc. to access emulated memory from the +// perspective of the CPU. Not for use by core emulation routines. +// Use "Host_" prefix. +u8 HostRead_U8(const u32 address); +u16 HostRead_U16(const u32 address); +u32 HostRead_U32(const u32 address); +u32 HostRead_Instruction(const u32 address); + +void HostWrite_U8(const u8 var, const u32 address); +void HostWrite_U16(const u16 var, const u32 address); +void HostWrite_U32(const u32 var, const u32 address); +void HostWrite_U64(const u64 var, const u32 address); + +// Returns whether a read or write to the given address will resolve to a RAM +// access given the current CPU state. +bool HostIsRAMAddress(const u32 address); + +std::string HostGetString(u32 em_address, size_t size = 0); + +// Routines for the CPU core to access memory. + +// Used by interpreter to read instructions, uses iCache +u32 Read_Opcode(const u32 address); +struct TryReadInstResult +{ + bool valid; + bool from_bat; + u32 hex; +}; +TryReadInstResult TryReadInstruction(const u32 address); + +u8 Read_U8(const u32 address); +u16 Read_U16(const u32 address); +u32 Read_U32(const u32 address); +u64 Read_U64(const u32 address); + +// Useful helper functions, used by ARM JIT +float Read_F32(const u32 address); +double Read_F64(const u32 address); + +// used by JIT. Return zero-extended 32bit values +u32 Read_U8_ZX(const u32 address); +u32 Read_U16_ZX(const u32 address); + +void Write_U8(const u8 var, const u32 address); +void Write_U16(const u16 var, const u32 address); +void Write_U32(const u32 var, const u32 address); +void Write_U64(const u64 var, const u32 address); + +void Write_U16_Swap(const u16 var, const u32 address); +void Write_U32_Swap(const u32 var, const u32 address); +void Write_U64_Swap(const u64 var, const u32 address); + +// Useful helper functions, used by ARM JIT +void Write_F64(const double var, const u32 address); + +void DMA_LCToMemory(const u32 memAddr, const u32 cacheAddr, const u32 numBlocks); +void DMA_MemoryToLC(const u32 cacheAddr, const u32 memAddr, const u32 numBlocks); +void ClearCacheLine(const u32 address); // Zeroes 32 bytes; address should be 32-byte-aligned + +// TLB functions +void SDRUpdated(); +void InvalidateTLBEntry(u32 address); + +// Result changes based on the BAT registers and MSR.DR. Returns whether +// it's safe to optimize a read or write to this address to an unguarded +// memory access. Does not consider page tables. +bool IsOptimizableRAMAddress(const u32 address); + } // namespace enum CRBits diff --git a/Source/Core/Core/PowerPC/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB.cpp index d20a041e5..1a960e374 100644 --- a/Source/Core/Core/PowerPC/SignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB.cpp @@ -150,7 +150,7 @@ void SignatureDB::Initialize(PPCSymbolDB *symbol_db, const std::string& prefix) u32 sum = 0; for (u32 offset = offsetStart; offset <= offsetEnd; offset += 4) { - u32 opcode = Memory::Read_Instruction(offset); + u32 opcode = PowerPC::HostRead_Instruction(offset); u32 op = opcode & 0xFC000000; u32 op2 = 0; u32 op3 = 0; diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 2b3ce95e0..16a86a9c1 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -64,7 +64,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 39; +static const u32 STATE_VERSION = 40; enum { @@ -176,7 +176,8 @@ static int GetEmptySlot(std::map m) break; } } - if (!found) return i; + if (!found) + return i; } return -1; } diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 74427c95a..bd3a05806 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -316,8 +316,9 @@ bool DecompressBlobToFile(const std::string& infile, const std::string& outfile, const CompressedBlobHeader &header = reader->GetHeader(); static const size_t BUFFER_BLOCKS = 32; size_t buffer_size = header.block_size * BUFFER_BLOCKS; + size_t last_buffer_size = header.block_size * (header.num_blocks % BUFFER_BLOCKS); std::vector buffer(buffer_size); - u32 num_buffers = header.num_blocks / BUFFER_BLOCKS; + u32 num_buffers = (header.num_blocks + BUFFER_BLOCKS - 1) / BUFFER_BLOCKS; int progress_monitor = std::max(1, num_buffers / 100); bool was_cancelled = false; @@ -329,8 +330,9 @@ bool DecompressBlobToFile(const std::string& infile, const std::string& outfile, if (was_cancelled) break; } - reader->Read(i * buffer_size, buffer_size, buffer.data()); - f.WriteBytes(buffer.data(), buffer_size); + const size_t sz = i == num_buffers - 1 ? last_buffer_size : buffer_size; + reader->Read(i * buffer_size, sz, buffer.data()); + f.WriteBytes(buffer.data(), sz); } if (was_cancelled) diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 3cb115bf7..4330bfc5d 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -28,7 +28,6 @@ public: return std::unique_ptr(); } virtual std::string GetUniqueID() const = 0; - virtual std::string GetRevisionSpecificUniqueID() const { return ""; } virtual std::string GetMakerID() const = 0; virtual int GetRevision() const { return 0; } // TODO: eliminate? diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 984a82ce3..7d09fc234 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -56,11 +56,6 @@ std::string CVolumeGC::GetUniqueID() const return ID; } -std::string CVolumeGC::GetRevisionSpecificUniqueID() const -{ - return GetUniqueID() + StringFromFormat("r%d", GetRevision()); -} - IVolume::ECountry CVolumeGC::GetCountry() const { if (!m_pReader) diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h index bc79e535c..fef6a8ae6 100644 --- a/Source/Core/DiscIO/VolumeGC.h +++ b/Source/Core/DiscIO/VolumeGC.h @@ -25,7 +25,6 @@ public: ~CVolumeGC(); bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override; std::string GetUniqueID() const override; - std::string GetRevisionSpecificUniqueID() const override; std::string GetMakerID() const override; int GetRevision() const override; std::vector GetNames() const override; diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 13fecce31..0e1f0c79b 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -103,6 +103,17 @@ bool CVolumeWAD::GetTitleID(u8* _pBuffer) const return true; } +int CVolumeWAD::GetRevision() const +{ + u32 TmdOffset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size); + + u16 revision; + if (!m_pReader->Read(TmdOffset + 0x1dc, 2, (u8*)&revision)) + return 0; + + return Common::swap16(revision); +} + bool CVolumeWAD::IsWadFile() const { return true; diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h index 58dc662d7..0a0f45607 100644 --- a/Source/Core/DiscIO/VolumeWad.h +++ b/Source/Core/DiscIO/VolumeWad.h @@ -36,6 +36,7 @@ public: ECountry GetCountry() const override; u64 GetSize() const override; u64 GetRawSize() const override; + int GetRevision() const override; private: std::unique_ptr m_pReader; diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index d956b9444..dad2977ba 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -33,7 +33,7 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, m_LastDecryptedBlockOffset(-1) { aes_setkey_dec(m_AES_ctx.get(), _pVolumeKey, 128); - m_pBuffer = new u8[0x8000]; + m_pBuffer = new u8[s_block_total_size]; } bool CVolumeWiiCrypted::ChangePartition(u64 offset) @@ -47,7 +47,6 @@ bool CVolumeWiiCrypted::ChangePartition(u64 offset) return true; } - CVolumeWiiCrypted::~CVolumeWiiCrypted() { delete[] m_pBuffer; @@ -66,36 +65,42 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer, bool de while (_Length > 0) { - static unsigned char IV[16]; - - // math block offset - u64 Block = _ReadOffset / 0x7C00; - u64 Offset = _ReadOffset % 0x7C00; - - // read current block - if (!m_pReader->Read(m_VolumeOffset + m_dataOffset + Block * 0x8000, 0x8000, m_pBuffer)) - return(false); + // Calculate block offset + u64 Block = _ReadOffset / s_block_data_size; + u64 Offset = _ReadOffset % s_block_data_size; if (m_LastDecryptedBlockOffset != Block) { - memcpy(IV, m_pBuffer + 0x3d0, 16); - aes_crypt_cbc(m_AES_ctx.get(), AES_DECRYPT, 0x7C00, IV, m_pBuffer + 0x400, m_LastDecryptedBlock); + // Read the current block + if (!m_pReader->Read(m_VolumeOffset + m_dataOffset + Block * s_block_total_size, s_block_total_size, m_pBuffer)) + return false; + // Decrypt the block's data. + // 0x3D0 - 0x3DF in m_pBuffer will be overwritten, + // but that won't affect anything, because we won't + // use the content of m_pBuffer anymore after this + aes_crypt_cbc(m_AES_ctx.get(), AES_DECRYPT, s_block_data_size, m_pBuffer + 0x3D0, + m_pBuffer + s_block_header_size, m_LastDecryptedBlock); m_LastDecryptedBlockOffset = Block; + + // The only thing we currently use from the 0x000 - 0x3FF part + // of the block is the IV (at 0x3D0), but it also contains SHA-1 + // hashes that IOS uses to check that discs aren't tampered with. + // http://wiibrew.org/wiki/Wii_Disc#Encrypted } - // copy the encrypted data - u64 MaxSizeToCopy = 0x7C00 - Offset; + // Copy the decrypted data + u64 MaxSizeToCopy = s_block_data_size - Offset; u64 CopySize = (_Length > MaxSizeToCopy) ? MaxSizeToCopy : _Length; memcpy(_pBuffer, &m_LastDecryptedBlock[Offset], (size_t)CopySize); - // increase buffers + // Update offsets _Length -= CopySize; _pBuffer += CopySize; _ReadOffset += CopySize; } - return(true); + return true; } bool CVolumeWiiCrypted::GetTitleID(u8* _pBuffer) const diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h index 1cca81c41..5e5e1e196 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.h +++ b/Source/Core/DiscIO/VolumeWiiCrypted.h @@ -44,6 +44,10 @@ public: bool ChangePartition(u64 offset) override; private: + static const unsigned int s_block_header_size = 0x0400; + static const unsigned int s_block_data_size = 0x7C00; + static const unsigned int s_block_total_size = s_block_header_size + s_block_data_size; + std::unique_ptr m_pReader; std::unique_ptr m_AES_ctx; @@ -53,7 +57,7 @@ private: u64 m_dataOffset; mutable u64 m_LastDecryptedBlockOffset; - mutable unsigned char m_LastDecryptedBlock[0x8000]; + mutable unsigned char m_LastDecryptedBlock[s_block_data_size]; }; } // namespace diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index 08cb4ec07..7f0a62596 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -40,10 +40,8 @@ WbfsFileReader::WbfsFileReader(const std::string& filename) WbfsFileReader::~WbfsFileReader() { - for (u32 i = 0; i != m_files.size(); ++ i) - { - delete m_files[i]; - } + for (file_entry* entry : m_files) + delete entry; delete[] m_wlba_table; } @@ -58,7 +56,7 @@ bool WbfsFileReader::OpenFiles(const std::string& filename) // Replace last character with index (e.g. wbfs = wbf1) std::string path = filename; - if (0 != m_total_files) + if (m_total_files != 0) { path[path.length() - 1] = '0' + m_total_files; } @@ -73,7 +71,7 @@ bool WbfsFileReader::OpenFiles(const std::string& filename) new_entry->size = new_entry->file.GetSize(); m_size += new_entry->size; - m_total_files ++; + m_total_files++; m_files.push_back(new_entry); } } @@ -90,10 +88,7 @@ bool WbfsFileReader::ReadHeader() m_hd_sector_size = 1ull << m_hd_sector_shift; if (m_size != (m_hd_sector_count * m_hd_sector_size)) - { - //printf("File size doesn't match expected size\n"); return false; - } // Read wbfs cluster info m_files[0]->file.ReadBytes(&m_wbfs_sector_shift, 1); @@ -101,10 +96,7 @@ bool WbfsFileReader::ReadHeader() m_wbfs_sector_count = m_size / m_wbfs_sector_size; if (m_wbfs_sector_size < WII_SECTOR_SIZE) - { - //Setting this too low would case a very large memory allocation return false; - } m_blocks_per_disc = (WII_SECTOR_COUNT * WII_SECTOR_SIZE) / m_wbfs_sector_size; m_disc_info_size = align(WII_DISC_HEADER_SIZE + m_blocks_per_disc * 2, m_hd_sector_size); @@ -113,11 +105,8 @@ bool WbfsFileReader::ReadHeader() m_files[0]->file.Seek(2, SEEK_CUR); m_files[0]->file.ReadBytes(m_disc_table, 500); - if (0 == m_disc_table[0]) - { - //printf("Game must be in 'slot 0'\n"); + if (m_disc_table[0] == 0) return false; - } return true; } @@ -153,7 +142,7 @@ File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available) u64 cluster_offset = offset & (m_wbfs_sector_size - 1); u64 final_address = cluster_address + cluster_offset; - for (u32 i = 0; i != m_total_files; i ++) + for (u32 i = 0; i != m_total_files; i++) { if (final_address < (m_files[i]->base_address + m_files[i]->size)) { diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp index f8601d05e..b5487793a 100644 --- a/Source/Core/DolphinQt/GameList/GameFile.cpp +++ b/Source/Core/DolphinQt/GameList/GameFile.cpp @@ -26,7 +26,7 @@ #include "DolphinQt/Utils/Resources.h" #include "DolphinQt/Utils/Utils.h" -static const u32 CACHE_REVISION = 0x003; +static const u32 CACHE_REVISION = 0x004; static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2 static QStringList VectorToStringList(std::vector vec, bool trim = false) @@ -126,10 +126,7 @@ GameFile::GameFile(const QString& fileName) if (m_valid) { - IniFile ini; - ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_unique_id.toStdString() + ".ini"); - ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_unique_id.toStdString() + ".ini", true); - + IniFile ini = SCoreStartupParameter::LoadGameIni(m_unique_id.toStdString(), m_revision); std::string issues_temp; ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state); ini.GetIfExists("EmuState", "EmulationIssues", &issues_temp); diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 75d7729ea..90fa48abb 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -284,7 +284,7 @@ void DMainWindow::OnOpenDocs() void DMainWindow::OnOpenGitHub() { - QDesktopServices::openUrl(QUrl(SL("https://github.com/dolphin-emu/dolphin/"))); + QDesktopServices::openUrl(QUrl(SL("https://github.com/dolphin-emu/dolphin"))); } void DMainWindow::OnOpenSystemInfo() diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index 19c6742ba..4ab29b068 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -41,7 +41,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, "Today Dolphin is an open source project with many\n" "contributors, too many to list.\n" "If interested, just go check out the project page at\n" - "https://github.com/dolphin-emu/dolphin/ .\n" + "https://github.com/dolphin-emu/dolphin .\n" "\n" "Special thanks to Bushing, Costis, CrowTRobo,\n" "Marcan, Segher, Titanik, or9 and Hotquik for their\n" diff --git a/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp index 8fb895b1c..5b2854686 100644 --- a/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp @@ -159,9 +159,10 @@ void wxCheatsWindow::OnEvent_Close(wxCloseEvent& ev) void wxCheatsWindow::UpdateGUI() { // load code - m_gameini_default = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadDefaultGameIni(); - m_gameini_local = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadLocalGameIni(); - m_gameini_local_path = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal; + SCoreStartupParameter parameters = SConfig::GetInstance().m_LocalCoreStartupParameter; + m_gameini_default = parameters.LoadDefaultGameIni(); + m_gameini_local = parameters.LoadLocalGameIni(); + m_gameini_local_path = File::GetUserPath(D_GAMESETTINGS_IDX) + parameters.GetUniqueID() + ".ini"; Load_ARCodes(); Load_GeckoCodes(); diff --git a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp index 0282b13d8..2c477bb38 100644 --- a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp @@ -63,7 +63,7 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) // button sizer wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL); btn_download = new wxButton(this, wxID_ANY, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1)); - btn_download->Enable(false); + btn_download->Disable(); btn_download->Bind(wxEVT_BUTTON, &CodeConfigPanel::DownloadCodes, this); sizer_buttons->AddStretchSpacer(1); sizer_buttons->Add(btn_download, 1, wxEXPAND); diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index a932b7b2a..5097dcae8 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -32,6 +32,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/HotkeyManager.h" #include "Core/Movie.h" #include "Core/NetPlayProto.h" #include "Core/HW/EXI.h" @@ -40,6 +41,7 @@ #include "Core/HW/DSPHLE/DSPHLE.h" #include "Core/HW/DSPLLE/DSPLLE.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/PowerPC/PowerPC.h" #include "DiscIO/NANDContentLoader.h" @@ -47,10 +49,13 @@ #include "DolphinWX/Frame.h" #include "DolphinWX/Globals.h" #include "DolphinWX/HotkeyDlg.h" +#include "DolphinWX/InputConfigDiag.h" #include "DolphinWX/Main.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/CodeWindow.h" +#include "InputCommon/InputConfig.h" + #include "VideoCommon/VideoBackendBase.h" #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text) @@ -380,22 +385,22 @@ void CConfigMain::InitializeGUIValues() // GameCube - Devices wxArrayString SlotDevices; - SlotDevices.Add(_(DEV_NONE_STR)); - SlotDevices.Add(_(DEV_DUMMY_STR)); - SlotDevices.Add(_(EXIDEV_MEMCARD_STR)); - SlotDevices.Add(_(EXIDEV_MEMDIR_STR)); - SlotDevices.Add(_(EXIDEV_GECKO_STR)); - SlotDevices.Add(_(EXIDEV_AGP_STR)); + SlotDevices.Add(_(DEV_NONE_STR)); + SlotDevices.Add(_(DEV_DUMMY_STR)); + SlotDevices.Add(_(EXIDEV_MEMCARD_STR)); + SlotDevices.Add(_(EXIDEV_MEMDIR_STR)); + SlotDevices.Add(_(EXIDEV_GECKO_STR)); + SlotDevices.Add(_(EXIDEV_AGP_STR)); #if HAVE_PORTAUDIO - SlotDevices.Add(_(EXIDEV_MIC_STR)); + SlotDevices.Add(_(EXIDEV_MIC_STR)); #endif wxArrayString SP1Devices; - SP1Devices.Add(_(DEV_NONE_STR)); - SP1Devices.Add(_(DEV_DUMMY_STR)); - SP1Devices.Add(_(EXIDEV_BBA_STR)); - SP1Devices.Add(_(EXIDEV_AM_BB_STR)); + SP1Devices.Add(_(DEV_NONE_STR)); + SP1Devices.Add(_(DEV_DUMMY_STR)); + SP1Devices.Add(_(EXIDEV_BBA_STR)); + SP1Devices.Add(_(EXIDEV_AM_BB_STR)); for (int i = 0; i < 3; ++i) @@ -614,7 +619,7 @@ void CConfigMain::CreateGUIControls() DSPEngine = new wxRadioBox(AudioPage, ID_DSPENGINE, _("DSP Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_DSPEngine, 0, wxRA_SPECIFY_ROWS); DPL2Decoder = new wxCheckBox(AudioPage, ID_DPL2DECODER, _("Dolby Pro Logic II decoder")); TimeStretching = new wxCheckBox(AudioPage, ID_TIMESTRETCHING, _("Time Stretching")); - VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL | wxSL_INVERSE); + VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE); VolumeText = new wxStaticText(AudioPage, wxID_ANY, ""); BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition, wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString); Latency = new wxSpinCtrl(AudioPage, ID_LATENCY, "", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 30); @@ -636,24 +641,24 @@ void CConfigMain::CreateGUIControls() sbAudioSettings->Add(TimeStretching, 0, wxALL, 5); wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume")); - sbVolume->Add(VolumeSlider, 1, wxLEFT | wxRIGHT, 13); - sbVolume->Add(VolumeText, 0, wxALIGN_CENTER | wxALL, 5); + sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT, 13); + sbVolume->Add(VolumeText, 0, wxALIGN_CENTER|wxALL, 5); wxGridBagSizer *sBackend = new wxGridBagSizer(); - sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); + sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sBackend->Add(BackendSelection, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5); - sBackend->Add(TEXT_BOX(AudioPage, _("Latency:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); + sBackend->Add(TEXT_BOX(AudioPage, _("Latency:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sBackend->Add(Latency, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings")); sbBackend->Add(sBackend, 0, wxEXPAND); wxBoxSizer *sAudio = new wxBoxSizer(wxHORIZONTAL); - sAudio->Add(sbAudioSettings, 1, wxEXPAND | wxALL, 5); - sAudio->Add(sbVolume, 0, wxEXPAND | wxALL, 5); + sAudio->Add(sbAudioSettings, 1, wxEXPAND|wxALL, 5); + sAudio->Add(sbVolume, 0, wxEXPAND|wxALL, 5); sAudioPage = new wxBoxSizer(wxVERTICAL); - sAudioPage->Add(sAudio, 0, wxALL | wxEXPAND); - sAudioPage->Add(sbBackend, 0, wxALL | wxEXPAND, 5); + sAudioPage->Add(sAudio, 0, wxALL|wxEXPAND); + sAudioPage->Add(sbBackend, 0, wxALL|wxEXPAND, 5); AudioPage->SetSizerAndFit(sAudioPage); @@ -663,11 +668,11 @@ void CConfigMain::CreateGUIControls() GCAlwaysHLE_BS2 = new wxCheckBox(GamecubePage, ID_GC_ALWAYS_HLE_BS2, _("Skip BIOS")); if (!File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && - !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && - !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) && - !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) && - !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL) && - !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL)) + !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL)) { GCAlwaysHLE_BS2->Disable(); GCAlwaysHLE_BS2->SetToolTip(_("Put BIOS roms in User/GC/{region}.")); @@ -683,16 +688,16 @@ void CConfigMain::CreateGUIControls() GCEXIDevice[1] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTB); GCEXIDevice[2] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SP1); GCMemcardPath[0] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTA_PATH, "...", - wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); GCMemcardPath[1] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTB_PATH, "...", - wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); // Populate the GameCube page sGamecubeIPLSettings = new wxGridBagSizer(); sGamecubeIPLSettings->Add(GCAlwaysHLE_BS2, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5); sGamecubeIPLSettings->Add(TEXT_BOX(GamecubePage, _("System Language:")), - wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5); - sGamecubeIPLSettings->Add(GCSystemLang, wxGBPosition(1, 1), wxDefaultSpan, wxLEFT | wxRIGHT | wxBOTTOM, 5); + wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); + sGamecubeIPLSettings->Add(GCSystemLang, wxGBPosition(1, 1), wxDefaultSpan, wxLEFT|wxRIGHT|wxBOTTOM, 5); sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, _("IPL Settings")); sbGamecubeIPLSettings->Add(sGamecubeIPLSettings); @@ -701,7 +706,7 @@ void CConfigMain::CreateGUIControls() for (int i = 0; i < 3; ++i) { sbGamecubeEXIDevSettings->Add(GCEXIDeviceText[i], wxGBPosition(i, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - sbGamecubeEXIDevSettings->Add(GCEXIDevice[i], wxGBPosition(i, 1), wxGBSpan(1, (i < 2) ? 1 : 2), wxALIGN_CENTER_VERTICAL); + sbGamecubeEXIDevSettings->Add(GCEXIDevice[i], wxGBPosition(i, 1), wxGBSpan(1, (i < 2)?1:2), wxALIGN_CENTER_VERTICAL); if (i < 2) sbGamecubeEXIDevSettings->Add(GCMemcardPath[i], wxGBPosition(i, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); if (NetPlay::IsNetPlayRunning()) GCEXIDevice[i]->Disable(); @@ -709,8 +714,8 @@ void CConfigMain::CreateGUIControls() sbGamecubeDeviceSettings->Add(sbGamecubeEXIDevSettings, 0, wxALL, 5); sGamecubePage = new wxBoxSizer(wxVERTICAL); - sGamecubePage->Add(sbGamecubeIPLSettings, 0, wxEXPAND | wxALL, 5); - sGamecubePage->Add(sbGamecubeDeviceSettings, 0, wxEXPAND | wxALL, 5); + sGamecubePage->Add(sbGamecubeIPLSettings, 0, wxEXPAND|wxALL, 5); + sGamecubePage->Add(sbGamecubeDeviceSettings, 0, wxEXPAND|wxALL, 5); GamecubePage->SetSizer(sGamecubePage); // Wii page @@ -729,10 +734,10 @@ void CConfigMain::CreateGUIControls() sWiiIPLSettings->Add(WiiScreenSaver, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5); sWiiIPLSettings->Add(WiiPAL60, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5); sWiiIPLSettings->Add(TEXT_BOX(WiiPage, _("Aspect Ratio:")), - wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); + wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sWiiIPLSettings->Add(WiiAspectRatio, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5); sWiiIPLSettings->Add(TEXT_BOX(WiiPage, _("System Language:")), - wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); + wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sWiiIPLSettings->Add(WiiSystemLang, wxGBPosition(3, 1), wxDefaultSpan, wxALL, 5); sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, _("Misc Settings")); sbWiiIPLSettings->Add(sWiiIPLSettings); @@ -742,8 +747,8 @@ void CConfigMain::CreateGUIControls() sbWiiDeviceSettings->Add(WiiKeyboard, 0, wxALL, 5); sWiiPage = new wxBoxSizer(wxVERTICAL); - sWiiPage->Add(sbWiiIPLSettings, 0, wxEXPAND | wxALL, 5); - sWiiPage->Add(sbWiiDeviceSettings, 0, wxEXPAND | wxALL, 5); + sWiiPage->Add(sbWiiIPLSettings, 0, wxEXPAND|wxALL, 5); + sWiiPage->Add(sbWiiDeviceSettings, 0, wxEXPAND|wxALL, 5); WiiPage->SetSizer(sWiiPage); @@ -752,50 +757,50 @@ void CConfigMain::CreateGUIControls() RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, _("Search Subfolders")); AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, _("Add...")); RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, _("Remove")); - RemoveISOPath->Enable(false); + RemoveISOPath->Disable(); DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, _("Choose a default ISO:"), _("All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)") + wxString::Format("|*.elf;*.dol;*.gcm;*.iso;*.wbfs;*.ciso;*.gcz;*.wad|%s", wxGetTranslation(wxALL_FILES)), - wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN); + wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN); DVDRoot = new wxDirPickerCtrl(PathsPage, ID_DVDROOT, wxEmptyString, _("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL); ApploaderPath = new wxFilePickerCtrl(PathsPage, ID_APPLOADERPATH, wxEmptyString, _("Choose file to use as apploader: (applies to discs constructed from directories only)"), _("apploader (.img)") + wxString::Format("|*.img|%s", wxGetTranslation(wxALL_FILES)), - wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN); + wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN); NANDRoot = new wxDirPickerCtrl(PathsPage, ID_NANDROOT, wxEmptyString, _("Choose a NAND root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL); // Populate the settings wxBoxSizer* sISOButtons = new wxBoxSizer(wxHORIZONTAL); - sISOButtons->Add(RecursiveISOPath, 0, wxALL | wxALIGN_CENTER, 0); + sISOButtons->Add(RecursiveISOPath, 0, wxALL|wxALIGN_CENTER, 0); sISOButtons->AddStretchSpacer(); sISOButtons->Add(AddISOPath, 0, wxALL, 0); sISOButtons->Add(RemoveISOPath, 0, wxALL, 0); sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, _("ISO Directories")); - sbISOPaths->Add(ISOPaths, 1, wxEXPAND | wxALL, 0); - sbISOPaths->Add(sISOButtons, 0, wxEXPAND | wxALL, 5); + sbISOPaths->Add(ISOPaths, 1, wxEXPAND|wxALL, 0); + sbISOPaths->Add(sISOButtons, 0, wxEXPAND|wxALL, 5); sOtherPaths = new wxGridBagSizer(); sOtherPaths->Add(TEXT_BOX(PathsPage, _("Default ISO:")), - wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - sOtherPaths->Add(DefaultISO, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND | wxALL, 5); + wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sOtherPaths->Add(DefaultISO, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND|wxALL, 5); sOtherPaths->Add(TEXT_BOX(PathsPage, _("DVD Root:")), - wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - sOtherPaths->Add(DVDRoot, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND | wxALL, 5); + wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sOtherPaths->Add(DVDRoot, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND|wxALL, 5); sOtherPaths->Add(TEXT_BOX(PathsPage, _("Apploader:")), - wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - sOtherPaths->Add(ApploaderPath, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND | wxALL, 5); + wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sOtherPaths->Add(ApploaderPath, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND|wxALL, 5); sOtherPaths->Add(TEXT_BOX(PathsPage, _("Wii NAND Root:")), - wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - sOtherPaths->Add(NANDRoot, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND | wxALL, 5); + wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sOtherPaths->Add(NANDRoot, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND|wxALL, 5); sOtherPaths->AddGrowableCol(1); // Populate the Paths page sPathsPage = new wxBoxSizer(wxVERTICAL); - sPathsPage->Add(sbISOPaths, 1, wxEXPAND | wxALL, 5); - sPathsPage->Add(sOtherPaths, 0, wxEXPAND | wxALL, 5); + sPathsPage->Add(sbISOPaths, 1, wxEXPAND|wxALL, 5); + sPathsPage->Add(sOtherPaths, 0, wxEXPAND|wxALL, 5); PathsPage->SetSizer(sPathsPage); wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL); - sMain->Add(Notebook, 1, wxEXPAND | wxALL, 5); + sMain->Add(Notebook, 1, wxEXPAND|wxALL, 5); sMain->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); wxStaticBoxSizer* sbCPUOptions = new wxStaticBoxSizer(wxVERTICAL, AdvancedPage, _("CPU Options")); @@ -805,14 +810,14 @@ void CConfigMain::CreateGUIControls() EnableOC = new wxCheckBox(AdvancedPage, ID_ENABLEOVERCLOCK, _("Enable CPU Clock Override")); OCSlider = new wxSlider(AdvancedPage, ID_OVERCLOCK, 100, 0, 150, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); wxStaticText* OCDescription = new wxStaticText(AdvancedPage, wxID_ANY, - _("Higher values can make variable-framerate games\n" - "run at a higher framerate, at the expense of CPU.\n" - "Lower values can make variable-framerate games\n" - "run at a lower framerate, saving CPU.\n\n" - "WARNING: Changing this from the default (100%)\n" - "can and will break games and cause glitches.\n" - "Do so at your own risk. Please do not report\n" - "bugs that occur with a non-default clock.\n")); + _("Higher values can make variable-framerate games\n" + "run at a higher framerate, at the expense of CPU.\n" + "Lower values can make variable-framerate games\n" + "run at a lower framerate, saving CPU.\n\n" + "WARNING: Changing this from the default (100%)\n" + "can and will break games and cause glitches.\n" + "Do so at your own risk. Please do not report\n" + "bugs that occur with a non-default clock.\n")); OCText = new wxStaticText(AdvancedPage, wxID_ANY, ""); bOverclockEnable->Add(EnableOC); bOverclock->Add(OCSlider, 1, wxALL, 5); @@ -835,12 +840,12 @@ void CConfigMain::CreateGUIControls() SetFocus(); } -void CConfigMain::OnClose(wxCloseEvent& WXUNUSED(event)) +void CConfigMain::OnClose(wxCloseEvent& WXUNUSED (event)) { EndModal((bRefreshList) ? wxID_OK : wxID_CANCEL); } -void CConfigMain::OnOk(wxCommandEvent& WXUNUSED(event)) +void CConfigMain::OnOk(wxCommandEvent& WXUNUSED (event)) { Close(); @@ -863,7 +868,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) switch (event.GetId()) { - // Core - Basic + // Core - Basic case ID_CPUTHREAD: if (Core::IsRunning()) return; @@ -878,12 +883,12 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) case ID_FRAMELIMIT: SConfig::GetInstance().m_Framelimit = Framelimit->GetSelection(); break; - // Core - Advanced + // Core - Advanced case ID_CPUENGINE: startup_params.iCPUCore = CPUCores[CPUEngine->GetSelection()].CPUid; if (main_frame->g_pCodeWindow) { - bool using_interp = (startup_params.iCPUCore == SCoreStartupParameter::CORE_INTERPRETER); + bool using_interp = (startup_params.iCPUCore == PowerPC::CORE_INTERPRETER); main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, using_interp); } break; @@ -908,7 +913,7 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event) { switch (event.GetId()) { - // Display - Interface + // Display - Interface case ID_INTERFACE_CONFIRMSTOP: SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop = ConfirmStop->IsChecked(); break; @@ -926,13 +931,38 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_InterfaceLanguage = langIds[InterfaceLang->GetSelection()]; break; case ID_HOTKEY_CONFIG: - { - HotkeyConfigDialog m_HotkeyDialog(this); - m_HotkeyDialog.ShowModal(); - } - // Update the GUI in case menu accelerators were changed - main_frame->UpdateGUI(); - break; + { + bool was_init = false; + + InputConfig* const hotkey_plugin = HotkeyManagerEmu::GetConfig(); + + // check if game is running + if (g_controller_interface.IsInit()) + { + was_init = true; + } + else + { +#if defined(HAVE_X11) && HAVE_X11 + Window win = X11Utils::XWindowFromHandle(GetHandle()); + HotkeyManagerEmu::Initialize(reinterpret_cast(win)); +#else + HotkeyManagerEmu::Initialize(reinterpret_cast(GetHandle())); +#endif + } + + InputConfigDialog m_ConfigFrame(this, *hotkey_plugin, _("Dolphin Hotkeys")); + m_ConfigFrame.ShowModal(); + + // if game isn't running + if (!was_init) + { + HotkeyManagerEmu::Shutdown(); + } + } + // Update the GUI in case menu accelerators were changed + main_frame->UpdateGUI(); + break; } } @@ -995,8 +1025,8 @@ bool CConfigMain::SupportsVolumeChanges(std::string backend) // too much just to enable/disable a stupid slider... return (backend == BACKEND_DIRECTSOUND || backend == BACKEND_COREAUDIO || - backend == BACKEND_OPENAL || - backend == BACKEND_XAUDIO2); + backend == BACKEND_OPENAL || + backend == BACKEND_XAUDIO2); } @@ -1007,16 +1037,16 @@ void CConfigMain::GCSettingsChanged(wxCommandEvent& event) int exidevice = 0; switch (event.GetId()) { - // GameCube - IPL + // GameCube - IPL case ID_GC_SRAM_LNG: SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage = GCSystemLang->GetSelection(); bRefreshList = true; break; - // GameCube - IPL Settings + // GameCube - IPL Settings case ID_GC_ALWAYS_HLE_BS2: SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2 = GCAlwaysHLE_BS2->IsChecked(); break; - // GameCube - Devices + // GameCube - Devices case ID_GC_EXIDEVICE_SP1: exidevice++; case ID_GC_EXIDEVICE_SLOTB: @@ -1081,6 +1111,7 @@ void CConfigMain::ChooseSlotPath(bool isSlotA, TEXIDevices device_type) filename = "./" + filename; } } + std::replace(filename.begin(), filename.end(), '\\', '/'); #endif // also check that the path isn't used for the other memcard... @@ -1167,7 +1198,7 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event) { switch (event.GetId()) { - // Wii - SYSCONF settings + // Wii - SYSCONF settings case ID_WII_IPL_SSV: SConfig::GetInstance().m_SYSCONF->SetData("IPL.SSV", WiiScreenSaver->IsChecked()); break; @@ -1202,7 +1233,7 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event) // Paths settings // ------------------- -void CConfigMain::ISOPathsSelectionChanged(wxCommandEvent& WXUNUSED(event)) +void CConfigMain::ISOPathsSelectionChanged(wxCommandEvent& WXUNUSED (event)) { RemoveISOPath->Enable(ISOPaths->GetSelection() != wxNOT_FOUND); } @@ -1212,7 +1243,7 @@ void CConfigMain::AddRemoveISOPaths(wxCommandEvent& event) if (event.GetId() == ID_ADDISOPATH) { wxDirDialog dialog(this, _("Choose a directory to add"), wxGetHomeDir(), - wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); + wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); if (dialog.ShowModal() == wxID_OK) { @@ -1245,32 +1276,32 @@ void CConfigMain::AddRemoveISOPaths(wxCommandEvent& event) SConfig::GetInstance().m_ISOFolder.push_back(WxStrToStr(ISOPaths->GetStrings()[i])); } -void CConfigMain::RecursiveDirectoryChanged(wxCommandEvent& WXUNUSED(event)) +void CConfigMain::RecursiveDirectoryChanged(wxCommandEvent& WXUNUSED (event)) { SConfig::GetInstance().m_RecursiveISOFolder = RecursiveISOPath->IsChecked(); bRefreshList = true; } -void CConfigMain::DefaultISOChanged(wxFileDirPickerEvent& WXUNUSED(event)) +void CConfigMain::DefaultISOChanged(wxFileDirPickerEvent& WXUNUSED (event)) { SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO = WxStrToStr(DefaultISO->GetPath()); } -void CConfigMain::DVDRootChanged(wxFileDirPickerEvent& WXUNUSED(event)) +void CConfigMain::DVDRootChanged(wxFileDirPickerEvent& WXUNUSED (event)) { SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDVDRoot = WxStrToStr(DVDRoot->GetPath()); } -void CConfigMain::ApploaderPathChanged(wxFileDirPickerEvent& WXUNUSED(event)) +void CConfigMain::ApploaderPathChanged(wxFileDirPickerEvent& WXUNUSED (event)) { SConfig::GetInstance().m_LocalCoreStartupParameter.m_strApploader = WxStrToStr(ApploaderPath->GetPath()); } -void CConfigMain::NANDRootChanged(wxFileDirPickerEvent& WXUNUSED(event)) +void CConfigMain::NANDRootChanged(wxFileDirPickerEvent& WXUNUSED (event)) { std::string NANDPath = SConfig::GetInstance().m_NANDPath = - File::GetUserPath(D_WIIROOT_IDX, WxStrToStr(NANDRoot->GetPath())); + File::GetUserPath(D_WIIROOT_IDX, WxStrToStr(NANDRoot->GetPath())); NANDRoot->SetPath(StrToWxStr(NANDPath)); SConfig::GetInstance().m_SYSCONF->UpdateLocation(); DiscIO::cUIDsys::AccessInstance().UpdateLocation(); diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 63fe40453..6dec417c1 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -412,17 +412,14 @@ void ControllerConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev) Wiimote::Initialize(reinterpret_cast(GetHandle())); #endif } + InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, _("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]); m_ConfigFrame.ShowModal(); - m_ConfigFrame.Destroy(); + if (!was_init) // if game isn't running { Wiimote::Shutdown(); } - - //InputConfigDialog* const m_emu_config_diag = new InputConfigDialog(this, *Wiimote::GetConfig(), _trans("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]); - //m_emu_config_diag->ShowModal(); - //m_emu_config_diag->Destroy(); } void ControllerConfigDiag::RefreshRealWiimotes(wxCommandEvent&) @@ -569,13 +566,11 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) { InputConfigDialog m_ConfigFrame(this, *key_plugin, _("GameCube Controller Configuration"), port_num); m_ConfigFrame.ShowModal(); - m_ConfigFrame.Destroy(); } else { InputConfigDialog m_ConfigFrame(this, *pad_plugin, _("GameCube Controller Configuration"), port_num); m_ConfigFrame.ShowModal(); - m_ConfigFrame.Destroy(); } // if game isn't running diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 8d5137430..aa7e65c3b 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -298,7 +298,7 @@ void CCodeWindow::StepOver() { if (CCPU::IsStepping()) { - UGeckoInstruction inst = Memory::Read_Instruction(PC); + UGeckoInstruction inst = PowerPC::HostRead_Instruction(PC); if (inst.LK) { PowerPC::breakpoints.ClearAllTemporary(); @@ -329,7 +329,7 @@ void CCodeWindow::StepOut() u64 steps = 0; PowerPC::CoreMode oldMode = PowerPC::GetMode(); PowerPC::SetMode(PowerPC::MODE_INTERPRETER); - UGeckoInstruction inst = Memory::Read_Instruction(PC); + UGeckoInstruction inst = PowerPC::HostRead_Instruction(PC); while (inst.hex != 0x4e800020 && steps < timeout) // check for blr { if (inst.LK) @@ -347,7 +347,7 @@ void CCodeWindow::StepOut() PowerPC::SingleStep(); ++steps; } - inst = Memory::Read_Instruction(PC); + inst = PowerPC::HostRead_Instruction(PC); } PowerPC::SingleStep(); @@ -436,7 +436,7 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& core_startup_parameter " and stepping to work as explained in the Developer Documentation. But it can be very" " slow, perhaps slower than 1 fps."), wxITEM_CHECK); - interpreter->Check(core_startup_parameter.iCPUCore == SCoreStartupParameter::CORE_INTERPRETER); + interpreter->Check(core_startup_parameter.iCPUCore == PowerPC::CORE_INTERPRETER); pCoreMenu->AppendSeparator(); pCoreMenu->Append(IDM_JIT_NO_BLOCK_LINKING, _("&JIT Block Linking off"), @@ -604,7 +604,7 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event) bool found = false; for (u32 addr = 0x80000000; addr < 0x80180000; addr += 4) { - const char *name = PPCTables::GetInstructionName(Memory::ReadUnchecked_U32(addr)); + const char *name = PPCTables::GetInstructionName(PowerPC::HostRead_U32(addr)); if (name && (wx_name == name)) { NOTICE_LOG(POWERPC, "Found %s at %08x", wx_name.c_str(), addr); diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp index bf0744c7f..0106839c0 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp @@ -223,24 +223,24 @@ void GFXDebuggerPanel::CreateGUIControls() void GFXDebuggerPanel::OnPause() { - m_pButtonDump->Enable(true); - m_pDumpList->Enable(true); - m_pButtonUpdateScreen->Enable(true); - m_pButtonClearScreen->Enable(true); - m_pButtonClearTextureCache->Enable(true); - m_pButtonClearVertexShaderCache->Enable(true); - m_pButtonClearPixelShaderCache->Enable(true); + m_pButtonDump->Enable(); + m_pDumpList->Enable(); + m_pButtonUpdateScreen->Enable(); + m_pButtonClearScreen->Enable(); + m_pButtonClearTextureCache->Enable(); + m_pButtonClearVertexShaderCache->Enable(); + m_pButtonClearPixelShaderCache->Enable(); } void GFXDebuggerPanel::OnContinue() { - m_pButtonDump->Enable(false); - m_pDumpList->Enable(false); - m_pButtonUpdateScreen->Enable(false); - m_pButtonClearScreen->Enable(false); - m_pButtonClearTextureCache->Enable(false); - m_pButtonClearVertexShaderCache->Enable(false); - m_pButtonClearPixelShaderCache->Enable(false); + m_pButtonDump->Disable(); + m_pDumpList->Disable(); + m_pButtonUpdateScreen->Disable(); + m_pButtonClearScreen->Disable(); + m_pButtonClearTextureCache->Disable(); + m_pButtonClearVertexShaderCache->Disable(); + m_pButtonClearPixelShaderCache->Disable(); } diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 859588394..c00bdda9b 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -24,7 +24,7 @@ #include "Common/CommonTypes.h" #include "Common/DebugInterface.h" #include "Common/StringUtil.h" -#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" #include "DolphinWX/Frame.h" #include "DolphinWX/Globals.h" #include "DolphinWX/WxUtils.h" @@ -324,7 +324,7 @@ void CMemoryView::OnPaint(wxPaintEvent& event) dc.SetTextForeground(*wxBLACK); } - if (!Memory::IsRAMAddress(address)) + if (!PowerPC::HostIsRAMAddress(address)) continue; if (debugger->IsAlive()) diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index 1e129d577..ec6ff6c29 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -181,7 +181,7 @@ void CMemoryWindow::SetMemoryValue(wxCommandEvent& event) return; } - Memory::Write_U32(val, addr); + PowerPC::HostWrite_U32(val, addr); memview->Refresh(); } diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp index 13baf3660..0ede80bb3 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp @@ -43,7 +43,7 @@ static u32 GetWatchAddr(int count) static u32 GetWatchValue(int count) { - return Memory::ReadUnchecked_U32(GetWatchAddr(count)); + return PowerPC::HostRead_U32(GetWatchAddr(count)); } static void AddWatchAddr(int count, u32 value) @@ -71,7 +71,7 @@ static void SetWatchName(int count, const std::string& value) static void SetWatchValue(int count, u32 value) { - Memory::WriteUnchecked_U32(value, GetWatchAddr(count)); + PowerPC::HostWrite_U32(value, GetWatchAddr(count)); } static wxString GetValueByRowCol(int row, int col) @@ -102,8 +102,8 @@ static wxString GetValueByRowCol(int row, int col) case 4: { u32 addr = GetWatchAddr(row); - if (Memory::IsRAMAddress(addr)) - return Memory::GetString(addr, 32).c_str(); + if (PowerPC::HostIsRAMAddress(addr)) + return PowerPC::HostGetString(addr, 32).c_str(); else return wxEmptyString; } diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 2ddfebeb8..2446cb4cd 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -46,9 +46,13 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreParameter.h" +#include "Core/HotkeyManager.h" #include "Core/Movie.h" #include "Core/State.h" #include "Core/HW/DVDInterface.h" +#include "Core/HW/GCKeyboard.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/Wiimote.h" #include "DolphinWX/Frame.h" #include "DolphinWX/GameListCtrl.h" @@ -78,21 +82,21 @@ int g_saveSlot = 1; // X11Utils nastiness that's only used here namespace X11Utils { - Window XWindowFromHandle(void *Handle) - { - return GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(Handle))); - } +Window XWindowFromHandle(void *Handle) +{ + return GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(Handle))); +} - Display *XDisplayFromHandle(void *Handle) - { - return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(GTK_WIDGET(Handle))); - } +Display *XDisplayFromHandle(void *Handle) +{ + return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(GTK_WIDGET(Handle))); +} } #endif CRenderFrame::CRenderFrame(wxFrame* parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, long style) + const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style) { // Give it an icon @@ -162,43 +166,43 @@ WXLRESULT CRenderFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa { switch (nMsg) { - case WM_SYSCOMMAND: - switch (wParam) - { - case SC_SCREENSAVE: - case SC_MONITORPOWER: - if (Core::GetState() == Core::CORE_RUN && SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) + case WM_SYSCOMMAND: + switch (wParam) + { + case SC_SCREENSAVE: + case SC_MONITORPOWER: + if (Core::GetState() == Core::CORE_RUN && SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) + break; + default: + return wxFrame::MSWWindowProc(nMsg, wParam, lParam); + } + break; + + case WM_USER: + switch (wParam) + { + case WM_USER_STOP: + main_frame->DoStop(); break; + + case WM_USER_SETCURSOR: + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && + main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN) + SetCursor(wxCURSOR_BLANK); + else + SetCursor(wxNullCursor); + break; + } + break; + + case WM_CLOSE: + // Let Core finish initializing before accepting any WM_CLOSE messages + if (!Core::IsRunning()) break; + // Use default action otherwise + default: + // By default let wxWidgets do what it normally does with this event return wxFrame::MSWWindowProc(nMsg, wParam, lParam); - } - break; - - case WM_USER: - switch (wParam) - { - case WM_USER_STOP: - main_frame->DoStop(); - break; - - case WM_USER_SETCURSOR: - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && - main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN) - SetCursor(wxCURSOR_BLANK); - else - SetCursor(wxNullCursor); - break; - } - break; - - case WM_CLOSE: - // Let Core finish initializing before accepting any WM_CLOSE messages - if (!Core::IsRunning()) break; - // Use default action otherwise - - default: - // By default let wxWidgets do what it normally does with this event - return wxFrame::MSWWindowProc(nMsg, wParam, lParam); } return 0; } @@ -269,6 +273,7 @@ EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX) EVT_MENU(IDM_CONFIG_AUDIO, CFrame::OnConfigAudio) EVT_MENU(IDM_CONFIG_CONTROLLERS, CFrame::OnConfigControllers) EVT_MENU(IDM_CONFIG_HOTKEYS, CFrame::OnConfigHotkey) +EVT_MENU(IDM_CONFIG_MENU_COMMANDS, CFrame::OnConfigMenuCommands) EVT_MENU(IDM_SAVE_PERSPECTIVE, CFrame::OnPerspectiveMenu) EVT_MENU(IDM_EDIT_PERSPECTIVES, CFrame::OnPerspectiveMenu) @@ -304,8 +309,8 @@ EVT_MENU_RANGE(IDM_SHOW_SYSTEM, IDM_SHOW_STATE, CFrame::OnChangeColumnsVisible) EVT_MENU(IDM_PURGE_CACHE, CFrame::GameListChanged) EVT_MENU(IDM_SAVE_FIRST_STATE, CFrame::OnSaveFirstState) -EVT_MENU(IDM_UNDO_LOAD_STATE, CFrame::OnUndoLoadState) -EVT_MENU(IDM_UNDO_SAVE_STATE, CFrame::OnUndoSaveState) +EVT_MENU(IDM_UNDO_LOAD_STATE, CFrame::OnUndoLoadState) +EVT_MENU(IDM_UNDO_SAVE_STATE, CFrame::OnUndoSaveState) EVT_MENU(IDM_LOAD_STATE_FILE, CFrame::OnLoadStateFromFile) EVT_MENU(IDM_SAVE_STATE_FILE, CFrame::OnSaveStateToFile) EVT_MENU(IDM_SAVE_SELECTED_SLOT, CFrame::OnSaveCurrentSlot) @@ -342,24 +347,46 @@ END_EVENT_TABLE() // --------------- // Creation and close, quit functions + +bool CFrame::InitControllers() +{ + if (!g_controller_interface.IsInit()) + { +#if defined(HAVE_X11) && HAVE_X11 + Window win = X11Utils::XWindowFromHandle(GetHandle()); + HotkeyManagerEmu::Initialize(reinterpret_cast(win)); + Pad::Initialize(reinterpret_cast(win)); + Keyboard::Initialize(reinterpret_cast(win)); + Wiimote::Initialize(reinterpret_cast(win)); +#else + HotkeyManagerEmu::Initialize(reinterpret_cast(GetHandle())); + Pad::Initialize(reinterpret_cast(GetHandle())); + Keyboard::Initialize(reinterpret_cast(GetHandle())); + Wiimote::Initialize(reinterpret_cast(GetHandle())); +#endif + return true; + } + return false; +} + CFrame::CFrame(wxFrame* parent, -wxWindowID id, -const wxString& title, -const wxPoint& pos, -const wxSize& size, -bool _UseDebugger, -bool _BatchMode, -bool ShowLogWindow, -long style) -: CRenderFrame(parent, id, title, pos, size, style) -, g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr) -, m_SavedPerspectives(nullptr), m_ToolBar(nullptr) -, m_GameListCtrl(nullptr), m_Panel(nullptr) -, m_RenderFrame(nullptr), m_RenderParent(nullptr) -, m_LogWindow(nullptr), m_LogConfigWindow(nullptr) -, m_FifoPlayerDlg(nullptr), UseDebugger(_UseDebugger) -, m_bBatchMode(_BatchMode), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false) -, m_bGameLoading(false), m_bClosing(false), m_confirmStop(false), m_menubar_shadow(nullptr) + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + bool _UseDebugger, + bool _BatchMode, + bool ShowLogWindow, + long style) + : CRenderFrame(parent, id, title, pos, size, style) + , g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr) + , m_SavedPerspectives(nullptr), m_ToolBar(nullptr) + , m_GameListCtrl(nullptr), m_Panel(nullptr) + , m_RenderFrame(nullptr), m_RenderParent(nullptr) + , m_LogWindow(nullptr), m_LogConfigWindow(nullptr) + , m_FifoPlayerDlg(nullptr), UseDebugger(_UseDebugger) + , m_bBatchMode(_BatchMode), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false) + , m_bGameLoading(false), m_bClosing(false), m_confirmStop(false), m_menubar_shadow(nullptr) { for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++) bFloatWindow[i] = false; @@ -399,8 +426,8 @@ long style) m_Panel = new wxPanel(this, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0); m_GameListCtrl = new CGameListCtrl(m_Panel, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT); + wxDefaultPosition, wxDefaultSize, + wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT); m_GameListCtrl->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CFrame::OnGameListCtrl_ItemActivated, this); wxBoxSizer *sizerPanel = new wxBoxSizer(wxHORIZONTAL); @@ -412,12 +439,12 @@ long style) m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE); m_Mgr->AddPane(m_Panel, wxAuiPaneInfo() - .Name("Pane 0").Caption("Pane 0").PaneBorder(false) - .CaptionVisible(false).Layer(0).Center().Show()); + .Name("Pane 0").Caption("Pane 0").PaneBorder(false) + .CaptionVisible(false).Layer(0).Center().Show()); if (!g_pCodeWindow) m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo() - .Name("Pane 1").Caption(_("Logging")).CaptionVisible(true) - .Layer(0).FloatingSize(wxSize(600, 350)).CloseButton(true).Hide()); + .Name("Pane 1").Caption(_("Logging")).CaptionVisible(true) + .Layer(0).FloatingSize(wxSize(600, 350)).CloseButton(true).Hide()); AuiFullscreen = m_Mgr->SavePerspective(); // Create toolbar @@ -457,15 +484,15 @@ long style) // Commit m_Mgr->Update(); -#ifdef _WIN32 - SetToolTip(""); - GetToolTip()->SetAutoPop(25000); -#endif + #ifdef _WIN32 + SetToolTip(""); + GetToolTip()->SetAutoPop(25000); + #endif -#if defined(HAVE_XRANDR) && HAVE_XRANDR - m_XRRConfig = new X11Utils::XRRConfiguration(X11Utils::XDisplayFromHandle(GetHandle()), - X11Utils::XWindowFromHandle(GetHandle())); -#endif + #if defined(HAVE_XRANDR) && HAVE_XRANDR + m_XRRConfig = new X11Utils::XRRConfiguration(X11Utils::XDisplayFromHandle(GetHandle()), + X11Utils::XWindowFromHandle(GetHandle())); + #endif // ------------------------- // Connect event handlers @@ -477,15 +504,33 @@ long style) UpdateGUI(); if (g_pCodeWindow) g_pCodeWindow->UpdateButtonStates(); + + // check if game is running + m_bHotkeysInit = InitControllers(); + + m_poll_hotkey_timer = new wxTimer(this); + Bind(wxEVT_TIMER, &CFrame::PollHotkeys, this); + m_poll_hotkey_timer->Start(1000 / 60, wxTIMER_CONTINUOUS); } // Destructor CFrame::~CFrame() { + m_poll_hotkey_timer->Stop(); + + if (m_bHotkeysInit) + { + Wiimote::Shutdown(); + Keyboard::Shutdown(); + Pad::Shutdown(); + HotkeyManagerEmu::Shutdown(); + m_bHotkeysInit = false; + } + drives.clear(); -#if defined(HAVE_XRANDR) && HAVE_XRANDR - delete m_XRRConfig; -#endif + #if defined(HAVE_XRANDR) && HAVE_XRANDR + delete m_XRRConfig; + #endif ClosePages(); @@ -508,7 +553,7 @@ bool CFrame::RendererIsFullscreen() #if defined(__APPLE__) if (m_RenderFrame != nullptr) { - NSView *view = (NSView *)m_RenderFrame->GetHandle(); + NSView *view = (NSView *) m_RenderFrame->GetHandle(); NSWindow *window = [view window]; fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask); @@ -518,7 +563,7 @@ bool CFrame::RendererIsFullscreen() return fullscreen; } -void CFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event)) { Close(true); } @@ -541,7 +586,7 @@ void CFrame::OnActive(wxActivateEvent& event) } if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && - Core::GetState() == Core::CORE_RUN) + Core::GetState() == Core::CORE_RUN) m_RenderParent->SetCursor(wxCURSOR_BLANK); } else @@ -631,8 +676,8 @@ void CFrame::OnResize(wxSizeEvent& event) if (!IsMaximized() && !(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && RendererIsFullscreen()) && !(Core::GetState() != Core::CORE_UNINITIALIZED && - SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && - SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)) + SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && + SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)) { SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth = GetSize().GetWidth(); SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight = GetSize().GetHeight(); @@ -640,9 +685,9 @@ void CFrame::OnResize(wxSizeEvent& event) // Make sure the logger pane is a sane size if (!g_pCodeWindow && m_LogWindow && m_Mgr->GetPane("Pane 1").IsShown() && - !m_Mgr->GetPane("Pane 1").IsFloating() && - (m_LogWindow->x > GetClientRect().GetWidth() || - m_LogWindow->y > GetClientRect().GetHeight())) + !m_Mgr->GetPane("Pane 1").IsFloating() && + (m_LogWindow->x > GetClientRect().GetWidth() || + m_LogWindow->y > GetClientRect().GetHeight())) ShowResizePane(); } @@ -676,7 +721,7 @@ WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) void CFrame::UpdateTitle(const std::string &str) { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && - SConfig::GetInstance().m_InterfaceStatusbar) + SConfig::GetInstance().m_InterfaceStatusbar) { GetStatusBar()->SetStatusText(str, 0); m_RenderFrame->SetTitle(scm_rev_str); @@ -706,27 +751,27 @@ void CFrame::OnHostMessage(wxCommandEvent& event) break; case IDM_WINDOW_SIZE_REQUEST: - { - std::pair *win_size = (std::pair *)(event.GetClientData()); - OnRenderWindowSizeRequest(win_size->first, win_size->second); - delete win_size; - } - break; + { + std::pair *win_size = (std::pair *)(event.GetClientData()); + OnRenderWindowSizeRequest(win_size->first, win_size->second); + delete win_size; + } + break; case IDM_FULLSCREEN_REQUEST: - { - bool enable_fullscreen = event.GetInt() == 0 ? false : true; - ToggleDisplayMode(enable_fullscreen); - if (m_RenderFrame != nullptr) - m_RenderFrame->ShowFullScreen(enable_fullscreen); + { + bool enable_fullscreen = event.GetInt() == 0 ? false : true; + ToggleDisplayMode(enable_fullscreen); + if (m_RenderFrame != nullptr) + m_RenderFrame->ShowFullScreen(enable_fullscreen); - // If the stop dialog initiated this fullscreen switch then we need - // to pause the emulator after we've completed the switch. - // TODO: Allow the renderer to switch fullscreen modes while paused. - if (m_confirmStop) - Core::SetState(Core::CORE_PAUSE); - } - break; + // If the stop dialog initiated this fullscreen switch then we need + // to pause the emulator after we've completed the switch. + // TODO: Allow the renderer to switch fullscreen modes while paused. + if (m_confirmStop) + Core::SetState(Core::CORE_PAUSE); + } + break; case WM_USER_CREATE: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) @@ -735,14 +780,14 @@ void CFrame::OnHostMessage(wxCommandEvent& event) #ifdef __WXGTK__ case IDM_PANIC: - { - wxString caption = event.GetString().BeforeFirst(':'); - wxString text = event.GetString().AfterFirst(':'); - bPanicResult = (wxYES == wxMessageBox(text, - caption, event.GetInt() ? wxYES_NO : wxOK, wxWindow::FindFocus())); - panic_event.Set(); - } - break; + { + wxString caption = event.GetString().BeforeFirst(':'); + wxString text = event.GetString().AfterFirst(':'); + bPanicResult = (wxYES == wxMessageBox(text, + caption, event.GetInt() ? wxYES_NO : wxOK, wxWindow::FindFocus())); + panic_event.Set(); + } + break; #endif case WM_USER_STOP: @@ -758,8 +803,8 @@ void CFrame::OnHostMessage(wxCommandEvent& event) void CFrame::OnRenderWindowSizeRequest(int width, int height) { if (!Core::IsRunning() || - !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize || - RendererIsFullscreen() || m_RenderFrame->IsMaximized()) + !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize || + RendererIsFullscreen() || m_RenderFrame->IsMaximized()) return; int old_width, old_height, log_width = 0, log_height = 0; @@ -767,20 +812,20 @@ void CFrame::OnRenderWindowSizeRequest(int width, int height) // Add space for the log/console/debugger window if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && - (SConfig::GetInstance().m_InterfaceLogWindow || - SConfig::GetInstance().m_InterfaceLogConfigWindow) && - !m_Mgr->GetPane("Pane 1").IsFloating()) + (SConfig::GetInstance().m_InterfaceLogWindow || + SConfig::GetInstance().m_InterfaceLogConfigWindow) && + !m_Mgr->GetPane("Pane 1").IsFloating()) { switch (m_Mgr->GetPane("Pane 1").dock_direction) { - case wxAUI_DOCK_LEFT: - case wxAUI_DOCK_RIGHT: - log_width = m_Mgr->GetPane("Pane 1").rect.GetWidth(); - break; - case wxAUI_DOCK_TOP: - case wxAUI_DOCK_BOTTOM: - log_height = m_Mgr->GetPane("Pane 1").rect.GetHeight(); - break; + case wxAUI_DOCK_LEFT: + case wxAUI_DOCK_RIGHT: + log_width = m_Mgr->GetPane("Pane 1").rect.GetWidth(); + break; + case wxAUI_DOCK_TOP: + case wxAUI_DOCK_BOTTOM: + log_height = m_Mgr->GetPane("Pane 1").rect.GetHeight(); + break; } } @@ -805,8 +850,8 @@ bool CFrame::RendererHasFocus() return false; // Why these different cases? if (m_RenderParent == window || - m_RenderParent == window->GetParent() || - m_RenderParent->GetParent() == window->GetParent()) + m_RenderParent == window->GetParent() || + m_RenderParent->GetParent() == window->GetParent()) { return true; } @@ -827,7 +872,7 @@ bool CFrame::UIHasFocus() return (focusWindow != nullptr); } -void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED(event)) +void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) { // Show all platforms and regions if... // 1. All platforms are set to hide @@ -856,22 +901,22 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED(event)) SConfig::GetInstance().m_ListUnknown))) { SConfig::GetInstance().m_ListGC = - SConfig::GetInstance().m_ListWii = - SConfig::GetInstance().m_ListWad = - SConfig::GetInstance().m_ListJap = - SConfig::GetInstance().m_ListUsa = - SConfig::GetInstance().m_ListPal = - SConfig::GetInstance().m_ListAustralia = - SConfig::GetInstance().m_ListFrance = - SConfig::GetInstance().m_ListGermany = - SConfig::GetInstance().m_ListInternational = - SConfig::GetInstance().m_ListItaly = - SConfig::GetInstance().m_ListKorea = - SConfig::GetInstance().m_ListNetherlands = - SConfig::GetInstance().m_ListRussia = - SConfig::GetInstance().m_ListSpain = - SConfig::GetInstance().m_ListTaiwan = - SConfig::GetInstance().m_ListUnknown = true; + SConfig::GetInstance().m_ListWii = + SConfig::GetInstance().m_ListWad = + SConfig::GetInstance().m_ListJap = + SConfig::GetInstance().m_ListUsa = + SConfig::GetInstance().m_ListPal = + SConfig::GetInstance().m_ListAustralia = + SConfig::GetInstance().m_ListFrance = + SConfig::GetInstance().m_ListGermany = + SConfig::GetInstance().m_ListInternational = + SConfig::GetInstance().m_ListItaly = + SConfig::GetInstance().m_ListKorea = + SConfig::GetInstance().m_ListNetherlands = + SConfig::GetInstance().m_ListRussia = + SConfig::GetInstance().m_ListSpain = + SConfig::GetInstance().m_ListTaiwan = + SConfig::GetInstance().m_ListUnknown = true; GetMenuBar()->FindItem(IDM_LIST_GC)->Check(true); GetMenuBar()->FindItem(IDM_LIST_WII)->Check(true); @@ -904,11 +949,18 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED(event)) } } -static bool IsHotkey(wxKeyEvent &event, int Id) +static bool IsHotkey(wxKeyEvent &event, int Id, bool keyUp = false) { - return (event.GetKeyCode() != WXK_NONE && - event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && - event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); + if (Core::GetState() == Core::CORE_UNINITIALIZED) + return false; + + // Input event hotkey + if (event.GetKeyCode() == WXK_NONE) + { + return HotkeyManagerEmu::IsPressed(Id, keyUp); + } + + return false; } int GetCmdForHotkey(unsigned int key) @@ -1045,202 +1097,12 @@ bool TASInputHasFocus() return false; } - void CFrame::OnKeyDown(wxKeyEvent& event) { if (Core::GetState() != Core::CORE_UNINITIALIZED && - (RendererHasFocus() || TASInputHasFocus())) + (RendererHasFocus() || TASInputHasFocus())) { - int WiimoteId = -1; - // Toggle fullscreen - if (IsHotkey(event, HK_FULLSCREEN)) - DoFullscreen(!RendererIsFullscreen()); - // Send Debugger keys to CodeWindow - else if (g_pCodeWindow && (event.GetKeyCode() >= WXK_F9 && event.GetKeyCode() <= WXK_F11)) - event.Skip(); - // Pause and Unpause - else if (IsHotkey(event, HK_PLAY_PAUSE)) - DoPause(); - // Stop - else if (IsHotkey(event, HK_STOP)) - DoStop(); - // Screenshot hotkey - else if (IsHotkey(event, HK_SCREENSHOT)) - Core::SaveScreenShot(); - else if (IsHotkey(event, HK_EXIT)) - wxPostEvent(this, wxCommandEvent(wxID_EXIT)); - else if (IsHotkey(event, HK_VOLUME_DOWN)) - AudioCommon::DecreaseVolume(3); - else if (IsHotkey(event, HK_VOLUME_UP)) - AudioCommon::IncreaseVolume(3); - else if (IsHotkey(event, HK_VOLUME_TOGGLE_MUTE)) - AudioCommon::ToggleMuteVolume(); - // Wiimote connect and disconnect hotkeys - else if (IsHotkey(event, HK_WIIMOTE1_CONNECT)) - WiimoteId = 0; - else if (IsHotkey(event, HK_WIIMOTE2_CONNECT)) - WiimoteId = 1; - else if (IsHotkey(event, HK_WIIMOTE3_CONNECT)) - WiimoteId = 2; - else if (IsHotkey(event, HK_WIIMOTE4_CONNECT)) - WiimoteId = 3; - else if (IsHotkey(event, HK_BALANCEBOARD_CONNECT)) - WiimoteId = 4; - else if (IsHotkey(event, HK_TOGGLE_IR)) - { - OSDChoice = 1; - // Toggle native resolution - if (++g_Config.iEFBScale > SCALE_4X) - g_Config.iEFBScale = SCALE_AUTO; - } - else if (IsHotkey(event, HK_TOGGLE_AR)) - { - OSDChoice = 2; - // Toggle aspect ratio - g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; - } - else if (IsHotkey(event, HK_TOGGLE_EFBCOPIES)) - { - OSDChoice = 3; - // Toggle EFB copies between EFB2RAM and EFB2Texture - if (!g_Config.bEFBCopyEnable) - { - OSD::AddMessage("EFB Copies are disabled, enable them in Graphics settings for toggling", 6000); - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } - } - else if (IsHotkey(event, HK_TOGGLE_FOG)) - { - OSDChoice = 4; - g_Config.bDisableFog = !g_Config.bDisableFog; - } - else if (IsHotkey(event, HK_TOGGLE_THROTTLE)) - { - Core::SetIsFramelimiterTempDisabled(true); - } - else if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT)) - { - if (--SConfig::GetInstance().m_Framelimit > 0x19) - SConfig::GetInstance().m_Framelimit = 0x19; - } - else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) - { - if (++SConfig::GetInstance().m_Framelimit > 0x19) - SConfig::GetInstance().m_Framelimit = 0; - } - else if (IsHotkey(event, HK_SAVE_STATE_SLOT_SELECTED)) - { - State::Save(g_saveSlot); - } - else if (IsHotkey(event, HK_LOAD_STATE_SLOT_SELECTED)) - { - State::Load(g_saveSlot); - } - else if (IsHotkey(event, HK_DECREASE_DEPTH)) - { - if (--g_Config.iStereoDepth < 0) - g_Config.iStereoDepth = 0; - } - else if (IsHotkey(event, HK_INCREASE_DEPTH)) - { - if (++g_Config.iStereoDepth > 100) - g_Config.iStereoDepth = 100; - } - else if (IsHotkey(event, HK_DECREASE_CONVERGENCE)) - { - if (--g_Config.iStereoConvergence < 0) - g_Config.iStereoConvergence = 0; - } - else if (IsHotkey(event, HK_INCREASE_CONVERGENCE)) - { - if (++g_Config.iStereoConvergence > 500) - g_Config.iStereoConvergence = 500; - } - - else - { - for (int i = HK_SELECT_STATE_SLOT_1; i < HK_SELECT_STATE_SLOT_10; ++i) - { - if (IsHotkey(event, i)) - { - wxCommandEvent slot_event; - slot_event.SetId(i + IDM_SELECT_SLOT_1 - HK_SELECT_STATE_SLOT_1); - CFrame::OnSelectSlot(slot_event); - } - } - - unsigned int i = NUM_HOTKEYS; - if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || TASInputHasFocus()) - { - for (i = 0; i < NUM_HOTKEYS; i++) - { - if (IsHotkey(event, i)) - { - int cmd = GetCmdForHotkey(i); - if (cmd >= 0) - { - wxCommandEvent evt(wxEVT_MENU, cmd); - wxMenuItem *item = GetMenuBar()->FindItem(cmd); - if (item && item->IsCheckable()) - { - item->wxMenuItemBase::Toggle(); - evt.SetInt(item->IsChecked()); - } - GetEventHandler()->AddPendingEvent(evt); - break; - } - } - } - } - // On OS X, we claim all keyboard events while - // emulation is running to avoid wxWidgets sounding - // the system beep for unhandled key events when - // receiving pad/Wiimote keypresses which take an - // entirely different path through the HID subsystem. -#ifndef __APPLE__ - // On other platforms, we leave the key event alone - // so it can be passed on to the windowing system. - if (i == NUM_HOTKEYS) - event.Skip(); -#endif - } - - // Actually perform the Wiimote connection or disconnection - if (WiimoteId >= 0) - { - wxCommandEvent evt; - evt.SetId(IDM_CONNECT_WIIMOTE1 + WiimoteId); - OnConnectWiimote(evt); - } - - if (g_Config.bFreeLook) - { - static float debugSpeed = 1.0f; - - if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED)) - debugSpeed /= 2.0f; - else if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED)) - debugSpeed *= 2.0f; - else if (IsHotkey(event, HK_FREELOOK_RESET_SPEED)) - debugSpeed = 1.0f; - else if (IsHotkey(event, HK_FREELOOK_UP)) - VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed); - else if (IsHotkey(event, HK_FREELOOK_DOWN)) - VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed); - else if (IsHotkey(event, HK_FREELOOK_LEFT)) - VertexShaderManager::TranslateView(debugSpeed, 0.0f); - else if (IsHotkey(event, HK_FREELOOK_RIGHT)) - VertexShaderManager::TranslateView(-debugSpeed, 0.0f); - else if (IsHotkey(event, HK_FREELOOK_ZOOM_IN)) - VertexShaderManager::TranslateView(0.0f, debugSpeed); - else if (IsHotkey(event, HK_FREELOOK_ZOOM_OUT)) - VertexShaderManager::TranslateView(0.0f, -debugSpeed); - else if (IsHotkey(event, HK_FREELOOK_RESET)) - VertexShaderManager::ResetView(); - } + ParseHotkeys(event); } else { @@ -1250,7 +1112,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event) void CFrame::OnKeyUp(wxKeyEvent& event) { - if (Core::IsRunning() && (RendererHasFocus() || TASInputHasFocus())) + if(Core::IsRunning() && (RendererHasFocus() || TASInputHasFocus())) { if (IsHotkey(event, HK_TOGGLE_THROTTLE)) { @@ -1303,7 +1165,7 @@ void CFrame::OnMouse(wxMouseEvent& event) if (mouseLookEnabled) { VertexShaderManager::RotateView((event.GetX() - lastMouse[0]) / 200.0f, - (event.GetY() - lastMouse[1]) / 200.0f); + (event.GetY() - lastMouse[1]) / 200.0f); lastMouse[0] = event.GetX(); lastMouse[1] = event.GetY(); } @@ -1311,7 +1173,7 @@ void CFrame::OnMouse(wxMouseEvent& event) if (mouseMoveEnabled) { VertexShaderManager::TranslateView((event.GetX() - lastMouse[0]) / 50.0f, - (event.GetY() - lastMouse[1]) / 50.0f); + (event.GetY() - lastMouse[1]) / 50.0f); lastMouse[0] = event.GetX(); lastMouse[1] = event.GetY(); } @@ -1335,12 +1197,12 @@ void CFrame::DoFullscreen(bool enable_fullscreen) ToggleDisplayMode(enable_fullscreen); #if defined(__APPLE__) - NSView *view = (NSView *)m_RenderFrame->GetHandle(); + NSView *view = (NSView *) m_RenderFrame->GetHandle(); NSWindow *window = [view window]; if (enable_fullscreen != RendererIsFullscreen()) { - [window toggleFullScreen : nil]; + [window toggleFullScreen:nil]; } #else if (enable_fullscreen) @@ -1410,3 +1272,223 @@ const CGameListCtrl *CFrame::GetGameListCtrl() const { return m_GameListCtrl; } + +void CFrame::PollHotkeys(wxTimerEvent& event) +{ + if (Core::GetState() == Core::CORE_UNINITIALIZED || Core::GetState() == Core::CORE_PAUSE) + { + m_bHotkeysInit = InitControllers(); + g_controller_interface.UpdateInput(); + } + + if (Core::GetState() != Core::CORE_STOPPING) + { + wxKeyEvent keyevent = 0; + + if (IsHotkey(keyevent, HK_TOGGLE_THROTTLE)) + { + Core::SetIsFramelimiterTempDisabled(false); + } + else + { + ParseHotkeys(keyevent); + } + } +} + +void CFrame::ParseHotkeys(wxKeyEvent &event) +{ + int WiimoteId = -1; + // Toggle fullscreen + if (IsHotkey(event, HK_FULLSCREEN)) + DoFullscreen(!RendererIsFullscreen()); + // Send Debugger keys to CodeWindow + else if (g_pCodeWindow && (event.GetKeyCode() >= WXK_F9 && event.GetKeyCode() <= WXK_F11)) + event.Skip(); + // Pause and Unpause + else if (IsHotkey(event, HK_PLAY_PAUSE)) + DoPause(); + // Stop + else if (IsHotkey(event, HK_STOP)) + DoStop(); + // Screenshot hotkey + else if (IsHotkey(event, HK_SCREENSHOT)) + Core::SaveScreenShot(); + else if (IsHotkey(event, HK_EXIT)) + wxPostEvent(this, wxCommandEvent(wxID_EXIT)); + else if (IsHotkey(event, HK_VOLUME_DOWN)) + AudioCommon::DecreaseVolume(3); + else if (IsHotkey(event, HK_VOLUME_UP)) + AudioCommon::IncreaseVolume(3); + else if (IsHotkey(event, HK_VOLUME_TOGGLE_MUTE)) + AudioCommon::ToggleMuteVolume(); + // Wiimote connect and disconnect hotkeys + else if (IsHotkey(event, HK_WIIMOTE1_CONNECT)) + WiimoteId = 0; + else if (IsHotkey(event, HK_WIIMOTE2_CONNECT)) + WiimoteId = 1; + else if (IsHotkey(event, HK_WIIMOTE3_CONNECT)) + WiimoteId = 2; + else if (IsHotkey(event, HK_WIIMOTE4_CONNECT)) + WiimoteId = 3; + else if (IsHotkey(event, HK_BALANCEBOARD_CONNECT)) + WiimoteId = 4; + else if (IsHotkey(event, HK_TOGGLE_IR)) + { + OSDChoice = 1; + // Toggle native resolution + if (++g_Config.iEFBScale > SCALE_4X) + g_Config.iEFBScale = SCALE_AUTO; + } + else if (IsHotkey(event, HK_TOGGLE_AR)) + { + OSDChoice = 2; + // Toggle aspect ratio + g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; + } + else if (IsHotkey(event, HK_TOGGLE_EFBCOPIES)) + { + OSDChoice = 3; + // Toggle EFB copies between EFB2RAM and EFB2Texture + if (!g_Config.bEFBCopyEnable) + { + OSD::AddMessage("EFB Copies are disabled, enable them in Graphics settings for toggling", 6000); + } + else + { + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + } + } + else if (IsHotkey(event, HK_TOGGLE_FOG)) + { + OSDChoice = 4; + g_Config.bDisableFog = !g_Config.bDisableFog; + } + else if (IsHotkey(event, HK_TOGGLE_THROTTLE, true)) + { + Core::SetIsFramelimiterTempDisabled(true); + } + else if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT)) + { + if (--SConfig::GetInstance().m_Framelimit > 0x19) + SConfig::GetInstance().m_Framelimit = 0x19; + } + else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) + { + if (++SConfig::GetInstance().m_Framelimit > 0x19) + SConfig::GetInstance().m_Framelimit = 0; + } + else if (IsHotkey(event, HK_SAVE_STATE_SLOT_SELECTED)) + { + State::Save(g_saveSlot); + } + else if (IsHotkey(event, HK_LOAD_STATE_SLOT_SELECTED)) + { + State::Load(g_saveSlot); + } + else if (IsHotkey(event, HK_DECREASE_DEPTH)) + { + if (--g_Config.iStereoDepth < 0) + g_Config.iStereoDepth = 0; + } + else if (IsHotkey(event, HK_INCREASE_DEPTH)) + { + if (++g_Config.iStereoDepth > 100) + g_Config.iStereoDepth = 100; + } + else if (IsHotkey(event, HK_DECREASE_CONVERGENCE)) + { + if (--g_Config.iStereoConvergence < 0) + g_Config.iStereoConvergence = 0; + } + else if (IsHotkey(event, HK_INCREASE_CONVERGENCE)) + { + if (++g_Config.iStereoConvergence > 500) + g_Config.iStereoConvergence = 500; + } + + else + { + for (int i = HK_SELECT_STATE_SLOT_1; i < HK_SELECT_STATE_SLOT_10; ++i) + { + if (IsHotkey(event, i)) + { + wxCommandEvent slot_event; + slot_event.SetId(i + IDM_SELECT_SLOT_1 - HK_SELECT_STATE_SLOT_1); + CFrame::OnSelectSlot(slot_event); + } + } + + unsigned int i = NUM_HOTKEYS; + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || TASInputHasFocus()) + { + for (i = 0; i < NUM_HOTKEYS; i++) + { + if (IsHotkey(event, i)) + { + int cmd = GetCmdForHotkey(i); + if (cmd >= 0) + { + wxCommandEvent evt(wxEVT_MENU, cmd); + wxMenuItem *item = GetMenuBar()->FindItem(cmd); + if (item && item->IsCheckable()) + { + item->wxMenuItemBase::Toggle(); + evt.SetInt(item->IsChecked()); + } + GetEventHandler()->AddPendingEvent(evt); + break; + } + } + } + } + // On OS X, we claim all keyboard events while + // emulation is running to avoid wxWidgets sounding + // the system beep for unhandled key events when + // receiving pad/Wiimote keypresses which take an + // entirely different path through the HID subsystem. +#ifndef __APPLE__ + // On other platforms, we leave the key event alone + // so it can be passed on to the windowing system. + if (i == NUM_HOTKEYS) + event.Skip(); +#endif + } + + // Actually perform the Wiimote connection or disconnection + if (Core::GetState() != Core::CORE_UNINITIALIZED) + { + if (WiimoteId >= 0) + { + wxCommandEvent evt; + evt.SetId(IDM_CONNECT_WIIMOTE1 + WiimoteId); + OnConnectWiimote(evt); + } + + if (g_Config.bFreeLook) + { + static float debugSpeed = 1.0f; + + if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED)) + debugSpeed /= 2.0f; + else if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED)) + debugSpeed *= 2.0f; + else if (IsHotkey(event, HK_FREELOOK_RESET_SPEED)) + debugSpeed = 1.0f; + else if (IsHotkey(event, HK_FREELOOK_UP)) + VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed); + else if (IsHotkey(event, HK_FREELOOK_DOWN)) + VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed); + else if (IsHotkey(event, HK_FREELOOK_LEFT)) + VertexShaderManager::TranslateView(debugSpeed, 0.0f); + else if (IsHotkey(event, HK_FREELOOK_RIGHT)) + VertexShaderManager::TranslateView(-debugSpeed, 0.0f); + else if (IsHotkey(event, HK_FREELOOK_ZOOM_IN)) + VertexShaderManager::TranslateView(0.0f, debugSpeed); + else if (IsHotkey(event, HK_FREELOOK_ZOOM_OUT)) + VertexShaderManager::TranslateView(0.0f, -debugSpeed); + else if (IsHotkey(event, HK_FREELOOK_RESET)) + VertexShaderManager::ResetView(); + } + } +} diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index e59d626e2..bcb51447a 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -47,27 +47,29 @@ class wxAuiNotebook; class wxAuiNotebookEvent; class wxListEvent; class wxMenuItem; +class wxTimer; +class wxTimerEvent; class wxWindow; class CRenderFrame : public wxFrame { -public: - CRenderFrame(wxFrame* parent, - wxWindowID id = wxID_ANY, - const wxString& title = "Dolphin", - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE); + public: + CRenderFrame(wxFrame* parent, + wxWindowID id = wxID_ANY, + const wxString& title = "Dolphin", + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE); - bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; + bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; -private: - void OnDropFiles(wxDropFilesEvent& event); - static bool IsValidSavestateDropped(const std::string& filepath); -#ifdef _WIN32 - // Receive WndProc messages - WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif + private: + void OnDropFiles(wxDropFilesEvent& event); + static bool IsValidSavestateDropped(const std::string& filepath); + #ifdef _WIN32 + // Receive WndProc messages + WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + #endif }; @@ -88,11 +90,11 @@ public: void* GetRenderHandle() { -#if defined(HAVE_X11) && HAVE_X11 - return reinterpret_cast(X11Utils::XWindowFromHandle(m_RenderParent->GetHandle())); -#else - return reinterpret_cast(m_RenderParent->GetHandle()); -#endif + #if defined(HAVE_X11) && HAVE_X11 + return reinterpret_cast(X11Utils::XWindowFromHandle(m_RenderParent->GetHandle())); + #else + return reinterpret_cast(m_RenderParent->GetHandle()); + #endif } // These have to be public @@ -121,8 +123,8 @@ public: bool UIHasFocus(); bool RendererIsFullscreen(); void DoFullscreen(bool bF); - void ToggleDisplayMode(bool bFullscreen); - void UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem = nullptr); + void ToggleDisplayMode (bool bFullscreen); + void UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem=nullptr); void PopulateSavedPerspectives(); static void ConnectWiimote(int wm_idx, bool connect); void UpdateTitle(const std::string &str); @@ -175,6 +177,7 @@ private: bool m_bGameLoading; bool m_bClosing; bool m_confirmStop; + bool m_bHotkeysInit; std::vector drives; @@ -195,6 +198,8 @@ private: EToolbar_Max }; + wxTimer* m_poll_hotkey_timer; + wxBitmap m_Bitmaps[EToolbar_Max]; wxBitmap m_BitmapsMenu[EToolbar_Max]; @@ -233,8 +238,8 @@ private: void OnFloatingPageSize(wxSizeEvent& event); void DoFloatNotebookPage(wxWindowID Id); wxFrame * CreateParentFrame(wxWindowID Id = wxID_ANY, - const wxString& title = "", - wxWindow * = nullptr); + const wxString& title = "", + wxWindow * = nullptr); wxString AuiFullscreen, AuiCurrent; void AddPane(); void UpdateCurrentPerspective(); @@ -295,6 +300,7 @@ private: void OnConfigAudio(wxCommandEvent& event); void OnConfigControllers(wxCommandEvent& event); void OnConfigHotkey(wxCommandEvent& event); + void OnConfigMenuCommands(wxCommandEvent& event); void OnToggleFullscreen(wxCommandEvent& event); void OnToggleDualCore(wxCommandEvent& event); @@ -337,6 +343,11 @@ private: void OnSaveCurrentSlot(wxCommandEvent& event); void OnLoadCurrentSlot(wxCommandEvent& event); + void PollHotkeys(wxTimerEvent&); + void ParseHotkeys(wxKeyEvent &event); + + bool InitControllers(); + // Event table DECLARE_EVENT_TABLE(); }; diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index f1fc772dc..e9848176b 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -46,6 +46,7 @@ #include "Core/Core.h" #include "Core/CoreParameter.h" #include "Core/Host.h" +#include "Core/HotkeyManager.h" #include "Core/Movie.h" #include "Core/State.h" #include "Core/HW/CPU.h" @@ -138,7 +139,7 @@ wxMenuBar* CFrame::CreateMenu() fileMenu->Append(IDM_CHANGE_DISC, GetMenuLabel(HK_CHANGE_DISC)); wxMenu *externalDrive = new wxMenu; - fileMenu->Append(IDM_DRIVES, _("&Boot from DVD Drive..."), externalDrive); + fileMenu->Append(IDM_DRIVES, _("&Boot from DVD Backup..."), externalDrive); drives = cdio_get_devices(); // Windows Limitation of 24 character drives @@ -188,7 +189,7 @@ wxMenuBar* CFrame::CreateMenu() loadMenu->Append(IDM_UNDO_SAVE_STATE, GetMenuLabel(HK_UNDO_SAVE_STATE)); saveMenu->AppendSeparator(); - loadMenu->Append(IDM_LOAD_STATE_FILE, GetMenuLabel(HK_LOAD_STATE_FILE)); + loadMenu->Append(IDM_LOAD_STATE_FILE, GetMenuLabel(HK_LOAD_STATE_FILE)); loadMenu->Append(IDM_LOAD_SELECTED_SLOT, GetMenuLabel(HK_LOAD_STATE_SLOT_SELECTED)); loadMenu->Append(IDM_UNDO_LOAD_STATE, GetMenuLabel(HK_UNDO_LOAD_STATE)); loadMenu->AppendSeparator(); @@ -197,7 +198,7 @@ wxMenuBar* CFrame::CreateMenu() { loadMenu->Append(IDM_LOAD_SLOT_1 + i - 1, GetMenuLabel(HK_LOAD_STATE_SLOT_1 + i - 1)); saveMenu->Append(IDM_SAVE_SLOT_1 + i - 1, GetMenuLabel(HK_SAVE_STATE_SLOT_1 + i - 1)); - slotSelectMenu->Append(IDM_SELECT_SLOT_1 + i - 1, GetMenuLabel(HK_SELECT_STATE_SLOT_1 + i - 1)); + slotSelectMenu->Append(IDM_SELECT_SLOT_1 + i - 1, GetMenuLabel(HK_SELECT_STATE_SLOT_1 + i -1)); } loadMenu->AppendSeparator(); @@ -238,6 +239,7 @@ wxMenuBar* CFrame::CreateMenu() pOptionsMenu->Append(IDM_CONFIG_AUDIO, _("&Audio Settings")); pOptionsMenu->Append(IDM_CONFIG_CONTROLLERS, _("&Controller Settings")); pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings")); + pOptionsMenu->Append(IDM_CONFIG_MENU_COMMANDS, _("&Menu Accelerators")); if (g_pCodeWindow) { pOptionsMenu->AppendSeparator(); @@ -384,7 +386,7 @@ wxMenuBar* CFrame::CreateMenu() wxMenu* helpMenu = new wxMenu; // Re-enable when there's something useful to display */ // helpMenu->Append(wxID_HELP, _("&Help")); - helpMenu->Append(IDM_HELP_WEBSITE, _("Dolphin &Web Site")); + helpMenu->Append(IDM_HELP_WEBSITE, _("Dolphin &Website")); helpMenu->Append(IDM_HELP_ONLINE_DOCS, _("Online &Documentation")); helpMenu->Append(IDM_HELP_GITHUB, _("Dolphin at &GitHub")); helpMenu->AppendSeparator(); @@ -404,139 +406,139 @@ wxString CFrame::GetMenuLabel(int Id) switch (Id) { - case HK_OPEN: - Label = _("&Open..."); - break; - case HK_CHANGE_DISC: - Label = _("Change &Disc..."); - break; - case HK_REFRESH_LIST: - Label = _("&Refresh List"); - break; + case HK_OPEN: + Label = _("&Open..."); + break; + case HK_CHANGE_DISC: + Label = _("Change &Disc..."); + break; + case HK_REFRESH_LIST: + Label = _("&Refresh List"); + break; - case HK_PLAY_PAUSE: - if (Core::GetState() == Core::CORE_RUN) - Label = _("&Pause"); - else - Label = _("&Play"); - break; - case HK_STOP: - Label = _("&Stop"); - break; - case HK_RESET: - Label = _("&Reset"); - break; - case HK_FRAME_ADVANCE: - Label = _("&Frame Advance"); - break; + case HK_PLAY_PAUSE: + if (Core::GetState() == Core::CORE_RUN) + Label = _("&Pause"); + else + Label = _("&Play"); + break; + case HK_STOP: + Label = _("&Stop"); + break; + case HK_RESET: + Label = _("&Reset"); + break; + case HK_FRAME_ADVANCE: + Label = _("&Frame Advance"); + break; - case HK_START_RECORDING: - Label = _("Start Re&cording Input"); - break; - case HK_PLAY_RECORDING: - Label = _("P&lay Input Recording..."); - break; - case HK_EXPORT_RECORDING: - Label = _("Export Recording..."); - break; - case HK_READ_ONLY_MODE: - Label = _("&Read-Only Mode"); - break; + case HK_START_RECORDING: + Label = _("Start Re&cording Input"); + break; + case HK_PLAY_RECORDING: + Label = _("P&lay Input Recording..."); + break; + case HK_EXPORT_RECORDING: + Label = _("Export Recording..."); + break; + case HK_READ_ONLY_MODE: + Label = _("&Read-Only Mode"); + break; - case HK_FULLSCREEN: - Label = _("&Fullscreen"); - break; - case HK_SCREENSHOT: - Label = _("Take Screenshot"); - break; - case HK_EXIT: - Label = _("Exit"); - break; + case HK_FULLSCREEN: + Label = _("&Fullscreen"); + break; + case HK_SCREENSHOT: + Label = _("Take Screenshot"); + break; + case HK_EXIT: + Label = _("Exit"); + break; - case HK_WIIMOTE1_CONNECT: - case HK_WIIMOTE2_CONNECT: - case HK_WIIMOTE3_CONNECT: - case HK_WIIMOTE4_CONNECT: - Label = wxString::Format(_("Connect Wiimote %i"), - Id - HK_WIIMOTE1_CONNECT + 1); - break; - case HK_BALANCEBOARD_CONNECT: - Label = _("Connect Balance Board"); - break; - case HK_LOAD_STATE_SLOT_1: - case HK_LOAD_STATE_SLOT_2: - case HK_LOAD_STATE_SLOT_3: - case HK_LOAD_STATE_SLOT_4: - case HK_LOAD_STATE_SLOT_5: - case HK_LOAD_STATE_SLOT_6: - case HK_LOAD_STATE_SLOT_7: - case HK_LOAD_STATE_SLOT_8: - case HK_LOAD_STATE_SLOT_9: - case HK_LOAD_STATE_SLOT_10: - Label = wxString::Format(_("Slot %i"), - Id - HK_LOAD_STATE_SLOT_1 + 1); - break; + case HK_WIIMOTE1_CONNECT: + case HK_WIIMOTE2_CONNECT: + case HK_WIIMOTE3_CONNECT: + case HK_WIIMOTE4_CONNECT: + Label = wxString::Format(_("Connect Wiimote %i"), + Id - HK_WIIMOTE1_CONNECT + 1); + break; + case HK_BALANCEBOARD_CONNECT: + Label = _("Connect Balance Board"); + break; + case HK_LOAD_STATE_SLOT_1: + case HK_LOAD_STATE_SLOT_2: + case HK_LOAD_STATE_SLOT_3: + case HK_LOAD_STATE_SLOT_4: + case HK_LOAD_STATE_SLOT_5: + case HK_LOAD_STATE_SLOT_6: + case HK_LOAD_STATE_SLOT_7: + case HK_LOAD_STATE_SLOT_8: + case HK_LOAD_STATE_SLOT_9: + case HK_LOAD_STATE_SLOT_10: + Label = wxString::Format(_("Slot %i"), + Id - HK_LOAD_STATE_SLOT_1 + 1); + break; - case HK_SAVE_STATE_SLOT_1: - case HK_SAVE_STATE_SLOT_2: - case HK_SAVE_STATE_SLOT_3: - case HK_SAVE_STATE_SLOT_4: - case HK_SAVE_STATE_SLOT_5: - case HK_SAVE_STATE_SLOT_6: - case HK_SAVE_STATE_SLOT_7: - case HK_SAVE_STATE_SLOT_8: - case HK_SAVE_STATE_SLOT_9: - case HK_SAVE_STATE_SLOT_10: - Label = wxString::Format(_("Slot %i"), - Id - HK_SAVE_STATE_SLOT_1 + 1); - break; - case HK_SAVE_STATE_FILE: - Label = _("Save State..."); - break; + case HK_SAVE_STATE_SLOT_1: + case HK_SAVE_STATE_SLOT_2: + case HK_SAVE_STATE_SLOT_3: + case HK_SAVE_STATE_SLOT_4: + case HK_SAVE_STATE_SLOT_5: + case HK_SAVE_STATE_SLOT_6: + case HK_SAVE_STATE_SLOT_7: + case HK_SAVE_STATE_SLOT_8: + case HK_SAVE_STATE_SLOT_9: + case HK_SAVE_STATE_SLOT_10: + Label = wxString::Format(_("Slot %i"), + Id - HK_SAVE_STATE_SLOT_1 + 1); + break; + case HK_SAVE_STATE_FILE: + Label = _("Save State..."); + break; - case HK_LOAD_LAST_STATE_1: - case HK_LOAD_LAST_STATE_2: - case HK_LOAD_LAST_STATE_3: - case HK_LOAD_LAST_STATE_4: - case HK_LOAD_LAST_STATE_5: - case HK_LOAD_LAST_STATE_6: - case HK_LOAD_LAST_STATE_7: - case HK_LOAD_LAST_STATE_8: - Label = wxString::Format(_("Last %i"), - Id - HK_LOAD_LAST_STATE_1 + 1); - break; - case HK_LOAD_STATE_FILE: - Label = _("Load State..."); - break; + case HK_LOAD_LAST_STATE_1: + case HK_LOAD_LAST_STATE_2: + case HK_LOAD_LAST_STATE_3: + case HK_LOAD_LAST_STATE_4: + case HK_LOAD_LAST_STATE_5: + case HK_LOAD_LAST_STATE_6: + case HK_LOAD_LAST_STATE_7: + case HK_LOAD_LAST_STATE_8: + Label = wxString::Format(_("Last %i"), + Id - HK_LOAD_LAST_STATE_1 + 1); + break; + case HK_LOAD_STATE_FILE: + Label = _("Load State..."); + break; - case HK_SAVE_FIRST_STATE: Label = _("Save Oldest State"); break; - case HK_UNDO_LOAD_STATE: Label = _("Undo Load State"); break; - case HK_UNDO_SAVE_STATE: Label = _("Undo Save State"); break; + case HK_SAVE_FIRST_STATE: Label = _("Save Oldest State"); break; + case HK_UNDO_LOAD_STATE: Label = _("Undo Load State"); break; + case HK_UNDO_SAVE_STATE: Label = _("Undo Save State"); break; - case HK_SAVE_STATE_SLOT_SELECTED: - Label = _("Save state to selected slot"); - break; + case HK_SAVE_STATE_SLOT_SELECTED: + Label = _("Save state to selected slot"); + break; - case HK_LOAD_STATE_SLOT_SELECTED: - Label = _("Load state from selected slot"); - break; + case HK_LOAD_STATE_SLOT_SELECTED: + Label = _("Load state from selected slot"); + break; - case HK_SELECT_STATE_SLOT_1: - case HK_SELECT_STATE_SLOT_2: - case HK_SELECT_STATE_SLOT_3: - case HK_SELECT_STATE_SLOT_4: - case HK_SELECT_STATE_SLOT_5: - case HK_SELECT_STATE_SLOT_6: - case HK_SELECT_STATE_SLOT_7: - case HK_SELECT_STATE_SLOT_8: - case HK_SELECT_STATE_SLOT_9: - case HK_SELECT_STATE_SLOT_10: - Label = wxString::Format(_("Select Slot %i"), Id - HK_SELECT_STATE_SLOT_1 + 1); - break; + case HK_SELECT_STATE_SLOT_1: + case HK_SELECT_STATE_SLOT_2: + case HK_SELECT_STATE_SLOT_3: + case HK_SELECT_STATE_SLOT_4: + case HK_SELECT_STATE_SLOT_5: + case HK_SELECT_STATE_SLOT_6: + case HK_SELECT_STATE_SLOT_7: + case HK_SELECT_STATE_SLOT_8: + case HK_SELECT_STATE_SLOT_9: + case HK_SELECT_STATE_SLOT_10: + Label = wxString::Format(_("Select Slot %i"), Id - HK_SELECT_STATE_SLOT_1 + 1); + break; - default: - Label = wxString::Format(_("Undefined %i"), Id); + default: + Label = wxString::Format(_("Undefined %i"), Id); } hotkeymodifier &= wxMOD_CONTROL | wxMOD_ALT | wxMOD_SHIFT; @@ -559,19 +561,19 @@ void CFrame::PopulateToolbar(wxToolBar* ToolBar) ToolBar->SetToolBitmapSize(wxSize(w, h)); - WxUtils::AddToolbarButton(ToolBar, wxID_OPEN, _("Open"), m_Bitmaps[Toolbar_FileOpen], _("Open file...")); - WxUtils::AddToolbarButton(ToolBar, wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list")); - WxUtils::AddToolbarButton(ToolBar, IDM_BROWSE, _("Browse"), m_Bitmaps[Toolbar_Browse], _("Browse for an ISO directory...")); + WxUtils::AddToolbarButton(ToolBar, wxID_OPEN, _("Open"), m_Bitmaps[Toolbar_FileOpen], _("Open file...")); + WxUtils::AddToolbarButton(ToolBar, wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list")); + WxUtils::AddToolbarButton(ToolBar, IDM_BROWSE, _("Browse"), m_Bitmaps[Toolbar_Browse], _("Browse for an ISO directory...")); ToolBar->AddSeparator(); - WxUtils::AddToolbarButton(ToolBar, IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play")); - WxUtils::AddToolbarButton(ToolBar, IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop")); - WxUtils::AddToolbarButton(ToolBar, IDM_TOGGLE_FULLSCREEN, _("FullScr"), m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen")); - WxUtils::AddToolbarButton(ToolBar, IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_Screenshot], _("Take Screenshot")); + WxUtils::AddToolbarButton(ToolBar, IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play")); + WxUtils::AddToolbarButton(ToolBar, IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop")); + WxUtils::AddToolbarButton(ToolBar, IDM_TOGGLE_FULLSCREEN, _("FullScr"), m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen")); + WxUtils::AddToolbarButton(ToolBar, IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_Screenshot], _("Take Screenshot")); ToolBar->AddSeparator(); - WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_AUDIO, _("Audio"), m_Bitmaps[Toolbar_ConfigAudio], _("Audio settings")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings")); + WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); + WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); + WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_AUDIO, _("Audio"), m_Bitmaps[Toolbar_ConfigAudio], _("Audio settings")); + WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings")); } @@ -606,18 +608,18 @@ void CFrame::InitBitmaps() { auto const dir = StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name)); - m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Browse].LoadFile(dir + "browse.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Play].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Stop].LoadFile(dir + "stop.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Pause].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_ConfigMain].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_ConfigGFX].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_ConfigAudio].LoadFile(dir + "audio.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Controller].LoadFile(dir + "classic.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Screenshot].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_FullScreen].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_FileOpen ].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Refresh ].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Browse ].LoadFile(dir + "browse.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Play ].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Stop ].LoadFile(dir + "stop.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Pause ].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigMain ].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigGFX ].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigAudio].LoadFile(dir + "audio.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Controller ].LoadFile(dir + "classic.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Screenshot ].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_FullScreen ].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); // Update in case the bitmap has been updated if (m_ToolBar != nullptr) @@ -650,14 +652,14 @@ void CFrame::BootGame(const std::string& filename) bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName(); } else if (!StartUp.m_strDefaultISO.empty() && - File::Exists(StartUp.m_strDefaultISO)) + File::Exists(StartUp.m_strDefaultISO)) { bootfile = StartUp.m_strDefaultISO; } else { if (!SConfig::GetInstance().m_LastFilename.empty() && - File::Exists(SConfig::GetInstance().m_LastFilename)) + File::Exists(SConfig::GetInstance().m_LastFilename)) { bootfile = SConfig::GetInstance().m_LastFilename; } @@ -682,7 +684,7 @@ void CFrame::BootGame(const std::string& filename) } // Open file to boot -void CFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnOpen(wxCommandEvent& WXUNUSED (event)) { DoOpen(true); } @@ -692,13 +694,13 @@ void CFrame::DoOpen(bool Boot) std::string currentDir = File::GetCurrentDir(); wxString path = wxFileSelector( - _("Select the file to load"), - wxEmptyString, wxEmptyString, wxEmptyString, - _("All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)") + - wxString::Format("|*.elf;*.dol;*.gcm;*.iso;*.wbfs;*.ciso;*.gcz;*.wad;*.dff;*.tmd|%s", - wxGetTranslation(wxALL_FILES)), - wxFD_OPEN | wxFD_FILE_MUST_EXIST, - this); + _("Select the file to load"), + wxEmptyString, wxEmptyString, wxEmptyString, + _("All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)") + + wxString::Format("|*.elf;*.dol;*.gcm;*.iso;*.wbfs;*.ciso;*.gcz;*.wad;*.dff;*.tmd|%s", + wxGetTranslation(wxALL_FILES)), + wxFD_OPEN | wxFD_FILE_MUST_EXIST, + this); if (path.IsEmpty()) return; @@ -708,7 +710,7 @@ void CFrame::DoOpen(bool Boot) if (currentDir != currentDir2) { PanicAlertT("Current directory changed from %s to %s after wxFileSelector!", - currentDir.c_str(), currentDir2.c_str()); + currentDir.c_str(), currentDir2.c_str()); File::SetCurrentDir(currentDir); } @@ -741,14 +743,14 @@ void CFrame::OnTASInput(wxCommandEvent& event) if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU && !(Core::IsRunning() && !SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)) { - g_TASInputDlg[i + 4]->CreateWiiLayout(i); - g_TASInputDlg[i + 4]->Show(true); - g_TASInputDlg[i + 4]->SetTitle(wxString::Format(_("TAS Input - Wiimote %d"), i + 1)); + g_TASInputDlg[i+4]->CreateWiiLayout(i); + g_TASInputDlg[i+4]->Show(true); + g_TASInputDlg[i+4]->SetTitle(wxString::Format(_("TAS Input - Wiimote %d"), i + 1)); } } } -void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) { SConfig::GetInstance().m_PauseMovie = !SConfig::GetInstance().m_PauseMovie; SConfig::GetInstance().SaveSettings(); @@ -765,13 +767,13 @@ void CFrame::OnToggleDumpAudio(wxCommandEvent& WXUNUSED(event)) SConfig::GetInstance().m_DumpAudio = !SConfig::GetInstance().m_DumpAudio; } -void CFrame::OnShowLag(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event)) { SConfig::GetInstance().m_ShowLag = !SConfig::GetInstance().m_ShowLag; SConfig::GetInstance().SaveSettings(); } -void CFrame::OnShowFrameCount(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnShowFrameCount(wxCommandEvent& WXUNUSED (event)) { SConfig::GetInstance().m_ShowFrameCount = !SConfig::GetInstance().m_ShowFrameCount; SConfig::GetInstance().SaveSettings(); @@ -794,12 +796,12 @@ void CFrame::OnFrameStep(wxCommandEvent& event) UpdateGUI(); } -void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event)) { DoOpen(false); } -void CFrame::OnRecord(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event)) { if ((!Core::IsRunningAndStarted() && Core::IsRunning()) || Movie::IsRecordingInput() || Movie::IsPlayingInput()) return; @@ -826,15 +828,15 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED(event)) BootGame(""); } -void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event)) { wxString path = wxFileSelector( - _("Select The Recording File"), - wxEmptyString, wxEmptyString, wxEmptyString, - _("Dolphin TAS Movies (*.dtm)") + - wxString::Format("|*.dtm|%s", wxGetTranslation(wxALL_FILES)), - wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, - this); + _("Select The Recording File"), + wxEmptyString, wxEmptyString, wxEmptyString, + _("Dolphin TAS Movies (*.dtm)") + + wxString::Format("|*.dtm|%s", wxGetTranslation(wxALL_FILES)), + wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, + this); if (path.IsEmpty()) return; @@ -850,12 +852,12 @@ void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED(event)) BootGame(""); } -void CFrame::OnRecordExport(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnRecordExport(wxCommandEvent& WXUNUSED (event)) { DoRecordingSave(); } -void CFrame::OnPlay(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event)) { if (Core::IsRunning()) { @@ -937,12 +939,12 @@ void CFrame::ToggleDisplayMode(bool bFullscreen) if (bFullscreen && SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto") { DEVMODE dmScreenSettings; - memset(&dmScreenSettings, 0, sizeof(dmScreenSettings)); + memset(&dmScreenSettings,0,sizeof(dmScreenSettings)); dmScreenSettings.dmSize = sizeof(dmScreenSettings); sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(), - "%dx%d", &dmScreenSettings.dmPelsWidth, &dmScreenSettings.dmPelsHeight); + "%dx%d", &dmScreenSettings.dmPelsWidth, &dmScreenSettings.dmPelsHeight); dmScreenSettings.dmBitsPerPel = 32; - dmScreenSettings.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + dmScreenSettings.dmFields = DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT; // Try To Set Selected Mode And Get Results. NOTE: CDS_FULLSCREEN Gets Rid Of Start Bar. ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN); @@ -996,7 +998,7 @@ void CFrame::StartGame(const std::string& filename) else { wxPoint position(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos, - SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos); + SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos); #ifdef __APPLE__ // On OS X, the render window's title bar is not visible, // and the window therefore not easily moved, when the @@ -1006,12 +1008,12 @@ void CFrame::StartGame(const std::string& filename) #endif wxSize size(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth, - SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); + SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); #ifdef _WIN32 // Out of desktop check int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN); int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN); - int width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + int width = GetSystemMetrics(SM_CXVIRTUALSCREEN); int height = GetSystemMetrics(SM_CYVIRTUALSCREEN); if ((leftPos + width) < (position.x + size.GetWidth()) || leftPos > position.x || (topPos + height) < (position.y + size.GetHeight()) || topPos > position.y) position.x = position.y = wxDefaultCoord; @@ -1039,10 +1041,10 @@ void CFrame::StartGame(const std::string& filename) } #if defined(__APPLE__) - NSView *view = (NSView *)m_RenderFrame->GetHandle(); + NSView *view = (NSView *) m_RenderFrame->GetHandle(); NSWindow *window = [view window]; - [window setCollectionBehavior : NSWindowCollectionBehaviorFullScreenPrimary]; + [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; #endif wxBeginBusyCursor(); @@ -1062,20 +1064,20 @@ void CFrame::StartGame(const std::string& filename) else { #if defined(HAVE_X11) && HAVE_X11 - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) - X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()), - X11Utils::XWindowFromHandle(GetHandle()), true); + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) + X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()), + X11Utils::XWindowFromHandle(GetHandle()), true); #endif m_RenderParent->SetFocus(); - wxTheApp->Bind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); - wxTheApp->Bind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); - wxTheApp->Bind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); - wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); - wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); - wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); - wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); + wxTheApp->Bind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); + wxTheApp->Bind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this); m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); } @@ -1084,11 +1086,11 @@ void CFrame::StartGame(const std::string& filename) void CFrame::OnBootDrive(wxCommandEvent& event) { - BootGame(drives[event.GetId() - IDM_DRIVE1]); + BootGame(drives[event.GetId()-IDM_DRIVE1]); } // Refresh the file list and browse for a favorites directory -void CFrame::OnRefresh(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnRefresh(wxCommandEvent& WXUNUSED (event)) { if (m_GameListCtrl) { @@ -1097,7 +1099,7 @@ void CFrame::OnRefresh(wxCommandEvent& WXUNUSED(event)) } -void CFrame::OnBrowse(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnBrowse(wxCommandEvent& WXUNUSED (event)) { if (m_GameListCtrl) { @@ -1106,7 +1108,7 @@ void CFrame::OnBrowse(wxCommandEvent& WXUNUSED(event)) } // Create screenshot -void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event)) { Core::SaveScreenShot(); } @@ -1125,7 +1127,7 @@ void CFrame::DoPause() { Core::SetState(Core::CORE_RUN); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && - RendererHasFocus()) + RendererHasFocus()) m_RenderParent->SetCursor(wxCURSOR_BLANK); } UpdateGUI(); @@ -1144,7 +1146,7 @@ void CFrame::DoStop() m_bGameLoading = false; if (Core::GetState() != Core::CORE_UNINITIALIZED || - m_RenderParent != nullptr) + m_RenderParent != nullptr) { #if defined __WXGTK__ wxMutexGuiLeave(); @@ -1209,7 +1211,6 @@ void CFrame::DoStop() Movie::EndPlayInput(false); NetPlay::StopGame(); - wxBeginBusyCursor(); BootManager::Stop(); UpdateGUI(); } @@ -1217,14 +1218,12 @@ void CFrame::DoStop() void CFrame::OnStopped() { - wxEndBusyCursor(); - m_confirmStop = false; #if defined(HAVE_X11) && HAVE_X11 if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()), - X11Utils::XWindowFromHandle(GetHandle()), false); + X11Utils::XWindowFromHandle(GetHandle()), false); #endif m_RenderFrame->SetTitle(StrToWxStr(scm_rev_str)); @@ -1232,15 +1231,15 @@ void CFrame::OnStopped() m_RenderParent->Unbind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); // Keyboard - wxTheApp->Unbind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); - wxTheApp->Unbind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); + wxTheApp->Unbind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); + wxTheApp->Unbind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); // Mouse - wxTheApp->Unbind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); - wxTheApp->Unbind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); wxTheApp->Unbind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); - wxTheApp->Unbind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); - wxTheApp->Unbind(wxEVT_MOTION, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MOTION, &CFrame::OnMouse, this); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxNullCursor); DoFullscreen(false); @@ -1293,12 +1292,12 @@ void CFrame::DoRecordingSave() DoPause(); wxString path = wxFileSelector( - _("Select The Recording File"), - wxEmptyString, wxEmptyString, wxEmptyString, - _("Dolphin TAS Movies (*.dtm)") + - wxString::Format("|*.dtm|%s", wxGetTranslation(wxALL_FILES)), - wxFD_SAVE | wxFD_PREVIEW | wxFD_OVERWRITE_PROMPT, - this); + _("Select The Recording File"), + wxEmptyString, wxEmptyString, wxEmptyString, + _("Dolphin TAS Movies (*.dtm)") + + wxString::Format("|*.dtm|%s", wxGetTranslation(wxALL_FILES)), + wxFD_SAVE | wxFD_PREVIEW | wxFD_OVERWRITE_PROMPT, + this); if (path.IsEmpty()) return; @@ -1309,19 +1308,19 @@ void CFrame::DoRecordingSave() DoPause(); } -void CFrame::OnStop(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnStop(wxCommandEvent& WXUNUSED (event)) { DoStop(); } -void CFrame::OnReset(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnReset(wxCommandEvent& WXUNUSED (event)) { if (Movie::IsRecordingInput()) Movie::g_bReset = true; ProcessorInterface::ResetButton_Tap(); } -void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event)) { CConfigMain ConfigMain(this); if (ConfigMain.ShowModal() == wxID_OK) @@ -1329,13 +1328,13 @@ void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED(event)) UpdateGUI(); } -void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event)) { if (g_video_backend) g_video_backend->ShowConfig(this); } -void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED (event)) { CConfigMain ConfigMain(this); ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE); @@ -1343,18 +1342,52 @@ void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED(event)) m_GameListCtrl->Update(); } -void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED (event)) { ControllerConfigDiag config_dlg(this); config_dlg.ShowModal(); - config_dlg.Destroy(); } -void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnConfigMenuCommands(wxCommandEvent& WXUNUSED(event)) { - HotkeyConfigDialog *m_HotkeyDialog = new HotkeyConfigDialog(this); - m_HotkeyDialog->ShowModal(); - m_HotkeyDialog->Destroy(); + HotkeyConfigDialog m_HotkeyDialog(this); + m_HotkeyDialog.ShowModal(); + + // Update the GUI in case menu accelerators were changed + UpdateGUI(); +} + + +void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event)) +{ + bool was_init = false; + + InputConfig* const hotkey_plugin = HotkeyManagerEmu::GetConfig(); + + // check if game is running + if (g_controller_interface.IsInit()) + { + was_init = true; + } + else + { +#if defined(HAVE_X11) && HAVE_X11 + Window win = X11Utils::XWindowFromHandle(GetHandle()); + HotkeyManagerEmu::Initialize(reinterpret_cast(win)); +#else + HotkeyManagerEmu::Initialize(reinterpret_cast(GetHandle())); +#endif + } + + InputConfigDialog m_ConfigFrame(this, *hotkey_plugin, _("Dolphin Hotkeys")); + m_ConfigFrame.ShowModal(); + + // if game isn't running + if (!was_init) + { + HotkeyManagerEmu::Shutdown(); + } + // Update the GUI in case menu accelerators were changed UpdateGUI(); } @@ -1364,11 +1397,11 @@ void CFrame::OnHelp(wxCommandEvent& event) switch (event.GetId()) { case wxID_ABOUT: - { - AboutDolphin frame(this); - frame.ShowModal(); - } - break; + { + AboutDolphin frame(this); + frame.ShowModal(); + } + break; case IDM_HELP_WEBSITE: WxUtils::Launch("https://dolphin-emu.org/"); break; @@ -1376,7 +1409,7 @@ void CFrame::OnHelp(wxCommandEvent& event) WxUtils::Launch("https://dolphin-emu.org/docs/guides/"); break; case IDM_HELP_GITHUB: - WxUtils::Launch("https://github.com/dolphin-emu/dolphin/"); + WxUtils::Launch("https://github.com/dolphin-emu/dolphin"); break; } } @@ -1391,7 +1424,7 @@ void CFrame::ClearStatusBar() void CFrame::StatusBarMessage(const char * Text, ...) { - const int MAX_BYTES = 1024 * 10; + const int MAX_BYTES = 1024*10; char Str[MAX_BYTES]; va_list ArgPtr; va_start(ArgPtr, Text); @@ -1400,7 +1433,7 @@ void CFrame::StatusBarMessage(const char * Text, ...) if (this->GetStatusBar()->IsEnabled()) { - this->GetStatusBar()->SetStatusText(StrToWxStr(Str), 0); + this->GetStatusBar()->SetStatusText(StrToWxStr(Str),0); } } @@ -1408,7 +1441,7 @@ void CFrame::StatusBarMessage(const char * Text, ...) // Miscellaneous menus // --------------------- // NetPlay stuff -void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event)) { if (!g_NetPlaySetupDiag) { @@ -1423,24 +1456,24 @@ void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED(event)) } } -void CFrame::OnMemcard(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event)) { CMemcardManager MemcardManager(this); MemcardManager.ShowModal(); } -void CFrame::OnExportAllSaves(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnExportAllSaves(wxCommandEvent& WXUNUSED (event)) { CWiiSaveCrypted::ExportAllSaves(); } -void CFrame::OnImportSave(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event)) { wxString path = wxFileSelector(_("Select the save file"), - wxEmptyString, wxEmptyString, wxEmptyString, - _("Wii save files (*.bin)|*.bin"), - wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, - this); + wxEmptyString, wxEmptyString, wxEmptyString, + _("Wii save files (*.bin)|*.bin"), + wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, + this); if (!path.IsEmpty()) { @@ -1448,7 +1481,7 @@ void CFrame::OnImportSave(wxCommandEvent& WXUNUSED(event)) } } -void CFrame::OnShow_CheatsWindow(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnShow_CheatsWindow(wxCommandEvent& WXUNUSED (event)) { if (!g_CheatsWindow) g_CheatsWindow = new wxCheatsWindow(this); @@ -1529,7 +1562,7 @@ void CFrame::UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem) } } -void CFrame::OnFifoPlayer(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnFifoPlayer(wxCommandEvent& WXUNUSED (event)) { if (m_FifoPlayerDlg) { @@ -1548,7 +1581,7 @@ void CFrame::ConnectWiimote(int wm_idx, bool connect) { GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->Activate(connect); wxString msg(wxString::Format(_("Wiimote %i %s"), wm_idx + 1, - connect ? _("Connected") : _("Disconnected"))); + connect ? _("Connected") : _("Disconnected"))); Core::DisplayMessage(WxStrToStr(msg), 3000); Host_UpdateMainFrame(); } @@ -1561,30 +1594,30 @@ void CFrame::OnConnectWiimote(wxCommandEvent& event) // Toggle fullscreen. In Windows the fullscreen mode is accomplished by expanding the m_Panel to cover // the entire screen (when we render to the main window). -void CFrame::OnToggleFullscreen(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnToggleFullscreen(wxCommandEvent& WXUNUSED (event)) { DoFullscreen(!RendererIsFullscreen()); } -void CFrame::OnToggleDualCore(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnToggleDualCore(wxCommandEvent& WXUNUSED (event)) { SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = !SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; SConfig::GetInstance().SaveSettings(); } -void CFrame::OnToggleSkipIdle(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnToggleSkipIdle(wxCommandEvent& WXUNUSED (event)) { SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle = !SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; SConfig::GetInstance().SaveSettings(); } -void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event)) { wxString path = wxFileSelector( _("Select the state to load"), wxEmptyString, wxEmptyString, wxEmptyString, _("All Save States (sav, s##)") + - wxString::Format("|*.sav;*.s??|%s", wxGetTranslation(wxALL_FILES)), + wxString::Format("|*.sav;*.s??|%s", wxGetTranslation(wxALL_FILES)), wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, this); @@ -1592,13 +1625,13 @@ void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED(event)) State::LoadAs(WxStrToStr(path)); } -void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED (event)) { wxString path = wxFileSelector( _("Select the state to save"), wxEmptyString, wxEmptyString, wxEmptyString, _("All Save States (sav, s##)") + - wxString::Format("|*.sav;*.s??|%s", wxGetTranslation(wxALL_FILES)), + wxString::Format("|*.sav;*.s??|%s", wxGetTranslation(wxALL_FILES)), wxFD_SAVE, this); @@ -1622,13 +1655,13 @@ void CFrame::OnSaveFirstState(wxCommandEvent& WXUNUSED(event)) State::SaveFirstSaved(); } -void CFrame::OnUndoLoadState(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnUndoLoadState(wxCommandEvent& WXUNUSED (event)) { if (Core::IsRunningAndStarted()) State::UndoLoadState(); } -void CFrame::OnUndoSaveState(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnUndoSaveState(wxCommandEvent& WXUNUSED (event)) { if (Core::IsRunningAndStarted()) State::UndoSaveState(); @@ -1694,11 +1727,11 @@ void CFrame::OnSaveCurrentSlot(wxCommandEvent& event) void CFrame::UpdateGUI() { // Save status - bool Initialized = Core::IsRunning(); - bool Running = Core::GetState() == Core::CORE_RUN; - bool Paused = Core::GetState() == Core::CORE_PAUSE; - bool Stopping = Core::GetState() == Core::CORE_STOPPING; - bool RunningWii = Initialized && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; + bool Initialized = Core::IsRunning(); + bool Running = Core::GetState() == Core::CORE_RUN; + bool Paused = Core::GetState() == Core::CORE_PAUSE; + bool Stopping = Core::GetState() == Core::CORE_STOPPING; + bool RunningWii = Initialized && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; // Make sure that we have a toolbar if (m_ToolBar) @@ -1755,15 +1788,15 @@ void CFrame::UpdateGUI() if (RunningWii) { GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Check(GetUsbPointer()-> - AccessWiiMote(0x0100)->IsConnected()); + AccessWiiMote(0x0100)->IsConnected()); GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Check(GetUsbPointer()-> - AccessWiiMote(0x0101)->IsConnected()); + AccessWiiMote(0x0101)->IsConnected()); GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Check(GetUsbPointer()-> - AccessWiiMote(0x0102)->IsConnected()); + AccessWiiMote(0x0102)->IsConnected()); GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE4)->Check(GetUsbPointer()-> - AccessWiiMote(0x0103)->IsConnected()); + AccessWiiMote(0x0103)->IsConnected()); GetMenuBar()->FindItem(IDM_CONNECT_BALANCEBOARD)->Check(GetUsbPointer()-> - AccessWiiMote(0x0104)->IsConnected()); + AccessWiiMote(0x0104)->IsConnected()); } if (m_ToolBar) @@ -1805,7 +1838,7 @@ void CFrame::UpdateGUI() } // Prepare to load last selected file, enable play button else if (!SConfig::GetInstance().m_LastFilename.empty() && - File::Exists(SConfig::GetInstance().m_LastFilename)) + File::Exists(SConfig::GetInstance().m_LastFilename)) { if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index a055aa270..df7bfe291 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -462,24 +462,10 @@ void CGameListCtrl::InsertItemInReportView(long _Index) titlestxt.close(); } - std::string GameIni[3]; - GameIni[0] = File::GetUserPath(D_GAMESETTINGS_IDX) + rISOFile.GetUniqueID() + ".ini"; - GameIni[1] = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + rISOFile.GetUniqueID() + std::to_string(rISOFile.GetRevision()) + ".ini"; - GameIni[2] = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + rISOFile.GetUniqueID() + ".ini"; std::string title; - IniFile gameini; - for (int i = 0; i < 3; ++i) - { - if (File::Exists(GameIni[i])) - { - gameini.Load(GameIni[i]); - if (gameini.GetIfExists("EmuState", "Title", &title)) - { - name = title; - break; - } - } - } + IniFile gameini = SCoreStartupParameter::LoadGameIni(rISOFile.GetUniqueID(), rISOFile.GetRevision()); + if (gameini.GetIfExists("EmuState", "Title", &title)) + name = title; SetItem(_Index, COLUMN_TITLE, StrToWxStr(name), -1); diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index fe888d222..2ca8a01f6 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -149,6 +149,7 @@ enum IDM_CONFIG_AUDIO, IDM_CONFIG_CONTROLLERS, IDM_CONFIG_HOTKEYS, + IDM_CONFIG_MENU_COMMANDS, IDM_CONFIG_LOGGER, // Views diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index afddacd38..8eb51c430 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/HotkeyDlg.cpp @@ -28,9 +28,9 @@ #include "DolphinWX/WXInputBase.h" HotkeyConfigDialog::HotkeyConfigDialog(wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &position, const wxSize& size, long style) - : wxDialog(parent, id, title, position, size, style) - , m_ButtonMappingTimer(this) + const wxPoint &position, const wxSize& size, long style) +: wxDialog(parent, id, title, position, size, style) +, m_ButtonMappingTimer(this) { CreateHotkeyGUIControls(); @@ -107,8 +107,8 @@ void HotkeyConfigDialog::OnKeyDown(wxKeyEvent& event) // Proceed to apply the binding to the selected button. SetButtonText(ClickedButton->GetId(), - WxUtils::WXKeyToString(g_Pressed), - WxUtils::WXKeymodToString(g_Modkey)); + WxUtils::WXKeyToString(g_Pressed), + WxUtils::WXKeymodToString(g_Modkey)); SaveButtonMapping(ClickedButton->GetId(), g_Pressed, g_Modkey); } EndGetButtons(); @@ -128,7 +128,7 @@ void HotkeyConfigDialog::DoGetButtons(int _GetId) const int TimesPerSecond = 40; // How often to run the check // If the Id has changed or the timer is not running we should start one - if (GetButtonWaitingID != _GetId || !m_ButtonMappingTimer.IsRunning()) + if ( GetButtonWaitingID != _GetId || !m_ButtonMappingTimer.IsRunning() ) { if (m_ButtonMappingTimer.IsRunning()) m_ButtonMappingTimer.Stop(); @@ -185,6 +185,112 @@ void HotkeyConfigDialog::OnButtonClick(wxCommandEvent& event) #define HOTKEY_NUM_COLUMNS 2 +const wxString hkText[] = +{ + _("Open"), + _("Change Disc"), + _("Refresh List"), + + _("Play/Pause"), + _("Stop"), + _("Reset"), + _("Frame Advance"), + + _("Start Recording"), + _("Play Recording"), + _("Export Recording"), + _("Read-only mode"), + + _("Toggle Fullscreen"), + _("Take Screenshot"), + _("Exit"), + + _("Connect Wiimote 1"), + _("Connect Wiimote 2"), + _("Connect Wiimote 3"), + _("Connect Wiimote 4"), + _("Connect Balance Board"), + + _("Volume Down"), + _("Volume Up"), + _("Volume Toggle Mute"), + + _("Toggle IR"), + _("Toggle Aspect Ratio"), + _("Toggle EFB Copies"), + _("Toggle Fog"), + _("Toggle Frame limit"), + _("Decrease Frame limit"), + _("Increase Frame limit"), + + _("Freelook Decrease Speed"), + _("Freelook Increase Speed"), + _("Freelook Reset Speed"), + _("Freelook Move Up"), + _("Freelook Move Down"), + _("Freelook Move Left"), + _("Freelook Move Right"), + _("Freelook Zoom In"), + _("Freelook Zoom Out"), + _("Freelook Reset"), + + _("Decrease Depth"), + _("Increase Depth"), + _("Decrease Convergence"), + _("Increase Convergence"), + + _("Load State Slot 1"), + _("Load State Slot 2"), + _("Load State Slot 3"), + _("Load State Slot 4"), + _("Load State Slot 5"), + _("Load State Slot 6"), + _("Load State Slot 7"), + _("Load State Slot 8"), + _("Load State Slot 9"), + _("Load State Slot 10"), + + _("Save State Slot 1"), + _("Save State Slot 2"), + _("Save State Slot 3"), + _("Save State Slot 4"), + _("Save State Slot 5"), + _("Save State Slot 6"), + _("Save State Slot 7"), + _("Save State Slot 8"), + _("Save State Slot 9"), + _("Save State Slot 10"), + + _("Select State Slot 1"), + _("Select State Slot 2"), + _("Select State Slot 3"), + _("Select State Slot 4"), + _("Select State Slot 5"), + _("Select State Slot 6"), + _("Select State Slot 7"), + _("Select State Slot 8"), + _("Select State Slot 9"), + _("Select State Slot 10"), + + _("Save to selected slot"), + _("Load from selected slot"), + + _("Load State Last 1"), + _("Load State Last 2"), + _("Load State Last 3"), + _("Load State Last 4"), + _("Load State Last 5"), + _("Load State Last 6"), + _("Load State Last 7"), + _("Load State Last 8"), + + _("Save Oldest State"), + _("Undo Load State"), + _("Undo Save State"), + _("Save State"), + _("Load State"), +}; + void HotkeyConfigDialog::CreateHotkeyGUIControls() { const wxString pageNames[] = @@ -193,116 +299,10 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() _("State Saves") }; - const wxString hkText[] = - { - _("Open"), - _("Change Disc"), - _("Refresh List"), - - _("Play/Pause"), - _("Stop"), - _("Reset"), - _("Frame Advance"), - - _("Start Recording"), - _("Play Recording"), - _("Export Recording"), - _("Read-only mode"), - - _("Toggle Fullscreen"), - _("Take Screenshot"), - _("Exit"), - - _("Connect Wiimote 1"), - _("Connect Wiimote 2"), - _("Connect Wiimote 3"), - _("Connect Wiimote 4"), - _("Connect Balance Board"), - - _("Volume Down"), - _("Volume Up"), - _("Volume Toggle Mute"), - - _("Toggle IR"), - _("Toggle Aspect Ratio"), - _("Toggle EFB Copies"), - _("Toggle Fog"), - _("Toggle Frame limit"), - _("Decrease Frame limit"), - _("Increase Frame limit"), - - _("Freelook Decrease Speed"), - _("Freelook Increase Speed"), - _("Freelook Reset Speed"), - _("Freelook Move Up"), - _("Freelook Move Down"), - _("Freelook Move Left"), - _("Freelook Move Right"), - _("Freelook Zoom In"), - _("Freelook Zoom Out"), - _("Freelook Reset"), - - _("Decrease Depth"), - _("Increase Depth"), - _("Decrease Convergence"), - _("Increase Convergence"), - - _("Load State Slot 1"), - _("Load State Slot 2"), - _("Load State Slot 3"), - _("Load State Slot 4"), - _("Load State Slot 5"), - _("Load State Slot 6"), - _("Load State Slot 7"), - _("Load State Slot 8"), - _("Load State Slot 9"), - _("Load State Slot 10"), - - _("Save State Slot 1"), - _("Save State Slot 2"), - _("Save State Slot 3"), - _("Save State Slot 4"), - _("Save State Slot 5"), - _("Save State Slot 6"), - _("Save State Slot 7"), - _("Save State Slot 8"), - _("Save State Slot 9"), - _("Save State Slot 10"), - - _("Select State Slot 1"), - _("Select State Slot 2"), - _("Select State Slot 3"), - _("Select State Slot 4"), - _("Select State Slot 5"), - _("Select State Slot 6"), - _("Select State Slot 7"), - _("Select State Slot 8"), - _("Select State Slot 9"), - _("Select State Slot 10"), - - _("Save to selected slot"), - _("Load from selected slot"), - - _("Load State Last 1"), - _("Load State Last 2"), - _("Load State Last 3"), - _("Load State Last 4"), - _("Load State Last 5"), - _("Load State Last 6"), - _("Load State Last 7"), - _("Load State Last 8"), - - _("Save Oldest State"), - _("Undo Load State"), - _("Undo Save State"), - _("Save State"), - _("Load State"), - }; - - const int page_breaks[3] = { HK_OPEN, HK_LOAD_STATE_SLOT_1, NUM_HOTKEYS }; + const int page_breaks[3] = {HK_OPEN, HK_LOAD_STATE_SLOT_1, NUM_HOTKEYS}; // Configuration controls sizes - wxSize size(100, 20); + wxSize size(100,20); // A small type font wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); @@ -326,9 +326,9 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() sHotkeys->Add(HeaderSizer, wxGBPosition(0, i), wxDefaultSpan, wxEXPAND | wxLEFT, (i > 0) ? 30 : 1); } - int column_break = (page_breaks[j + 1] + page_breaks[j] + 1) / 2; + int column_break = (page_breaks[j+1] + page_breaks[j] + 1) / 2; - for (int i = page_breaks[j]; i < page_breaks[j + 1]; i++) + for (int i = page_breaks[j]; i < page_breaks[j+1]; i++) { // Text for the action wxStaticText *stHotkeys = new wxStaticText(Page, wxID_ANY, hkText[i]); @@ -338,17 +338,17 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() m_Button_Hotkeys[i]->SetFont(m_SmallFont); m_Button_Hotkeys[i]->SetToolTip(_("Left click to detect hotkeys.\nEnter space to clear.")); SetButtonText(i, - WxUtils::WXKeyToString(SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[i]), - WxUtils::WXKeymodToString( - SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[i])); + WxUtils::WXKeyToString(SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[i]), + WxUtils::WXKeymodToString( + SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[i])); wxBoxSizer *sHotkey = new wxBoxSizer(wxHORIZONTAL); sHotkey->Add(stHotkeys, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 2); sHotkey->Add(m_Button_Hotkeys[i], 0, wxALL, 2); sHotkeys->Add(sHotkey, - wxGBPosition((i < column_break) ? i - page_breaks[j] + 1 : i - column_break + 1, - (i < column_break) ? 0 : 1), - wxDefaultSpan, wxEXPAND | wxLEFT, (i < column_break) ? 1 : 30); + wxGBPosition((i < column_break) ? i - page_breaks[j] + 1 : i - column_break + 1, + (i < column_break) ? 0 : 1), + wxDefaultSpan, wxEXPAND | wxLEFT, (i < column_break) ? 1 : 30); } wxStaticBoxSizer *sHotkeyBox = new wxStaticBoxSizer(wxVERTICAL, Page, _("Hotkeys")); diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h index 71d863a1a..db4c687c5 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.h +++ b/Source/Core/DolphinWX/HotkeyDlg.h @@ -29,7 +29,7 @@ class HotkeyConfigDialog : public wxDialog public: HotkeyConfigDialog(wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString &title = _("Hotkey Configuration"), + const wxString &title = _("Menu Accelerators"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE); diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 58eecce21..8587e6244 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -37,7 +37,7 @@ #include "DolphinWX/ISOFile.h" #include "DolphinWX/WxUtils.h" -static const u32 CACHE_REVISION = 0x119; +static const u32 CACHE_REVISION = 0x120; #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 @@ -121,13 +121,9 @@ GameListItem::GameListItem(const std::string& _rFileName) if (IsValid()) { - IniFile ini; - ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_UniqueID + ".ini"); - ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_UniqueID + ".ini", true); - - IniFile::Section* emu_state = ini.GetOrCreateSection("EmuState"); - emu_state->Get("EmulationStateId", &m_emu_state); - emu_state->Get("EmulationIssues", &m_issues); + IniFile ini = SCoreStartupParameter::LoadGameIni(m_UniqueID, m_Revision); + ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state); + ini.GetIfExists("EmuState", "EmulationIssues", &m_issues); } if (!m_pImage.empty()) diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index c67cc37fa..579d2d59c 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -163,11 +163,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW } } - // Load game ini + // Is it really necessary to use GetTitleID in case GetUniqueID fails? std::string _iniFilename = OpenISO->GetUniqueID(); - std::string _iniFilenameRevisionSpecific = OpenISO->GetRevisionSpecificUniqueID(); - - if (!_iniFilename.length()) + if (_iniFilename.empty()) { u8 title_id[8]; if (OpenISO->GetTitleID(title_id)) @@ -176,14 +174,11 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW } } + // Load game INIs GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini"; - std::string GameIniFileDefaultRevisionSpecific = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilenameRevisionSpecific + ".ini"; GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini"; - - GameIniDefault.Load(GameIniFileDefault); - if (_iniFilenameRevisionSpecific != "") - GameIniDefault.Load(GameIniFileDefaultRevisionSpecific, true); - GameIniLocal.Load(GameIniFileLocal); + GameIniDefault = SCoreStartupParameter::LoadDefaultGameIni(_iniFilename, OpenISO->GetRevision()); + GameIniLocal = SCoreStartupParameter::LoadLocalGameIni(_iniFilename, OpenISO->GetRevision()); // Setup GUI OpenGameListItem = new GameListItem(fileName); @@ -404,19 +399,14 @@ void CISOProperties::CreateGUIControls(bool IsWad) SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle")); MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU")); MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)")); - BAT = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable BAT"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BAT")); - BAT->SetToolTip(_("Enables Block Address Translation, needed for a few games. Requires MMU. (ON = Compatible, OFF = Fast)")); DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ")); DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled.")); - FPRF = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable FPRF"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FPRF")); + FPRF = new wxCheckBox(m_GameConfig, ID_FPRF, _("Enable FPRF"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FPRF")); FPRF->SetToolTip(_("Enables Floating Point Result Flag calculation, needed for a few games. (ON = Compatible, OFF = Fast)")); - DVideo = new wxCheckBox(m_GameConfig, ID_DVIDEO, _("Double Video Rate Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DoubleVideoRate")); - DVideo->SetToolTip(_("Double the rate of video interruptions (ON = Fast, OFF = Compatible)")); SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU")); SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)")); FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed")); FastDiscSpeed->SetToolTip(_("Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)")); - BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging")); DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE")); wxBoxSizer* const sGPUDeterminism = new wxBoxSizer(wxHORIZONTAL); @@ -467,14 +457,11 @@ void CISOProperties::CreateGUIControls(bool IsWad) new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core")); sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5); sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5); - sbCoreOverrides->Add(BAT, 0, wxLEFT, 5); sbCoreOverrides->Add(MMU, 0, wxLEFT, 5); sbCoreOverrides->Add(DCBZOFF, 0, wxLEFT, 5); sbCoreOverrides->Add(FPRF, 0, wxLEFT, 5); - sbCoreOverrides->Add(DVideo, 0, wxLEFT, 5); sbCoreOverrides->Add(SyncGPU, 0, wxLEFT, 5); sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5); - sbCoreOverrides->Add(BlockMerging, 0, wxLEFT, 5); sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5); sbCoreOverrides->Add(sGPUDeterminism, 0, wxEXPAND|wxALL, 5); @@ -512,8 +499,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) EditPatch = new wxButton(m_PatchPage, ID_EDITPATCH, _("Edit...")); wxButton* const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add...")); RemovePatch = new wxButton(m_PatchPage, ID_REMOVEPATCH, _("Remove")); - EditPatch->Enable(false); - RemovePatch->Enable(false); + EditPatch->Disable(); + RemovePatch->Disable(); wxBoxSizer* sPatchPage = new wxBoxSizer(wxVERTICAL); sPatches->Add(Patches, 1, wxEXPAND|wxALL, 0); @@ -533,8 +520,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) EditCheat = new wxButton(m_CheatPage, ID_EDITCHEAT, _("Edit...")); wxButton * const AddCheat = new wxButton(m_CheatPage, ID_ADDCHEAT, _("Add...")); RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove")); - EditCheat->Enable(false); - RemoveCheat->Enable(false); + EditCheat->Disable(); + RemoveCheat->Disable(); wxBoxSizer* sCheatPage = new wxBoxSizer(wxVERTICAL); sCheats->Add(Cheats, 1, wxEXPAND|wxALL, 0); @@ -1060,13 +1047,10 @@ void CISOProperties::LoadGameConfig() SetCheckboxValueFromGameini("Core", "CPUThread", CPUThread); SetCheckboxValueFromGameini("Core", "SkipIdle", SkipIdle); SetCheckboxValueFromGameini("Core", "MMU", MMU); - SetCheckboxValueFromGameini("Core", "BAT", BAT); SetCheckboxValueFromGameini("Core", "DCBZ", DCBZOFF); SetCheckboxValueFromGameini("Core", "FPRF", FPRF); - SetCheckboxValueFromGameini("Core", "DoubleVideoRate", DVideo); SetCheckboxValueFromGameini("Core", "SyncGPU", SyncGPU); SetCheckboxValueFromGameini("Core", "FastDiscSpeed", FastDiscSpeed); - SetCheckboxValueFromGameini("Core", "BlockMerging", BlockMerging); SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE); SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen); SetCheckboxValueFromGameini("Video_Stereoscopy", "StereoEFBMonoDepth", MonoDepth); @@ -1157,13 +1141,10 @@ bool CISOProperties::SaveGameConfig() SaveGameIniValueFrom3StateCheckbox("Core", "CPUThread", CPUThread); SaveGameIniValueFrom3StateCheckbox("Core", "SkipIdle", SkipIdle); SaveGameIniValueFrom3StateCheckbox("Core", "MMU", MMU); - SaveGameIniValueFrom3StateCheckbox("Core", "BAT", BAT); SaveGameIniValueFrom3StateCheckbox("Core", "DCBZ", DCBZOFF); SaveGameIniValueFrom3StateCheckbox("Core", "FPRF", FPRF); - SaveGameIniValueFrom3StateCheckbox("Core", "DoubleVideoRate", DVideo); SaveGameIniValueFrom3StateCheckbox("Core", "SyncGPU", SyncGPU); SaveGameIniValueFrom3StateCheckbox("Core", "FastDiscSpeed", FastDiscSpeed); - SaveGameIniValueFrom3StateCheckbox("Core", "BlockMerging", BlockMerging); SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE); SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen); SaveGameIniValueFrom3StateCheckbox("Video_Stereoscopy", "StereoEFBMonoDepth", MonoDepth); @@ -1429,8 +1410,8 @@ void CISOProperties::PatchButtonClicked(wxCommandEvent& event) Patches->Clear(); PatchList_Load(); - EditPatch->Enable(false); - RemovePatch->Enable(false); + EditPatch->Disable(); + RemovePatch->Disable(); } void CISOProperties::ActionReplayList_Load() @@ -1509,8 +1490,8 @@ void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event) Cheats->Clear(); ActionReplayList_Load(); - EditCheat->Enable(false); - RemoveCheat->Enable(false); + EditCheat->Disable(); + RemoveCheat->Disable(); } void CISOProperties::OnChangeBannerLang(wxCommandEvent& event) diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 150a992ca..6bc70bbf4 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -69,8 +69,8 @@ private: DECLARE_EVENT_TABLE(); // Core - wxCheckBox *CPUThread, *SkipIdle, *MMU, *BAT, *DCBZOFF, *FPRF; - wxCheckBox *DVideo, *SyncGPU, *FastDiscSpeed, *BlockMerging, *DSPHLE; + wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *FPRF; + wxCheckBox *SyncGPU, *FastDiscSpeed, *DSPHLE; wxArrayString arrayStringFor_GPUDeterminism; wxChoice* GPUDeterminism; @@ -136,10 +136,9 @@ private: ID_IDLESKIP, ID_MMU, ID_DCBZOFF, - ID_DVIDEO, + ID_FPRF, ID_SYNCGPU, ID_DISCSPEED, - ID_MERGEBLOCKS, ID_AUDIO_DSP_HLE, ID_USE_BBOX, ID_ENABLEPROGRESSIVESCAN, diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index eca604803..653f92ea1 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -839,7 +839,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin // Draw buttons in rows of 8 unsigned int button_cols = group->controls.size() > 8 ? 8 : group->controls.size(); unsigned int button_rows = ceil((float)group->controls.size() / 8.0f); - wxBitmap bitmap(int(12 * button_cols + 1), (12 * button_rows) - (button_rows - 1)); + wxBitmap bitmap(int(12 * button_cols + 1), (11 * button_rows) + 1); dc.SelectObject(bitmap); dc.Clear(); @@ -1074,17 +1074,12 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config szr->Add(m_pad_notebook, 0, wxEXPAND|wxTOP|wxLEFT|wxRIGHT, 5); szr->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxEXPAND|wxALL, 5); + SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); SetSizerAndFit(szr); Center(); // live preview update timer - m_update_timer = new wxTimer(this); + m_update_timer.SetOwner(this); Bind(wxEVT_TIMER, &InputConfigDialog::UpdateBitmaps, this); - m_update_timer->Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS); -} - -bool InputConfigDialog::Destroy() -{ - m_update_timer->Stop(); - return true; + m_update_timer.Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS); } diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index 0f18ab56c..d75fe4598 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "InputCommon/ControllerEmu.h" @@ -39,7 +40,6 @@ class wxSlider; class wxStaticBitmap; class wxStaticText; class wxTextCtrl; -class wxTimer; class wxTimerEvent; class wxWindow; @@ -224,9 +224,6 @@ class InputConfigDialog : public wxDialog { public: InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num = 0); - //~InputConfigDialog(); - - bool Destroy() override; void ClickSave(wxCommandEvent& event); @@ -241,5 +238,5 @@ private: wxNotebook* m_pad_notebook; std::vector m_padpages; InputConfig& m_config; - wxTimer* m_update_timer; + wxTimer m_update_timer; }; diff --git a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp index 0eeb935c8..3da025358 100644 --- a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp +++ b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp @@ -119,12 +119,12 @@ static void DrawButton(unsigned int* const bitmasks, unsigned int buttons, unsig unsigned char amt = 255 - g->control_group->controls[(row * 8) + n]->control_ref->State() * 128; dc.SetBrush(wxBrush(wxColour(amt, amt, amt))); } - dc.DrawRectangle(n * 12, (row == 0) ? 0 : (row * 12 - 1), 14, 12); + dc.DrawRectangle(n * 12, (row == 0) ? 0 : (row * 11), 14, 12); // text const std::string name = g->control_group->controls[(row * 8) + n]->name; // bit of hax so ZL, ZR show up as L, R - dc.DrawText(StrToWxStr(std::string(1, (name[1] && name[1] < 'a') ? name[1] : name[0])), n * 12 + 2, 1 + ((row == 0) ? 0 : (row * 12 - 1))); + dc.DrawText(StrToWxStr(std::string(1, (name[1] && name[1] < 'a') ? name[1] : name[0])), n * 12 + 2, 1 + ((row == 0) ? 0 : (row * 11))); } static void DrawControlGroupBox(wxDC &dc, ControlGroupBox *g) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index b7ab92f72..e0a36c023 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -209,6 +209,7 @@ bool DolphinApp::OnInit() // Gets the command line parameters wxCmdLineParser parser(cmdLineDesc, argc, argv); + LoadFile = false; if (argc == 2 && File::Exists(argv[1].ToUTF8().data())) { LoadFile = true; diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 0d9d4428c..89ebc8837 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -105,6 +105,12 @@ void Host_SetWiiMoteConnectionState(int _State) {} void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {} +static bool MsgAlert(const char* caption, const char* text, bool /*yes_no*/, int /*Style*/) +{ + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "%s:%s", caption, text); + return false; +} + #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 std::vector m_volume_names; @@ -344,6 +350,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv * OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init); OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown); + RegisterMsgAlertHandler(&MsgAlert); + UICommon::Init(); // No use running the loop when booting fails diff --git a/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp b/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp index 15624f247..26a200026 100644 --- a/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp +++ b/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp @@ -202,7 +202,7 @@ void PostProcessingConfigDiag::ConfigGrouping::GenerateUI(PostProcessingConfigDi wxTextCtrl* text_ctrl = new wxTextCtrl(parent, wxID_ANY, string_value); // Disable the textctrl, it's only there to show the absolute value from the slider - text_ctrl->Enable(false); + text_ctrl->Disable(); // wxWidget takes over the pointer provided to it in the event handler. // This won't be a memory leak, it'll be destroyed on dialog close. diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 5920b39b9..da5bb5081 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -17,7 +17,6 @@ InputConfig::~InputConfig() bool InputConfig::LoadConfig(bool isGC) { IniFile inifile; - IniFile game_ini; bool useProfile[MAX_BBMOTES] = {false, false, false, false, false}; std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"}; std::string profile[MAX_BBMOTES]; @@ -37,8 +36,7 @@ bool InputConfig::LoadConfig(bool isGC) path = "Profiles/Wiimote/"; } - game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); - game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", true); + IniFile game_ini = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni(); IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls"); for (int i = 0; i < 4; i++) @@ -53,7 +51,7 @@ bool InputConfig::LoadConfig(bool isGC) } else { - // TODO: Having a PanicAlert for this is dumb. + // TODO: PanicAlert shouldn't be used for this. PanicAlertT("Selected controller profile does not exist"); } } diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 8e260f582..735487306 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -65,6 +65,7 @@ void CreateDirectories() File::CreateFullPath(File::GetUserPath(D_MAPS_IDX)); File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX)); + File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX) + ANAGLYPH_DIR DIR_SEP); File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); File::CreateFullPath(File::GetUserPath(D_THEMES_IDX)); } diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index de4992edc..d962c5124 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -52,6 +52,14 @@ + + + {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + + + {e54cf649-140e-4255-81a5-30a673c1fb36} + + @@ -59,14 +67,6 @@ - - - {c87a4178-44f6-49b2-b7aa-c79af1b8c534} - - - {8c60e805-0da5-4e25-8f84-038db504bb0d} - - diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index 2f0e314d2..25b5fd9dd 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -125,7 +125,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolarSSL", "..\Externals\po EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "..\Externals\miniupnpc\miniupnpc.vcxproj", "{A680190D-0764-485B-9CF3-A82C5EDD5715}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "..\Externals\libusbx\msvc\libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "..\Externals\libusb\libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dolphin Core", "Dolphin Core", "{701E4F10-DED0-4ECB-A486-91188247EDBD}" EndProject diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index 2ec996ce4..479d96c88 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -2,6 +2,9 @@ set(LIBS core gtest) if(APPLE) list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY}) endif() +if(ANDROID) + set(LIBS ${LIBS} android log) +endif() macro(add_dolphin_test target srcs) # Since this is a Core dependency, it can't be linked as a library and has # to be linked as an object file. Otherwise CMake inserts the library after diff --git a/Source/UnitTests/Common/BitFieldTest.cpp b/Source/UnitTests/Common/BitFieldTest.cpp new file mode 100644 index 000000000..ff317649e --- /dev/null +++ b/Source/UnitTests/Common/BitFieldTest.cpp @@ -0,0 +1,170 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include + +#include "Common/BitField.h" +#include "Common/CommonTypes.h" + +union TestUnion +{ + u64 hex; + + BitField< 0,64,u64> full_u64; // spans whole storage + BitField< 0,64,s64> full_s64; // spans whole storage + + BitField< 9, 3,u64> regular_field_unsigned; // a plain bitfield + BitField< 9, 3,u64> regular_field_unsigned2; // Just the very same bitfield again + BitField< 9, 3,s64> regular_field_signed; // Same bitfield, but different sign + + BitField<30, 4,s64> at_dword_boundary; // goes over the boundary of two u32 values + + BitField<15, 1,s64> signed_1bit; // allowed values: -1 and 0 +}; + +// table of raw numbers to test with +static u64 table[] = +{ + 0x0000000000000000ull, // all zero + 0xffffffffffffffffull, // all one + 0x7fffffffffffffffull, // all one apart from the sign bit + 0x8000000000000000ull, // all zero apart from the sign bit + 0x8000000000000048ull, // regular_field = 0b1001 + + // "random" numbers + 0x0F7B8B1ABD9B8D3Full, + 0xA8B86F73FDAADD2Dull, + 0x1B17A557BFEB351Dull, + 0xE3354268B0C2395Bull, +}; + +// Verify that bitfields in a union have the same underlying data +TEST(BitField, Storage) +{ + TestUnion object; + + EXPECT_EQ((void*)&object.hex, (void*)&object.regular_field_unsigned); + EXPECT_EQ(sizeof(TestUnion), sizeof(object.hex)); + EXPECT_EQ(sizeof(TestUnion), sizeof(object.full_u64)); + EXPECT_EQ(sizeof(TestUnion), sizeof(object.full_s64)); + EXPECT_EQ(sizeof(TestUnion), sizeof(object.regular_field_unsigned)); + EXPECT_EQ(sizeof(TestUnion), sizeof(object.regular_field_signed)); + EXPECT_EQ(sizeof(TestUnion), sizeof(object.at_dword_boundary)); + EXPECT_EQ(sizeof(TestUnion), sizeof(object.signed_1bit)); + + // Now write some values to one field and check if this reflects properly + // in the others. + for (u64 val : table) + { + object.hex = val; + EXPECT_EQ(object.hex, object.full_u64); + EXPECT_EQ(object.regular_field_unsigned, object.regular_field_unsigned2); + + object.regular_field_unsigned = val & 0x3; + EXPECT_EQ(object.hex, object.full_u64); + EXPECT_EQ(object.regular_field_unsigned, object.regular_field_unsigned2); + } +} + +TEST(BitField, Read) +{ + TestUnion object; + + for (u64 val : table) + { + object.hex = val; + + // Make sure reading/casting does not behave completely idiotic + EXPECT_EQ(object.full_u64, (u64)object.full_u64); + EXPECT_EQ(object.full_s64, (s64)object.full_s64); + EXPECT_EQ(object.regular_field_unsigned, (u64)object.regular_field_unsigned); + EXPECT_EQ(object.regular_field_unsigned2, (u64)object.regular_field_unsigned2); + EXPECT_EQ(object.regular_field_signed, (s64)object.regular_field_signed); + EXPECT_EQ(object.at_dword_boundary, (s64)object.at_dword_boundary); + EXPECT_EQ(object.signed_1bit, (s64)object.signed_1bit); + + // Now make sure the value is indeed correct + EXPECT_EQ(val, object.full_u64); + EXPECT_EQ(*(s64*)&val, object.full_s64); + EXPECT_EQ((val >> 9) & 0x7, object.regular_field_unsigned); + EXPECT_EQ((val >> 9) & 0x7, object.regular_field_unsigned2); + EXPECT_EQ(((s64)(object.hex << 52)) >> 61, object.regular_field_signed); + EXPECT_EQ(((s64)(object.hex << 30)) >> 60, object.at_dword_boundary); + EXPECT_EQ(((object.hex >> 15) & 1) ? -1 : 0, object.signed_1bit); + } +} + +TEST(BitField, Assignment) +{ + TestUnion object; + + for (u64 val : table) + { + // Assignments with fixed values + object.full_u64 = val; + EXPECT_EQ(val, object.full_u64); + + object.full_s64 = (s64)val; + EXPECT_EQ(val, object.full_u64); + + object.regular_field_unsigned = val; + EXPECT_EQ(val & 0x7, object.regular_field_unsigned); + + object.at_dword_boundary = val; + EXPECT_EQ(((s64)(val << 60)) >> 60, object.at_dword_boundary); + + object.signed_1bit = val; + EXPECT_EQ((val & 1) ? -1 : 0, object.signed_1bit); + + object.regular_field_signed = val; + EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed); + + // Assignment from other BitField + object.at_dword_boundary = object.regular_field_signed; + EXPECT_EQ(object.regular_field_signed, object.at_dword_boundary); + } +} + +// Test class behavior on oddly aligned structures. +TEST(BitField, Alignment) +{ + #pragma pack(1) + struct OddlyAlignedTestStruct + { + u8 padding; + TestUnion obj; + }; + #pragma pack() + + GC_ALIGNED16(OddlyAlignedTestStruct test_struct); + TestUnion& object = test_struct.obj; + static_assert(alignof(decltype(test_struct.obj.signed_1bit)) == 1, + "Incorrect variable alignment"); + + for (u64 val : table) + { + // Assignments with fixed values + object.full_u64 = val; + EXPECT_EQ(val, object.full_u64); + + object.full_s64 = (s64)val; + EXPECT_EQ(val, object.full_u64); + + object.regular_field_unsigned = val; + EXPECT_EQ(val & 0x7, object.regular_field_unsigned); + + object.at_dword_boundary = val; + EXPECT_EQ(((s64)(val << 60)) >> 60, object.at_dword_boundary); + + object.signed_1bit = val; + EXPECT_EQ((val & 1) ? -1 : 0, object.signed_1bit); + + object.regular_field_signed = val; + EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed); + + // Assignment from other BitField + object.at_dword_boundary = object.regular_field_signed; + EXPECT_EQ(object.regular_field_signed, object.at_dword_boundary); + } +} diff --git a/Source/UnitTests/Common/CommonFuncsTest.cpp b/Source/UnitTests/Common/CommonFuncsTest.cpp new file mode 100644 index 000000000..e9b39b320 --- /dev/null +++ b/Source/UnitTests/Common/CommonFuncsTest.cpp @@ -0,0 +1,40 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include + +#include "Common/CommonFuncs.h" + +TEST(CommonFuncs, ArraySizeMacro) +{ + char test[4]; + u32 test2[42]; + + EXPECT_EQ(4u, ArraySize(test)); + EXPECT_EQ(42u, ArraySize(test2)); + + (void)test; + (void)test2; +} + +TEST(CommonFuncs, RoundUpPow2Macro) +{ + EXPECT_EQ(4, ROUND_UP_POW2(3)); + EXPECT_EQ(4, ROUND_UP_POW2(4)); + EXPECT_EQ(8, ROUND_UP_POW2(6)); + EXPECT_EQ(0x40000000, ROUND_UP_POW2(0x23456789)); +} + +TEST(CommonFuncs, CrashMacro) +{ + EXPECT_DEATH({ Crash(); }, ""); +} + +TEST(CommonFuncs, Swap) +{ + EXPECT_EQ(0xf0, Common::swap8(0xf0)); + EXPECT_EQ(0x1234, Common::swap16(0x3412)); + EXPECT_EQ(0x12345678u, Common::swap32(0x78563412)); + EXPECT_EQ(0x123456789abcdef0ull, Common::swap64(0xf0debc9a78563412ull)); +} diff --git a/Source/UnitTests/Common/EventTest.cpp b/Source/UnitTests/Common/EventTest.cpp new file mode 100644 index 000000000..41949a893 --- /dev/null +++ b/Source/UnitTests/Common/EventTest.cpp @@ -0,0 +1,42 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include +#include + +#include "Common/Event.h" + +using Common::Event; + +TEST(Event, MultiThreaded) +{ + Event has_sent, can_send; + int shared_obj; + const int ITERATIONS_COUNT = 100000; + + auto sender = [&]() { + for (int i = 0; i < ITERATIONS_COUNT; ++i) + { + can_send.Wait(); + shared_obj = i; + has_sent.Set(); + } + }; + + auto receiver = [&]() { + for (int i = 0; i < ITERATIONS_COUNT; ++i) { + has_sent.Wait(); + EXPECT_EQ(i, shared_obj); + can_send.Set(); + } + }; + + std::thread sender_thread(sender); + std::thread receiver_thread(receiver); + + can_send.Set(); + + sender_thread.join(); + receiver_thread.join(); +} diff --git a/Source/UnitTests/Common/FifoQueueTest.cpp b/Source/UnitTests/Common/FifoQueueTest.cpp new file mode 100644 index 000000000..6530e15dd --- /dev/null +++ b/Source/UnitTests/Common/FifoQueueTest.cpp @@ -0,0 +1,67 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include +#include + +#include "Common/FifoQueue.h" + +TEST(FifoQueue, Simple) +{ + Common::FifoQueue q; + + EXPECT_EQ(0u, q.Size()); + EXPECT_TRUE(q.Empty()); + + q.Push(1); + EXPECT_EQ(1u, q.Size()); + EXPECT_FALSE(q.Empty()); + + u32 v; q.Pop(v); + EXPECT_EQ(1u, v); + EXPECT_EQ(0u, q.Size()); + EXPECT_TRUE(q.Empty()); + + // Test the FIFO order. + for (u32 i = 0; i < 1000; ++i) + q.Push(i); + EXPECT_EQ(1000u, q.Size()); + for (u32 i = 0; i < 1000; ++i) + { + u32 v2; q.Pop(v2); + EXPECT_EQ(i, v2); + } + EXPECT_TRUE(q.Empty()); + + for (u32 i = 0; i < 1000; ++i) + q.Push(i); + EXPECT_FALSE(q.Empty()); + q.Clear(); + EXPECT_TRUE(q.Empty()); +} + +TEST(FifoQueue, MultiThreaded) +{ + Common::FifoQueue q; + + auto inserter = [&q]() { + for (u32 i = 0; i < 100000; ++i) + q.Push(i); + }; + + auto popper = [&q]() { + for (u32 i = 0; i < 100000; ++i) + { + while (q.Empty()); + u32 v; q.Pop(v); + EXPECT_EQ(i, v); + } + }; + + std::thread popper_thread(popper); + std::thread inserter_thread(inserter); + + popper_thread.join(); + inserter_thread.join(); +} diff --git a/Source/UnitTests/Common/FixedSizeQueueTest.cpp b/Source/UnitTests/Common/FixedSizeQueueTest.cpp new file mode 100644 index 000000000..d77f3645f --- /dev/null +++ b/Source/UnitTests/Common/FixedSizeQueueTest.cpp @@ -0,0 +1,33 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include + +#include "Common/FixedSizeQueue.h" + +TEST(FixedSizeQueue, Simple) +{ + FixedSizeQueue q; + + EXPECT_EQ(0u, q.size()); + + q.push(0); + q.push(1); + q.push(2); + q.push(3); + q.push(4); + for (int i = 0; i < 1000; ++i) + { + EXPECT_EQ(i, q.front()); + EXPECT_EQ(i, q.pop_front()); + q.push(i + 5); + } + EXPECT_EQ(1000, q.pop_front()); + EXPECT_EQ(1001, q.pop_front()); + EXPECT_EQ(1002, q.pop_front()); + EXPECT_EQ(1003, q.pop_front()); + EXPECT_EQ(1004, q.pop_front()); + + EXPECT_EQ(0u, q.size()); +} diff --git a/Source/UnitTests/Common/FlagTest.cpp b/Source/UnitTests/Common/FlagTest.cpp new file mode 100644 index 000000000..2c087fd73 --- /dev/null +++ b/Source/UnitTests/Common/FlagTest.cpp @@ -0,0 +1,91 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include +#include +#include + +#include "Common/Flag.h" + +using Common::Flag; + +TEST(Flag, Simple) +{ + Flag f; + EXPECT_FALSE(f.IsSet()); + + f.Set(); + EXPECT_TRUE(f.IsSet()); + + f.Clear(); + EXPECT_FALSE(f.IsSet()); + + f.Set(false); + EXPECT_FALSE(f.IsSet()); + + EXPECT_TRUE(f.TestAndSet()); + EXPECT_TRUE(f.TestAndClear()); + + Flag f2(true); + EXPECT_TRUE(f2.IsSet()); +} + +TEST(Flag, MultiThreaded) +{ + Flag f; + int count = 0; + const int ITERATIONS_COUNT = 100000; + + auto setter = [&]() { + for (int i = 0; i < ITERATIONS_COUNT; ++i) + { + while (f.IsSet()); + f.Set(); + } + }; + + auto clearer = [&]() { + for (int i = 0; i < ITERATIONS_COUNT; ++i) + { + while (!f.IsSet()); + count++; + f.Clear(); + } + }; + + std::thread setter_thread(setter); + std::thread clearer_thread(clearer); + + setter_thread.join(); + clearer_thread.join(); + + EXPECT_EQ(ITERATIONS_COUNT, count); +} + +TEST(Flag, SpinLock) +{ + // Uses a flag to implement basic spinlocking using TestAndSet. + Flag f; + int count = 0; + const int ITERATIONS_COUNT = 5000; + const int THREADS_COUNT = 50; + + auto adder_func = [&]() { + for (int i = 0; i < ITERATIONS_COUNT; ++i) + { + // Acquire the spinlock. + while (!f.TestAndSet()); + count++; + f.Clear(); + } + }; + + std::array threads; + for (auto& th : threads) + th = std::thread(adder_func); + for (auto& th : threads) + th.join(); + + EXPECT_EQ(ITERATIONS_COUNT * THREADS_COUNT, count); +} diff --git a/Source/UnitTests/TestUtils/CMakeLists.txt b/Source/UnitTests/TestUtils/CMakeLists.txt new file mode 100644 index 000000000..79424a42a --- /dev/null +++ b/Source/UnitTests/TestUtils/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SRCS + # Do not add StubHost.cpp here - it is added manually via add_dolphin_test. + ) + +set(LIBS + ) + +# TODO: uncomment when there is actually something here. +#add_dolphin_library(testutils "${SRCS}" "${LIBS}") diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index 7ccfa763d..a67c8e5ac 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -1,221 +1,112 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 - {40C636FA-B5BF-4D67-ABC8-376B524A7551} - UnitTests - Win32Proj + {474661E7-C73A-43A6-AFEE-EE1EC433D49E} - + Application - Unicode - false v120 - - - Application Unicode - v120_xp - - Application - Unicode - true - v120 + + true - - Application - Unicode - v120 + + false - - - - - - - - - - + + + - - <_ProjectFileVersion>10.0.40219.1 - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - false - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - false - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - false - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - + + - Disabled - ../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue + $(ExternalsDir)gtest\include;$(ExternalsDir)gtest;%(AdditionalIncludeDirectories) - Iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - true + + 0x00400000 + false + true + + $(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories) + iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) Console - MachineX86 - - xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d - - - - - X64 - - - Disabled - ../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - Iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - true - Console - MachineX64 - - - xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d - - - - - MaxSpeed - true - ../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d - - - - - X64 - - - /MP %(AdditionalOptions) - MaxSpeed - true - ../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - Iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d - - - - + + + + + - + - - {cd3d4c3c-1027-4d33-b047-aec7b56d0bf6} + + {E54CF649-140E-4255-81A5-30A673C1FB36} - - {c87a4178-44f6-49b2-b7aa-c79af1b8c534} + + {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - - {8c60e805-0da5-4e25-8f84-038db504bb0d} + + {ec1a314c-5588-4506-9c1e-2e58e5817f75} + + + {a4c423aa-f57c-46c7-a172-d1a777017d29} + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/UnitTests/VideoCommon/CMakeLists.txt b/Source/UnitTests/VideoCommon/CMakeLists.txt new file mode 100644 index 000000000..b5198536e --- /dev/null +++ b/Source/UnitTests/VideoCommon/CMakeLists.txt @@ -0,0 +1 @@ +add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp) diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp index 864e7de29..631ad463f 100644 --- a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp +++ b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp @@ -105,7 +105,7 @@ TEST_F(VertexLoaderTest, PositionDirectFloatXYZ) Input(0.0f); Input(0.0f); Input(1.0f); // Convert 4 points. "7" -> primitive are points. - int count = loader->RunVertices(7, 4, src, dst); + int count = loader->RunVertices(src, dst, 4, 7); src.Skip(4 * loader->m_VertexSize); dst.Skip(count * loader->m_native_vtx_decl.stride); delete loader; @@ -119,7 +119,7 @@ TEST_F(VertexLoaderTest, PositionDirectFloatXYZ) Input(1.0f); Input(2.0f); Input(4.0f); m_vtx_attr.g0.PosFrac = 1; loader = VertexLoaderBase::CreateVertexLoader(m_vtx_desc, m_vtx_attr); - count = loader->RunVertices(7, 1, src, dst); + count = loader->RunVertices(src, dst, 1, 7); src.Skip(1 * loader->m_VertexSize); dst.Skip(count * loader->m_native_vtx_decl.stride); ExpectOut(1.0f); ExpectOut(2.0f); ExpectOut(4.0f); @@ -145,7 +145,7 @@ TEST_F(VertexLoaderTest, PositionDirectU16XY) Input(12345); Input(54321); // Convert 5 points. "7" -> primitive are points. - int count = loader->RunVertices(7, 5, src, dst); + int count = loader->RunVertices(src, dst, 5, 7); src.Skip(5 * loader->m_VertexSize); dst.Skip(count * loader->m_native_vtx_decl.stride); delete loader; @@ -161,7 +161,7 @@ TEST_F(VertexLoaderTest, PositionDirectU16XY) m_vtx_attr.g0.PosFrac = 1; m_vtx_attr.g0.ByteDequant = 1; loader = VertexLoaderBase::CreateVertexLoader(m_vtx_desc, m_vtx_attr); - count = loader->RunVertices(7, 1, src, dst); + count = loader->RunVertices(src, dst, 1, 7); src.Skip(1 * loader->m_VertexSize); dst.Skip(count * loader->m_native_vtx_decl.stride); ExpectOut(21.0f); ExpectOut(12.0f); ExpectOut(0.0f); @@ -182,7 +182,7 @@ TEST_F(VertexLoaderTest, PositionDirectFloatXYZSpeed) for (int i = 0; i < 1000; ++i) { ResetPointers(); - int count = loader->RunVertices(7, 100000, src, dst); + int count = loader->RunVertices(src, dst, 100000, 7); src.Skip(100000 * loader->m_VertexSize); dst.Skip(count * loader->m_native_vtx_decl.stride); } @@ -203,7 +203,7 @@ TEST_F(VertexLoaderTest, PositionDirectU16XYSpeed) for (int i = 0; i < 1000; ++i) { ResetPointers(); - int count = loader->RunVertices(7, 100000, src, dst); + int count = loader->RunVertices(src, dst, 100000, 7); src.Skip(100000 * loader->m_VertexSize); dst.Skip(count * loader->m_native_vtx_decl.stride); } @@ -267,7 +267,7 @@ TEST_F(VertexLoaderTest, LargeFloatVertexSpeed) for (int i = 0; i < 100; ++i) { ResetPointers(); - int count = loader->RunVertices(7, 100000, src, dst); + int count = loader->RunVertices(src, dst, 100000, 7); src.Skip(100000 * loader->m_VertexSize); dst.Skip(count * loader->m_native_vtx_decl.stride); } diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 21d44f8b3..3f28b509e 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -37,7 +37,7 @@ $(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories) $(ExternalsDir)CLRun\include;%(AdditionalIncludeDirectories) $(ExternalsDir)GL;%(AdditionalIncludeDirectories) - $(ExternalsDir)libusbx\libusb;%(AdditionalIncludeDirectories) + $(ExternalsDir)libusb\libusb;%(AdditionalIncludeDirectories) $(ExternalsDir)libpng\;%(AdditionalIncludeDirectories) $(ExternalsDir)LZO;%(AdditionalIncludeDirectories) $(ExternalsDir)miniupnpc\src;%(AdditionalIncludeDirectories)