Commit graph

48 commits

Author SHA1 Message Date
Andrea Odetti
f61e73b639 Move resources, bitmaps and messageboxes into Frames.
And remove a few windows.h interface functions used before.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-20 19:07:18 +00:00
Andrea Odetti
620fa10454 Remove redundant CPU check and data.h / .cpp. 2021-01-16 16:26:43 +00:00
Andrea Odetti
8a41ed4d73 Introduce SDL Frame. 2021-01-13 15:28:53 +00:00
Andrea Odetti
8e36c2c7b3 Add header files to cmake project.
So they appear in QtCreator.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-12 12:52:26 +00:00
Andrea Odetti
0aec7061c3 Incorporate changes from AW's master.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-03 18:44:44 +00:00
Andrea Odetti
cdf8573202 Tidy up linux interface.h.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-29 09:22:10 +00:00
Andrea Odetti
247b51b2ab Integration of GetVideo().
Part 1.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-28 19:42:04 +00:00
Andrea Odetti
7d6439fefd Introduce a LinuxFrame.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-27 20:25:42 +00:00
Andrea Odetti
eae49b3f41 Integrate AW changes about IPropertySheet. 2020-12-20 16:35:44 +00:00
Andrea Odetti
edb93cbaa0 Integrate memory changes from AW.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-11 08:28:16 +00:00
Andrea Odetti
8e6fc89384 From AW's master, AppleWin.cpp split.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-27 13:48:53 +00:00
Andrea Odetti
9cd8b22647 Use Frame.cpp from upstream.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-24 07:51:50 +00:00
Andrea Odetti
cadb72442a Use Video.cpp "as is".
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-22 09:36:28 +00:00
Andrea Odetti
7a9ed38326 Follow upstream capitalisation of AppleWin.cpp.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-15 15:44:06 +00:00
Andrea Odetti
c7a8c628e4 Changes required from upstream. 2020-11-12 18:43:04 +00:00
Andrea Odetti
a72d19b386 Couple of fixes from upstream AW.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-12 20:58:32 +01:00
Andrea Odetti
697a5b5c88 Rechange the order of initialisation.
Need to find a better solution.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-09 10:30:53 +01:00
Andrea Odetti
8b081725ce More SDL WIP. 2020-10-09 09:46:15 +01:00
Andrea Odetti
ae0194d5b1 Merge branch 'master' into sdl4
# Conflicts:
#	source/CMakeLists.txt
#	source/frontends/ncurses/main.cpp
#	source/frontends/ncurses/resources.cpp
2020-10-09 09:17:55 +01:00
Andrea Odetti
13edefa6e0 Add support for older cmake versions.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-06 20:58:43 +01:00
Andrea Odetti
ffddc18fe6 Dummy implementation of MultiByteToWideChar & WideCharToMultiByte.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-06 20:57:18 +01:00
mariofutire@gmail.com
806a369624 WIP SDL2 2020-10-06 20:05:48 +01:00
Andrea Odetti
60beb9aa58 Add installation and packaging in cmake.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-12 15:53:53 +01:00
Andrea Odetti
9c442468f5 Compile AW's Speaker.cpp and remove custom implementation.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-08 16:52:00 +01:00
Andrea Odetti
86ad2130a9 Make sure configuration is saved when a snapshot is loaded.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-06 19:29:18 +01:00
Andrea Odetti
04ef0bf377 Compile SoundCore from AW.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-01 18:48:41 +01:00
Andrea Odetti
259428a946 Add support for a (munte) mockingboard.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-06-30 15:43:06 +01:00
Andrea Odetti
85b1f872f0 Rationalise location of some duplicate code.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-06-24 12:26:47 +01:00
Andrea Odetti
ee2e80aae4 Fix order of initialisation of global variables.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-06-22 16:43:36 +01:00
Andrea Odetti
12a4180fc7 Small fixes from latest upstream changes.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-06-14 09:18:18 +01:00
Andrea Odetti
93990b0055 Small changes to compile with latest version.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-02-22 19:00:42 +00:00
Andrea Odetti
2d1021c629 Need some of Debug.cpp to link now.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-31 18:34:16 +00:00
Andrea Odetti
0191652565 First part of merge of new CardManager code.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-31 18:19:45 +00:00
Andrea Odetti
874f4be666 Single keyboard handler.
Seems to work...

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-07 11:20:37 +00:00
Andrea Odetti
e8022bf6a0 Cleanup CMakeLists.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-01 15:22:17 +00:00
Andrea Odetti
35a81f8009 applen: add --log, --ntsc, and log time till first $C000 access. 2019-11-23 20:34:24 +00:00
Andrea Odetti
7529f5c659 Reworked the entire wondows.h replacement.
wincompat.h is a stripped down version coming from linapple-pie with the bare minimum common types.
Each group of functions in its own file.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-23 18:17:44 +00:00
Andrea Odetti
9c7abcab91 Compile NTSC * NTSC_CharSet from AppleWin.
Video is still duplicated.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-17 13:57:34 +00:00
Andrea Odetti
add4e526a9 Split dummies into duplicates of AppleWin files.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-16 17:01:11 +00:00
Andrea Odetti
d44bc6c019 Improve cmake detection of required libraries.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-03 09:36:16 +00:00
Andrea Odetti
907474c489 Add wrappers for StringCbXXXX functions and default RegLoadXXXX.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-08-26 10:27:38 +01:00
Andrea Odetti
7ce15903bf Compile RGBMonitor too.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-04-19 20:55:23 +01:00
Andrea Odetti
e68898daf4 Fix Version macros.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-04-19 20:42:25 +01:00
Andrea Odetti
ee2c70c389 Incorporate changes about LC.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2018-11-03 19:20:08 +00:00
Andrea Odetti
da7ac10987 Add AppleWin version number in the About dialog box.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2018-02-06 16:50:50 +00:00
Andrea Odetti
21156bb606 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	source/Disk.cpp
#	source/DiskImageHelper.h
#	source/Memory.cpp

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2018-02-03 20:35:04 +00:00
Andrea Odetti
3733da1af7 Remove configuration from libappleii and delegate it to the frontends.
In qapple we use QSettings.


Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2017-10-14 19:18:44 +01:00
Andrea Odetti
03de883889 Modularise CMakeLists.txt
qapple does not run at the moment: can find configuration file.


Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2017-10-14 19:18:44 +01:00