WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = gcc\r
OBJS = \\r
- $(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)\r
+LIBDIRNAME = \\r
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
- $(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \\r
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
- -Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS)
+ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
DIALOGS_OBJECTS = \\r
$(OBJS)\dialogs_sample_rc.o \\r
$(OBJS)\dialogs_dialogs.o \\r
\r
### Conditionally set variables: ###\r
\r
-ifeq ($(TOOLKIT),GTK)
-WIN32_TOOLKIT_LOWERCASE = gtk
-endif
-ifeq ($(TOOLKIT),MSW)
-WIN32_TOOLKIT_LOWERCASE = msw
-endif
ifeq ($(GCC_VERSION),2.95)\r
GCCFLAGS = -fvtable-thunks\r
endif\r
PORTNAME = base\r
endif\r
ifeq ($(USE_GUI),1)\r
-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)\r
+endif\r
+ifeq ($(OFFICIAL_BUILD),1)\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
endif\r
ifeq ($(BUILD),debug)\r
WXDEBUGFLAG = d\r
ifeq ($(MONOLITHIC),1)\r
EXTRALIBS_FOR_BASE = \r
endif\r
-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)\r
__OPTIMIZEFLAG_2 = -O0\r
endif\r
__DLLFLAG_p_1 = --define WXUSINGDLL\r
endif\r
ifeq ($(SHARED),0)\r
-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)\r
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \\r
$(OBJS)\dialogs_colrdlgg.o \\r
$(OBJS)\dialogs_fontdlgg.o\r
endif\r
endif\r
-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)\r
__WXLIB_ADV_p = \\r
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
endif\r
ifeq ($(MONOLITHIC),0)\r
__WXLIB_BASE_p = \\r
- -lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
endif\r
ifeq ($(MONOLITHIC),1)\r
__WXLIB_MONO_p = \\r
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
endif\r
+ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
+endif\r
+endif
ifeq ($(USE_GUI),1)\r
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
endif\r
-if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
\r
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample_rc.o\r
- $(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_SCINTILLA_IF_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\r
\r
data: \r
if not exist $(OBJS) mkdir $(OBJS)\r
for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
\r
$(OBJS)\dialogs_sample_rc.o: ./../../samples/sample.rc\r
- 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\r
\r
$(OBJS)\dialogs_dialogs.o: ./dialogs.cpp\r
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
\r
-ifeq ($(SHARED),0)
-ifeq ($(WXUNIV),0)
$(OBJS)\dialogs_colrdlgg.o: ./../../src/generic/colrdlgg.cpp\r
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-endif
-endif
\r
-ifeq ($(SHARED),0)
-ifeq ($(WXUNIV),0)
$(OBJS)\dialogs_dirdlgg.o: ./../../src/generic/dirdlgg.cpp\r
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-endif
-endif
\r
-ifeq ($(SHARED),0)
-ifeq ($(WXUNIV),0)
$(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp\r
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-endif
-endif
\r
-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\r
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-endif
-endif
\r
.PHONY: all clean data\r
\r
projects / wxWidgets.git / blobdiff