folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMAKE: Regenerate, PDP10 needs USES_AIO

Browse source 
- Periodic "python cmake/generate.py" to sync with makefile changes.

- Ensure that AIO_CCDEFS (makefile) and USES_AIO (CMake generate.py) are
  present for PDP-10 simulators. Otherwise, user gets a warning message
  when the simulator starts about network support and asynchronous I/O.
This commit is contained in:
B. Scott Michel 2024-06-20 09:23:05 -07:00 • committed by Paul Koning
parent a011507fe9
commit 103d1dd554
5 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AltairZ80/CMakeLists.txt
View file

@ -18,6 +18,7 @@ add_simulator(altairz80
SOURCES
altairz80_cpu.c
altairz80_cpu_nommu.c
s100_tuart.c
s100_dazzler.c
s100_jair.c
sol20.c
@ -62,7 +63,6 @@ add_simulator(altairz80
s100_scp300f.c
s100_tarbell.c
s100_tdd.c
s100_tuart.c
wd179x.c
s100_hdc1001.c
s100_if3.c

7
Ibm1130/CMakeLists.txt
View file

@ -31,11 +31,16 @@ add_simulator(ibm1130
ibm1130_t2741.c
INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}
TEST_ARGS "-g"
LABEL Ibm1130
PKG_FAMILY ibm_family
TEST ibm1130)
if (WIN32)
## Add GUI support, compile in resources:
target_compile_definitions(ibm1130 PRIVATE GUI_SUPPORT)
## missing source in IBM1130? ## target_sources(ibm1130 PRIVATE ibm1130.c)
target_sources(ibm1130 PRIVATE ibm1130.rc)
endif()
# IBM 1130 utilities:
# add_subdirectory(utils)

4
PDP10/CMakeLists.txt
View file

@ -114,6 +114,7 @@ add_simulator(pdp10-ka
FEATURE_INT64
FEATURE_VIDEO
FEATURE_DISPLAY
USES_AIO
LABEL PDP10
PKG_FAMILY pdp10_family
TEST ka10)
@ -161,6 +162,7 @@ add_simulator(pdp10-ki
FEATURE_INT64
FEATURE_VIDEO
FEATURE_DISPLAY
USES_AIO
LABEL PDP10
PKG_FAMILY pdp10_family
TEST ki10)
@ -193,6 +195,7 @@ add_simulator(pdp10-kl
DEFINES
KL=1
FEATURE_INT64
USES_AIO
LABEL PDP10
PKG_FAMILY pdp10_family
TEST kl10)
@ -220,6 +223,7 @@ add_simulator(pdp10-ks
DEFINES
KS=1
FEATURE_INT64
USES_AIO
LABEL PDP10
PKG_FAMILY pdp10_family
TEST ks10)

4
VAX/CMakeLists.txt
View file

@ -566,12 +566,12 @@ add_simulator(vax8200
vax_sys.c
vax_syscm.c
vax_watch.c
vax_uw.c
vax820_stddev.c
vax820_bi.c
vax820_mem.c
vax820_uba.c
vax820_ka.c
vax_uw.c
vax820_syslist.c
${PDP11D}/pdp11_rl.c
${PDP11D}/pdp11_rq.c
@ -615,12 +615,12 @@ add_simulator(vax8600
vax_mmu.c
vax_sys.c
vax_syscm.c
vax_uw.c
vax860_stddev.c
vax860_sbia.c
vax860_abus.c
vax780_uba.c
vax7x0_mba.c
vax_uw.c
vax860_syslist.c
${PDP11D}/pdp11_rl.c
${PDP11D}/pdp11_rq.c

8
makefile
View file

@ -2074,7 +2074,7 @@ KA10 = ${KA10D}/kx10_cpu.c ${KA10D}/kx10_sys.c ${KA10D}/kx10_df.c \
${KA10D}/ka10_ai.c ${KA10D}/ka10_iii.c ${KA10D}/kx10_disk.c \
${KA10D}/ka10_pclk.c ${KA10D}/ka10_tv.c ${KA10D}/ka10_dd.c \
${KA10D}/kx10_ddc.c ${DISPLAYL} ${DISPLAY340} ${DISPLAYIII}
KA10_OPT = -DKA=1 -DUSE_INT64 -I ${KA10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KA10_DISPLAY_OPT}
KA10_OPT = -DKA=1 -DUSE_INT64 -I ${KA10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KA10_DISPLAY_OPT} ${AIO_CCDEFS}
ifneq (${PANDA_LIGHTS},)
# ONLY for Panda display.
KA10_OPT += -DPANDA_LIGHTS
@ -2094,7 +2094,7 @@ KI10 = ${KI10D}/kx10_cpu.c ${KI10D}/kx10_sys.c ${KI10D}/kx10_df.c \
${KI10D}/kx10_cp.c ${KI10D}/kx10_tu.c ${KI10D}/kx10_rs.c \
${KI10D}/kx10_imp.c ${KI10D}/kx10_dpy.c ${KI10D}/kx10_disk.c \
${KI10D}/kx10_ddc.c ${KI10D}/kx10_tym.c ${DISPLAYL} ${DISPLAY340}
KI10_OPT = -DKI=1 -DUSE_INT64 -I ${KI10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KI10_DISPLAY_OPT}
KI10_OPT = -DKI=1 -DUSE_INT64 -I ${KI10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KI10_DISPLAY_OPT} ${AIO_CCDEFS}
ifneq (${PANDA_LIGHTS},)
# ONLY for Panda display.
KI10_OPT += -DPANDA_LIGHTS
@ -2110,7 +2110,7 @@ KL10 = ${KL10D}/kx10_cpu.c ${KL10D}/kx10_sys.c ${KL10D}/kx10_df.c \
${KL10D}/kx10_rp.c ${KL10D}/kx10_tu.c ${KL10D}/kx10_rs.c \
${KL10D}/kx10_imp.c ${KL10D}/kl10_fe.c ${KL10D}/ka10_pd.c \
${KL10D}/ka10_ch10.c ${KL10D}/kl10_nia.c ${KL10D}/kx10_disk.c
KL10_OPT = -DKL=1 -DUSE_INT64 -I $(KL10D) -DUSE_SIM_CARD ${NETWORK_OPT}
KL10_OPT = -DKL=1 -DUSE_INT64 -I $(KL10D) -DUSE_SIM_CARD ${NETWORK_OPT} ${AIO_CCDEFS}
KS10D = ${SIMHD}/PDP10
KS10 = ${KS10D}/kx10_cpu.c ${KS10D}/kx10_sys.c ${KS10D}/kx10_disk.c \
@ -2118,7 +2118,7 @@ KS10 = ${KS10D}/kx10_cpu.c ${KS10D}/kx10_sys.c ${KS10D}/kx10_disk.c \
${KS10D}/kx10_rp.c ${KS10D}/kx10_tu.c ${KS10D}/ks10_dz.c \
${KS10D}/ks10_tcu.c ${KS10D}/ks10_lp.c ${KS10D}/ks10_ch11.c \
${KS10D}/ks10_kmc.c ${KS10D}/ks10_dup.c ${KS10D}/kx10_imp.c
KS10_OPT = -DKS=1 -DUSE_INT64 -I $(KS10D) -I $(PDP11D) ${NETWORK_OPT}
KS10_OPT = -DKS=1 -DUSE_INT64 -I $(KS10D) -I $(PDP11D) ${NETWORK_OPT} ${AIO_CCDEFS}
ATT3B2D = ${SIMHD}/3B2
ATT3B2M400 = ${ATT3B2D}/3b2_cpu.c ${ATT3B2D}/3b2_sys.c \