Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / samples / minimal / makefile.wat

diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat
index 17cbade5aa2f1a5a024089c2363e27fcb7ebfaa2..556701357a22402e5b25f455aa408ce1f171690e 100644 (file)
--- a/samples/minimal/makefile.wat
+++ b/samples/minimal/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -110,26 +110,33 @@ __OPTIMIZEFLAG_2 = -od
 !ifeq BUILD release
 __OPTIMIZEFLAG_2 = -ot -ox
 !endif
 !ifeq BUILD release
 __OPTIMIZEFLAG_2 = -ot -ox
 !endif

-__RUNTIME_LIBS_5 =
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =

 !ifeq RUNTIME_LIBS dynamic
 !ifeq RUNTIME_LIBS dynamic

-__RUNTIME_LIBS_5 = -br
+__RUNTIME_LIBS_6 = -br

 !endif
 !ifeq RUNTIME_LIBS static
 !endif
 !ifeq RUNTIME_LIBS static

-__RUNTIME_LIBS_5 = 
+__RUNTIME_LIBS_6 = 

 !endif
 !endif

-__EXCEPTIONSFLAG_6 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_6 = 
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 

 !endif
 !endif

-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_6 = -xr
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr

 !endif
 !endif

-__EXCEPTIONSFLAG_7 =
+__EXCEPTIONSFLAG_8 =

 !ifeq USE_EXCEPTIONS 0
 !ifeq USE_EXCEPTIONS 0

-__EXCEPTIONSFLAG_7 = 
+__EXCEPTIONSFLAG_8 = 

 !endif
 !ifeq USE_EXCEPTIONS 1
 !endif
 !ifeq USE_EXCEPTIONS 1

-__EXCEPTIONSFLAG_7 = -xs
+__EXCEPTIONSFLAG_8 = -xs

 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0


@@ -171,6 +178,18 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif

+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif

 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE


@@ -182,17 +201,18 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 26

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

-MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
-       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-       -i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
-       $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG_6) &
-       $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
+       -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)

 MINIMAL_OBJECTS =  &
        $(OBJS)\minimal_minimal.obj
 
 MINIMAL_OBJECTS =  &
        $(OBJS)\minimal_minimal.obj
 


@@ -225,7 +245,7 @@ $(OBJS)\minimal.exe :  $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res
        wlink @$(OBJS)\minimal.lbc
 
 $(OBJS)\minimal_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
        wlink @$(OBJS)\minimal.lbc
 
 $(OBJS)\minimal_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=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<

 
 $(OBJS)\minimal_minimal.obj :  .AUTODEPEND .\minimal.cpp
        $(CXX) -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $<
 
 $(OBJS)\minimal_minimal.obj :  .AUTODEPEND .\minimal.cpp
        $(CXX) -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $<