X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8704bf74fba8523e2e174bd5a8195b5202009cd0..8d7dafc91ad68448a481b78df798a7bc85a92a60:/src/make.env diff --git a/src/make.env b/src/make.env index 14d45519e3..d618b07d3c 100644 --- a/src/make.env +++ b/src/make.env @@ -8,6 +8,7 @@ ########################### Programs ################################# # Replace this with your own path if necessary +#WXDIR = /home/karl/wxWindows WXDIR = /home/jacs/wx2 # C++ compiler @@ -35,7 +36,7 @@ GUISUFFIX = _stubs ########################## Compiler flags ############################# # Misc options -OPTIONS = -D__WXDEBUG__ -DWXDEBUG +OPTIONS = -D__WXDEBUG__ COPTIONS = DEBUGFLAGS = -ggdb INCLUDE = @@ -74,8 +75,8 @@ INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS) # Directory for object files OBJDIR = objects$(GUISUFFIX) -CPPFLAGS = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) -CFLAGS = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(CWARN) $(OPT) +CPPFLAGS = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) +CFLAGS = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT) LDFLAGS = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib LDLIBS = $(EXTRALDLIBS) $(GUILDLIBS) @@ -83,7 +84,7 @@ LDLIBS = $(EXTRALDLIBS) $(GUILDLIBS) .SUFFIXES: .o .cpp .c .c.o : - $(CC) -c $(CFLAGS) -o $@ $< + $(CCC) -c $(CFLAGS) -o $@ $< .cpp.o : $(CC) -c $(CPPFLAGS) -o $@ $<