Skip to content

Commit

Permalink
Change to consistent ARCH in Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarkRivers
MarkRivers committed Feb 10, 2024
1 parent 18243ac commit b6122ae
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 25 deletions.
3 changes: 1 addition & 2 deletions iocBoot/iocE1608/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
ARCH = linux-x86_64
#ARCH = linux-x86_64-ub18
#ARCH = windows-x64-static
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocEDIO24/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64
#ARCH = windows-x64-static-vs2015
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
1 change: 0 additions & 1 deletion iocBoot/iocETC/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64
#ARCH = linux-x86_64-ub22
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
5 changes: 3 additions & 2 deletions iocBoot/iocMeasCompDemo/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
ARCH = win32-x86
TARGETS = envPaths
#ARCH = windows-x64-static
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocTC32/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
ARCH = linux-x86_64
#ARCH = windows-x64-static
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
4 changes: 2 additions & 2 deletions iocBoot/iocUSB1208/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = win32-x86-static
ARCH = windows-x64-static
#ARCH = windows-x64-static
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocUSB1608G-2AO/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub22
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
3 changes: 2 additions & 1 deletion iocBoot/iocUSB1608G/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
ARCH = windows-x64-static
#ARCH = windows-x64-static
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocUSB1608HS-2AO/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub18
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocUSB1808/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub18
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
4 changes: 2 additions & 2 deletions iocBoot/iocUSB231/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = win32-x86-static
ARCH = windows-x64-static
#ARCH = windows-x64-static
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocUSB2408/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub22
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocUSB3104/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub18
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
2 changes: 1 addition & 1 deletion iocBoot/iocUSB3105/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub18
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
1 change: 0 additions & 1 deletion iocBoot/iocUSBCTR/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
#ARCH = windows-x64
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
3 changes: 1 addition & 2 deletions iocBoot/iocUSBSSR/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64
#TARGETS = envPaths dllPath.bat
TARGETS = envPaths
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
3 changes: 1 addition & 2 deletions iocBoot/iocUSBTEMP-AI/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub22
#ARCH = linux-x86_64
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc
3 changes: 1 addition & 2 deletions iocBoot/iocUSBTEMP/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-static
ARCH = linux-x86_64-ub18
#ARCH = linux-x86_64
ARCH = linux-x86_64
TARGETS = envPaths dllPath.bat
include $(TOP)/configure/RULES.ioc

0 comments on commit b6122ae

Please sign in to comment.