define wxUSE_UNICODE=0 in non-Unicode build to prevent it from getting automatically defined as 1 by setup.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -1751,7 +1751,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_automtn.o \
|
||||
$(OBJS)\monodll_uuid.o \
|
||||
$(OBJS)\monodll_accel.o \
|
||||
$(OBJS)\monodll_animateg.o \
|
||||
$(OBJS)\monodll_clrpickerg.o \
|
||||
$(OBJS)\monodll_collpaneg.o \
|
||||
$(OBJS)\monodll_colrdlgg.o \
|
||||
@@ -1991,7 +1990,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_aboutdlg.o \
|
||||
$(OBJS)\monodll_sound.o \
|
||||
$(OBJS)\monodll_taskbar.o \
|
||||
$(OBJS)\monodll_joystick.o
|
||||
$(OBJS)\monodll_joystick.o \
|
||||
$(OBJS)\monodll_animateg.o
|
||||
endif
|
||||
ifeq ($(USE_STC),1)
|
||||
__wxscintilla_library_link_DEP = $(__wxscintilla)
|
||||
@@ -2396,7 +2396,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_automtn.o \
|
||||
$(OBJS)\monolib_uuid.o \
|
||||
$(OBJS)\monolib_accel.o \
|
||||
$(OBJS)\monolib_animateg.o \
|
||||
$(OBJS)\monolib_clrpickerg.o \
|
||||
$(OBJS)\monolib_collpaneg.o \
|
||||
$(OBJS)\monolib_colrdlgg.o \
|
||||
@@ -2636,7 +2635,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_aboutdlg.o \
|
||||
$(OBJS)\monolib_sound.o \
|
||||
$(OBJS)\monolib_taskbar.o \
|
||||
$(OBJS)\monolib_joystick.o
|
||||
$(OBJS)\monolib_joystick.o \
|
||||
$(OBJS)\monolib_animateg.o
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),1)
|
||||
@@ -2966,7 +2966,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_automtn.o \
|
||||
$(OBJS)\coredll_uuid.o \
|
||||
$(OBJS)\coredll_accel.o \
|
||||
$(OBJS)\coredll_animateg.o \
|
||||
$(OBJS)\coredll_clrpickerg.o \
|
||||
$(OBJS)\coredll_collpaneg.o \
|
||||
$(OBJS)\coredll_colrdlgg.o \
|
||||
@@ -3439,7 +3438,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_automtn.o \
|
||||
$(OBJS)\corelib_uuid.o \
|
||||
$(OBJS)\corelib_accel.o \
|
||||
$(OBJS)\corelib_animateg.o \
|
||||
$(OBJS)\corelib_clrpickerg.o \
|
||||
$(OBJS)\corelib_collpaneg.o \
|
||||
$(OBJS)\corelib_colrdlgg.o \
|
||||
@@ -3693,7 +3691,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\advdll_aboutdlg.o \
|
||||
$(OBJS)\advdll_sound.o \
|
||||
$(OBJS)\advdll_taskbar.o \
|
||||
$(OBJS)\advdll_joystick.o
|
||||
$(OBJS)\advdll_joystick.o \
|
||||
$(OBJS)\advdll_animateg.o
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
ifeq ($(SHARED),0)
|
||||
@@ -3762,7 +3761,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\advlib_aboutdlg.o \
|
||||
$(OBJS)\advlib_sound.o \
|
||||
$(OBJS)\advlib_taskbar.o \
|
||||
$(OBJS)\advlib_joystick.o
|
||||
$(OBJS)\advlib_joystick.o \
|
||||
$(OBJS)\advlib_animateg.o
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
____wxadv_namedll_DEP = $(__advdll___depname)
|
||||
@@ -4030,6 +4030,9 @@ endif
|
||||
ifeq ($(USE_THREADS),0)
|
||||
__THREAD_DEFINE_p_53 = --define wxNO_THREADS
|
||||
endif
|
||||
ifeq ($(UNICODE),0)
|
||||
__UNICODE_DEFINE_p_54 = --define wxUSE_UNICODE=0
|
||||
endif
|
||||
ifeq ($(UNICODE),1)
|
||||
__UNICODE_DEFINE_p_54 = --define _UNICODE
|
||||
endif
|
||||
@@ -4114,6 +4117,9 @@ endif
|
||||
ifeq ($(USE_THREADS),0)
|
||||
__THREAD_DEFINE_p = -DwxNO_THREADS
|
||||
endif
|
||||
ifeq ($(UNICODE),0)
|
||||
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
|
||||
endif
|
||||
ifeq ($(UNICODE),1)
|
||||
__UNICODE_DEFINE_p = -D_UNICODE
|
||||
endif
|
||||
@@ -4241,7 +4247,7 @@ endif
|
||||
ifeq ($(MONOLITHIC),1)
|
||||
ifeq ($(SHARED),1)
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP)
|
||||
$(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__wxscintilla)
|
||||
$(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__wxscintilla)
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -7288,18 +7294,6 @@ $(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(WXUNIV),1)
|
||||
$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_animatecmn.o: ../../src/common/animatecmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -7410,6 +7404,18 @@ $(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(WXUNIV),1)
|
||||
$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -9480,18 +9486,6 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(WXUNIV),1)
|
||||
$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_animatecmn.o: ../../src/common/animatecmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -9602,6 +9596,18 @@ $(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
ifeq ($(WXUNIV),1)
|
||||
$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -10411,9 +10417,6 @@ $(OBJS)\coredll_treectrl.o: ../../src/msw/treectrl.cpp
|
||||
$(OBJS)\coredll_fontdlg.o: ../../src/msw/fontdlg.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\coredll_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -11825,9 +11828,6 @@ $(OBJS)\corelib_treectrl.o: ../../src/msw/treectrl.cpp
|
||||
$(OBJS)\corelib_fontdlg.o: ../../src/msw/fontdlg.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\corelib_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -13221,6 +13221,11 @@ $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
|
||||
$(OBJS)\advdll_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
ifeq ($(WXUNIV),1)
|
||||
$(OBJS)\advdll_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
$(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
|
||||
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -13308,6 +13313,11 @@ $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
|
||||
$(OBJS)\advlib_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
ifeq ($(WXUNIV),1)
|
||||
$(OBJS)\advlib_animateg.o: ../../src/generic/animateg.cpp
|
||||
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
$(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
|
||||
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
|
||||
Reference in New Issue
Block a user