File tree Expand file tree Collapse file tree 3 files changed +1
-14
lines changed Expand file tree Collapse file tree 3 files changed +1
-14
lines changed Original file line number Diff line number Diff line change @@ -222,7 +222,5 @@ else()
222
222
223
223
file (MAKE_DIRECTORY ${REACTOS_BINARY_DIR} /include/reactos )
224
224
225
- file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR} /importlibs )
226
-
227
225
add_dependency_footer ()
228
226
endif ()
Original file line number Diff line number Diff line change @@ -83,13 +83,6 @@ else()
83
83
set (ARCH2 ${ARCH} )
84
84
endif ()
85
85
86
- # Linking
87
- if (ARCH MATCHES i386 )
88
- link_directories (${REACTOS_SOURCE_DIR} /importlibs )
89
- endif ()
90
-
91
- link_directories (${REACTOS_BINARY_DIR} /lib/sdk/crt )
92
-
93
86
get_target_property (RSYM native-rsym IMPORTED_LOCATION_NOCONFIG )
94
87
95
88
set (CMAKE_C_LINK_EXECUTABLE
Original file line number Diff line number Diff line change 44
44
set (SPEC2DEF_ARCH i386 )
45
45
endif ()
46
46
47
- link_directories (${REACTOS_SOURCE_DIR} /importlibs ${REACTOS_BINARY_DIR} /importlibs ${REACTOS_BINARY_DIR} /lib/sdk/crt )
48
-
49
47
set (CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR} /include/psdk /I${REACTOS_BINARY_DIR} /include/psdk /I${REACTOS_SOURCE_DIR} /include /I${REACTOS_SOURCE_DIR} /include/reactos /I${REACTOS_BINARY_DIR} /include/reactos /I${REACTOS_SOURCE_DIR} /include/reactos/wine /I${REACTOS_SOURCE_DIR} /include/crt /I${REACTOS_SOURCE_DIR} /include/crt/mingw32 /fo <OBJECT> <SOURCE>" )
50
48
51
49
if (MSVC_IDE )
@@ -149,7 +147,7 @@ function(add_importlib_target _exports_file _implib_name)
149
147
150
148
# add our library
151
149
# NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other
152
- add_library (lib${_name} STATIC
150
+ add_library (lib${_name} STATIC EXCLUDE_FROM_ALL
153
151
${CMAKE_CURRENT_BINARY_DIR} /lib${_name}_stubs.asm )
154
152
155
153
# Add necessary importlibs for redirections. Still necessary ?
@@ -188,8 +186,6 @@ macro(macro_mc FLAG FILE)
188
186
set (COMMAND_MC mc ${FLAG} -r ${REACTOS_BINARY_DIR} /include/reactos -h ${REACTOS_BINARY_DIR} /include/reactos ${CMAKE_CURRENT_SOURCE_DIR} /${FILE}.mc )
189
187
endmacro ()
190
188
191
- file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR} /importlibs )
192
-
193
189
#pseh workaround
194
190
set (PSEH_LIB "pseh" )
195
191
You can’t perform that action at this time.
0 commit comments