makefiles update with OSX fixes

[wxWidgets.git] / samples / html / helpview / makefile.gcc

diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index 4010217e4e59c9b74feb7324b75289aec2150b9b..5149a34db78581de2ce0fa02efed45dce14fb863 100644 (file)
--- a/samples/html/helpview/makefile.gcc
+++ b/samples/html/helpview/makefile.gcc
@@ -17,7 +17,7 @@ HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples $(CXXFLAGS)

 HELPVIEW_OBJECTS =  \
        $(OBJS)\helpview_helpview.o \
        $(OBJS)\helpview_helpview_rc.o
 HELPVIEW_OBJECTS =  \
        $(OBJS)\helpview_helpview.o \
        $(OBJS)\helpview_helpview_rc.o


@@ -113,6 +113,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 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)
 endif


@@ -135,8 +138,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 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) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -150,7 +151,7 @@ $(OBJS)\helpview_helpview.o: .\helpview.cpp
        $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $<
 
 $(OBJS)\helpview_helpview_rc.o: .\helpview.rc
        $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $<
 
 $(OBJS)\helpview_helpview_rc.o: .\helpview.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../samples

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o


@@ -161,6 +162,6 @@ data:
        for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
        for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o

-       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 
 .PHONY: all clean data
 
 .PHONY: all clean data