mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-02-09 06:50:49 +00:00
Makefile: Fix STARTUP_WINDOW=0 on Windows so that the resource objects are built, but the editor's startup window is not. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5943 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
0cf64500c1
commit
7a96542c40
1 changed files with 6 additions and 5 deletions
|
@ -102,7 +102,9 @@ ifeq ($(PLATFORM),DARWIN)
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),WINDOWS)
|
ifeq ($(PLATFORM),WINDOWS)
|
||||||
ENGINE_OBJS+= winbits
|
ENGINE_OBJS+= winbits
|
||||||
ENGINE_EDITOR_OBJS+= startwin.editor
|
ifeq ($(STARTUP_WINDOW),1)
|
||||||
|
ENGINE_EDITOR_OBJS+= startwin.editor
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),WII)
|
ifeq ($(PLATFORM),WII)
|
||||||
ENGINE_OBJS+= wiibits
|
ENGINE_OBJS+= wiibits
|
||||||
|
@ -512,11 +514,10 @@ ifeq ($(PLATFORM),WINDOWS)
|
||||||
endif
|
endif
|
||||||
LIBS += -lFLAC -lvorbisfile -lvorbis -logg
|
LIBS += -lFLAC -lvorbisfile -lvorbis -logg
|
||||||
LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Windows/lib$(WINLIB)
|
LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Windows/lib$(WINLIB)
|
||||||
|
DUKE3D_GAME_OBJS+= gameres winbits
|
||||||
|
DUKE3D_EDITOR_OBJS+= buildres
|
||||||
ifeq ($(STARTUP_WINDOW),1)
|
ifeq ($(STARTUP_WINDOW),1)
|
||||||
DUKE3D_GAME_OBJS+= gameres winbits startwin.game
|
DUKE3D_GAME_OBJS+= startwin.game
|
||||||
DUKE3D_EDITOR_OBJS+= buildres
|
|
||||||
else
|
|
||||||
DUKE3D_GAME_OBJS+= winbits
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(MIXERTYPE),WIN)
|
ifeq ($(MIXERTYPE),WIN)
|
||||||
LIBS+= -ldsound
|
LIBS+= -ldsound
|
||||||
|
|
Loading…
Reference in a new issue