Skip to content

Commit 6b6feb5

Browse files
yuxiaomaoyuxiaomao
committed
Add -D HL_DISABLE_LEGACY_FFI to hlc template
1 parent f23d428 commit 6b6feb5

7 files changed

Lines changed: 22 additions & 21 deletions

File tree

‎other/haxelib/templates/ci/__file__.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<WarningLevel>Level3</WarningLevel>
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
98-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<ConformanceMode>true</ConformanceMode>
100100
<ObjectFileName>$(IntDir)\%(RelativeDir)\%(Filename).obj</ObjectFileName>
101101
</ClCompile>
@@ -112,7 +112,7 @@
112112
<FunctionLevelLinking>true</FunctionLevelLinking>
113113
<IntrinsicFunctions>true</IntrinsicFunctions>
114114
<SDLCheck>true</SDLCheck>
115-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116116
<ConformanceMode>true</ConformanceMode>
117117
<ObjectFileName>$(IntDir)\%(RelativeDir)\%(Filename).obj</ObjectFileName>
118118
</ClCompile>
@@ -129,7 +129,7 @@
129129
<WarningLevel>Level3</WarningLevel>
130130
<Optimization>Disabled</Optimization>
131131
<SDLCheck>true</SDLCheck>
132-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133133
<ConformanceMode>true</ConformanceMode>
134134
<ObjectFileName>$(IntDir)\%(RelativeDir)\%(Filename).obj</ObjectFileName>
135135
</ClCompile>
@@ -146,7 +146,7 @@
146146
<FunctionLevelLinking>true</FunctionLevelLinking>
147147
<IntrinsicFunctions>true</IntrinsicFunctions>
148148
<SDLCheck>true</SDLCheck>
149-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150150
<ConformanceMode>true</ConformanceMode>
151151
<ObjectFileName>$(IntDir)\%(RelativeDir)\%(Filename).obj</ObjectFileName>
152152
</ClCompile>

‎other/haxelib/templates/hxcpp/Build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<files id="::name::">
33
<compilerflag value="-std=c11" unless="MSVC_VER" />
44
<compilerflag value="-DHL_MAKE" />
5+
<compilerflag value="-DHL_DISABLE_LEGACY_FFI" />
56
<compilerflag value="-I$$makePath(::relDir::)" />
67
<compilerflag value="-I${HASHLINK}/src" if="HASHLINK" />
78
<compilerflag value="-I${HASHLINK}/include" if="HASHLINK" />

‎other/haxelib/templates/make/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Auto-generated from hashlink's Makefile template; do not edit
22

33
UNAME := $(shell uname)
4-
CFLAGS=-O3 -std=c11 -DHL_MAKE -I$$makePath(::relDir::)
4+
CFLAGS=-O3 -std=c11 -DHL_MAKE -DHL_DISABLE_LEGACY_FFI -I$$makePath(::relDir::)
55
ifeq ($(UNAME),Darwin)
66
LDLIBS=-lhl -lm::foreach libraries::::if (name == "uv"):: -luv::end:: /usr/local/lib/::name::.hdll::end::
77
else

‎other/haxelib/templates/vs2015/__file__.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</PrecompiledHeader>
9696
<WarningLevel>Level3</WarningLevel>
9797
<Optimization>Disabled</Optimization>
98-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<SDLCheck>true</SDLCheck>
100100
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
101101
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -115,7 +115,7 @@
115115
</PrecompiledHeader>
116116
<WarningLevel>Level3</WarningLevel>
117117
<Optimization>Disabled</Optimization>
118-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119119
<SDLCheck>true</SDLCheck>
120120
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
121121
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -137,7 +137,7 @@
137137
<Optimization>MaxSpeed</Optimization>
138138
<FunctionLevelLinking>true</FunctionLevelLinking>
139139
<IntrinsicFunctions>true</IntrinsicFunctions>
140-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
140+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141141
<SDLCheck>true</SDLCheck>
142142
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
143143
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -161,7 +161,7 @@
161161
<Optimization>MaxSpeed</Optimization>
162162
<FunctionLevelLinking>true</FunctionLevelLinking>
163163
<IntrinsicFunctions>true</IntrinsicFunctions>
164-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
164+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165165
<SDLCheck>true</SDLCheck>
166166
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
167167
<MultiProcessorCompilation>true</MultiProcessorCompilation>

