Kaydet (Commit) e389e3ae authored tarafından tono's avatar tono

i#116264: gbuild for MinGW

üst 7997ab5b
...@@ -67,6 +67,20 @@ $(eval $(call gb_Library_add_exception_objects,fsstorage,\ ...@@ -67,6 +67,20 @@ $(eval $(call gb_Library_add_exception_objects,fsstorage,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,fsstorage,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Library_add_linked_libs,fsstorage,\ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -75,4 +89,5 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\ ...@@ -75,4 +89,5 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -63,6 +63,20 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ ...@@ -63,6 +63,20 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -71,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ ...@@ -71,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -169,6 +169,22 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ ...@@ -169,6 +169,22 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/source/svdde/ddewrap \ svl/source/svdde/ddewrap \
)) ))
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,svl,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
mingwex \
advapi32 \
kernel32 \
gdi32 \
msvcrt \
shell32 \
user32 \
))
else
$(eval $(call gb_Library_add_linked_libs,svl,\ $(eval $(call gb_Library_add_linked_libs,svl,\
advapi32 \ advapi32 \
kernel32 \ kernel32 \
...@@ -178,6 +194,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\ ...@@ -178,6 +194,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
user32 \ user32 \
uwinapi \ uwinapi \
)) ))
endif
else else
$(eval $(call gb_Library_add_exception_objects,svl,\ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/unx/source/svdde/ddedummy \ svl/unx/source/svdde/ddedummy \
......
...@@ -53,6 +53,20 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\ ...@@ -53,6 +53,20 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Executable_add_linked_libs,bmp,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Executable_add_linked_libs,bmp,\ $(eval $(call gb_Executable_add_linked_libs,bmp,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -61,6 +75,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\ ...@@ -61,6 +75,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,bmp,\ $(eval $(call gb_Executable_add_linked_libs,bmp,\
......
...@@ -49,6 +49,20 @@ $(eval $(call gb_Executable_add_exception_objects,bmpsum,\ ...@@ -49,6 +49,20 @@ $(eval $(call gb_Executable_add_exception_objects,bmpsum,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -57,6 +71,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ ...@@ -57,6 +71,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
......
...@@ -50,6 +50,20 @@ $(eval $(call gb_Executable_add_exception_objects,g2g,\ ...@@ -50,6 +50,20 @@ $(eval $(call gb_Executable_add_exception_objects,g2g,\
svtools/bmpmaker/g2g \ svtools/bmpmaker/g2g \
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Executable_add_linked_libs,g2g,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Executable_add_linked_libs,g2g,\ $(eval $(call gb_Executable_add_linked_libs,g2g,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -58,6 +72,7 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\ ...@@ -58,6 +72,7 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,g2g,\ $(eval $(call gb_Executable_add_linked_libs,g2g,\
pthread \ pthread \
......
...@@ -64,6 +64,20 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ ...@@ -64,6 +64,20 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
)) ))
endif endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -73,4 +87,5 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ ...@@ -73,4 +87,5 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -66,6 +66,20 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\ ...@@ -66,6 +66,20 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\
endif endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,productregistration,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Library_add_linked_libs,productregistration,\ $(eval $(call gb_Library_add_linked_libs,productregistration,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -74,4 +88,5 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\ ...@@ -74,4 +88,5 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -300,6 +300,25 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ ...@@ -300,6 +300,25 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
endif endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,svt,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
advapi32 \
gdi32 \
kernel32 \
msvcrt \
ole32 \
oleaut32 \
user32 \
uuid \
))
else
$(eval $(call gb_Library_add_linked_libs,svt,\ $(eval $(call gb_Library_add_linked_libs,svt,\
advapi32 \ advapi32 \
gdi32 \ gdi32 \
...@@ -313,4 +332,5 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ ...@@ -313,4 +332,5 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -166,10 +166,23 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ ...@@ -166,10 +166,23 @@ $(eval $(call gb_Library_add_linked_libs,tk,\
)) ))
endif endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,tk,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
mingwex \
kernel32 \
msvcrt \
))
else
$(eval $(call gb_Library_add_linked_libs,tk,\ $(eval $(call gb_Library_add_linked_libs,tk,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
uwinapi \ uwinapi \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -58,6 +58,20 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ ...@@ -58,6 +58,20 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -66,6 +80,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ ...@@ -66,6 +80,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
......
...@@ -55,8 +55,30 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ ...@@ -55,8 +55,30 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
ifeq ($(HAVE_GETOPT),YES)
$(eval $(call gb_Executable_set_cxxflags,rscdep,\
$$(CXXFLAGS) \
-DHAVE_GETOPT \
))
endif
$(eval $(call gb_Executable_add_linked_libs,rscdep,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Executable_add_linked_libs,rscdep,\ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
gnu_getopt \ gnu_getopt \
))
$(eval $(call gb_Executable_add_linked_libs,rscdep,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
oldnames \ oldnames \
...@@ -64,6 +86,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\ ...@@ -64,6 +86,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,rscdep,\ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
......
...@@ -51,6 +51,20 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ ...@@ -51,6 +51,20 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -59,6 +73,7 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\ ...@@ -59,6 +73,7 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
......
...@@ -56,6 +56,20 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\ ...@@ -56,6 +56,20 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Executable_add_linked_libs,sspretty,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
kernel32 \
msvcrt \
user32 \
))
else
$(eval $(call gb_Executable_add_linked_libs,sspretty,\ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
kernel32 \ kernel32 \
msvcrt \ msvcrt \
...@@ -64,6 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\ ...@@ -64,6 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,sspretty,\ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
......
...@@ -160,6 +160,25 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ ...@@ -160,6 +160,25 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/win/source/dll/toolsdll \ tools/win/source/dll/toolsdll \
)) ))
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,tl,\
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
moldname \
mingwex \
advapi32 \
kernel32 \
mpr \
msvcrt \
ole32 \
shell32 \
user32 \
uuid \
))
else
$(eval $(call gb_Library_add_linked_libs,tl,\ $(eval $(call gb_Library_add_linked_libs,tl,\
advapi32 \ advapi32 \
kernel32 \ kernel32 \
...@@ -173,6 +192,7 @@ $(eval $(call gb_Library_add_linked_libs,tl,\ ...@@ -173,6 +192,7 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
uwinapi \ uwinapi \
)) ))
endif endif
endif
# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g # tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
# -DOPTIMIZE # -DOPTIMIZE
# no -DTOOLS_DLLIMPLEMENTATION on toolsdll # no -DTOOLS_DLLIMPLEMENTATION on toolsdll
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment