Cleaned up some comments, reorganized some code

[wxWidgets.git] / samples / mobile / styles / makefile.wat

diff --git a/samples/mobile/styles/makefile.wat b/samples/mobile/styles/makefile.wat
index 61bc447251192d7c32639c73af7880ace937b67e..188bcfd9d6bc5698a8f1709152ac7bacb8b8210b 100644 (file)
--- a/samples/mobile/styles/makefile.wat
+++ b/samples/mobile/styles/makefile.wat
@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = .\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = .\..\..\..\lib\wat_dll$(CFG)
+!endif

 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base


@@ -153,16 +160,14 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-LIBDIRNAME = &
-       .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 STYLES_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 STYLES_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &

-       $(__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) -i=..\..\..\samples $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS)

 STYLES_OBJECTS =  &
        $(OBJS)\styles_styles.obj
 
 STYLES_OBJECTS =  &
        $(OBJS)\styles_styles.obj
 


@@ -176,7 +181,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\styles.exe data
 
 $(OBJS)\styles_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\styles.exe data
 
 $(OBJS)\styles_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__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) -i=..\..\..\samples $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<

 
 $(OBJS)\styles_styles.obj :  .AUTODEPEND .\styles.cpp
        $(CXX) -zq -fo=$^@ $(STYLES_CXXFLAGS) $<
 
 $(OBJS)\styles_styles.obj :  .AUTODEPEND .\styles.cpp
        $(CXX) -zq -fo=$^@ $(STYLES_CXXFLAGS) $<


@@ -196,7 +201,7 @@ $(OBJS)\styles.exe :  $(STYLES_OBJECTS) $(OBJS)\styles_sample.res
        @%create $(OBJS)\styles.lbc
        @%append $(OBJS)\styles.lbc option quiet
        @%append $(OBJS)\styles.lbc name $^@
        @%create $(OBJS)\styles.lbc
        @%append $(OBJS)\styles.lbc option quiet
        @%append $(OBJS)\styles.lbc name $^@

-       @%append $(OBJS)\styles.lbc option incremental
+       @%append $(OBJS)\styles.lbc option caseexact

        @%append $(OBJS)\styles.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STYLES_OBJECTS)) do @%append $(OBJS)\styles.lbc file %i
        @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\styles.lbc library %i
        @%append $(OBJS)\styles.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STYLES_OBJECTS)) do @%append $(OBJS)\styles.lbc file %i
        @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\styles.lbc library %i