make/common/Program.gmk

*** 234,250 ****
  include $(files)
  endif # files
  endif # INCREMENTAL_BUILD
  
  ifdef JAVA_ARGS
! OTHER_CPPFLAGS += -DJAVA_ARGS=$(JAVA_ARGS)
! OTHER_CPPFLAGS += -DLAUNCHER_NAME=\"$(LAUNCHER_NAME)\"
  endif
  
  ifeq ($(PLATFORM), windows)
  ifdef RELEASE
! OTHER_CPPFLAGS += -DVERSION="$(RELEASE)"
  endif
  endif
  
  
  ifneq ($(PLATFORM), windows)
--- 234,250 ----
  include $(files)
  endif # files
  endif # INCREMENTAL_BUILD
  
  ifdef JAVA_ARGS
! OTHER_CPPFLAGS += -DJAVA_ARGS='$(JAVA_ARGS)'
! OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"'
  endif
  
  ifeq ($(PLATFORM), windows)
  ifdef RELEASE
! OTHER_CPPFLAGS += -DVERSION='"$(RELEASE)"'
  endif
  endif
  
  
  ifneq ($(PLATFORM), windows)
*** 256,273 ****
  endif
  
  OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
  OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
  
- # this may not be necessary...
- ifeq ($(PLATFORM), windows)
- OTHER_CPPFLAGS += -DPROGNAME="\"$(PROGRAM)\""
- VERSION_DEFINES += -DFULL_VERSION="\"$(FULL_VERSION)\""
- else
  OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
  VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
- endif
  
  VERSION_DEFINES += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
                     -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"'
  
  
--- 256,267 ----