check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

[wxWidgets.git] / contrib / build / gizmos / makefile.gcc

diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
index 5f50838f0e485d1af1ac38f389d521ed915be096..978feb8fefefe762d1a63ea3d171d186ae4498ef 100644 (file)
--- a/contrib/build/gizmos/makefile.gcc
+++ b/contrib/build/gizmos/makefile.gcc
@@ -22,7 +22,7 @@ SETUPHDIR = \
 GIZMOSDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
        -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
@@ -39,7 +39,7 @@ GIZMOSDLL_OBJECTS =  \
 GIZMOS_XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
        -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS_XRC \
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
@@ -51,7 +51,7 @@ GIZMOS_XRCDLL_OBJECTS =  \
 GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
        -I..\..\src\gizmos\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -66,7 +66,7 @@ GIZMOSLIB_OBJECTS =  \
 GIZMOS_XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
        -I..\..\src\gizmos\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -171,6 +171,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_0 = --define _UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_0 = --define wxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@@ -258,6 +261,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
 
 
 all: $(OBJS)
@@ -310,7 +316,7 @@ $(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG)
+       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG)
 
 $(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -334,7 +340,7 @@ $(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG)
+       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG)
 
 $(OBJS)\gizmos_xrcdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
        $(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<