Rebake the rest of the files after TOOLKIT change in MSW bakefile.
This should have been part of r74406 but I only rebaked wxWidgets make/project files themselves and not the samples/utils/demos files in it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -31,7 +31,7 @@ CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@@ -146,7 +146,7 @@ LINK32=link.exe
|
||||
|
||||
SOURCE=.\..\..\src\generic\colrdlgg.cpp
|
||||
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
|
||||
@@ -171,7 +171,7 @@ SOURCE=.\dialogs.cpp
|
||||
|
||||
SOURCE=.\..\..\src\generic\dirdlgg.cpp
|
||||
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
|
||||
@@ -192,7 +192,7 @@ SOURCE=.\..\..\src\generic\dirdlgg.cpp
|
||||
|
||||
SOURCE=.\..\..\src\generic\filedlgg.cpp
|
||||
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
|
||||
@@ -213,7 +213,7 @@ SOURCE=.\..\..\src\generic\filedlgg.cpp
|
||||
|
||||
SOURCE=.\..\..\src\generic\fontdlgg.cpp
|
||||
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
!IF "$(CFG)" == "dialogs - Win32 DLL Release"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
|
||||
|
||||
@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
|
||||
WX_RELEASE_NODOT = 29
|
||||
COMPILER_PREFIX = bcc
|
||||
OBJS = \
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = \
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = \
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_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) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
|
||||
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
||||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
|
||||
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
|
||||
-DNOPCH $(CPPFLAGS) $(CXXFLAGS)
|
||||
DIALOGS_OBJECTS = \
|
||||
@@ -42,23 +42,14 @@ DIALOGS_OBJECTS = \
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
!if "$(TOOLKIT)" == "GTK"
|
||||
WIN32_TOOLKIT_LOWERCASE = gtk
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "MSW"
|
||||
WIN32_TOOLKIT_LOWERCASE = msw
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "0"
|
||||
PORTNAME = base
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1"
|
||||
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "MAC"
|
||||
WXBASEPORT = _carbon
|
||||
!endif
|
||||
!if "$(OFFICIAL_BUILD)" == "1"
|
||||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
PORTNAME = msw$(TOOLKIT_VERSION)
|
||||
!endif
|
||||
!if "$(OFFICIAL_BUILD)" == "1"
|
||||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
WXDEBUGFLAG = d
|
||||
@@ -84,11 +75,6 @@ EXTRALIBS_FOR_BASE =
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
|
||||
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
|
||||
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
|
||||
glib-2.0.lib
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__OPTIMIZEFLAG_2 = -Od
|
||||
!endif
|
||||
@@ -185,28 +171,13 @@ __DLLFLAG_p = -DWXUSINGDLL
|
||||
!if "$(SHARED)" == "1"
|
||||
__DLLFLAG_p_1 = -dWXUSINGDLL
|
||||
!endif
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MAC" && "$(WXUNIV)" == "0"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_colrdlgg.obj \
|
||||
$(OBJS)\dialogs_dirdlgg.obj \
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MSW" && "$(WXUNIV)" == "0"
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_colrdlgg.obj \
|
||||
$(OBJS)\dialogs_dirdlgg.obj \
|
||||
$(OBJS)\dialogs_filedlgg.obj \
|
||||
$(OBJS)\dialogs_fontdlgg.obj
|
||||
!endif
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_fontdlgg.obj \
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
@@ -217,7 +188,7 @@ __WXLIB_CORE_p = \
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_BASE_p = \
|
||||
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
__WXLIB_MONO_p = \
|
||||
@@ -276,7 +247,7 @@ clean:
|
||||
|
||||
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
|
||||
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
|
||||
c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res
|
||||
c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res
|
||||
|
|
||||
|
||||
data:
|
||||
@@ -284,38 +255,20 @@ data:
|
||||
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
|
||||
|
||||
$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
|
||||
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
|
||||
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
|
||||
!endif
|
||||
|
||||
|
||||
@@ -16,19 +16,19 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
|
||||
WX_RELEASE_NODOT = 29
|
||||
COMPILER_PREFIX = gcc
|
||||
OBJS = \
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = \
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = \
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
|
||||
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
||||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
|
||||
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
|
||||
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
|
||||
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS)
|
||||
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
|
||||
DIALOGS_OBJECTS = \
|
||||
$(OBJS)\dialogs_sample_rc.o \
|
||||
$(OBJS)\dialogs_dialogs.o \
|
||||
@@ -36,12 +36,6 @@ DIALOGS_OBJECTS = \
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
ifeq ($(TOOLKIT),GTK)
|
||||
WIN32_TOOLKIT_LOWERCASE = gtk
|
||||
endif
|
||||
ifeq ($(TOOLKIT),MSW)
|
||||
WIN32_TOOLKIT_LOWERCASE = msw
|
||||
endif
|
||||
ifeq ($(GCC_VERSION),2.95)
|
||||
GCCFLAGS = -fvtable-thunks
|
||||
endif
|
||||
@@ -49,13 +43,10 @@ ifeq ($(USE_GUI),0)
|
||||
PORTNAME = base
|
||||
endif
|
||||
ifeq ($(USE_GUI),1)
|
||||
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
endif
|
||||
ifeq ($(TOOLKIT),MAC)
|
||||
WXBASEPORT = _carbon
|
||||
endif
|
||||
ifeq ($(OFFICIAL_BUILD),1)
|
||||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
PORTNAME = msw$(TOOLKIT_VERSION)
|
||||
endif
|
||||
ifeq ($(OFFICIAL_BUILD),1)
|
||||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
endif
|
||||
ifeq ($(BUILD),debug)
|
||||
WXDEBUGFLAG = d
|
||||
@@ -81,16 +72,6 @@ endif
|
||||
ifeq ($(MONOLITHIC),1)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
ifeq ($(TOOLKIT),GTK)
|
||||
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
|
||||
endif
|
||||
ifeq ($(TOOLKIT),GTK)
|
||||
ifeq ($(TOOLKIT_VERSION),2)
|
||||
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
|
||||
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
|
||||
glib-2.0.lib
|
||||
endif
|
||||
endif
|
||||
ifeq ($(BUILD),debug)
|
||||
__OPTIMIZEFLAG_2 = -O0
|
||||
endif
|
||||
@@ -176,17 +157,6 @@ ifeq ($(SHARED),1)
|
||||
__DLLFLAG_p_1 = --define WXUSINGDLL
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(TOOLKIT),MAC)
|
||||
ifeq ($(WXUNIV),0)
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_colrdlgg.o \
|
||||
$(OBJS)\dialogs_dirdlgg.o \
|
||||
$(OBJS)\dialogs_filedlgg.o
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(TOOLKIT),MSW)
|
||||
ifeq ($(WXUNIV),0)
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_colrdlgg.o \
|
||||
@@ -195,22 +165,6 @@ ____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_fontdlgg.o
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(TOOLKIT),PM)
|
||||
ifeq ($(WXUNIV),0)
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_fontdlgg.o \
|
||||
$(OBJS)\dialogs_filedlgg.o
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(TOOLKIT),GTK)
|
||||
ifeq ($(TOOLKIT_VERSION),2)
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_filedlgg.o
|
||||
endif
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_ADV_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
|
||||
@@ -221,7 +175,7 @@ __WXLIB_CORE_p = \
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_BASE_p = \
|
||||
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
|
||||
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),1)
|
||||
__WXLIB_MONO_p = \
|
||||
@@ -283,61 +237,29 @@ clean:
|
||||
-if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
|
||||
|
||||
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample_rc.o
|
||||
$(CXX) -o $@ $(DIALOGS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
|
||||
$(CXX) -o $@ $(DIALOGS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
|
||||
|
||||
data:
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
|
||||
|
||||
$(OBJS)\dialogs_sample_rc.o: ./../../samples/sample.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
|
||||
|
||||
$(OBJS)\dialogs_dialogs.o: ./dialogs.cpp
|
||||
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(WXUNIV),0)
|
||||
$(OBJS)\dialogs_colrdlgg.o: ./../../src/generic/colrdlgg.cpp
|
||||
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(WXUNIV),0)
|
||||
$(OBJS)\dialogs_dirdlgg.o: ./../../src/generic/dirdlgg.cpp
|
||||
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(WXUNIV),0)
|
||||
$(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp
|
||||
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(TOOLKIT),GTK)
|
||||
ifeq ($(TOOLKIT_VERSION),2)
|
||||
$(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp
|
||||
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(TOOLKIT),PM)
|
||||
ifeq ($(WXUNIV),0)
|
||||
$(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp
|
||||
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SHARED),0)
|
||||
ifeq ($(WXUNIV),0)
|
||||
$(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp
|
||||
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
endif
|
||||
|
||||
.PHONY: all clean data
|
||||
|
||||
|
||||
@@ -15,22 +15,21 @@
|
||||
WX_RELEASE_NODOT = 29
|
||||
COMPILER_PREFIX = vc
|
||||
OBJS = \
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
|
||||
LIBDIRNAME = \
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
|
||||
$(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(____DEBUGRUNTIME_3_p) \
|
||||
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
|
||||
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
|
||||
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
||||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
|
||||
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
|
||||
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
$(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
|
||||
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
|
||||
/I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
|
||||
$(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
|
||||
$(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
|
||||
DIALOGS_OBJECTS = \
|
||||
$(OBJS)\dialogs_dialogs.obj \
|
||||
$(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)
|
||||
@@ -39,41 +38,32 @@ DIALOGS_RESOURCES = \
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
!if "$(TOOLKIT)" == "GTK"
|
||||
WIN32_TOOLKIT_LOWERCASE = gtk
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "MSW"
|
||||
WIN32_TOOLKIT_LOWERCASE = msw
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "AMD64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "IA64"
|
||||
ARCH_SUFFIX = _ia64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "X64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "amd64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "ia64"
|
||||
ARCH_SUFFIX = _ia64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "x64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "AMD64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "IA64"
|
||||
ARCH_SUFFIX = _ia64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "X64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "amd64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "ia64"
|
||||
ARCH_SUFFIX = _ia64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "x64"
|
||||
ARCH_SUFFIX = _x64
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "0"
|
||||
PORTNAME = base
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1"
|
||||
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "MAC"
|
||||
WXBASEPORT = _carbon
|
||||
!endif
|
||||
!if "$(OFFICIAL_BUILD)" == "1"
|
||||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
PORTNAME = msw$(TOOLKIT_VERSION)
|
||||
!endif
|
||||
!if "$(OFFICIAL_BUILD)" == "1"
|
||||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
|
||||
WXDEBUGFLAG = d
|
||||
@@ -102,29 +92,24 @@ LINK_TARGET_CPU = /MACHINE:X64
|
||||
!if "$(TARGET_CPU)" == "IA64"
|
||||
LINK_TARGET_CPU = /MACHINE:IA64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "X64"
|
||||
LINK_TARGET_CPU = /MACHINE:X64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "X64"
|
||||
LINK_TARGET_CPU = /MACHINE:X64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "amd64"
|
||||
LINK_TARGET_CPU = /MACHINE:X64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "ia64"
|
||||
LINK_TARGET_CPU = /MACHINE:IA64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "x64"
|
||||
LINK_TARGET_CPU = /MACHINE:X64
|
||||
!endif
|
||||
!if "$(TARGET_CPU)" == "x64"
|
||||
LINK_TARGET_CPU = /MACHINE:X64
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
|
||||
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
|
||||
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
|
||||
glib-2.0.lib
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO_0 = /Zi
|
||||
!endif
|
||||
@@ -323,28 +308,13 @@ __DLLFLAG_p = /DWXUSINGDLL
|
||||
!if "$(SHARED)" == "1"
|
||||
__DLLFLAG_p_1 = /d WXUSINGDLL
|
||||
!endif
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MAC" && "$(WXUNIV)" == "0"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_colrdlgg.obj \
|
||||
$(OBJS)\dialogs_dirdlgg.obj \
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MSW" && "$(WXUNIV)" == "0"
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_colrdlgg.obj \
|
||||
$(OBJS)\dialogs_dirdlgg.obj \
|
||||
$(OBJS)\dialogs_filedlgg.obj \
|
||||
$(OBJS)\dialogs_fontdlgg.obj
|
||||
!endif
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_fontdlgg.obj \
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
@@ -355,7 +325,7 @@ __WXLIB_CORE_p = \
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_BASE_p = \
|
||||
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "1"
|
||||
__WXLIB_MONO_p = \
|
||||
@@ -399,7 +369,7 @@ clean:
|
||||
|
||||
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
|
||||
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
|
||||
$(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
|
||||
$(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
|
||||
<<
|
||||
|
||||
data:
|
||||
@@ -407,38 +377,20 @@ data:
|
||||
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
|
||||
|
||||
$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
|
||||
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
|
||||
$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
|
||||
!endif
|
||||
|
||||
|
||||
@@ -31,27 +31,16 @@ 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 = $(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
|
||||
PORTNAME = msw$(TOOLKIT_VERSION)
|
||||
!endif
|
||||
COMPILER_VERSION =
|
||||
!ifeq OFFICIAL_BUILD 1
|
||||
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
||||
!endif
|
||||
WXDEBUGFLAG =
|
||||
!ifeq BUILD debug
|
||||
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
|
||||
!ifeq MONOLITHIC 1
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
LIB_GTK =
|
||||
!ifeq TOOLKIT GTK
|
||||
!ifeq TOOLKIT_VERSION 2
|
||||
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
|
||||
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
|
||||
glib-2.0.lib
|
||||
!endif
|
||||
!endif
|
||||
__DEBUGINFO_0 =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_INFO default
|
||||
@@ -162,17 +143,6 @@ __EXCEPTIONSFLAG_8 = -xs
|
||||
!endif
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =
|
||||
!ifeq SHARED 0
|
||||
!ifeq TOOLKIT MAC
|
||||
!ifeq WXUNIV 0
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\dialogs_colrdlgg.obj &
|
||||
$(OBJS)\dialogs_dirdlgg.obj &
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
!ifeq SHARED 0
|
||||
!ifeq TOOLKIT MSW
|
||||
!ifeq WXUNIV 0
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\dialogs_colrdlgg.obj &
|
||||
@@ -181,22 +151,6 @@ ____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\dialogs_fontdlgg.obj
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
!ifeq SHARED 0
|
||||
!ifeq TOOLKIT PM
|
||||
!ifeq WXUNIV 0
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\dialogs_fontdlgg.obj &
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
!ifeq TOOLKIT GTK
|
||||
!ifeq TOOLKIT_VERSION 2
|
||||
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\dialogs_filedlgg.obj
|
||||
!endif
|
||||
!endif
|
||||
__WXLIB_ADV_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_ADV_p = &
|
||||
@@ -210,7 +164,7 @@ __WXLIB_CORE_p = &
|
||||
__WXLIB_BASE_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_BASE_p = &
|
||||
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
!endif
|
||||
__WXLIB_MONO_p =
|
||||
!ifeq MONOLITHIC 1
|
||||
@@ -282,18 +236,18 @@ __DLLFLAG_p = -dWXUSINGDLL
|
||||
WX_RELEASE_NODOT = 29
|
||||
COMPILER_PREFIX = wat
|
||||
OBJS = &
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = &
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = &
|
||||
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = &
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
|
||||
$(__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) -wx &
|
||||
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
|
||||
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
|
||||
$(__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) -wx -wcd=549 -wcd=656 &
|
||||
-wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
|
||||
$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
|
||||
DIALOGS_OBJECTS = &
|
||||
$(OBJS)\dialogs_dialogs.obj &
|
||||
$(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)
|
||||
@@ -322,7 +276,7 @@ $(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
|
||||
@%append $(OBJS)\dialogs.lbc option caseexact
|
||||
@%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
|
||||
@for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i
|
||||
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i
|
||||
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i
|
||||
@%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_sample.res
|
||||
@for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i
|
||||
wlink @$(OBJS)\dialogs.lbc
|
||||
@@ -332,52 +286,20 @@ data : .SYMBOLIC
|
||||
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
$(OBJS)\dialogs_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -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) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -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) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
|
||||
|
||||
$(OBJS)\dialogs_dialogs.obj : .AUTODEPEND .\dialogs.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
|
||||
|
||||
!ifeq SHARED 0
|
||||
!ifeq WXUNIV 0
|
||||
$(OBJS)\dialogs_colrdlgg.obj : .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq SHARED 0
|
||||
!ifeq WXUNIV 0
|
||||
$(OBJS)\dialogs_dirdlgg.obj : .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq SHARED 0
|
||||
!ifeq WXUNIV 0
|
||||
$(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq TOOLKIT GTK
|
||||
!ifeq TOOLKIT_VERSION 2
|
||||
$(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq SHARED 0
|
||||
!ifeq TOOLKIT PM
|
||||
!ifeq WXUNIV 0
|
||||
$(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifeq SHARED 0
|
||||
!ifeq WXUNIV 0
|
||||
$(OBJS)\dialogs_fontdlgg.obj : .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
|
||||
!endif
|
||||
!endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user