Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't include wxUniversal configurations in MSVC project files.

Browse Source 
wxUniversal is practically not used under MSW and just confuses people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-01-21 16:37:01 +00:00
parent b640fa17f3
commit 22a3b6e4b2
1137 changed files with 30808 additions and 204321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
utils/execmon/makefile.wat
View File

@@ -31,17 +31,28 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME =
!ifeq USE_GUI 0
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
!endif
WXBASEPORT =
!ifeq TOOLKIT MAC
WXBASEPORT = _carbon
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
WXDEBUGFLAG = d
@@ -187,7 +198,7 @@ __DLLFLAG_p = -dWXUSINGDLL
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
@@ -222,12 +233,12 @@ LIBDIRNAME = &
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 &
-wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG_7) &
$(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 &
$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
EXECMON_OBJECTS = &
$(OBJS)\execmon_execmon.obj