build

Author: coder114514

README.md

@@ -3,25 +3,3 @@ This is a **modified** version of the Casio emulator developed by [qiufuyu](http
 Files are modified so that they can work on windows.
 
 Note that ROMs are **not** included in the `models` folder (for copyright reasons), you have to obtain one from somewhere else or dump it from a real calculator or emulator. (note that models labeled with `_emu` are for ROMs dumped from official emulators)
-
-
-# CasioEmuX-win
-
-An emulator and disassembler for the CASIO calculator series using the nX-U8/100 core.  
-With debuggers.
-
-To build it, install tdm-gcc and run build.bat
-
-syntax:
-
-`casioemu key1=value1 key2=value2 ...`
-
-`model=<directory>` model directory, which should contain interface.png, model.lua, rom.bin(you can find it elsewhere) and _disas.txt(use disas-cpp on rom.bin to obtain this file)
-
-these arguments are optional:
-
-`script=<xxx.lua>` the supplied lua script will run on startup
-
-`exit_on_console_shutdown=true/false` pretty self-evident, default to false
-
-`history=<history file path>` input history

emulator/README.md

@@ -1,4 +1,22 @@
 # Emulator
-a version ported to windows
-run build.bat to build it, if you are using 32-bit system, then you need to change the libraries in build.bat to the correspoding 32 bit versions
-the dlls needed by the program is in the dlls directory
+
+An emulator and disassembler for the CASIO calculator series using the nX-U8/100 core ported to windows.
+With debuggers.
+
+To build it, install tdm-gcc and run build32.bat or build64.bat (depending on your machine's architecture).
+
+The dlls needed by the program (SDL2.dll, SDL2_image.dll) are in the `dlls` directory.
+
+## Syntax
+
+`casioemu <key1>=<value1> <key2>=<value2> ...`
+
+`model=<directory>` model directory, which should contain interface.png, model.lua, rom.bin(you can find it elsewhere) and _disas.txt(use disas-cpp on rom.bin to obtain this file)
+
+these arguments are optional:
+
+`script=<xxx.lua>` the supplied lua script will run on startup
+
+`exit_on_console_shutdown=true/false` pretty self-evident, default to false
+
+`history=<history file path>` the file that stores your input history

emulator/build32.bat

@@ -0,0 +1,20 @@
+@pushd %~dp0%
+
+@set include=-I"libs\SDL2-2.26.4\i686-w64-mingw32\include\SDL2" -I"libs\SDL2_image-2.6.3\i686-w64-mingw32\include\SDL2" -I"libs\lua-5.3.6\include" -I"libs\wineditline-2.206\include"
+
+@set compiler=%include% -Wall -pedantic -std=c++2a -O2
+
+@set linker=-L"libs\SDL2-2.26.4\i686-w64-mingw32\lib" -L"libs\SDL2_image-2.6.3\i686-w64-mingw32\lib" -L"libs\lua-5.3.6" -L"libs\wineditline-2.206\lib32"
+@set linker=%linker% -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -llua53_32bit -ledit_static
+
+@set files=src\casioemu.cpp src\Emulator.cpp src\Logger.cpp
+@set files=%files% src\Chipset\CPU.cpp src\Chipset\CPUPushPop.cpp src\Chipset\MMURegion.cpp src\Chipset\CPUControl.cpp src\Chipset\CPUArithmetic.cpp src\Chipset\CPULoadStore.cpp src\Chipset\Chipset.cpp src\Chipset\MMU.cpp src\Chipset\InterruptSource.cpp
+@set files=%files% src\Peripheral\BatteryBackedRAM.cpp src\Peripheral\Peripheral.cpp src\Peripheral\Keyboard.cpp src\Peripheral\Screen.cpp src\Peripheral\Timer.cpp src\Peripheral\StandbyControl.cpp src\Peripheral\ROMWindow.cpp src\Peripheral\Miscellaneous.cpp
+@set files=%files% src\Gui\CodeViewer.cpp src\Gui\Command.cpp src\Data\ModelInfo.cpp
+@set files=%files% src\Gui\imgui\imgui_impl_sdl2.cpp src\Gui\imgui\imgui_impl_sdlrenderer2.cpp src\Gui\imgui\imgui.cpp src\Gui\imgui\imgui_widgets.cpp src\Gui\imgui\imgui_tables.cpp src\Gui\imgui\imgui_draw.cpp
+
+@set output_exe=casioemu32.exe
+
+g++ %compiler% %files% %linker% -m32 -o %output_exe%
+
+@popd

emulator/build.bat renamed to emulator/build64.bat

@@ -2,7 +2,7 @@
 
 @set include=-I"libs\SDL2-2.26.4\x86_64-w64-mingw32\include\SDL2" -I"libs\SDL2_image-2.6.3\x86_64-w64-mingw32\include\SDL2" -I"libs\lua-5.3.6\include" -I"libs\wineditline-2.206\include"
 
-@set compiler=%include% -Wall -pedantic -std=c++2a
+@set compiler=%include% -Wall -pedantic -std=c++2a -O2
 
 @set linker=-L"libs\SDL2-2.26.4\x86_64-w64-mingw32\lib" -L"libs\SDL2_image-2.6.3\x86_64-w64-mingw32\lib" -L"libs\lua-5.3.6" -L"libs\wineditline-2.206\lib64"
 @set linker=%linker% -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -llua53 -ledit_static
@@ -13,8 +13,8 @@
 @set files=%files% src\Gui\CodeViewer.cpp src\Gui\Command.cpp src\Data\ModelInfo.cpp
 @set files=%files% src\Gui\imgui\imgui_impl_sdl2.cpp src\Gui\imgui\imgui_impl_sdlrenderer2.cpp src\Gui\imgui\imgui.cpp src\Gui\imgui\imgui_widgets.cpp src\Gui\imgui\imgui_tables.cpp src\Gui\imgui\imgui_draw.cpp
 
-@set output_exe=casioemu.exe
+@set output_exe=casioemu64.exe
 
-g++ %compiler% %files% %linker% -O2 -o %output_exe%
+g++ %compiler% %files% %linker% -m64 -o %output_exe%
 
 @popd