X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..fa9f937f05d77c2d8f8c96374f6856b8ccc3a642:/contrib/build/net/makefile.gcc

diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc
index 50226da026..e6a179460a 100644
--- a/contrib/build/net/makefile.gcc
+++ b/contrib/build/net/makefile.gcc
@@ -12,14 +12,9 @@ include ../../../build/msw/config.gcc
 
 ### 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) \
-	$(__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 \
 	$(CXXFLAGS)
 NETUTILSDLL_OBJECTS =  \
@@ -29,10 +24,7 @@ NETUTILSDLL_OBJECTS =  \
 	$(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 \
+	$(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(SETUPHDIR) -Wall \
 	-I..\..\src\net\..\..\include $(CXXFLAGS)
 NETUTILSLIB_OBJECTS =  \
 	$(OBJS)\netutilslib_dummy.o \
@@ -41,12 +33,20 @@ NETUTILSLIB_OBJECTS =  \
 	$(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
+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
@@ -116,7 +116,10 @@ ifeq ($(BUILD),release)
 __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)
@@ -134,15 +137,13 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 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 = \
 	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a
 endif
 
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) 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):
@@ -152,39 +153,39 @@ $(OBJS):
 
 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) $<
 
-$(OBJS)\netutilsdll_email.o: ../../src/net\email.cpp
+$(OBJS)\netutilsdll_email.o: ../../src/net/email.cpp
 	$(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) $<
 
-$(OBJS)\netutilsdll_web.o: ../../src/net\web.cpp
+$(OBJS)\netutilsdll_web.o: ../../src/net/web.cpp
 	$(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) $<
 
-$(OBJS)\netutilslib_email.o: ../../src/net\email.cpp
+$(OBJS)\netutilslib_email.o: ../../src/net/email.cpp
 	$(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) $<
 
-$(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
-	-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)
-$(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)