Mercurial > install

changeset 6:60042a92863e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some CRT issues with Visual C and remove some WX code.
author Brian Smith <brian@dbsoft.org>
date Sun, 13 Nov 2011 15:03:53 -0600
parents 5d4e598c4535
children 308a1e4d2f8d d399eef87cc5
files sfxace/makefile.vc uninst/makefile.vc
diffstat 2 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/sfxace/makefile.vc	Sun Nov 13 08:43:10 2011 -0600
+++ b/sfxace/makefile.vc	Sun Nov 13 15:03:53 2011 -0600
@@ -8,9 +8,14 @@
 TARGET_CPU=x86
 !endif
 
-WXDIR = $(WXWIN)
+!if "$(TARGET_CPU)" == "x86"
+PLATFORM_DEF = -DWIN32
+!else
+PLATFORM_DEF = -DWIN64 -DWIN32
+!endif
+
 CC = cl
-CFLAGS = -c -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DENABLE_LOGGING -I. -I.. -I..\incace -I..\platform -I"$(REGINA_LANG_DIR)\include"
+CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DENABLE_LOGGING -I. -I.. -I..\incace -I..\platform -I"$(REGINA_LANG_DIR)\include"
 CFLAGS_DEBUG = -Zi
 CFLAGS_COMPILE = -MT
 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib msimg32.lib userenv.lib "$(REGINA_LANG_DIR)\lib\rexx.lib"
--- a/uninst/makefile.vc	Sun Nov 13 08:43:10 2011 -0600
+++ b/uninst/makefile.vc	Sun Nov 13 15:03:53 2011 -0600
@@ -8,12 +8,17 @@
 TARGET_CPU=x86
 !endif
 
-WXDIR = $(WXWIN)
+!if "$(TARGET_CPU)" == "x86"
+PLATFORM_DEF = -DWIN32
+!else
+PLATFORM_DEF = -DWIN64
+!endif
+
 CC = cl
-CFLAGS = -c -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DENABLE_LOGGING -I. -I.. -I..\incace
+CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DENABLE_LOGGING -I. -I.. -I..\incace
 CFLAGS_DEBUG = -Zi
-CFLAGS_COMPILE = -MT
-LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib msimg32.lib userenv.lib "$(REGINA_LANG_DIR)\lib\rexx.lib"
+CFLAGS_COMPILE = -MTd
+LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib msimg32.lib userenv.lib
 
 RES = 
 LINKFLAGS = -machine:$(TARGET_CPU) -debug -debugtype:cv