Compile TFE and drop the duplicate.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-04-17 19:07:21 +01:00
parent 4683883c2b
commit bbb698ece1
5 changed files with 15 additions and 11 deletions

View file

@ -1,6 +1,10 @@
include(FindPkgConfig)
set(SOURCE_FILES
Tfe/tfe.cpp
Tfe/tfearch.cpp
Tfe/tfesupp.cpp
Debugger/Debugger_Color.cpp
Debugger/Debugger_Disassembler.cpp
Debugger/Debugger_Symbols.cpp
@ -75,7 +79,6 @@ set(SOURCE_FILES
linux/duplicates/Joystick.cpp
linux/duplicates/SerialComms.cpp
linux/duplicates/PropertySheet.cpp
linux/duplicates/Tfe.cpp
Z80VICE/z80.cpp
Z80VICE/z80mem.cpp
@ -171,10 +174,12 @@ add_library(appleii SHARED
pkg_check_modules(YAML REQUIRED yaml-0.1)
pkg_check_modules(MINIZIP REQUIRED minizip)
pkg_check_modules(PCAP REQUIRED libpcap)
find_package(Boost REQUIRED)
target_include_directories(appleii PRIVATE
${YAML_INCLUDE_DIRS}
${PCAP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
Debugger
)
@ -187,6 +192,7 @@ target_include_directories(appleii PUBLIC
target_link_libraries(appleii PRIVATE
${YAML_LIBRARIES}
${MINIZIP_LIBRARIES}
${PCAP_LIBRARIES}
)
target_compile_options(appleii PUBLIC

View file

@ -27,6 +27,7 @@
#include "Utilities.h"
#include "Interface.h"
#include "Debugger/Debug.h"
#include "Tfe/tfe.h"
#include <libgen.h>
#include <unistd.h>
@ -86,6 +87,7 @@ namespace common2
GetCardMgr().GetDisk2CardMgr().Reset();
HD_Reset();
tfe_init();
Snapshot_Startup();
DebugInitialize();
@ -105,6 +107,7 @@ namespace common2
MB_Destroy();
DSUninit();
tfe_shutdown();
HD_Destroy();
PrintDestroy();
CpuDestroy();

View file

@ -1,9 +0,0 @@
#include <StdAfx.h>
#include "Tfe/Tfe.h"
int tfe_enabled = 0;
int update_tfe_interface(void *v, void *param)
{
return 0;
}

View file

@ -17,7 +17,6 @@ typedef void * HDC;
typedef void * HINSTANCE;
typedef LONG_PTR LPARAM;
typedef UINT_PTR WPARAM;
typedef void * SOCKET;
typedef void * CRITICAL_SECTION;
typedef void * LPDIRECTDRAW;
typedef void * LPOVERLAPPED;
@ -25,5 +24,8 @@ typedef void * OVERLAPPED;
typedef void * LPSECURITY_ATTRIBUTES;
typedef void * HSEMAPHORE;
#ifndef SOCKET
#define SOCKET int
#endif
BOOL CloseHandle(HANDLE hObject);

View file

@ -6,7 +6,9 @@
#define CBR_9600 9600
#define WM_USER 0x0400
#ifndef INVALID_SOCKET
#define INVALID_SOCKET (SOCKET)(~0)
#endif
#define MB_OK 0x00000000
#define MB_OKCANCEL 0x00000001