Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebake the rest of the files after TOOLKIT change in MSW bakefile.

Browse Source 
This should have been part of r74406 but I only rebaked wxWidgets make/project
files themselves and not the samples/utils/demos files in it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-06 12:32:23 +00:00
parent f901941933
commit bed99c2256
576 changed files with 15025 additions and 22405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/bombs/bombs.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "bombs - Win32 DLL Release" !IF "$(CFG)" == "bombs - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
demos/bombs/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
BOMBS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ BOMBS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
BOMBS_OBJECTS = \ BOMBS_OBJECTS = \
@@ -43,23 +43,14 @@ BOMBS_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -85,11 +76,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -192,7 +178,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -251,7 +237,7 @@ clean:
$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res
| |
$(OBJS)\bombs_bombs.obj: .\bombs.cpp $(OBJS)\bombs_bombs.obj: .\bombs.cpp
@@ -264,5 +250,5 @@ $(OBJS)\bombs_game.obj: .\game.cpp
$(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\game.cpp $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\game.cpp
$(OBJS)\bombs_bombs.res: .\bombs.rc $(OBJS)\bombs_bombs.res: .\bombs.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\bombs.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\bombs.rc

43
demos/bombs/makefile.gcc
View File

@@ -16,19 +16,19 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
BOMBS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ BOMBS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
BOMBS_OBJECTS = \ BOMBS_OBJECTS = \
$(OBJS)\bombs_bombs.o \ $(OBJS)\bombs_bombs.o \
$(OBJS)\bombs_bombs1.o \ $(OBJS)\bombs_bombs1.o \
@@ -37,12 +37,6 @@ BOMBS_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -50,13 +44,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -82,16 +73,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -182,7 +163,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -244,7 +225,7 @@ clean:
-if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o
$(CXX) -o $@ $(BOMBS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(BOMBS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\bombs_bombs.o: ./bombs.cpp $(OBJS)\bombs_bombs.o: ./bombs.cpp
$(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
@@ -256,7 +237,7 @@ $(OBJS)\bombs_game.o: ./game.cpp
$(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\bombs_bombs_rc.o: ./bombs.rc $(OBJS)\bombs_bombs_rc.o: ./bombs.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean .PHONY: all clean

93
demos/bombs/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
BOMBS_OBJECTS = \ BOMBS_OBJECTS = \
$(OBJS)\bombs_bombs.obj \ $(OBJS)\bombs_bombs.obj \
$(OBJS)\bombs_bombs1.obj \ $(OBJS)\bombs_bombs1.obj \
@@ -40,41 +39,32 @@ BOMBS_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -103,29 +93,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -330,7 +315,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -374,7 +359,7 @@ clean:
$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(BOMBS_OBJECTS) $(BOMBS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(BOMBS_OBJECTS) $(BOMBS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\bombs_bombs.obj: .\bombs.cpp $(OBJS)\bombs_bombs.obj: .\bombs.cpp
@@ -387,5 +372,5 @@ $(OBJS)\bombs_game.obj: .\game.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\game.cpp $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\game.cpp
$(OBJS)\bombs_bombs.res: .\bombs.rc $(OBJS)\bombs_bombs.res: .\bombs.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\bombs.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\bombs.rc

53
demos/bombs/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
BOMBS_OBJECTS = & BOMBS_OBJECTS = &
$(OBJS)\bombs_bombs.obj & $(OBJS)\bombs_bombs.obj &
$(OBJS)\bombs_bombs1.obj & $(OBJS)\bombs_bombs1.obj &
@@ -281,7 +262,7 @@ $(OBJS)\bombs.exe : $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
@%append $(OBJS)\bombs.lbc option caseexact @%append $(OBJS)\bombs.lbc option caseexact
@%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bombs.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bombs.lbc library %i
@%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res
@for %i in () do @%append $(OBJS)\bombs.lbc option stack=%i @for %i in () do @%append $(OBJS)\bombs.lbc option stack=%i
wlink @$(OBJS)\bombs.lbc wlink @$(OBJS)\bombs.lbc
@@ -296,5 +277,5 @@ $(OBJS)\bombs_game.obj : .AUTODEPEND .\game.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<
$(OBJS)\bombs_bombs.res : .AUTODEPEND .\bombs.rc $(OBJS)\bombs_bombs.res : .AUTODEPEND .\bombs.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
demos/forty/forty.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "forty - Win32 DLL Release" !IF "$(CFG)" == "forty - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

44
demos/forty/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FORTY_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ FORTY_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
FORTY_OBJECTS = \ FORTY_OBJECTS = \
@@ -48,23 +48,14 @@ FORTY_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -90,11 +81,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -201,7 +187,7 @@ __WXLIB_ADV_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
@@ -209,7 +195,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -268,7 +254,7 @@ clean:
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
| |
data: data:
@@ -300,5 +286,5 @@ $(OBJS)\forty_scorefil.obj: .\scorefil.cpp
$(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\scorefil.cpp $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\scorefil.cpp
$(OBJS)\forty_forty.res: .\forty.rc $(OBJS)\forty_forty.res: .\forty.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\forty.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\forty.rc

45
demos/forty/makefile.gcc
View File

@@ -16,19 +16,19 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FORTY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ FORTY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
FORTY_OBJECTS = \ FORTY_OBJECTS = \
$(OBJS)\forty_forty.o \ $(OBJS)\forty_forty.o \
$(OBJS)\forty_canvas.o \ $(OBJS)\forty_canvas.o \
@@ -42,12 +42,6 @@ FORTY_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -55,13 +49,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -87,16 +78,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -191,7 +172,7 @@ __WXLIB_ADV_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_XML_p = \ __WXLIB_XML_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
@@ -199,7 +180,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -261,7 +242,7 @@ clean:
-if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
$(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
@@ -292,7 +273,7 @@ $(OBJS)\forty_scorefil.o: ./scorefil.cpp
$(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\forty_forty_rc.o: ./forty.rc $(OBJS)\forty_forty_rc.o: ./forty.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean data .PHONY: all clean data

95
demos/forty/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
FORTY_OBJECTS = \ FORTY_OBJECTS = \
$(OBJS)\forty_forty.obj \ $(OBJS)\forty_forty.obj \
$(OBJS)\forty_canvas.obj \ $(OBJS)\forty_canvas.obj \
@@ -45,41 +44,32 @@ FORTY_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -108,29 +98,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -339,7 +324,7 @@ __WXLIB_ADV_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
@@ -347,7 +332,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -391,7 +376,7 @@ clean:
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
data: data:
@@ -423,5 +408,5 @@ $(OBJS)\forty_scorefil.obj: .\scorefil.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scorefil.cpp $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scorefil.cpp
$(OBJS)\forty_forty.res: .\forty.rc $(OBJS)\forty_forty.res: .\forty.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\forty.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\forty.rc

55
demos/forty/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,7 +154,7 @@ __WXLIB_ADV_p = &
__WXLIB_XML_p = __WXLIB_XML_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_XML_p = & __WXLIB_XML_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
__WXLIB_CORE_p = __WXLIB_CORE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
@@ -183,7 +164,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -255,18 +236,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
FORTY_OBJECTS = & FORTY_OBJECTS = &
$(OBJS)\forty_forty.obj & $(OBJS)\forty_forty.obj &
$(OBJS)\forty_canvas.obj & $(OBJS)\forty_canvas.obj &
@@ -301,7 +282,7 @@ $(OBJS)\forty.exe : $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
@%append $(OBJS)\forty.lbc option caseexact @%append $(OBJS)\forty.lbc option caseexact
@%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i
@for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\forty.lbc library %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\forty.lbc library %i
@%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res
@for %i in () do @%append $(OBJS)\forty.lbc option stack=%i @for %i in () do @%append $(OBJS)\forty.lbc option stack=%i
wlink @$(OBJS)\forty.lbc wlink @$(OBJS)\forty.lbc
@@ -335,5 +316,5 @@ $(OBJS)\forty_scorefil.obj : .AUTODEPEND .\scorefil.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
$(OBJS)\forty_forty.res : .AUTODEPEND .\forty.rc $(OBJS)\forty_forty.res : .AUTODEPEND .\forty.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
demos/fractal/fractal.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "fractal - Win32 DLL Release" !IF "$(CFG)" == "fractal - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
demos/fractal/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FRACTAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ FRACTAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
FRACTAL_OBJECTS = \ FRACTAL_OBJECTS = \
@@ -41,23 +41,14 @@ FRACTAL_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -190,7 +176,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -249,12 +235,12 @@ clean:
$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res
| |
$(OBJS)\fractal_fractal.obj: .\fractal.cpp $(OBJS)\fractal_fractal.obj: .\fractal.cpp
$(CXX) -q -c -P -o$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp $(CXX) -q -c -P -o$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp
$(OBJS)\fractal_fractal.res: .\fractal.rc $(OBJS)\fractal_fractal.res: .\fractal.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\fractal.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\fractal.rc

43
demos/fractal/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FRACTAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ FRACTAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
FRACTAL_OBJECTS = \ FRACTAL_OBJECTS = \
$(OBJS)\fractal_fractal.o \ $(OBJS)\fractal_fractal.o \
$(OBJS)\fractal_fractal_rc.o $(OBJS)\fractal_fractal_rc.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -180,7 +161,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -242,13 +223,13 @@ clean:
-if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o
$(CXX) -o $@ $(FRACTAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(FRACTAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\fractal_fractal.o: ./fractal.cpp $(OBJS)\fractal_fractal.o: ./fractal.cpp
$(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\fractal_fractal_rc.o: ./fractal.rc $(OBJS)\fractal_fractal_rc.o: ./fractal.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean .PHONY: all clean

93
demos/fractal/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
FRACTAL_OBJECTS = \ FRACTAL_OBJECTS = \
$(OBJS)\fractal_fractal.obj $(OBJS)\fractal_fractal.obj
FRACTAL_RESOURCES = \ FRACTAL_RESOURCES = \
@@ -38,41 +37,32 @@ FRACTAL_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -328,7 +313,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -372,12 +357,12 @@ clean:
$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(FRACTAL_OBJECTS) $(FRACTAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(FRACTAL_OBJECTS) $(FRACTAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\fractal_fractal.obj: .\fractal.cpp $(OBJS)\fractal_fractal.obj: .\fractal.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp $(CXX) /c /nologo /TP /Fo$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp
$(OBJS)\fractal_fractal.res: .\fractal.rc $(OBJS)\fractal_fractal.res: .\fractal.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\fractal.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\fractal.rc

53
demos/fractal/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
FRACTAL_OBJECTS = & FRACTAL_OBJECTS = &
$(OBJS)\fractal_fractal.obj $(OBJS)\fractal_fractal.obj
@@ -279,7 +260,7 @@ $(OBJS)\fractal.exe : $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
@%append $(OBJS)\fractal.lbc option caseexact @%append $(OBJS)\fractal.lbc option caseexact
@%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\fractal.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\fractal.lbc library %i
@%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res
@for %i in () do @%append $(OBJS)\fractal.lbc option stack=%i @for %i in () do @%append $(OBJS)\fractal.lbc option stack=%i
wlink @$(OBJS)\fractal.lbc wlink @$(OBJS)\fractal.lbc
@@ -288,5 +269,5 @@ $(OBJS)\fractal_fractal.obj : .AUTODEPEND .\fractal.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $<
$(OBJS)\fractal_fractal.res : .AUTODEPEND .\fractal.rc $(OBJS)\fractal_fractal.res : .AUTODEPEND .\fractal.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
demos/life/life.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "life - Win32 DLL Release" !IF "$(CFG)" == "life - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
demos/life/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
LIFE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ LIFE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
LIFE_OBJECTS = \ LIFE_OBJECTS = \
@@ -44,23 +44,14 @@ LIFE_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -86,11 +77,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -193,7 +179,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -252,7 +238,7 @@ clean:
$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res
| |
data: data:
@@ -272,5 +258,5 @@ $(OBJS)\life_reader.obj: .\reader.cpp
$(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\reader.cpp $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\reader.cpp
$(OBJS)\life_life.res: .\life.rc $(OBJS)\life_life.res: .\life.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\life.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\life.rc

44
demos/life/makefile.gcc
View File

@@ -16,19 +16,18 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
LIFE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \ LIFE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
-Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) \ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
LIFE_OBJECTS = \ LIFE_OBJECTS = \
$(OBJS)\life_life.o \ $(OBJS)\life_life.o \
$(OBJS)\life_dialogs.o \ $(OBJS)\life_dialogs.o \
@@ -38,12 +37,6 @@ LIFE_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -51,13 +44,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,16 +73,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -183,7 +163,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -245,7 +225,7 @@ clean:
-if exist $(OBJS)\life.exe del $(OBJS)\life.exe -if exist $(OBJS)\life.exe del $(OBJS)\life.exe
$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o
$(CXX) -o $@ $(LIFE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(LIFE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
@@ -264,7 +244,7 @@ $(OBJS)\life_reader.o: ./reader.cpp
$(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\life_life_rc.o: ./life.rc $(OBJS)\life_life_rc.o: ./life.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean data .PHONY: all clean data

93
demos/life/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
LIFE_OBJECTS = \ LIFE_OBJECTS = \
$(OBJS)\life_life.obj \ $(OBJS)\life_life.obj \
$(OBJS)\life_dialogs.obj \ $(OBJS)\life_dialogs.obj \
@@ -41,41 +40,32 @@ LIFE_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -104,29 +94,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -331,7 +316,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -375,7 +360,7 @@ clean:
$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(LIFE_OBJECTS) $(LIFE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIFE_OBJECTS) $(LIFE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
data: data:
@@ -395,5 +380,5 @@ $(OBJS)\life_reader.obj: .\reader.cpp
$(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\reader.cpp $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\reader.cpp
$(OBJS)\life_life.res: .\life.rc $(OBJS)\life_life.res: .\life.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\life.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\life.rc

53
demos/life/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
LIFE_OBJECTS = & LIFE_OBJECTS = &
$(OBJS)\life_life.obj & $(OBJS)\life_life.obj &
$(OBJS)\life_dialogs.obj & $(OBJS)\life_dialogs.obj &
@@ -282,7 +263,7 @@ $(OBJS)\life.exe : $(LIFE_OBJECTS) $(OBJS)\life_life.res
@%append $(OBJS)\life.lbc option caseexact @%append $(OBJS)\life.lbc option caseexact
@%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\life.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\life.lbc library %i
@%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res
@for %i in () do @%append $(OBJS)\life.lbc option stack=%i @for %i in () do @%append $(OBJS)\life.lbc option stack=%i
wlink @$(OBJS)\life.lbc wlink @$(OBJS)\life.lbc
@@ -304,5 +285,5 @@ $(OBJS)\life_reader.obj : .AUTODEPEND .\reader.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<
$(OBJS)\life_life.res : .AUTODEPEND .\life.rc $(OBJS)\life_life.res : .AUTODEPEND .\life.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

19
demos/makefile.bcc
View File

@@ -23,16 +23,15 @@ BCCDIR = $(MAKEDIR)\..
MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
-DCPP="$(CPP)" -DSHARED="$(SHARED)" -DTOOLKIT="$(TOOLKIT)" \ -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DTOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
-DTOOLKIT_VERSION="$(TOOLKIT_VERSION)" -DWXUNIV="$(WXUNIV)" \ -DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" \
-DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
-DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ -DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \
-DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \
-DUSE_HTML="$(USE_HTML)" -DUSE_WEBVIEW="$(USE_WEBVIEW)" \ -DUSE_WEBVIEW="$(USE_WEBVIEW)" -DUSE_MEDIA="$(USE_MEDIA)" \
-DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" -DUSE_AUI="$(USE_AUI)" \ -DUSE_XRC="$(USE_XRC)" -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
-DUSE_RIBBON="$(USE_RIBBON)" -DUSE_PROPGRID="$(USE_PROPGRID)" \ -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \ -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \ -DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \

4
demos/makefile.gcc
View File

@@ -15,8 +15,8 @@ include ../build/msw/config.gcc
MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" TOOLKIT="$(TOOLKIT)" \ LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \ TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \

4
demos/makefile.vc
View File

@@ -14,8 +14,8 @@
MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
TOOLKIT="$(TOOLKIT)" TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \

16
demos/makefile.wat
View File

@@ -36,14 +36,14 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
TOOLKIT="$(TOOLKIT)" TOOLKIT_VERSION="$(TOOLKIT_VERSION)" & TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" &
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" &
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & DEBUG_FLAG="$(DEBUG_FLAG)" MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" &
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" &
USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" & USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" & USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" & USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" & USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" &
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &

42
demos/poem/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXPOEM_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ WXPOEM_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
WXPOEM_OBJECTS = \ WXPOEM_OBJECTS = \
@@ -41,23 +41,14 @@ WXPOEM_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -194,7 +180,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -253,7 +239,7 @@ clean:
$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res
| |
data: data:
@@ -264,5 +250,5 @@ $(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp
$(CXX) -q -c -P -o$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp $(CXX) -q -c -P -o$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp
$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc $(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wxpoem.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wxpoem.rc

43
demos/poem/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXPOEM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ WXPOEM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
WXPOEM_OBJECTS = \ WXPOEM_OBJECTS = \
$(OBJS)\wxpoem_wxpoem.o \ $(OBJS)\wxpoem_wxpoem.o \
$(OBJS)\wxpoem_wxpoem_rc.o $(OBJS)\wxpoem_wxpoem_rc.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -184,7 +165,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -246,7 +227,7 @@ clean:
-if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o
$(CXX) -o $@ $(WXPOEM_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(WXPOEM_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
@@ -256,7 +237,7 @@ $(OBJS)\wxpoem_wxpoem.o: ./wxpoem.cpp
$(CXX) -c -o $@ $(WXPOEM_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(WXPOEM_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\wxpoem_wxpoem_rc.o: ./wxpoem.rc $(OBJS)\wxpoem_wxpoem_rc.o: ./wxpoem.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean data .PHONY: all clean data

93
demos/poem/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
WXPOEM_OBJECTS = \ WXPOEM_OBJECTS = \
$(OBJS)\wxpoem_wxpoem.obj $(OBJS)\wxpoem_wxpoem.obj
WXPOEM_RESOURCES = \ WXPOEM_RESOURCES = \
@@ -38,41 +37,32 @@ WXPOEM_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -332,7 +317,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -376,7 +361,7 @@ clean:
$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(WXPOEM_OBJECTS) $(WXPOEM_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(WXPOEM_OBJECTS) $(WXPOEM_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
data: data:
@@ -387,5 +372,5 @@ $(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp
$(CXX) /c /nologo /TP /Fo$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp
$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc $(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wxpoem.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wxpoem.rc

53
demos/poem/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,7 +154,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -245,18 +226,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
WXPOEM_OBJECTS = & WXPOEM_OBJECTS = &
$(OBJS)\wxpoem_wxpoem.obj $(OBJS)\wxpoem_wxpoem.obj
@@ -284,7 +265,7 @@ $(OBJS)\wxpoem.exe : $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
@%append $(OBJS)\wxpoem.lbc option caseexact @%append $(OBJS)\wxpoem.lbc option caseexact
@%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i
@for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxpoem.lbc library %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxpoem.lbc library %i
@%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res
@for %i in () do @%append $(OBJS)\wxpoem.lbc option stack=%i @for %i in () do @%append $(OBJS)\wxpoem.lbc option stack=%i
wlink @$(OBJS)\wxpoem.lbc wlink @$(OBJS)\wxpoem.lbc
@@ -297,5 +278,5 @@ $(OBJS)\wxpoem_wxpoem.obj : .AUTODEPEND .\wxpoem.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $<
$(OBJS)\wxpoem_wxpoem.res : .AUTODEPEND .\wxpoem.rc $(OBJS)\wxpoem_wxpoem.res : .AUTODEPEND .\wxpoem.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
demos/poem/poem.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "wxpoem - Win32 DLL Release" !IF "$(CFG)" == "wxpoem - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

2
samples/access/access.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "accesstest - Win32 DLL Release" !IF "$(CFG)" == "accesstest - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/access/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ACCESSTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ ACCESSTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
ACCESSTEST_OBJECTS = \ ACCESSTEST_OBJECTS = \
@@ -41,23 +41,14 @@ ACCESSTEST_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -190,7 +176,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -249,11 +235,11 @@ clean:
$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_sample.res c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_sample.res
| |
$(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc $(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp $(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp
$(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp $(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp

43
samples/access/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ACCESSTEST_OBJECTS = \ ACCESSTEST_OBJECTS = \
$(OBJS)\accesstest_sample_rc.o \ $(OBJS)\accesstest_sample_rc.o \
$(OBJS)\accesstest_accesstest.o $(OBJS)\accesstest_accesstest.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -180,7 +161,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -242,10 +223,10 @@ clean:
-if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample_rc.o $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample_rc.o
$(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\accesstest_sample_rc.o: ./../../samples/sample.rc $(OBJS)\accesstest_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\accesstest_accesstest.o: ./accesstest.cpp $(OBJS)\accesstest_accesstest.o: ./accesstest.cpp
$(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $<

93
samples/access/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
ACCESSTEST_OBJECTS = \ ACCESSTEST_OBJECTS = \
$(OBJS)\accesstest_accesstest.obj $(OBJS)\accesstest_accesstest.obj
ACCESSTEST_RESOURCES = \ ACCESSTEST_RESOURCES = \
@@ -38,41 +37,32 @@ ACCESSTEST_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -328,7 +313,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -372,11 +357,11 @@ clean:
$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ACCESSTEST_OBJECTS) $(ACCESSTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(ACCESSTEST_OBJECTS) $(ACCESSTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc $(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp $(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp

53
samples/access/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
ACCESSTEST_OBJECTS = & ACCESSTEST_OBJECTS = &
$(OBJS)\accesstest_accesstest.obj $(OBJS)\accesstest_accesstest.obj
@@ -279,13 +260,13 @@ $(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res
@%append $(OBJS)\accesstest.lbc option caseexact @%append $(OBJS)\accesstest.lbc option caseexact
@%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\accesstest.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\accesstest.lbc library %i
@%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_sample.res @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_sample.res
@for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i
wlink @$(OBJS)\accesstest.lbc wlink @$(OBJS)\accesstest.lbc
$(OBJS)\accesstest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\accesstest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp $(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<

2
samples/animate/anitest.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "anitest - Win32 DLL Release" !IF "$(CFG)" == "anitest - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/animate/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANITEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ ANITEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
ANITEST_OBJECTS = \ ANITEST_OBJECTS = \
@@ -41,23 +41,14 @@ ANITEST_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -194,7 +180,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -253,7 +239,7 @@ clean:
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res
| |
catalog: catalog:
@@ -264,5 +250,5 @@ $(OBJS)\anitest_anitest.obj: .\anitest.cpp
$(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) .\anitest.cpp $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) .\anitest.cpp
$(OBJS)\anitest_sample.res: .\..\sample.rc $(OBJS)\anitest_sample.res: .\..\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc

43
samples/animate/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANITEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ ANITEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ANITEST_OBJECTS = \ ANITEST_OBJECTS = \
$(OBJS)\anitest_anitest.o \ $(OBJS)\anitest_anitest.o \
$(OBJS)\anitest_sample_rc.o $(OBJS)\anitest_sample_rc.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -184,7 +165,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -246,7 +227,7 @@ clean:
-if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o
$(CXX) -o $@ $(ANITEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(ANITEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
catalog: catalog:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
@@ -256,7 +237,7 @@ $(OBJS)\anitest_anitest.o: ./anitest.cpp
$(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\anitest_sample_rc.o: ./../sample.rc $(OBJS)\anitest_sample_rc.o: ./../sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean catalog .PHONY: all clean catalog

93
samples/animate/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
ANITEST_OBJECTS = \ ANITEST_OBJECTS = \
$(OBJS)\anitest_anitest.obj $(OBJS)\anitest_anitest.obj
ANITEST_RESOURCES = \ ANITEST_RESOURCES = \
@@ -38,41 +37,32 @@ ANITEST_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -332,7 +317,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -376,7 +361,7 @@ clean:
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ANITEST_OBJECTS) $(ANITEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(ANITEST_OBJECTS) $(ANITEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
catalog: catalog:
@@ -387,5 +372,5 @@ $(OBJS)\anitest_anitest.obj: .\anitest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) .\anitest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) .\anitest.cpp
$(OBJS)\anitest_sample.res: .\..\sample.rc $(OBJS)\anitest_sample.res: .\..\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc

53
samples/animate/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,7 +154,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -245,18 +226,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
ANITEST_OBJECTS = & ANITEST_OBJECTS = &
$(OBJS)\anitest_anitest.obj $(OBJS)\anitest_anitest.obj
@@ -284,7 +265,7 @@ $(OBJS)\anitest.exe : $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
@%append $(OBJS)\anitest.lbc option caseexact @%append $(OBJS)\anitest.lbc option caseexact
@%append $(OBJS)\anitest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\anitest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\anitest.lbc library %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\anitest.lbc library %i
@%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res
@for %i in () do @%append $(OBJS)\anitest.lbc option stack=%i @for %i in () do @%append $(OBJS)\anitest.lbc option stack=%i
wlink @$(OBJS)\anitest.lbc wlink @$(OBJS)\anitest.lbc
@@ -297,5 +278,5 @@ $(OBJS)\anitest_anitest.obj : .AUTODEPEND .\anitest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ANITEST_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(ANITEST_CXXFLAGS) $<
$(OBJS)\anitest_sample.res : .AUTODEPEND .\..\sample.rc $(OBJS)\anitest_sample.res : .AUTODEPEND .\..\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
samples/artprov/artprov.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "arttest - Win32 DLL Release" !IF "$(CFG)" == "arttest - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/artprov/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ARTTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ ARTTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
ARTTEST_OBJECTS = \ ARTTEST_OBJECTS = \
@@ -42,23 +42,14 @@ ARTTEST_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -84,11 +75,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -191,7 +177,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -250,11 +236,11 @@ clean:
$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_sample.res c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_sample.res
| |
$(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc $(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\arttest_arttest.obj: .\arttest.cpp $(OBJS)\arttest_arttest.obj: .\arttest.cpp
$(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp

43
samples/artprov/makefile.gcc
View File

@@ -16,19 +16,19 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ARTTEST_OBJECTS = \ ARTTEST_OBJECTS = \
$(OBJS)\arttest_sample_rc.o \ $(OBJS)\arttest_sample_rc.o \
$(OBJS)\arttest_arttest.o \ $(OBJS)\arttest_arttest.o \
@@ -36,12 +36,6 @@ ARTTEST_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -49,13 +43,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -81,16 +72,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -181,7 +162,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -243,10 +224,10 @@ clean:
-if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample_rc.o $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample_rc.o
$(CXX) -o $@ $(ARTTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(ARTTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\arttest_sample_rc.o: ./../../samples/sample.rc $(OBJS)\arttest_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\arttest_arttest.o: ./arttest.cpp $(OBJS)\arttest_arttest.o: ./arttest.cpp
$(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<

93
samples/artprov/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
ARTTEST_OBJECTS = \ ARTTEST_OBJECTS = \
$(OBJS)\arttest_arttest.obj \ $(OBJS)\arttest_arttest.obj \
$(OBJS)\arttest_artbrows.obj $(OBJS)\arttest_artbrows.obj
@@ -39,41 +38,32 @@ ARTTEST_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -102,29 +92,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -329,7 +314,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -373,11 +358,11 @@ clean:
$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ARTTEST_OBJECTS) $(ARTTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(ARTTEST_OBJECTS) $(ARTTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc $(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\arttest_arttest.obj: .\arttest.cpp $(OBJS)\arttest_arttest.obj: .\arttest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp

53
samples/artprov/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
ARTTEST_OBJECTS = & ARTTEST_OBJECTS = &
$(OBJS)\arttest_arttest.obj & $(OBJS)\arttest_arttest.obj &
$(OBJS)\arttest_artbrows.obj $(OBJS)\arttest_artbrows.obj
@@ -280,13 +261,13 @@ $(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res
@%append $(OBJS)\arttest.lbc option caseexact @%append $(OBJS)\arttest.lbc option caseexact
@%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\arttest.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\arttest.lbc library %i
@%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_sample.res @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_sample.res
@for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i
wlink @$(OBJS)\arttest.lbc wlink @$(OBJS)\arttest.lbc
$(OBJS)\arttest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\arttest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp $(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<

2
samples/aui/auidemo.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "auidemo - Win32 DLL Release" !IF "$(CFG)" == "auidemo - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

44
samples/aui/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
AUIDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ AUIDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
AUIDEMO_OBJECTS = \ AUIDEMO_OBJECTS = \
@@ -41,23 +41,14 @@ AUIDEMO_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -202,11 +188,11 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -265,11 +251,11 @@ clean:
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res
| |
$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc $(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp $(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp
$(CXX) -q -c -P -o$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp $(CXX) -q -c -P -o$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp

45
samples/aui/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
AUIDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ AUIDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
AUIDEMO_OBJECTS = \ AUIDEMO_OBJECTS = \
$(OBJS)\auidemo_sample_rc.o \ $(OBJS)\auidemo_sample_rc.o \
$(OBJS)\auidemo_auidemo.o $(OBJS)\auidemo_auidemo.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -192,11 +173,11 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_XML_p = \ __WXLIB_XML_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -258,10 +239,10 @@ clean:
-if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o
$(CXX) -o $@ $(AUIDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc $(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\auidemo_auidemo.o: ./auidemo.cpp $(OBJS)\auidemo_auidemo.o: ./auidemo.cpp
$(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $<

95
samples/aui/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
AUIDEMO_OBJECTS = \ AUIDEMO_OBJECTS = \
$(OBJS)\auidemo_auidemo.obj $(OBJS)\auidemo_auidemo.obj
AUIDEMO_RESOURCES = \ AUIDEMO_RESOURCES = \
@@ -38,41 +37,32 @@ AUIDEMO_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -340,11 +325,11 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -388,11 +373,11 @@ clean:
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(AUIDEMO_OBJECTS) $(AUIDEMO_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(AUIDEMO_OBJECTS) $(AUIDEMO_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc $(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp $(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp $(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp

55
samples/aui/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -183,12 +164,12 @@ __WXLIB_CORE_p = &
__WXLIB_XML_p = __WXLIB_XML_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_XML_p = & __WXLIB_XML_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -260,18 +241,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
AUIDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & AUIDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
AUIDEMO_OBJECTS = & AUIDEMO_OBJECTS = &
$(OBJS)\auidemo_auidemo.obj $(OBJS)\auidemo_auidemo.obj
@@ -299,13 +280,13 @@ $(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
@%append $(OBJS)\auidemo.lbc option caseexact @%append $(OBJS)\auidemo.lbc option caseexact
@%append $(OBJS)\auidemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\auidemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i
@for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i
@%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res
@for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i
wlink @$(OBJS)\auidemo.lbc wlink @$(OBJS)\auidemo.lbc
$(OBJS)\auidemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\auidemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\auidemo_auidemo.obj : .AUTODEPEND .\auidemo.cpp $(OBJS)\auidemo_auidemo.obj : .AUTODEPEND .\auidemo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $<

2
samples/calendar/calendar.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "calendar - Win32 DLL Release" !IF "$(CFG)" == "calendar - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/calendar/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CALENDAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ CALENDAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
CALENDAR_OBJECTS = \ CALENDAR_OBJECTS = \
@@ -41,23 +41,14 @@ CALENDAR_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -194,7 +180,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -253,11 +239,11 @@ clean:
$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_sample.res c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_sample.res
| |
$(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc $(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\calendar_calendar.obj: .\calendar.cpp $(OBJS)\calendar_calendar.obj: .\calendar.cpp
$(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp $(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp

43
samples/calendar/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CALENDAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ CALENDAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CALENDAR_OBJECTS = \ CALENDAR_OBJECTS = \
$(OBJS)\calendar_sample_rc.o \ $(OBJS)\calendar_sample_rc.o \
$(OBJS)\calendar_calendar.o $(OBJS)\calendar_calendar.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -184,7 +165,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -246,10 +227,10 @@ clean:
-if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample_rc.o $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample_rc.o
$(CXX) -o $@ $(CALENDAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(CALENDAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\calendar_sample_rc.o: ./../../samples/sample.rc $(OBJS)\calendar_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\calendar_calendar.o: ./calendar.cpp $(OBJS)\calendar_calendar.o: ./calendar.cpp
$(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<

93
samples/calendar/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
CALENDAR_OBJECTS = \ CALENDAR_OBJECTS = \
$(OBJS)\calendar_calendar.obj $(OBJS)\calendar_calendar.obj
CALENDAR_RESOURCES = \ CALENDAR_RESOURCES = \
@@ -38,41 +37,32 @@ CALENDAR_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -332,7 +317,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -376,11 +361,11 @@ clean:
$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CALENDAR_OBJECTS) $(CALENDAR_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(CALENDAR_OBJECTS) $(CALENDAR_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc $(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\calendar_calendar.obj: .\calendar.cpp $(OBJS)\calendar_calendar.obj: .\calendar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp

53
samples/calendar/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,7 +154,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -245,18 +226,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
CALENDAR_OBJECTS = & CALENDAR_OBJECTS = &
$(OBJS)\calendar_calendar.obj $(OBJS)\calendar_calendar.obj
@@ -284,13 +265,13 @@ $(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res
@%append $(OBJS)\calendar.lbc option caseexact @%append $(OBJS)\calendar.lbc option caseexact
@%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\calendar.lbc library %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\calendar.lbc library %i
@%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_sample.res @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_sample.res
@for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i
wlink @$(OBJS)\calendar.lbc wlink @$(OBJS)\calendar.lbc
$(OBJS)\calendar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\calendar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp $(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $<

2
samples/caret/caret.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "caret - Win32 DLL Release" !IF "$(CFG)" == "caret - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/caret/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CARET_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ CARET_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
CARET_OBJECTS = \ CARET_OBJECTS = \
@@ -41,23 +41,14 @@ CARET_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -190,7 +176,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -249,11 +235,11 @@ clean:
$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_sample.res c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_sample.res
| |
$(OBJS)\caret_sample.res: .\..\..\samples\sample.rc $(OBJS)\caret_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\caret_caret.obj: .\caret.cpp $(OBJS)\caret_caret.obj: .\caret.cpp
$(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp $(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp

43
samples/caret/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CARET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ CARET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CARET_OBJECTS = \ CARET_OBJECTS = \
$(OBJS)\caret_sample_rc.o \ $(OBJS)\caret_sample_rc.o \
$(OBJS)\caret_caret.o $(OBJS)\caret_caret.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -180,7 +161,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -242,10 +223,10 @@ clean:
-if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample_rc.o $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample_rc.o
$(CXX) -o $@ $(CARET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(CARET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\caret_sample_rc.o: ./../../samples/sample.rc $(OBJS)\caret_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\caret_caret.o: ./caret.cpp $(OBJS)\caret_caret.o: ./caret.cpp
$(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $<

93
samples/caret/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
CARET_OBJECTS = \ CARET_OBJECTS = \
$(OBJS)\caret_caret.obj $(OBJS)\caret_caret.obj
CARET_RESOURCES = \ CARET_RESOURCES = \
@@ -38,41 +37,32 @@ CARET_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -328,7 +313,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -372,11 +357,11 @@ clean:
$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CARET_OBJECTS) $(CARET_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(CARET_OBJECTS) $(CARET_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\caret_sample.res: .\..\..\samples\sample.rc $(OBJS)\caret_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\caret_caret.obj: .\caret.cpp $(OBJS)\caret_caret.obj: .\caret.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp

53
samples/caret/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
CARET_OBJECTS = & CARET_OBJECTS = &
$(OBJS)\caret_caret.obj $(OBJS)\caret_caret.obj
@@ -279,13 +260,13 @@ $(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_sample.res
@%append $(OBJS)\caret.lbc option caseexact @%append $(OBJS)\caret.lbc option caseexact
@%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i
@%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_sample.res @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_sample.res
@for %i in () do @%append $(OBJS)\caret.lbc option stack=%i @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i
wlink @$(OBJS)\caret.lbc wlink @$(OBJS)\caret.lbc
$(OBJS)\caret_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\caret_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp $(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $<

42
samples/clipboard/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CLIPBOARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ CLIPBOARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
CLIPBOARD_OBJECTS = \ CLIPBOARD_OBJECTS = \
@@ -41,23 +41,14 @@ CLIPBOARD_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -190,7 +176,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -249,11 +235,11 @@ clean:
$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res $(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_sample.res c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_sample.res
| |
$(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc $(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp $(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp
$(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp $(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp

43
samples/clipboard/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CLIPBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ CLIPBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CLIPBOARD_OBJECTS = \ CLIPBOARD_OBJECTS = \
$(OBJS)\clipboard_sample_rc.o \ $(OBJS)\clipboard_sample_rc.o \
$(OBJS)\clipboard_clipboard.o $(OBJS)\clipboard_clipboard.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -180,7 +161,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -242,10 +223,10 @@ clean:
-if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample_rc.o $(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample_rc.o
$(CXX) -o $@ $(CLIPBOARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(CLIPBOARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\clipboard_sample_rc.o: ./../../samples/sample.rc $(OBJS)\clipboard_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\clipboard_clipboard.o: ./clipboard.cpp $(OBJS)\clipboard_clipboard.o: ./clipboard.cpp
$(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $<

93
samples/clipboard/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
CLIPBOARD_OBJECTS = \ CLIPBOARD_OBJECTS = \
$(OBJS)\clipboard_clipboard.obj $(OBJS)\clipboard_clipboard.obj
CLIPBOARD_RESOURCES = \ CLIPBOARD_RESOURCES = \
@@ -38,41 +37,32 @@ CLIPBOARD_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -328,7 +313,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -372,11 +357,11 @@ clean:
$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res $(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CLIPBOARD_OBJECTS) $(CLIPBOARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(CLIPBOARD_OBJECTS) $(CLIPBOARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc $(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp $(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp

53
samples/clipboard/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CLIPBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & CLIPBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
CLIPBOARD_OBJECTS = & CLIPBOARD_OBJECTS = &
$(OBJS)\clipboard_clipboard.obj $(OBJS)\clipboard_clipboard.obj
@@ -279,13 +260,13 @@ $(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res
@%append $(OBJS)\clipboard.lbc option caseexact @%append $(OBJS)\clipboard.lbc option caseexact
@%append $(OBJS)\clipboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\clipboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\clipboard.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\clipboard.lbc library %i
@%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_sample.res @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_sample.res
@for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i
wlink @$(OBJS)\clipboard.lbc wlink @$(OBJS)\clipboard.lbc
$(OBJS)\clipboard_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\clipboard_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\clipboard_clipboard.obj : .AUTODEPEND .\clipboard.cpp $(OBJS)\clipboard_clipboard.obj : .AUTODEPEND .\clipboard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $<

2
samples/collpane/collpane.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "collpane - Win32 DLL Release" !IF "$(CFG)" == "collpane - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/collpane/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COLLPANE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ COLLPANE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
COLLPANE_OBJECTS = \ COLLPANE_OBJECTS = \
@@ -41,23 +41,14 @@ COLLPANE_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -194,7 +180,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -253,12 +239,12 @@ clean:
$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(COLLPANE_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\collpane_sample.res c0w32.obj $(COLLPANE_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\collpane_sample.res
| |
$(OBJS)\collpane_collpane.obj: .\collpane.cpp $(OBJS)\collpane_collpane.obj: .\collpane.cpp
$(CXX) -q -c -P -o$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp $(CXX) -q -c -P -o$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp
$(OBJS)\collpane_sample.res: .\..\sample.rc $(OBJS)\collpane_sample.res: .\..\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc

43
samples/collpane/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COLLPANE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ COLLPANE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
COLLPANE_OBJECTS = \ COLLPANE_OBJECTS = \
$(OBJS)\collpane_collpane.o \ $(OBJS)\collpane_collpane.o \
$(OBJS)\collpane_sample_rc.o $(OBJS)\collpane_sample_rc.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -184,7 +165,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -246,13 +227,13 @@ clean:
-if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe
$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o
$(CXX) -o $@ $(COLLPANE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(COLLPANE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\collpane_collpane.o: ./collpane.cpp $(OBJS)\collpane_collpane.o: ./collpane.cpp
$(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\collpane_sample_rc.o: ./../sample.rc $(OBJS)\collpane_sample_rc.o: ./../sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean .PHONY: all clean

93
samples/collpane/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COLLPANE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ COLLPANE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
COLLPANE_OBJECTS = \ COLLPANE_OBJECTS = \
$(OBJS)\collpane_collpane.obj $(OBJS)\collpane_collpane.obj
COLLPANE_RESOURCES = \ COLLPANE_RESOURCES = \
@@ -38,41 +37,32 @@ COLLPANE_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -332,7 +317,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -376,12 +361,12 @@ clean:
$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(COLLPANE_OBJECTS) $(COLLPANE_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(COLLPANE_OBJECTS) $(COLLPANE_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\collpane_collpane.obj: .\collpane.cpp $(OBJS)\collpane_collpane.obj: .\collpane.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp $(CXX) /c /nologo /TP /Fo$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp
$(OBJS)\collpane_sample.res: .\..\sample.rc $(OBJS)\collpane_sample.res: .\..\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc

53
samples/collpane/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,7 +154,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -245,18 +226,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COLLPANE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & COLLPANE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
COLLPANE_OBJECTS = & COLLPANE_OBJECTS = &
$(OBJS)\collpane_collpane.obj $(OBJS)\collpane_collpane.obj
@@ -284,7 +265,7 @@ $(OBJS)\collpane.exe : $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
@%append $(OBJS)\collpane.lbc option caseexact @%append $(OBJS)\collpane.lbc option caseexact
@%append $(OBJS)\collpane.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\collpane.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i @for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\collpane.lbc library %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\collpane.lbc library %i
@%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res @%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res
@for %i in () do @%append $(OBJS)\collpane.lbc option stack=%i @for %i in () do @%append $(OBJS)\collpane.lbc option stack=%i
wlink @$(OBJS)\collpane.lbc wlink @$(OBJS)\collpane.lbc
@@ -293,5 +274,5 @@ $(OBJS)\collpane_collpane.obj : .AUTODEPEND .\collpane.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $<
$(OBJS)\collpane_sample.res : .AUTODEPEND .\..\sample.rc $(OBJS)\collpane_sample.res : .AUTODEPEND .\..\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
samples/combo/combo.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "combo - Win32 DLL Release" !IF "$(CFG)" == "combo - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/combo/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COMBO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ COMBO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
COMBO_OBJECTS = \ COMBO_OBJECTS = \
@@ -41,23 +41,14 @@ COMBO_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -194,7 +180,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -253,7 +239,7 @@ clean:
$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res
| |
data: data:
@@ -261,7 +247,7 @@ data:
for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc $(OBJS)\combo_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\combo_combo.obj: .\combo.cpp $(OBJS)\combo_combo.obj: .\combo.cpp
$(CXX) -q -c -P -o$@ $(COMBO_CXXFLAGS) .\combo.cpp $(CXX) -q -c -P -o$@ $(COMBO_CXXFLAGS) .\combo.cpp

43
samples/combo/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COMBO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ COMBO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
COMBO_OBJECTS = \ COMBO_OBJECTS = \
$(OBJS)\combo_sample_rc.o \ $(OBJS)\combo_sample_rc.o \
$(OBJS)\combo_combo.o $(OBJS)\combo_combo.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -184,7 +165,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -246,14 +227,14 @@ clean:
-if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o
$(CXX) -o $@ $(COMBO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(COMBO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
for %%f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) for %%f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
$(OBJS)\combo_sample_rc.o: ./../../samples/sample.rc $(OBJS)\combo_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\combo_combo.o: ./combo.cpp $(OBJS)\combo_combo.o: ./combo.cpp
$(CXX) -c -o $@ $(COMBO_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COMBO_CXXFLAGS) $(CPPDEPS) $<

93
samples/combo/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COMBO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ COMBO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
COMBO_OBJECTS = \ COMBO_OBJECTS = \
$(OBJS)\combo_combo.obj $(OBJS)\combo_combo.obj
COMBO_RESOURCES = \ COMBO_RESOURCES = \
@@ -38,41 +37,32 @@ COMBO_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -332,7 +317,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -376,7 +361,7 @@ clean:
$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(COMBO_OBJECTS) $(COMBO_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(COMBO_OBJECTS) $(COMBO_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
data: data:
@@ -384,7 +369,7 @@ data:
for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc $(OBJS)\combo_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\combo_combo.obj: .\combo.cpp $(OBJS)\combo_combo.obj: .\combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COMBO_CXXFLAGS) .\combo.cpp $(CXX) /c /nologo /TP /Fo$@ $(COMBO_CXXFLAGS) .\combo.cpp

53
samples/combo/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,7 +154,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -245,18 +226,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
COMBO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & COMBO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
COMBO_OBJECTS = & COMBO_OBJECTS = &
$(OBJS)\combo_combo.obj $(OBJS)\combo_combo.obj
@@ -284,7 +265,7 @@ $(OBJS)\combo.exe : $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
@%append $(OBJS)\combo.lbc option caseexact @%append $(OBJS)\combo.lbc option caseexact
@%append $(OBJS)\combo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\combo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i @for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\combo.lbc library %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\combo.lbc library %i
@%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res @%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res
@for %i in () do @%append $(OBJS)\combo.lbc option stack=%i @for %i in () do @%append $(OBJS)\combo.lbc option stack=%i
wlink @$(OBJS)\combo.lbc wlink @$(OBJS)\combo.lbc
@@ -294,7 +275,7 @@ data : .SYMBOLIC
for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\combo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\combo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\combo_combo.obj : .AUTODEPEND .\combo.cpp $(OBJS)\combo_combo.obj : .AUTODEPEND .\combo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COMBO_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COMBO_CXXFLAGS) $<

2
samples/config/config.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "conftest - Win32 DLL Release" !IF "$(CFG)" == "conftest - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/config/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONFTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ CONFTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
CONFTEST_OBJECTS = \ CONFTEST_OBJECTS = \
@@ -41,23 +41,14 @@ CONFTEST_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -190,7 +176,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -249,11 +235,11 @@ clean:
$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_sample.res c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_sample.res
| |
$(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc $(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\conftest_conftest.obj: .\conftest.cpp $(OBJS)\conftest_conftest.obj: .\conftest.cpp
$(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp $(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp

43
samples/config/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CONFTEST_OBJECTS = \ CONFTEST_OBJECTS = \
$(OBJS)\conftest_sample_rc.o \ $(OBJS)\conftest_sample_rc.o \
$(OBJS)\conftest_conftest.o $(OBJS)\conftest_conftest.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -180,7 +161,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -242,10 +223,10 @@ clean:
-if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample_rc.o $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample_rc.o
$(CXX) -o $@ $(CONFTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(CONFTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\conftest_sample_rc.o: ./../../samples/sample.rc $(OBJS)\conftest_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\conftest_conftest.o: ./conftest.cpp $(OBJS)\conftest_conftest.o: ./conftest.cpp
$(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $<

93
samples/config/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
CONFTEST_OBJECTS = \ CONFTEST_OBJECTS = \
$(OBJS)\conftest_conftest.obj $(OBJS)\conftest_conftest.obj
CONFTEST_RESOURCES = \ CONFTEST_RESOURCES = \
@@ -38,41 +37,32 @@ CONFTEST_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -328,7 +313,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -372,11 +357,11 @@ clean:
$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CONFTEST_OBJECTS) $(CONFTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(CONFTEST_OBJECTS) $(CONFTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc $(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\conftest_conftest.obj: .\conftest.cpp $(OBJS)\conftest_conftest.obj: .\conftest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp

53
samples/config/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
CONFTEST_OBJECTS = & CONFTEST_OBJECTS = &
$(OBJS)\conftest_conftest.obj $(OBJS)\conftest_conftest.obj
@@ -279,13 +260,13 @@ $(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res
@%append $(OBJS)\conftest.lbc option caseexact @%append $(OBJS)\conftest.lbc option caseexact
@%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\conftest.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\conftest.lbc library %i
@%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_sample.res @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_sample.res
@for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i
wlink @$(OBJS)\conftest.lbc wlink @$(OBJS)\conftest.lbc
$(OBJS)\conftest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\conftest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp $(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $<

2
samples/console/console.dsp
View File

@@ -30,7 +30,7 @@ CFG=console - Win32 Debug
CPP=cl.exe CPP=cl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "console - Win32 DLL Release" !IF "$(CFG)" == "console - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

35
samples/console/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONSOLE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ CONSOLE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
$(CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
CONSOLE_OBJECTS = \ CONSOLE_OBJECTS = \
@@ -41,23 +41,14 @@ CONSOLE_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -148,11 +139,11 @@ __DLLFLAG_p = -DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_NET_p = \ __WXLIB_NET_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \

36
samples/console/makefile.gcc
View File

@@ -16,30 +16,24 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONSOLE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ CONSOLE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
$(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \ $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
$(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) $(CXXFLAGS)
CONSOLE_OBJECTS = \ CONSOLE_OBJECTS = \
$(OBJS)\console_console.o $(OBJS)\console_console.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -47,13 +41,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -79,9 +70,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -135,11 +123,11 @@ __DLLFLAG_p = -DWXUSINGDLL
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_NET_p = \ __WXLIB_NET_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \

86
samples/console/makefile.vc
View File

@@ -15,62 +15,52 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \ $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
/DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CXXFLAGS)
CONSOLE_OBJECTS = \ CONSOLE_OBJECTS = \
$(OBJS)\console_console.obj $(OBJS)\console_console.obj
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -99,18 +89,18 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
@@ -263,11 +253,11 @@ __DLLFLAG_p = /DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_NET_p = \ __WXLIB_NET_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \

43
samples/console/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -194,12 +183,12 @@ __DLLFLAG_p = -dWXUSINGDLL
__WXLIB_NET_p = __WXLIB_NET_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_NET_p = & __WXLIB_NET_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif !endif
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -228,18 +217,18 @@ ____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONSOLE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & CONSOLE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG_7) &
$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
CONSOLE_OBJECTS = & CONSOLE_OBJECTS = &
$(OBJS)\console_console.obj $(OBJS)\console_console.obj

2
samples/controls/controls.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "controls - Win32 DLL Release" !IF "$(CFG)" == "controls - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/controls/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONTROLS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ CONTROLS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
CONTROLS_OBJECTS = \ CONTROLS_OBJECTS = \
@@ -41,23 +41,14 @@ CONTROLS_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -190,7 +176,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -249,7 +235,7 @@ clean:
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res $(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(CONTROLS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\controls_controls.res c0w32.obj $(CONTROLS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\controls_controls.res
| |
data: data:
@@ -260,5 +246,5 @@ $(OBJS)\controls_controls.obj: .\controls.cpp
$(CXX) -q -c -P -o$@ $(CONTROLS_CXXFLAGS) .\controls.cpp $(CXX) -q -c -P -o$@ $(CONTROLS_CXXFLAGS) .\controls.cpp
$(OBJS)\controls_controls.res: .\controls.rc $(OBJS)\controls_controls.res: .\controls.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\controls.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\controls.rc

43
samples/controls/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CONTROLS_OBJECTS = \ CONTROLS_OBJECTS = \
$(OBJS)\controls_controls.o \ $(OBJS)\controls_controls.o \
$(OBJS)\controls_controls_rc.o $(OBJS)\controls_controls_rc.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -180,7 +161,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -242,7 +223,7 @@ clean:
-if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o $(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o
$(CXX) -o $@ $(CONTROLS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(CONTROLS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
@@ -252,7 +233,7 @@ $(OBJS)\controls_controls.o: ./controls.cpp
$(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\controls_controls_rc.o: ./controls.rc $(OBJS)\controls_controls_rc.o: ./controls.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean data .PHONY: all clean data

93
samples/controls/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
CONTROLS_OBJECTS = \ CONTROLS_OBJECTS = \
$(OBJS)\controls_controls.obj $(OBJS)\controls_controls.obj
CONTROLS_RESOURCES = \ CONTROLS_RESOURCES = \
@@ -38,41 +37,32 @@ CONTROLS_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -328,7 +313,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -372,7 +357,7 @@ clean:
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res $(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CONTROLS_OBJECTS) $(CONTROLS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(CONTROLS_OBJECTS) $(CONTROLS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
data: data:
@@ -383,5 +368,5 @@ $(OBJS)\controls_controls.obj: .\controls.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) .\controls.cpp $(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) .\controls.cpp
$(OBJS)\controls_controls.res: .\controls.rc $(OBJS)\controls_controls.res: .\controls.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\controls.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\controls.rc

53
samples/controls/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -168,7 +149,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -240,18 +221,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
CONTROLS_OBJECTS = & CONTROLS_OBJECTS = &
$(OBJS)\controls_controls.obj $(OBJS)\controls_controls.obj
@@ -279,7 +260,7 @@ $(OBJS)\controls.exe : $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
@%append $(OBJS)\controls.lbc option caseexact @%append $(OBJS)\controls.lbc option caseexact
@%append $(OBJS)\controls.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\controls.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i @for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\controls.lbc library %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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\controls.lbc library %i
@%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res @%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res
@for %i in () do @%append $(OBJS)\controls.lbc option stack=%i @for %i in () do @%append $(OBJS)\controls.lbc option stack=%i
wlink @$(OBJS)\controls.lbc wlink @$(OBJS)\controls.lbc
@@ -292,5 +273,5 @@ $(OBJS)\controls_controls.obj : .AUTODEPEND .\controls.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $<
$(OBJS)\controls_controls.res : .AUTODEPEND .\controls.rc $(OBJS)\controls_controls.res : .AUTODEPEND .\controls.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
samples/dataview/dataview.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "dataview - Win32 DLL Release" !IF "$(CFG)" == "dataview - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

42
samples/dataview/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DATAVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ DATAVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
DATAVIEW_OBJECTS = \ DATAVIEW_OBJECTS = \
@@ -42,23 +42,14 @@ DATAVIEW_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -84,11 +75,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -195,7 +181,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -254,7 +240,7 @@ clean:
$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res
| |
$(OBJS)\dataview_dataview.obj: .\dataview.cpp $(OBJS)\dataview_dataview.obj: .\dataview.cpp
@@ -264,5 +250,5 @@ $(OBJS)\dataview_mymodels.obj: .\mymodels.cpp
$(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp $(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp
$(OBJS)\dataview_sample.res: .\..\sample.rc $(OBJS)\dataview_sample.res: .\..\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc

43
samples/dataview/makefile.gcc
View File

@@ -16,19 +16,19 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DATAVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ DATAVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
DATAVIEW_OBJECTS = \ DATAVIEW_OBJECTS = \
$(OBJS)\dataview_dataview.o \ $(OBJS)\dataview_dataview.o \
$(OBJS)\dataview_mymodels.o \ $(OBJS)\dataview_mymodels.o \
@@ -36,12 +36,6 @@ DATAVIEW_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -49,13 +43,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -81,16 +72,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -185,7 +166,7 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -247,7 +228,7 @@ clean:
-if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o
$(CXX) -o $@ $(DATAVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\dataview_dataview.o: ./dataview.cpp $(OBJS)\dataview_dataview.o: ./dataview.cpp
$(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
@@ -256,7 +237,7 @@ $(OBJS)\dataview_mymodels.o: ./mymodels.cpp
$(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\dataview_sample_rc.o: ./../sample.rc $(OBJS)\dataview_sample_rc.o: ./../sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
.PHONY: all clean .PHONY: all clean

93
samples/dataview/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
DATAVIEW_OBJECTS = \ DATAVIEW_OBJECTS = \
$(OBJS)\dataview_dataview.obj \ $(OBJS)\dataview_dataview.obj \
$(OBJS)\dataview_mymodels.obj $(OBJS)\dataview_mymodels.obj
@@ -39,41 +38,32 @@ DATAVIEW_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -102,29 +92,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -333,7 +318,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -377,7 +362,7 @@ clean:
$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(DATAVIEW_OBJECTS) $(DATAVIEW_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(DATAVIEW_OBJECTS) $(DATAVIEW_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\dataview_dataview.obj: .\dataview.cpp $(OBJS)\dataview_dataview.obj: .\dataview.cpp
@@ -387,5 +372,5 @@ $(OBJS)\dataview_mymodels.obj: .\mymodels.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp
$(OBJS)\dataview_sample.res: .\..\sample.rc $(OBJS)\dataview_sample.res: .\..\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc

53
samples/dataview/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,7 +154,7 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -245,18 +226,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
DATAVIEW_OBJECTS = & DATAVIEW_OBJECTS = &
$(OBJS)\dataview_dataview.obj & $(OBJS)\dataview_dataview.obj &
$(OBJS)\dataview_mymodels.obj $(OBJS)\dataview_mymodels.obj
@@ -285,7 +266,7 @@ $(OBJS)\dataview.exe : $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
@%append $(OBJS)\dataview.lbc option caseexact @%append $(OBJS)\dataview.lbc option caseexact
@%append $(OBJS)\dataview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\dataview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dataview.lbc library %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dataview.lbc library %i
@%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res
@for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i
wlink @$(OBJS)\dataview.lbc wlink @$(OBJS)\dataview.lbc
@@ -297,5 +278,5 @@ $(OBJS)\dataview_mymodels.obj : .AUTODEPEND .\mymodels.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
$(OBJS)\dataview_sample.res : .AUTODEPEND .\..\sample.rc $(OBJS)\dataview_sample.res : .AUTODEPEND .\..\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<

2
samples/debugrpt/debugrpt.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "debugrpt - Win32 DLL Release" !IF "$(CFG)" == "debugrpt - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1

44
samples/debugrpt/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEBUGRPT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ DEBUGRPT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
DEBUGRPT_OBJECTS = \ DEBUGRPT_OBJECTS = \
@@ -41,23 +41,14 @@ DEBUGRPT_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -83,11 +74,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -194,11 +180,11 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -257,11 +243,11 @@ clean:
$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(DEBUGRPT_OBJECTS),$@,, $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\debugrpt_sample.res c0w32.obj $(DEBUGRPT_OBJECTS),$@,, $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\debugrpt_sample.res
| |
$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc $(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp $(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp
$(CXX) -q -c -P -o$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp $(CXX) -q -c -P -o$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp

45
samples/debugrpt/makefile.gcc
View File

@@ -16,31 +16,25 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEBUGRPT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ DEBUGRPT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
DEBUGRPT_OBJECTS = \ DEBUGRPT_OBJECTS = \
$(OBJS)\debugrpt_sample_rc.o \ $(OBJS)\debugrpt_sample_rc.o \
$(OBJS)\debugrpt_debugrpt.o $(OBJS)\debugrpt_debugrpt.o
### Conditionally set variables: ### ### Conditionally set variables: ###
ifeq ($(TOOLKIT),GTK)
WIN32_TOOLKIT_LOWERCASE = gtk
endif
ifeq ($(TOOLKIT),MSW)
WIN32_TOOLKIT_LOWERCASE = msw
endif
ifeq ($(GCC_VERSION),2.95) ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks GCCFLAGS = -fvtable-thunks
endif endif
@@ -48,13 +42,10 @@ ifeq ($(USE_GUI),0)
PORTNAME = base PORTNAME = base
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
endif endif
ifeq ($(TOOLKIT),MAC) ifeq ($(OFFICIAL_BUILD),1)
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
ifeq ($(OFFICIAL_BUILD),1)
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -80,16 +71,6 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif
ifeq ($(TOOLKIT),GTK)
CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
endif
ifeq ($(TOOLKIT),GTK)
ifeq ($(TOOLKIT_VERSION),2)
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
endif
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0 __OPTIMIZEFLAG_2 = -O0
endif endif
@@ -184,11 +165,11 @@ __WXLIB_CORE_p = \
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_XML_p = \ __WXLIB_XML_p = \
-lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -250,10 +231,10 @@ clean:
-if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe
$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample_rc.o $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample_rc.o
$(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
$(OBJS)\debugrpt_sample_rc.o: ./../../samples/sample.rc $(OBJS)\debugrpt_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\debugrpt_debugrpt.o: ./debugrpt.cpp $(OBJS)\debugrpt_debugrpt.o: ./debugrpt.cpp
$(CXX) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(CPPDEPS) $<

95
samples/debugrpt/makefile.vc
View File

@@ -15,22 +15,21 @@
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEBUGRPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ DEBUGRPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
$(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(____DEBUGRUNTIME_3_p) \ $(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(____DEBUGRUNTIME_3_p) \
$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
$(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
$(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
$(CPPFLAGS) $(CXXFLAGS)
DEBUGRPT_OBJECTS = \ DEBUGRPT_OBJECTS = \
$(OBJS)\debugrpt_debugrpt.obj $(OBJS)\debugrpt_debugrpt.obj
DEBUGRPT_RESOURCES = \ DEBUGRPT_RESOURCES = \
@@ -38,41 +37,32 @@ DEBUGRPT_RESOURCES = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK" !if "$(TARGET_CPU)" == "AMD64"
WIN32_TOOLKIT_LOWERCASE = gtk ARCH_SUFFIX = _x64
!endif !endif
!if "$(TOOLKIT)" == "MSW" !if "$(TARGET_CPU)" == "IA64"
WIN32_TOOLKIT_LOWERCASE = msw ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "X64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "amd64"
ARCH_SUFFIX = _ia64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64 ARCH_SUFFIX = _x64
!endif !endif
!if "$(TARGET_CPU)" == "ia64"
ARCH_SUFFIX = _ia64
!endif
!if "$(TARGET_CPU)" == "x64"
ARCH_SUFFIX = _x64
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -101,29 +91,24 @@ LINK_TARGET_CPU = /MACHINE:X64
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "X64" !if "$(TARGET_CPU)" == "X64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "x64" !if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64 LINK_TARGET_CPU = /MACHINE:X64
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_0 = /Zi __DEBUGINFO_0 = /Zi
!endif !endif
@@ -332,11 +317,11 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -380,11 +365,11 @@ clean:
$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(DEBUGRPT_OBJECTS) $(DEBUGRPT_RESOURCES) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(DEBUGRPT_OBJECTS) $(DEBUGRPT_RESOURCES) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc $(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp $(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp

55
samples/debugrpt/makefile.wat
View File

@@ -31,27 +31,16 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ### ### Conditionally set variables: ###
WIN32_TOOLKIT_LOWERCASE =
!ifeq TOOLKIT GTK
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!ifeq TOOLKIT MSW
WIN32_TOOLKIT_LOWERCASE = msw
!endif
PORTNAME = PORTNAME =
!ifeq USE_GUI 0 !ifeq USE_GUI 0
PORTNAME = base PORTNAME = base
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
WXBASEPORT = COMPILER_VERSION =
!ifeq TOOLKIT MAC !ifeq OFFICIAL_BUILD 1
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
WXDEBUGFLAG = WXDEBUGFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
LIB_GTK =
!ifeq TOOLKIT GTK
!ifeq TOOLKIT_VERSION 2
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
glib-2.0.lib
!endif
!endif
__DEBUGINFO_0 = __DEBUGINFO_0 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -173,12 +154,12 @@ __WXLIB_CORE_p = &
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
__WXLIB_XML_p = __WXLIB_XML_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_XML_p = & __WXLIB_XML_p = &
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
__WXLIB_MONO_p = __WXLIB_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
@@ -250,18 +231,18 @@ __DLLFLAG_p = -dWXUSINGDLL
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = wat COMPILER_PREFIX = wat
OBJS = & OBJS = &
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = & LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = & SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEBUGRPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & DEBUGRPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
$(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
DEBUGRPT_OBJECTS = & DEBUGRPT_OBJECTS = &
$(OBJS)\debugrpt_debugrpt.obj $(OBJS)\debugrpt_debugrpt.obj
@@ -289,13 +270,13 @@ $(OBJS)\debugrpt.exe : $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
@%append $(OBJS)\debugrpt.lbc option caseexact @%append $(OBJS)\debugrpt.lbc option caseexact
@%append $(OBJS)\debugrpt.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @%append $(OBJS)\debugrpt.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i @for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i
@for %i in ( $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\debugrpt.lbc library %i @for %i in ( $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\debugrpt.lbc library %i
@%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res @%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res
@for %i in () do @%append $(OBJS)\debugrpt.lbc option stack=%i @for %i in () do @%append $(OBJS)\debugrpt.lbc option stack=%i
wlink @$(OBJS)\debugrpt.lbc wlink @$(OBJS)\debugrpt.lbc
$(OBJS)\debugrpt_sample.res : .AUTODEPEND .\..\..\samples\sample.rc $(OBJS)\debugrpt_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\debugrpt_debugrpt.obj : .AUTODEPEND .\debugrpt.cpp $(OBJS)\debugrpt_debugrpt.obj : .AUTODEPEND .\debugrpt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $<

10
samples/dialogs/dialogs.dsp
View File

@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "dialogs - Win32 DLL Release" !IF "$(CFG)" == "dialogs - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
@@ -146,7 +146,7 @@ LINK32=link.exe
SOURCE=.\..\..\src\generic\colrdlgg.cpp SOURCE=.\..\..\src\generic\colrdlgg.cpp
!IF "$(CFG)" == "dialogs - Win32 DLL Release" !IF "$(CFG)" == "dialogs - Win32 DLL Release"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1
@@ -171,7 +171,7 @@ SOURCE=.\dialogs.cpp
SOURCE=.\..\..\src\generic\dirdlgg.cpp SOURCE=.\..\..\src\generic\dirdlgg.cpp
!IF "$(CFG)" == "dialogs - Win32 DLL Release" !IF "$(CFG)" == "dialogs - Win32 DLL Release"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1
@@ -192,7 +192,7 @@ SOURCE=.\..\..\src\generic\dirdlgg.cpp
SOURCE=.\..\..\src\generic\filedlgg.cpp SOURCE=.\..\..\src\generic\filedlgg.cpp
!IF "$(CFG)" == "dialogs - Win32 DLL Release" !IF "$(CFG)" == "dialogs - Win32 DLL Release"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1
@@ -213,7 +213,7 @@ SOURCE=.\..\..\src\generic\filedlgg.cpp
SOURCE=.\..\..\src\generic\fontdlgg.cpp SOURCE=.\..\..\src\generic\fontdlgg.cpp
!IF "$(CFG)" == "dialogs - Win32 DLL Release" !IF "$(CFG)" == "dialogs - Win32 DLL Release"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1

77
samples/dialogs/makefile.bcc
View File

@@ -24,16 +24,16 @@ BCCDIR = $(MAKEDIR)\..
WX_RELEASE_NODOT = 29 WX_RELEASE_NODOT = 29
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \ LIBDIRNAME = \
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
DIALOGS_OBJECTS = \ DIALOGS_OBJECTS = \
@@ -42,23 +42,14 @@ DIALOGS_OBJECTS = \
### Conditionally set variables: ### ### Conditionally set variables: ###
!if "$(TOOLKIT)" == "GTK"
WIN32_TOOLKIT_LOWERCASE = gtk
!endif
!if "$(TOOLKIT)" == "MSW"
WIN32_TOOLKIT_LOWERCASE = msw
!endif
!if "$(USE_GUI)" == "0" !if "$(USE_GUI)" == "0"
PORTNAME = base PORTNAME = base
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) PORTNAME = msw$(TOOLKIT_VERSION)
!endif !endif
!if "$(TOOLKIT)" == "MAC" !if "$(OFFICIAL_BUILD)" == "1"
WXBASEPORT = _carbon COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
!if "$(OFFICIAL_BUILD)" == "1"
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
WXDEBUGFLAG = d WXDEBUGFLAG = d
@@ -84,11 +75,6 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
glib-2.0.lib
!endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -Od
!endif !endif
@@ -185,28 +171,13 @@ __DLLFLAG_p = -DWXUSINGDLL
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
__DLLFLAG_p_1 = -dWXUSINGDLL __DLLFLAG_p_1 = -dWXUSINGDLL
!endif !endif
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MAC" && "$(WXUNIV)" == "0" !if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
$(OBJS)\dialogs_colrdlgg.obj \
$(OBJS)\dialogs_dirdlgg.obj \
$(OBJS)\dialogs_filedlgg.obj
!endif
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MSW" && "$(WXUNIV)" == "0"
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \ ____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
$(OBJS)\dialogs_colrdlgg.obj \ $(OBJS)\dialogs_colrdlgg.obj \
$(OBJS)\dialogs_dirdlgg.obj \ $(OBJS)\dialogs_dirdlgg.obj \
$(OBJS)\dialogs_filedlgg.obj \ $(OBJS)\dialogs_filedlgg.obj \
$(OBJS)\dialogs_fontdlgg.obj $(OBJS)\dialogs_fontdlgg.obj
!endif !endif
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
$(OBJS)\dialogs_fontdlgg.obj \
$(OBJS)\dialogs_filedlgg.obj
!endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \
$(OBJS)\dialogs_filedlgg.obj
!endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_ADV_p = \ __WXLIB_ADV_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
@@ -217,7 +188,7 @@ __WXLIB_CORE_p = \
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \ __WXLIB_MONO_p = \
@@ -276,7 +247,7 @@ clean:
$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(LIB_GTK) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res
| |
data: data:
@@ -284,38 +255,20 @@ data:
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc $(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp $(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp
!endif
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp $(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp
!endif
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
!endif
!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
!endif
!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
!endif
!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
!endif

Some files were not shown because too many files have changed in this diff Show More