DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
- -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
- -I..\..\src\deprecated\..\..\..\src\jpeg \
- -I..\..\src\deprecated\..\..\..\src\png \
- -I..\..\src\deprecated\..\..\..\src\zlib \
- -I..\..\src\deprecated\..\..\..\src\regex \
- -I..\..\src\deprecated\..\..\..\src\expat\lib \
- -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
- $(CFLAGS)
+ -I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
+ -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I..\..\src\deprecated\..\..\..\include -I$(LIBDIRNAME) \
- -I..\..\src\deprecated\..\..\..\src\tiff \
- -I..\..\src\deprecated\..\..\..\src\jpeg \
- -I..\..\src\deprecated\..\..\..\src\png \
- -I..\..\src\deprecated\..\..\..\src\zlib \
- -I..\..\src\deprecated\..\..\..\src\regex \
- -I..\..\src\deprecated\..\..\..\src\expat\lib \
+ -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) -Wall \
-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
- $(CXXFLAGS)
+ -I..\..\src\deprecated $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+ $(__EXCEPTIONSFLAG_0)
DEPRECATEDDLL_OBJECTS = \
$(OBJS)\deprecateddll_dummy.o \
$(OBJS)\deprecateddll_prop.o \
$(OBJS)\deprecateddll_propform.o \
$(OBJS)\deprecateddll_proplist.o \
$(OBJS)\deprecateddll_resource.o \
+ $(OBJS)\deprecateddll_tbarsmpl.o \
$(OBJS)\deprecateddll_treelay.o \
$(OBJS)\deprecateddll_wxexpr.o \
$(OBJS)\deprecateddll_dosyacc.o
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
- -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
- -I..\..\src\deprecated\..\..\..\src\jpeg \
- -I..\..\src\deprecated\..\..\..\src\png \
- -I..\..\src\deprecated\..\..\..\src\zlib \
- -I..\..\src\deprecated\..\..\..\src\regex \
- -I..\..\src\deprecated\..\..\..\src\expat\lib \
- -I..\..\src\deprecated\..\..\include $(CFLAGS)
+ -I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include \
+ -I..\..\src\deprecated $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
- -I..\..\src\deprecated\..\..\..\include -I$(LIBDIRNAME) \
- -I..\..\src\deprecated\..\..\..\src\tiff \
- -I..\..\src\deprecated\..\..\..\src\jpeg \
- -I..\..\src\deprecated\..\..\..\src\png \
- -I..\..\src\deprecated\..\..\..\src\zlib \
- -I..\..\src\deprecated\..\..\..\src\regex \
- -I..\..\src\deprecated\..\..\..\src\expat\lib \
- -I..\..\src\deprecated\..\..\include $(CXXFLAGS)
+ -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) -Wall \
+ -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS) \
+ $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
DEPRECATEDLIB_OBJECTS = \
$(OBJS)\deprecatedlib_dummy.o \
$(OBJS)\deprecatedlib_prop.o \
$(OBJS)\deprecatedlib_propform.o \
$(OBJS)\deprecatedlib_proplist.o \
$(OBJS)\deprecatedlib_resource.o \
+ $(OBJS)\deprecatedlib_tbarsmpl.o \
$(OBJS)\deprecatedlib_treelay.o \
$(OBJS)\deprecatedlib_wxexpr.o \
$(OBJS)\deprecatedlib_dosyacc.o
-LIBDIRNAME = \
- ..\..\src\deprecated\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
endif
+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_dll$(CFG)
+endif
ifeq ($(USE_GUI),0)
PORTNAME = base
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 =
+endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
__OPTIMIZEFLAG = -O2
endif
ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(SHARED),1)
__deprecateddll___depname = \
- $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll
endif
ifeq ($(SHARED),0)
__deprecatedlib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
endif
-MAKEARGS = BUILD=$(BUILD) CC=$(CC) CFG=$(CFG) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-
all: $(OBJS)
$(OBJS):
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
-$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated\dosyacc.c
+$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $<
-$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
+$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
-$(OBJS)\deprecateddll_prop.o: ../../src/deprecated\prop.cpp
+$(OBJS)\deprecateddll_prop.o: ../../src/deprecated/prop.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
-$(OBJS)\deprecateddll_propform.o: ../../src/deprecated\propform.cpp
+$(OBJS)\deprecateddll_propform.o: ../../src/deprecated/propform.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
-$(OBJS)\deprecateddll_proplist.o: ../../src/deprecated\proplist.cpp
+$(OBJS)\deprecateddll_proplist.o: ../../src/deprecated/proplist.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
-$(OBJS)\deprecateddll_resource.o: ../../src/deprecated\resource.cpp
+$(OBJS)\deprecateddll_resource.o: ../../src/deprecated/resource.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
-$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated\treelay.cpp
+$(OBJS)\deprecateddll_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
-$(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated\wxexpr.cpp
+$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated/treelay.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
-$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated\dosyacc.c
+$(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated/wxexpr.cpp
+ $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
+
+$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $<
-$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
+$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
+ $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
+
+$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated/prop.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
-$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated\prop.cpp
+$(OBJS)\deprecatedlib_propform.o: ../../src/deprecated/propform.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
-$(OBJS)\deprecatedlib_propform.o: ../../src/deprecated\propform.cpp
+$(OBJS)\deprecatedlib_proplist.o: ../../src/deprecated/proplist.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
-$(OBJS)\deprecatedlib_proplist.o: ../../src/deprecated\proplist.cpp
+$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated/resource.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
-$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated\resource.cpp
+$(OBJS)\deprecatedlib_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
-$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated\treelay.cpp
+$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated/treelay.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
-$(OBJS)\deprecatedlib_wxexpr.o: ../../src/deprecated\wxexpr.cpp
+$(OBJS)\deprecatedlib_wxexpr.o: ../../src/deprecated/wxexpr.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS)
- $(CXX) -shared -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS)
+ $(CXX) -shared -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)