Skip to content

Commit 103d1dd

Browse files
bscottmpkoning2
authored andcommitted
CMAKE: Regenerate, PDP10 needs USES_AIO
- 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.
1 parent a011507 commit 103d1dd

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

AltairZ80/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ add_simulator(altairz80
1818
SOURCES
1919
altairz80_cpu.c
2020
altairz80_cpu_nommu.c
21+
s100_tuart.c
2122
s100_dazzler.c
2223
s100_jair.c
2324
sol20.c
@@ -62,7 +63,6 @@ add_simulator(altairz80
6263
s100_scp300f.c
6364
s100_tarbell.c
6465
s100_tdd.c
65-
s100_tuart.c
6666
wd179x.c
6767
s100_hdc1001.c
6868
s100_if3.c

Ibm1130/CMakeLists.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,16 @@ add_simulator(ibm1130
3131
ibm1130_t2741.c
3232
INCLUDES
3333
${CMAKE_CURRENT_SOURCE_DIR}
34+
TEST_ARGS "-g"
3435
LABEL Ibm1130
3536
PKG_FAMILY ibm_family
3637
TEST ibm1130)
3738

3839
if (WIN32)
40+
## Add GUI support, compile in resources:
3941
target_compile_definitions(ibm1130 PRIVATE GUI_SUPPORT)
40-
## missing source in IBM1130? ## target_sources(ibm1130 PRIVATE ibm1130.c)
41-
endif()
42+
target_sources(ibm1130 PRIVATE ibm1130.rc)
43+
endif()
44+
45+
# IBM 1130 utilities:
46+
# add_subdirectory(utils)

PDP10/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ add_simulator(pdp10-ka
114114
FEATURE_INT64
115115
FEATURE_VIDEO
116116
FEATURE_DISPLAY
117+
USES_AIO
117118
LABEL PDP10
118119
PKG_FAMILY pdp10_family
119120
TEST ka10)
@@ -161,6 +162,7 @@ add_simulator(pdp10-ki
161162
FEATURE_INT64
162163
FEATURE_VIDEO
163164
FEATURE_DISPLAY
165+
USES_AIO
164166
LABEL PDP10
165167
PKG_FAMILY pdp10_family
166168
TEST ki10)
@@ -193,6 +195,7 @@ add_simulator(pdp10-kl
193195
DEFINES
194196
KL=1
195197
FEATURE_INT64
198+
USES_AIO
196199
LABEL PDP10
197200
PKG_FAMILY pdp10_family
198201
TEST kl10)
@@ -220,6 +223,7 @@ add_simulator(pdp10-ks
220223
DEFINES
221224
KS=1
222225
FEATURE_INT64
226+
USES_AIO
223227
LABEL PDP10
224228
PKG_FAMILY pdp10_family
225229
TEST ks10)

VAX/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -566,12 +566,12 @@ add_simulator(vax8200
566566
vax_sys.c
567567
vax_syscm.c
568568
vax_watch.c
569-
vax_uw.c
570569
vax820_stddev.c
571570
vax820_bi.c
572571
vax820_mem.c
573572
vax820_uba.c
574573
vax820_ka.c
574+
vax_uw.c
575575
vax820_syslist.c
576576
${PDP11D}/pdp11_rl.c
577577
${PDP11D}/pdp11_rq.c
@@ -615,12 +615,12 @@ add_simulator(vax8600
615615
vax_mmu.c
616616
vax_sys.c
617617
vax_syscm.c
618-
vax_uw.c
619618
vax860_stddev.c
620619
vax860_sbia.c
621620
vax860_abus.c
622621
vax780_uba.c
623622
vax7x0_mba.c
623+
vax_uw.c
624624
vax860_syslist.c
625625
${PDP11D}/pdp11_rl.c
626626
${PDP11D}/pdp11_rq.c

makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ KA10 = ${KA10D}/kx10_cpu.c ${KA10D}/kx10_sys.c ${KA10D}/kx10_df.c \
20742074
${KA10D}/ka10_ai.c ${KA10D}/ka10_iii.c ${KA10D}/kx10_disk.c \
20752075
${KA10D}/ka10_pclk.c ${KA10D}/ka10_tv.c ${KA10D}/ka10_dd.c \
20762076
${KA10D}/kx10_ddc.c ${DISPLAYL} ${DISPLAY340} ${DISPLAYIII}
2077-
KA10_OPT = -DKA=1 -DUSE_INT64 -I ${KA10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KA10_DISPLAY_OPT}
2077+
KA10_OPT = -DKA=1 -DUSE_INT64 -I ${KA10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KA10_DISPLAY_OPT} ${AIO_CCDEFS}
20782078
ifneq (${PANDA_LIGHTS},)
20792079
# ONLY for Panda display.
20802080
KA10_OPT += -DPANDA_LIGHTS
@@ -2094,7 +2094,7 @@ KI10 = ${KI10D}/kx10_cpu.c ${KI10D}/kx10_sys.c ${KI10D}/kx10_df.c \
20942094
${KI10D}/kx10_cp.c ${KI10D}/kx10_tu.c ${KI10D}/kx10_rs.c \
20952095
${KI10D}/kx10_imp.c ${KI10D}/kx10_dpy.c ${KI10D}/kx10_disk.c \
20962096
${KI10D}/kx10_ddc.c ${KI10D}/kx10_tym.c ${DISPLAYL} ${DISPLAY340}
2097-
KI10_OPT = -DKI=1 -DUSE_INT64 -I ${KI10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KI10_DISPLAY_OPT}
2097+
KI10_OPT = -DKI=1 -DUSE_INT64 -I ${KI10D} -DUSE_SIM_CARD ${NETWORK_OPT} ${DISPLAY_OPT} ${KI10_DISPLAY_OPT} ${AIO_CCDEFS}
20982098
ifneq (${PANDA_LIGHTS},)
20992099
# ONLY for Panda display.
21002100
KI10_OPT += -DPANDA_LIGHTS
@@ -2110,15 +2110,15 @@ KL10 = ${KL10D}/kx10_cpu.c ${KL10D}/kx10_sys.c ${KL10D}/kx10_df.c \
21102110
${KL10D}/kx10_rp.c ${KL10D}/kx10_tu.c ${KL10D}/kx10_rs.c \
21112111
${KL10D}/kx10_imp.c ${KL10D}/kl10_fe.c ${KL10D}/ka10_pd.c \
21122112
${KL10D}/ka10_ch10.c ${KL10D}/kl10_nia.c ${KL10D}/kx10_disk.c
2113-
KL10_OPT = -DKL=1 -DUSE_INT64 -I $(KL10D) -DUSE_SIM_CARD ${NETWORK_OPT}
2113+
KL10_OPT = -DKL=1 -DUSE_INT64 -I $(KL10D) -DUSE_SIM_CARD ${NETWORK_OPT} ${AIO_CCDEFS}
21142114

21152115
KS10D = ${SIMHD}/PDP10
21162116
KS10 = ${KS10D}/kx10_cpu.c ${KS10D}/kx10_sys.c ${KS10D}/kx10_disk.c \
21172117
${KS10D}/ks10_cty.c ${KS10D}/ks10_uba.c ${KS10D}/kx10_rh.c \
21182118
${KS10D}/kx10_rp.c ${KS10D}/kx10_tu.c ${KS10D}/ks10_dz.c \
21192119
${KS10D}/ks10_tcu.c ${KS10D}/ks10_lp.c ${KS10D}/ks10_ch11.c \
21202120
${KS10D}/ks10_kmc.c ${KS10D}/ks10_dup.c ${KS10D}/kx10_imp.c
2121-
KS10_OPT = -DKS=1 -DUSE_INT64 -I $(KS10D) -I $(PDP11D) ${NETWORK_OPT}
2121+
KS10_OPT = -DKS=1 -DUSE_INT64 -I $(KS10D) -I $(PDP11D) ${NETWORK_OPT} ${AIO_CCDEFS}
21222122

21232123
ATT3B2D = ${SIMHD}/3B2
21242124
ATT3B2M400 = ${ATT3B2D}/3b2_cpu.c ${ATT3B2D}/3b2_sys.c \

0 commit comments

Comments
 (0)