platformLibs:mingw: move shell32 to separate package

JetBrains · Oct 28, 2019 · f88dd8a · f88dd8a
1 parent afee74b
commit f88dd8a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/platformLibs/src/platform/mingw/shell32.def b/platformLibs/src/platform/mingw/shell32.def
@@ -0,0 +1,23 @@
+package = platform.shell32
+depends = windows
+
+compilerOpts = \
+    -DUNICODE \
+    -DWINVER=0x0601 \
+    -D_WIN32_WINNT=0x0601 \
+    -DWINAPI_FAMILY=3 \
+    -DOEMRESOURCE \
+    -Wno-incompatible-pointer-types \
+    -Wno-deprecated-declarations
+
+headers = windows.h shlobj.h
+
+headerFilter = \
+    shlobj.h \
+    shobjidl.h \
+    sherrors.h \
+    shtypes.h \
+    shldisp.h \
+    shlguid.h
+
+linkerOpts = -lshell32
diff --git a/platformLibs/src/platform/mingw/windows.def b/platformLibs/src/platform/mingw/windows.def
@@ -14,9 +14,7 @@ headers = \
     wtypes.h \
     minwindef.h \
     windows.h \
-    commctrl.h \
-    shlobj.h \
-    shobjidl.h
+    commctrl.h
 
 headerFilter = \
     apiset.h \
@@ -104,12 +102,6 @@ headerFilter = \
     securitybaseapi.h \
     servprov.h \
     shellapi.h \
-    sherrors.h \
-    shldisp.h \
-    shlguid.h \
-    shlobj.h \
-    shobjidl.h \
-    shtypes.h \
     specstrings.h \
     stralign.h \
     stringapiset.h \
@@ -161,7 +153,6 @@ noStringConversion = \
 
 linkerOpts = \
     -lcomctl32 \
-    -lshell32 \
     -limm32 \
     -lgdi32 \
     -luser32 \