diff options
| author | Andrea Weikert <elubie@gmx.net> | 2006-03-20 20:25:42 +0300 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2006-03-20 20:25:42 +0300 |
| commit | a89905d6fa419f9200c6cae4a391dbf5e3cb1a7a (patch) | |
| tree | d2ae21be750311868b52fba1c1ebe11be192e452 | |
| parent | e469e4875f97d04fc788cab533495d9408e9b038 (diff) | |
=== MINGW compile ===
Fixing compile for Windows mingw builds with cygwin make and scons.
Used SHGetFolderPath instead of SHGetSpecialFolderPath which is
better supported for mingw.
Thanks to Ralf Hoelzemer for the tip and the patch.
Let me know if any problems persist, I'll try to fix then.
--- Andrea
| -rw-r--r-- | config/win32-mingw-config.py | 2 | ||||
| -rw-r--r-- | source/blender/src/usiblender.c | 6 | ||||
| -rw-r--r-- | source/nan_link.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 4f51e037cbe..a5c59158bde 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -141,7 +141,7 @@ CC_WARN = [ '-Wall' ] ##FIX_STUBS_WARNINGS = -Wno-unused -LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ] +LLIBS = ['-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread'] ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 833d70e47fa..265919a4937 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -486,11 +486,11 @@ static void readBlog(void) /* Adding Desktop and My Documents */ fsmenu_append_seperator(); - SHGetSpecialFolderPath(0, folder, CSIDL_PERSONAL, 0); + SHGetFolderPath(0, CSIDL_PERSONAL,NULL, 0, folder); fsmenu_insert_entry(folder, 0); - SHGetSpecialFolderPath(0, folder, CSIDL_DESKTOPDIRECTORY, 0); + SHGetFolderPath(0, CSIDL_DESKTOPDIRECTORY,NULL, 0, folder); fsmenu_insert_entry(folder, 0); - + fsmenu_append_seperator(); } #endif diff --git a/source/nan_link.mk b/source/nan_link.mk index f201077d4c8..35eb80b2cc7 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -134,7 +134,7 @@ ifeq ($(OS),windows) ifeq ($(FREE_WINDOWS),true) MINGWLIB = /usr/lib/w32api LDFLAGS += -mwindows -mno-cygwin -mconsole - DADD += -L/usr/lib/w32api -lnetapi32 -lopengl32 -lglu32 + DADD += -L/usr/lib/w32api -lnetapi32 -lopengl32 -lglu32 -lshfolder DADD += -L/usr/lib/w32api -lwinmm -lwsock32 else DADD = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib |