Subversion Repositories eduke32

Rev

Rev 5928 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5928 Rev 5941
Line 161... Line 161...
161
161
162
# Mac OS X Frameworks location
162
# Mac OS X Frameworks location
163
# Like above, use absolute paths.
163
# Like above, use absolute paths.
164
APPLE_FRAMEWORKS ?=/Library/Frameworks
164
APPLE_FRAMEWORKS ?=/Library/Frameworks
165
# Without the resource files packaged in the .app bundle, the startupwindow produces errors, so give it an off switch.
165
166
OSX_STARTUPWINDOW ?= 1
-
 
167
-
 
168
# Engine options
166
# Engine options
169
#  USE_OPENGL     - enables basic OpenGL Polymost renderer
167
#  USE_OPENGL     - enables basic OpenGL Polymost renderer
170
#  POLYMER        - enables fancy Polymer renderer
168
#  POLYMER        - enables fancy Polymer renderer
171
#  NOASM          - disables the use of inline assembly pragmas
169
#  NOASM          - disables the use of inline assembly pragmas
172
#  LINKED_GTK     - enables compile-time linkage to GTK
170
#  LINKED_GTK     - enables compile-time linkage to GTK
Line 378... Line 376...
378
        ifeq ($(findstring ppc,$(IMPLICIT_ARCH)),ppc)
376
        ifeq ($(findstring ppc,$(IMPLICIT_ARCH)),ppc)
379
            COMMONFLAGS += $(F_NO_STACK_PROTECTOR)
377
            COMMONFLAGS += $(F_NO_STACK_PROTECTOR)
380
        endif
378
        endif
381
    endif
379
    endif
382
    ifneq (0,$(OSX_STARTUPWINDOW))
380
endif
383
        COMPILERFLAGS+= -DOSX_STARTUPWINDOW
-
 
384
    endif
-
 
385
endif
-
 
386
381
387
382
388
ifneq (0,$(RELEASE))
383
ifneq (0,$(RELEASE))
389
    # Debugging disabled
384
    # Debugging disabled
390
    COMMONFLAGS += $(F_NO_STACK_PROTECTOR)
385
    COMMONFLAGS += $(F_NO_STACK_PROTECTOR)