ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename

This commit is contained in:
CaH4e3 2013-03-26 15:54:56 +00:00
parent 88950914d7
commit 775c6fcd93
12 changed files with 17481 additions and 17478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tags/2.2.1/attic/cmake-stuff/cmake/fceux.cmake
View File

@ -112,7 +112,7 @@ set(SRC_CORE
${CMAKE_SOURCE_DIR}/src/boards/h2288.cpp
${CMAKE_SOURCE_DIR}/src/boards/karaoke.cpp
${CMAKE_SOURCE_DIR}/src/boards/kof97.cpp
${CMAKE_SOURCE_DIR}/src/boards/konami-qtai.cpp
${CMAKE_SOURCE_DIR}/src/boards/vrc5.cpp
${CMAKE_SOURCE_DIR}/src/boards/ks7032.cpp
${CMAKE_SOURCE_DIR}/src/boards/malee.cpp
${CMAKE_SOURCE_DIR}/src/boards/mmc1.cpp
@ -330,12 +330,12 @@ set(SRC_DRIVERS_WIN
${CMAKE_SOURCE_DIR}/src/drivers/win/tasedit.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/taseditproj.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/greenzone.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/bookmark.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/bookmark.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/bookmarks.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/inputhistory.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/inputsnapshot.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/playback.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/markers.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/playback.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/markers.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/texthook.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/throttle.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/timing.cpp
@ -368,13 +368,13 @@ add_definitions( -DNETWORK )
if(WIN32)
set(SOURCES ${SRC_CORE} ${SRC_DRIVERS_COMMON} ${SRC_DRIVERS_WIN})
include_directories( ${CMAKE_SOURCE_DIR}/src/drivers/win/directx ${CMAKE_SOURCE_DIR}/src/drivers/win/zlib )
add_definitions(
add_definitions(
-DWIN32
-DFCEUDEF_DEBUGGER
-D_USE_SHARED_MEMORY_
-DPSS_STYLE=2
-DNOMINMAX
-D_S9XLUA_H
-D_S9XLUA_H
)
link_directories( ${CMAKE_SOURCE_DIR}/src/drivers/win/directx )
else(WIN32)
@ -433,8 +433,8 @@ if(WIN32)
add_dependencies( ${FCEUX_EXE_NAME} InstallHelpFile )
#add_dependencies( ${FCEUX_EXE_NAME} res.o)
#add_custom_command(
# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/res.o
# COMMAND windres
# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/res.o
# COMMAND windres
# ARGS ${CMAKE_SOURCE_DIR}/src/drivers/win/res.rc ${CMAKE_CURRENT_BINARY_DIR}/res.o --use-temp-file -D_WIN_IE=0x300
# MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/src/drivers/win/res.rc
#)
@ -450,7 +450,7 @@ if(WIN32)
DEPENDS ${OUTPUT_RES_RC_O}
)
set(DEFINED_BUILD_RESOURCE_FILE TRUE CACHE GLOBAL "This is a hack to get CMake to build the .rc file")
add_dependencies( ${FCEUX_EXE_NAME} BuildResourceFileFor${FCEUX_EXE_NAME} )
set_property(
TARGET ${FCEUX_EXE_NAME}
@ -462,7 +462,7 @@ if(WIN32)
dsound dxguid ddraw dinput
)
if(MINGW)
include_directories(${CMAKE_SOURCE_DIR}/src/drivers/win/lua/include/)
include_directories(${CMAKE_SOURCE_DIR}/src/drivers/win/lua/include/)
else(MINGW)
target_link_libraries( ${FCEUX_EXE_NAME} htmlhelp)
endif(MINGW)

2
tags/2.2.1/vc/vc10_fceux.vcxproj
View File

@ -356,7 +356,7 @@
<ClCompile Include="..\src\boards\h2288.cpp" />
<ClCompile Include="..\src\boards\karaoke.cpp" />
<ClCompile Include="..\src\boards\kof97.cpp" />
<ClCompile Include="..\src\boards\konami-qtai.cpp" />
<ClCompile Include="..\src\boards\vrc5.cpp" />
<ClCompile Include="..\src\boards\ks7032.cpp" />
<ClCompile Include="..\src\boards\malee.cpp" />
<ClCompile Include="..\src\boards\mmc1.cpp" />

2
tags/2.2.1/vc/vc10_fceux.vcxproj.filters
View File

@ -217,7 +217,7 @@
<ClCompile Include="..\src\boards\kof97.cpp">
<Filter>boards</Filter>
</ClCompile>
<ClCompile Include="..\src\boards\konami-qtai.cpp">
<ClCompile Include="..\src\boards\vrc5.cpp">
<Filter>boards</Filter>
</ClCompile>
<ClCompile Include="..\src\boards\ks7032.cpp">

9710
tags/2.2.1/vc/vc8_fceux.vcproj
View File

File diff suppressed because it is too large Load Diff

6044
tags/2.2.1/vc/vc9_fceux.vcproj
View File

File diff suppressed because it is too large Load Diff

20
trunk/attic/cmake-stuff/cmake/fceux.cmake
View File

@ -112,7 +112,7 @@ set(SRC_CORE
${CMAKE_SOURCE_DIR}/src/boards/h2288.cpp
${CMAKE_SOURCE_DIR}/src/boards/karaoke.cpp
${CMAKE_SOURCE_DIR}/src/boards/kof97.cpp
${CMAKE_SOURCE_DIR}/src/boards/konami-qtai.cpp
${CMAKE_SOURCE_DIR}/src/boards/vrc5.cpp
${CMAKE_SOURCE_DIR}/src/boards/ks7032.cpp
${CMAKE_SOURCE_DIR}/src/boards/malee.cpp
${CMAKE_SOURCE_DIR}/src/boards/mmc1.cpp
@ -330,12 +330,12 @@ set(SRC_DRIVERS_WIN
${CMAKE_SOURCE_DIR}/src/drivers/win/tasedit.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/taseditproj.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/greenzone.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/bookmark.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/bookmark.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/bookmarks.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/inputhistory.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/inputsnapshot.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/playback.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/markers.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/playback.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/taseditlib/markers.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/texthook.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/throttle.cpp
${CMAKE_SOURCE_DIR}/src/drivers/win/timing.cpp
@ -368,13 +368,13 @@ add_definitions( -DNETWORK )
if(WIN32)
set(SOURCES ${SRC_CORE} ${SRC_DRIVERS_COMMON} ${SRC_DRIVERS_WIN})
include_directories( ${CMAKE_SOURCE_DIR}/src/drivers/win/directx ${CMAKE_SOURCE_DIR}/src/drivers/win/zlib )
add_definitions(
add_definitions(
-DWIN32
-DFCEUDEF_DEBUGGER
-D_USE_SHARED_MEMORY_
-DPSS_STYLE=2
-DNOMINMAX
-D_S9XLUA_H
-D_S9XLUA_H
)
link_directories( ${CMAKE_SOURCE_DIR}/src/drivers/win/directx )
else(WIN32)
@ -433,8 +433,8 @@ if(WIN32)
add_dependencies( ${FCEUX_EXE_NAME} InstallHelpFile )
#add_dependencies( ${FCEUX_EXE_NAME} res.o)
#add_custom_command(
# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/res.o
# COMMAND windres
# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/res.o
# COMMAND windres
# ARGS ${CMAKE_SOURCE_DIR}/src/drivers/win/res.rc ${CMAKE_CURRENT_BINARY_DIR}/res.o --use-temp-file -D_WIN_IE=0x300
# MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/src/drivers/win/res.rc
#)
@ -450,7 +450,7 @@ if(WIN32)
DEPENDS ${OUTPUT_RES_RC_O}
)
set(DEFINED_BUILD_RESOURCE_FILE TRUE CACHE GLOBAL "This is a hack to get CMake to build the .rc file")
add_dependencies( ${FCEUX_EXE_NAME} BuildResourceFileFor${FCEUX_EXE_NAME} )
set_property(
TARGET ${FCEUX_EXE_NAME}
@ -462,7 +462,7 @@ if(WIN32)
dsound dxguid ddraw dinput
)
if(MINGW)
include_directories(${CMAKE_SOURCE_DIR}/src/drivers/win/lua/include/)
include_directories(${CMAKE_SOURCE_DIR}/src/drivers/win/lua/include/)
else(MINGW)
target_link_libraries( ${FCEUX_EXE_NAME} htmlhelp)
endif(MINGW)

0
trunk/src/boards/konami-qtai.cpp → trunk/src/boards/vrc5.cpp
View File

17
trunk/src/fceu.cpp
View File

@ -275,8 +275,10 @@ readfunc GetReadHandler(int32 a) {
else
return ARead[a];
}
void SetReadHandler(int32 start, int32 end, readfunc func) {
int32 x;
if (!func)
func = ANull;
@ -360,14 +362,14 @@ void ResetGameLoaded(void) {
if (GameInfo) FCEU_CloseGame();
EmulationPaused = 0; //mbg 5/8/08 - loading games while paused was bad news. maybe this fixes it
GameStateRestore = 0;
PPU_hook = 0;
GameHBIRQHook = 0;
FFCEUX_PPURead = 0;
FFCEUX_PPUWrite = 0;
PPU_hook = NULL;
GameHBIRQHook = NULL;
FFCEUX_PPURead = NULL;
FFCEUX_PPUWrite = NULL;
if (GameExpSound.Kill)
GameExpSound.Kill();
memset(&GameExpSound, 0, sizeof(GameExpSound));
MapIRQHook = 0;
MapIRQHook = NULL;
MMC5Hack = 0;
PAL &= 1;
pale = 0;
@ -786,8 +788,8 @@ void PowerNES(void) {
SetReadHandler(0, 0x7FF, ARAML);
SetWriteHandler(0, 0x7FF, BRAML);
SetReadHandler(0x800, 0x1FFF, ARAMH); // Part of a little
SetWriteHandler(0x800, 0x1FFF, BRAMH); //hack for a small speed boost.
SetReadHandler(0x800, 0x1FFF, ARAMH); // Part of a little
SetWriteHandler(0x800, 0x1FFF, BRAMH); //hack for a small speed boost.
InitializeInput();
FCEUSND_Power();
@ -832,6 +834,7 @@ void FCEU_ResetVidSys(void) {
w = FSettings.PAL;
PAL = w ? 1 : 0;
FCEUPPU_SetVideoSystem(w);
SetSoundVariables();
}

2
trunk/vc/vc10_fceux.vcxproj
View File

@ -358,7 +358,7 @@
<ClCompile Include="..\src\boards\h2288.cpp" />
<ClCompile Include="..\src\boards\karaoke.cpp" />
<ClCompile Include="..\src\boards\kof97.cpp" />
<ClCompile Include="..\src\boards\konami-qtai.cpp" />
<ClCompile Include="..\src\boards\vrc5.cpp" />
<ClCompile Include="..\src\boards\ks7032.cpp" />
<ClCompile Include="..\src\boards\malee.cpp" />
<ClCompile Include="..\src\boards\mmc1.cpp" />

2
trunk/vc/vc10_fceux.vcxproj.filters
View File

@ -217,7 +217,7 @@
<ClCompile Include="..\src\boards\kof97.cpp">
<Filter>boards</Filter>
</ClCompile>
<ClCompile Include="..\src\boards\konami-qtai.cpp">
<ClCompile Include="..\src\boards\vrc5.cpp">
<Filter>boards</Filter>
</ClCompile>
<ClCompile Include="..\src\boards\ks7032.cpp">

9708
trunk/vc/vc8_fceux.vcproj
View File

File diff suppressed because it is too large Load Diff

9432
trunk/vc/vc9_fceux.vcproj
View File

File diff suppressed because it is too large Load Diff