‎other/haxelib/templates/vs2017/__file__.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<WarningLevel>Level3</WarningLevel>
9898
<Optimization>Disabled</Optimization>
9999
<SDLCheck>true</SDLCheck>
100-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
100+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101101
<ConformanceMode>true</ConformanceMode>
102102
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
103103
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -118,7 +118,7 @@
118118
<WarningLevel>Level3</WarningLevel>
119119
<Optimization>Disabled</Optimization>
120120
<SDLCheck>true</SDLCheck>
121-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
121+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122122
<ConformanceMode>true</ConformanceMode>
123123
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
124124
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -141,7 +141,7 @@
141141
<FunctionLevelLinking>true</FunctionLevelLinking>
142142
<IntrinsicFunctions>true</IntrinsicFunctions>
143143
<SDLCheck>true</SDLCheck>
144-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
144+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145145
<ConformanceMode>true</ConformanceMode>
146146
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
147147
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -166,7 +166,7 @@
166166
<FunctionLevelLinking>true</FunctionLevelLinking>
167167
<IntrinsicFunctions>true</IntrinsicFunctions>
168168
<SDLCheck>true</SDLCheck>
169-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
169+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
170170
<ConformanceMode>true</ConformanceMode>
171171
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
172172
<MultiProcessorCompilation>true</MultiProcessorCompilation>

‎other/haxelib/templates/vs2019/__file__.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<WarningLevel>Level3</WarningLevel>
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
98-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<ConformanceMode>true</ConformanceMode>
100100
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
101101
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -116,7 +116,7 @@
116116
<FunctionLevelLinking>true</FunctionLevelLinking>
117117
<IntrinsicFunctions>true</IntrinsicFunctions>
118118
<SDLCheck>true</SDLCheck>
119-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120120
<ConformanceMode>true</ConformanceMode>
121121
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
122122
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -137,7 +137,7 @@
137137
<WarningLevel>Level3</WarningLevel>
138138
<Optimization>Disabled</Optimization>
139139
<SDLCheck>true</SDLCheck>
140-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
140+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141141
<ConformanceMode>true</ConformanceMode>
142142
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
143143
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -158,7 +158,7 @@
158158
<FunctionLevelLinking>true</FunctionLevelLinking>
159159
<IntrinsicFunctions>true</IntrinsicFunctions>
160160
<SDLCheck>true</SDLCheck>
161-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
161+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162162
<ConformanceMode>true</ConformanceMode>
163163
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
164164
<MultiProcessorCompilation>true</MultiProcessorCompilation>

‎other/haxelib/templates/vs2022/__file__.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<WarningLevel>Level3</WarningLevel>
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
98-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<ConformanceMode>true</ConformanceMode>
100100
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
101101
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -116,7 +116,7 @@
116116
<FunctionLevelLinking>true</FunctionLevelLinking>
117117
<IntrinsicFunctions>true</IntrinsicFunctions>
118118
<SDLCheck>true</SDLCheck>
119-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120120
<ConformanceMode>true</ConformanceMode>
121121
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
122122
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -137,7 +137,7 @@
137137
<WarningLevel>Level3</WarningLevel>
138138
<Optimization>Disabled</Optimization>
139139
<SDLCheck>true</SDLCheck>
140-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
140+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141141
<ConformanceMode>true</ConformanceMode>
142142
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
143143
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -158,7 +158,7 @@
158158
<FunctionLevelLinking>true</FunctionLevelLinking>
159159
<IntrinsicFunctions>true</IntrinsicFunctions>
160160
<SDLCheck>true</SDLCheck>
161-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::%(PreprocessorDefinitions)</PreprocessorDefinitions>
161+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;::if (jumboBuild != "true")::HL_MAKE;::end::HL_DISABLE_LEGACY_FFI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162162
<ConformanceMode>true</ConformanceMode>
163163
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
164164
<MultiProcessorCompilation>true</MultiProcessorCompilation>

0 commit comments

Comments
 (0)