added .chm support for Unix (Markus Sinner)

[wxWidgets.git] / contrib / build / net / makefile.gcc

diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc
index 426d0b2fd36789caa75b4c33ae94cc7105195231..669a06f36549bb928576c2a9a6e6d8421dec0c8c 100644 (file)
--- a/contrib/build/net/makefile.gcc
+++ b/contrib/build/net/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-include ../../../build/config.gcc
+include ../../../build/msw/config.gcc

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -12,16 +12,11 @@ include ../../../build/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-LIBDIRNAME = \
-       ..\..\src\net\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

-       $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\net\..\..\..\src\tiff -I..\..\src\net\..\..\..\src\jpeg \
-       -I..\..\src\net\..\..\..\src\png -I..\..\src\net\..\..\..\src\zlib \
-       -I..\..\src\net\..\..\..\src\regex -I..\..\src\net\..\..\..\src\expat\lib \
+       $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(SETUPHDIR) -Wall \

        -I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS \
        -I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS \

-       $(CXXFLAGS)
+       $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)

 NETUTILSDLL_OBJECTS =  \
        $(OBJS)\netutilsdll_dummy.o \
        $(OBJS)\netutilsdll_email.o \
 NETUTILSDLL_OBJECTS =  \
        $(OBJS)\netutilsdll_dummy.o \
        $(OBJS)\netutilsdll_email.o \


@@ -29,11 +24,9 @@ NETUTILSDLL_OBJECTS =  \
        $(OBJS)\netutilsdll_web.o
 NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(OBJS)\netutilsdll_web.o
 NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

-       $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\net\..\..\..\src\tiff -I..\..\src\net\..\..\..\src\jpeg \
-       -I..\..\src\net\..\..\..\src\png -I..\..\src\net\..\..\..\src\zlib \
-       -I..\..\src\net\..\..\..\src\regex -I..\..\src\net\..\..\..\src\expat\lib \
-       -I..\..\src\net\..\..\include $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(SETUPHDIR) -Wall \
+       -I..\..\src\net\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_0)

 NETUTILSLIB_OBJECTS =  \
        $(OBJS)\netutilslib_dummy.o \
        $(OBJS)\netutilslib_email.o \
 NETUTILSLIB_OBJECTS =  \
        $(OBJS)\netutilslib_dummy.o \
        $(OBJS)\netutilslib_email.o \


@@ -41,12 +34,20 @@ NETUTILSLIB_OBJECTS =  \
        $(OBJS)\netutilslib_web.o
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        $(OBJS)\netutilslib_web.o
 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
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif

+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\net\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\net\..\..\..\lib\gcc_dll$(CFG)
+endif

 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif


@@ -100,6 +101,18 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 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
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif


@@ -116,7 +129,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(UNICODE),1)
 __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 ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)


@@ -134,7 +150,7 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)
 __netutilsdll___depname = \
 endif
 ifeq ($(SHARED),1)
 __netutilsdll___depname = \

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll

 endif
 ifeq ($(SHARED),0)
 __netutilslib___depname = \
 endif
 ifeq ($(SHARED),0)
 __netutilslib___depname = \


@@ -150,39 +166,39 @@ $(OBJS):
 
 all: $(__netutilsdll___depname) $(__netutilslib___depname)
 
 
 all: $(__netutilsdll___depname) $(__netutilslib___depname)
 

-$(OBJS)\netutilsdll_dummy.o: ../../src/net\..\..\..\src\msw\dummy.cpp
+$(OBJS)\netutilsdll_dummy.o: ../../src/net/../../../src/msw/dummy.cpp

        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 

-$(OBJS)\netutilsdll_email.o: ../../src/net\email.cpp
+$(OBJS)\netutilsdll_email.o: ../../src/net/email.cpp

        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 

-$(OBJS)\netutilsdll_smapi.o: ../../src/net\smapi.cpp
+$(OBJS)\netutilsdll_smapi.o: ../../src/net/smapi.cpp

        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 

-$(OBJS)\netutilsdll_web.o: ../../src/net\web.cpp
+$(OBJS)\netutilsdll_web.o: ../../src/net/web.cpp

        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 

-$(OBJS)\netutilslib_dummy.o: ../../src/net\..\..\..\src\msw\dummy.cpp
+$(OBJS)\netutilslib_dummy.o: ../../src/net/../../../src/msw/dummy.cpp

        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 

-$(OBJS)\netutilslib_email.o: ../../src/net\email.cpp
+$(OBJS)\netutilslib_email.o: ../../src/net/email.cpp

        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 

-$(OBJS)\netutilslib_smapi.o: ../../src/net\smapi.cpp
+$(OBJS)\netutilslib_smapi.o: ../../src/net/smapi.cpp

        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 

-$(OBJS)\netutilslib_web.o: ../../src/net\web.cpp
+$(OBJS)\netutilslib_web.o: ../../src/net/web.cpp

        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $<
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll

        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a
 
 ifeq ($(SHARED),1)
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a
 
 ifeq ($(SHARED),1)

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS)
-       $(CXX) -shared -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.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)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS)
+       $(CXX) -shared -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.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)
 endif
 
 ifeq ($(SHARED),0)