mirror of
https://github.com/mupen64plus/mupen64plus-oldsvn.git
synced 2024-05-13 17:57:42 -04:00
More build system updates. glN64 fails to link currently.
This commit is contained in:
Louai Al-Khanji
parent
390e4795d5
commit
2f1a8fca89
66
Makefile
66
Makefile
|
|
@ -231,15 +231,15 @@ OBJ_GTK_DBG_GUI = \
|
|||
|
||||
OBJ_QT4_GUI = main/gui_qt4/libgui_qt4.a
|
||||
|
||||
PLUGINS = plugins/blight_input.so \
|
||||
plugins/dummyaudio.so \
|
||||
plugins/dummyvideo.so \
|
||||
plugins/glN64.so \
|
||||
plugins/ricevideo.so \
|
||||
plugins/glide64.so \
|
||||
plugins/jttl_audio.so \
|
||||
plugins/mupen64_hle_rsp_azimer.so \
|
||||
plugins/mupen64_input.so
|
||||
PLUGINS = plugins/blight_input.$(SO_EXTENSION) \
|
||||
plugins/dummyaudio.$(SO_EXTENSION) \
|
||||
plugins/dummyvideo.$(SO_EXTENSION) \
|
||||
plugins/glN64.$(SO_EXTENSION) \
|
||||
plugins/ricevideo.$(SO_EXTENSION) \
|
||||
plugins/glide64.$(SO_EXTENSION) \
|
||||
plugins/jttl_audio.$(SO_EXTENSION) \
|
||||
plugins/mupen64_hle_rsp_azimer.$(SO_EXTENSION) \
|
||||
plugins/mupen64_input.$(SO_EXTENSION)
|
||||
|
||||
SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
|
||||
|
||||
|
|
@ -339,12 +339,12 @@ ifneq ($(OS), WINDOWS)
|
|||
$(RM_F) ./r4300/*.o ./r4300/x86/*.o ./r4300/x86_64/*.o ./memory/*.o ./debugger/*.o ./opengl/*.o
|
||||
$(RM_F) ./main/*.o ./main/version.h ./main/zip/*.o ./main/bzip2/*.o ./main/lzma/*.o ./main/7zip/*.o ./main/gui_gtk/*.o ./main/gui_gtk/debugger/*.o
|
||||
$(RM_F) mupen64plus mupen64plus.desktop
|
||||
$(RM_F) plugins/mupen64_input.so blight_input/arial.ttf.c blight_input/ttftoh plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so
|
||||
$(RM_F) plugins/dummyaudio.so plugins/dummyvideo.so plugins/jttl_audio.so plugins/glN64.so plugins/ricevideo.so plugins/glide64.so
|
||||
$(RM_F) plugins/mupen64_input.$(SO_EXTENSION) blight_input/arial.ttf.c blight_input/ttftoh plugins/blight_input.$(SO_EXTENSION) plugins/mupen64_hle_rsp_azimer.$(SO_EXTENSION)
|
||||
$(RM_F) plugins/dummyaudio.$(SO_EXTENSION) plugins/dummyvideo.$(SO_EXTENSION) plugins/jttl_audio.$(SO_EXTENSION) plugins/glN64.$(SO_EXTENSION) plugins/ricevideo.$(SO_EXTENSION) plugins/glide64.$(SO_EXTENSION)
|
||||
$(RM_F) main/gui_qt4/moc_* main/gui_qt4/ui_*.h main/gui_qt4/*.o main/gui_qt4/*.a main/gui_qt4/Makefile
|
||||
$(RM_F) translations/*.qm
|
||||
else
|
||||
del /S *.o *.so mupen64plus.exe moc_* *.a *.qm
|
||||
del /S *.o *.$(SO_EXTENSION) mupen64plus.exe moc_* *.a *.qm
|
||||
cd main\gui_qt4
|
||||
del /S ui_*.h
|
||||
endif
|
||||
|
|
@ -384,41 +384,53 @@ else
|
|||
copy main\gui_qt4\release\libgui_qt4.a main\gui_qt4
|
||||
endif
|
||||
|
||||
plugins/blight_input.so: FORCE
|
||||
plugins/blight_input.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C blight_input all
|
||||
ifneq ($(OS), WINDOWS)
|
||||
@$(CP) ./blight_input/blight_input.so ./plugins/blight_input.so
|
||||
else
|
||||
copy blight_input\blight_input.dll plugins
|
||||
endif
|
||||
|
||||
plugins/dummyaudio.so: FORCE
|
||||
plugins/dummyaudio.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C dummy_audio all
|
||||
ifneq ($(OS), WINDOWS)
|
||||
@$(CP) ./dummy_audio/dummyaudio.so ./plugins/dummyaudio.so
|
||||
else
|
||||
copy dummy_audio\dummyaudio.dll plugins
|
||||
endif
|
||||
|
||||
plugins/dummyvideo.so: FORCE
|
||||
plugins/dummyvideo.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C dummy_video all
|
||||
ifneq ($(OS), WINDOWS)
|
||||
@$(CP) ./dummy_video/dummyvideo.so ./plugins/dummyvideo.so
|
||||
else
|
||||
copy dummy_video\dummyvideo.dll plugins
|
||||
endif
|
||||
|
||||
plugins/glN64.so: FORCE
|
||||
plugins/glN64.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C glN64 all
|
||||
@$(CP) ./glN64/glN64.so ./plugins/glN64.so
|
||||
@$(CP) ./glN64/glN64.$(SO_EXTENSION) ./plugins/glN64.$(SO_EXTENSION)
|
||||
|
||||
plugins/ricevideo.so: FORCE
|
||||
plugins/ricevideo.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C rice_video all
|
||||
@$(CP) ./rice_video/ricevideo.so ./plugins/ricevideo.so
|
||||
@$(CP) ./rice_video/ricevideo.$(SO_EXTENSION) ./plugins/ricevideo.$(SO_EXTENSION)
|
||||
|
||||
plugins/glide64.so: FORCE
|
||||
plugins/glide64.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C glide64 all
|
||||
@$(CP) ./glide64/glide64.so ./plugins/glide64.so
|
||||
@$(CP) ./glide64/glide64.$(SO_EXTENSION) ./plugins/glide64.$(SO_EXTENSION)
|
||||
|
||||
plugins/jttl_audio.so: FORCE
|
||||
plugins/jttl_audio.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C jttl_audio all
|
||||
@$(CP) ./jttl_audio/jttl_audio.so ./plugins/jttl_audio.so
|
||||
@$(CP) ./jttl_audio/jttl_audio.$(SO_EXTENSION) ./plugins/jttl_audio.$(SO_EXTENSION)
|
||||
|
||||
plugins/mupen64_hle_rsp_azimer.so: FORCE
|
||||
plugins/mupen64_hle_rsp_azimer.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C rsp_hle all
|
||||
@$(CP) ./rsp_hle/mupen64_hle_rsp_azimer.so ./plugins/mupen64_hle_rsp_azimer.so
|
||||
@$(CP) ./rsp_hle/mupen64_hle_rsp_azimer.$(SO_EXTENSION) ./plugins/mupen64_hle_rsp_azimer.$(SO_EXTENSION)
|
||||
|
||||
plugins/mupen64_input.so: FORCE
|
||||
plugins/mupen64_input.$(SO_EXTENSION): FORCE
|
||||
$(MAKE) -C mupen64_input all
|
||||
@$(CP) ./mupen64_input/mupen64_input.so ./plugins/mupen64_input.so
|
||||
@$(CP) ./mupen64_input/mupen64_input.$(SO_EXTENSION) ./plugins/mupen64_input.$(SO_EXTENSION)
|
||||
|
||||
# This is used to force the plugin builds
|
||||
FORCE:
|
||||
|
|
|
|||
|
|
@ -14,11 +14,19 @@
|
|||
#***************************************************************************
|
||||
|
||||
# include pre-make file with a bunch of definitions
|
||||
include ../pre.mk
|
||||
ifeq ($(WIN32),1)
|
||||
include ../pre.mk.win32
|
||||
else
|
||||
include ../pre.mk
|
||||
endif
|
||||
|
||||
# local CFLAGS, LIBS, and LDFLAGS
|
||||
SDLTTF_LIBS = -lSDL_ttf
|
||||
CFLAGS += -DGUI_SDL -fpic -DPIC
|
||||
SDLTTF_LIBS = -lSDL_ttf -LC:\SDL_ttf-2.0.9\lib
|
||||
CFLAGS += -DGUI_SDL -DPIC
|
||||
|
||||
ifneq ($(OS), WINDOWS)
|
||||
CFLAGS += -fpic
|
||||
endif
|
||||
|
||||
# list of object files to generate
|
||||
OBJ_BLIGHT = \
|
||||
|
|
@ -28,18 +36,20 @@ OBJ_BLIGHT = \
|
|||
pad.o
|
||||
|
||||
# build targets
|
||||
all: blight_input.so
|
||||
all: blight_input.$(SO_EXTENSION)
|
||||
|
||||
clean:
|
||||
rm -f *.o *.so ttftoh arial.ttf.c
|
||||
rm -f *.o *.$(SO_EXTENSION) ttftoh arial.ttf.c
|
||||
|
||||
# build rules
|
||||
.c.o:
|
||||
$(CC) -o $@ $(CFLAGS) $(SDL_FLAGS) $(FREETYPE_FLAGS) -c $<
|
||||
|
||||
blight_input.so: $(OBJ_BLIGHT)
|
||||
$(CC) $^ $(LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(SDLTTF_LIBS) $(FREETYPE_LIBS) -o $@
|
||||
blight_input.$(SO_EXTENSION): $(OBJ_BLIGHT)
|
||||
$(CC) -o $@ -shared $(LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(SDLTTF_LIBS) $(FREETYPE_LIBS)
|
||||
ifneq ($(OS), WINDOWS)
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
configdialog_sdl.o: configdialog_sdl.c
|
||||
$(CC) -o $@ $(CFLAGS) $(SDL_FLAGS) -c $<
|
||||
|
|
@ -49,11 +59,18 @@ plugin.o: plugin.c
|
|||
|
||||
arial.ttf.c: ttftoh
|
||||
./ttftoh ./font/arial.ttf
|
||||
ifneq ($(OS), WINDOWS)
|
||||
$(MV) ./font/arial.ttf.h ./arial.ttf.c
|
||||
else
|
||||
# no idea why, but move fails.
|
||||
copy font\arial.ttf.h arial.ttf.c
|
||||
endif
|
||||
|
||||
ttftoh: ttftoh.o
|
||||
$(CC) $^ -o $@
|
||||
ifneq ($(OS), WINDOWS)
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
ttftoh.o: ttftoh.c
|
||||
$(CC) -o $@ -O3 -c $<
|
||||
|
|
|
|||
|
|
@ -20,7 +20,11 @@
|
|||
# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||
|
||||
# include pre-make file with a bunch of definitions
|
||||
include ../pre.mk
|
||||
ifeq ($(WIN32),1)
|
||||
include ../pre.mk.win32
|
||||
else
|
||||
include ../pre.mk
|
||||
endif
|
||||
|
||||
# local CFLAGS, LIBS, and LDFLAGS
|
||||
CFLAGS += -fpic -DPIC
|
||||
|
|
@ -29,16 +33,18 @@ CFLAGS += -fpic -DPIC
|
|||
OBJECTS = audio.o
|
||||
|
||||
# build targets
|
||||
all: dummyaudio.so
|
||||
all: dummyaudio.$(SO_EXTENSION)
|
||||
|
||||
clean:
|
||||
rm -f *.o *.so
|
||||
rm -f *.o *.$(SO_EXTENSION)
|
||||
|
||||
# build rules
|
||||
.c.o:
|
||||
$(CC) -o $@ $(CFLAGS) -c $<
|
||||
|
||||
dummyaudio.so: $(OBJECTS)
|
||||
$(CC) $^ $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@
|
||||
dummyaudio.$(SO_EXTENSION): $(OBJECTS)
|
||||
$(CC) -shared $^ $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@
|
||||
ifneq ($(OS), WINDOWS)
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,11 @@
|
|||
|
||||
|
||||
# include pre-make file with a bunch of definitions
|
||||
include ../pre.mk
|
||||
ifeq ($(WIN32),1)
|
||||
include ../pre.mk.win32
|
||||
else
|
||||
include ../pre.mk
|
||||
endif
|
||||
|
||||
# local CFLAGS, LIBS, and LDFLAGS
|
||||
CFLAGS += -fpic -DPIC -D__LINUX__ -DX86_ASM
|
||||
|
|
@ -25,18 +29,20 @@ OBJECTS = \
|
|||
video.o \
|
||||
|
||||
# build targets
|
||||
all: dummyvideo.so
|
||||
all: dummyvideo.$(SO_EXTENSION)
|
||||
|
||||
clean:
|
||||
rm -f *.o *.so
|
||||
rm -f *.o *.$(SO_EXTENSION)
|
||||
|
||||
# build rules
|
||||
.cpp.o:
|
||||
$(CXX) -o $@ $(CFLAGS) $(SDL_FLAGS) $(GTK_FLAGS) -c $<
|
||||
|
||||
dummyvideo.so: $(OBJECTS)
|
||||
$(CXX) $^ $(LDFLAGS) $(ASM_LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(LIBGL_LIBS) -o $@
|
||||
dummyvideo.$(SO_EXTENSION): $(OBJECTS)
|
||||
$(CXX) -shared $^ $(LDFLAGS) $(ASM_LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(LIBGL_LIBS) -o $@
|
||||
ifneq ($(OS), WINDOWS)
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
video.o: video.cpp
|
||||
$(CXX) $(CFLAGS) $(SDL_FLAGS) -DMAINDEF -c -o $@ $<
|
||||
|
|
|
|||
|
|
@ -33,8 +33,10 @@ static const char *pluginDir = 0;
|
|||
|
||||
static inline const char *GetPluginDir()
|
||||
{
|
||||
static char path[PATH_MAX];
|
||||
|
||||
static char path[PATH_MAX];
|
||||
#ifdef __WIN32__
|
||||
strncpy(path, ".", PATH_MAX);
|
||||
#else
|
||||
if(strlen(configdir) > 0)
|
||||
{
|
||||
strncpy(path, configdir, PATH_MAX);
|
||||
|
|
@ -66,8 +68,9 @@ static inline const char *GetPluginDir()
|
|||
strncat(path, "/plugins", PATH_MAX);
|
||||
#ifdef __USE_GNU
|
||||
}
|
||||
#endif
|
||||
#endif // __USE_GNU
|
||||
}
|
||||
#endif // __WIN32__
|
||||
return path;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,12 +23,20 @@
|
|||
# include pre-make file with a bunch of definitions
|
||||
USES_QT4 = true
|
||||
USES_GTK2 = true
|
||||
include ../pre.mk
|
||||
ifeq ($(WIN32),1)
|
||||
include ../pre.mk.win32
|
||||
else
|
||||
include ../pre.mk
|
||||
endif
|
||||
|
||||
# local CFLAGS, LIBS, and LDFLAGS
|
||||
CFLAGS += -fpic -DPIC -D__LINUX__ -Wall
|
||||
CFLAGS += -DPIC -D__LINUX__ -Wall
|
||||
LDFLAGS += $(GTHREAD_LIBS)
|
||||
|
||||
ifneq ($(OS), WINDOWS)
|
||||
CFLAGS += -fpic
|
||||
endif
|
||||
|
||||
ifeq ($(GUI), NONE)
|
||||
OBJECTS = Config_nogui.o
|
||||
else
|
||||
|
|
@ -75,10 +83,10 @@ OBJECTS += glN64.o \
|
|||
F3DWRUS.o
|
||||
|
||||
# build targets
|
||||
all: glN64.so
|
||||
all: glN64.$(SO_EXTENSION)
|
||||
|
||||
clean:
|
||||
rm -f *.o *.so ui_gln64config.*
|
||||
rm -f *.o *.$(SO_EXTENSION) ui_gln64config.*
|
||||
|
||||
# build rules
|
||||
.cpp.o:
|
||||
|
|
@ -87,8 +95,8 @@ clean:
|
|||
ui_gln64config.h: gln64config.ui
|
||||
$(UIC) $< -o $@
|
||||
|
||||
glN64.so: $(OBJECTS)
|
||||
$(CXX) $^ $(LDFLAGS) $(ASM_LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(LIBGL_LIBS) -o $@
|
||||
glN64.$(SO_EXTENSION): $(OBJECTS)
|
||||
$(CXX) $^ $(LDFLAGS) $(ASM_LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(LIBGL_LIBS) -shared -o $@
|
||||
$(STRIP) $@
|
||||
|
||||
glN64.o: glN64.cpp
|
||||
|
|
|
|||
|
|
@ -867,7 +867,7 @@ void TextureCache_Update( u32 t )
|
|||
u32 tileWidth, maskWidth, loadWidth, lineWidth, clampWidth, height;
|
||||
u32 tileHeight, maskHeight, loadHeight, lineHeight, clampHeight, width;
|
||||
|
||||
if (cache.enable2xSaI != OGL.enable2xSaI)
|
||||
if (cache.enable2xSaI != (unsigned int) OGL.enable2xSaI)
|
||||
{
|
||||
TextureCache_Destroy();
|
||||
TextureCache_Init();
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ HINSTANCE hInstance;
|
|||
|
||||
char pluginName[] = "glN64 v0.4.1";
|
||||
char *screenDirectory;
|
||||
u32 last_good_ucode = -1;
|
||||
u32 last_good_ucode = 0;
|
||||
void (*CheckInterrupts)( void );
|
||||
char configdir[PATH_MAX] = {0};
|
||||
void (*renderCallback)() = NULL;
|
||||
|
|
@ -240,30 +240,30 @@ EXPORT BOOL CALL InitiateGFX (GFX_INFO Gfx_Info)
|
|||
IMEM = Gfx_Info.IMEM;
|
||||
RDRAM = Gfx_Info.RDRAM;
|
||||
|
||||
REG.MI_INTR = Gfx_Info.MI_INTR_REG;
|
||||
REG.DPC_START = Gfx_Info.DPC_START_REG;
|
||||
REG.DPC_END = Gfx_Info.DPC_END_REG;
|
||||
REG.DPC_CURRENT = Gfx_Info.DPC_CURRENT_REG;
|
||||
REG.DPC_STATUS = Gfx_Info.DPC_STATUS_REG;
|
||||
REG.DPC_CLOCK = Gfx_Info.DPC_CLOCK_REG;
|
||||
REG.DPC_BUFBUSY = Gfx_Info.DPC_BUFBUSY_REG;
|
||||
REG.DPC_PIPEBUSY = Gfx_Info.DPC_PIPEBUSY_REG;
|
||||
REG.DPC_TMEM = Gfx_Info.DPC_TMEM_REG;
|
||||
REG.MI_INTR = (u32*) Gfx_Info.MI_INTR_REG;
|
||||
REG.DPC_START = (u32*) Gfx_Info.DPC_START_REG;
|
||||
REG.DPC_END = (u32*) Gfx_Info.DPC_END_REG;
|
||||
REG.DPC_CURRENT = (u32*) Gfx_Info.DPC_CURRENT_REG;
|
||||
REG.DPC_STATUS = (u32*) Gfx_Info.DPC_STATUS_REG;
|
||||
REG.DPC_CLOCK = (u32*) Gfx_Info.DPC_CLOCK_REG;
|
||||
REG.DPC_BUFBUSY = (u32*) Gfx_Info.DPC_BUFBUSY_REG;
|
||||
REG.DPC_PIPEBUSY = (u32*) Gfx_Info.DPC_PIPEBUSY_REG;
|
||||
REG.DPC_TMEM = (u32*) Gfx_Info.DPC_TMEM_REG;
|
||||
|
||||
REG.VI_STATUS = Gfx_Info.VI_STATUS_REG;
|
||||
REG.VI_ORIGIN = Gfx_Info.VI_ORIGIN_REG;
|
||||
REG.VI_WIDTH = Gfx_Info.VI_WIDTH_REG;
|
||||
REG.VI_INTR = Gfx_Info.VI_INTR_REG;
|
||||
REG.VI_V_CURRENT_LINE = Gfx_Info.VI_V_CURRENT_LINE_REG;
|
||||
REG.VI_TIMING = Gfx_Info.VI_TIMING_REG;
|
||||
REG.VI_V_SYNC = Gfx_Info.VI_V_SYNC_REG;
|
||||
REG.VI_H_SYNC = Gfx_Info.VI_H_SYNC_REG;
|
||||
REG.VI_LEAP = Gfx_Info.VI_LEAP_REG;
|
||||
REG.VI_H_START = Gfx_Info.VI_H_START_REG;
|
||||
REG.VI_V_START = Gfx_Info.VI_V_START_REG;
|
||||
REG.VI_V_BURST = Gfx_Info.VI_V_BURST_REG;
|
||||
REG.VI_X_SCALE = Gfx_Info.VI_X_SCALE_REG;
|
||||
REG.VI_Y_SCALE = Gfx_Info.VI_Y_SCALE_REG;
|
||||
REG.VI_STATUS = (u32*) Gfx_Info.VI_STATUS_REG;
|
||||
REG.VI_ORIGIN = (u32*) Gfx_Info.VI_ORIGIN_REG;
|
||||
REG.VI_WIDTH = (u32*) Gfx_Info.VI_WIDTH_REG;
|
||||
REG.VI_INTR = (u32*) Gfx_Info.VI_INTR_REG;
|
||||
REG.VI_V_CURRENT_LINE = (u32*) Gfx_Info.VI_V_CURRENT_LINE_REG;
|
||||
REG.VI_TIMING = (u32*) Gfx_Info.VI_TIMING_REG;
|
||||
REG.VI_V_SYNC = (u32*) Gfx_Info.VI_V_SYNC_REG;
|
||||
REG.VI_H_SYNC = (u32*) Gfx_Info.VI_H_SYNC_REG;
|
||||
REG.VI_LEAP = (u32*) Gfx_Info.VI_LEAP_REG;
|
||||
REG.VI_H_START = (u32*) Gfx_Info.VI_H_START_REG;
|
||||
REG.VI_V_START = (u32*) Gfx_Info.VI_V_START_REG;
|
||||
REG.VI_V_BURST = (u32*) Gfx_Info.VI_V_BURST_REG;
|
||||
REG.VI_X_SCALE = (u32*) Gfx_Info.VI_X_SCALE_REG;
|
||||
REG.VI_Y_SCALE = (u32*) Gfx_Info.VI_Y_SCALE_REG;
|
||||
|
||||
CheckInterrupts = Gfx_Info.CheckInterrupts;
|
||||
|
||||
|
|
|
|||
2
pre.mk
2
pre.mk
|
|
@ -240,3 +240,5 @@ else # set variables for debugging symbols
|
|||
STRIP = true
|
||||
endif
|
||||
endif
|
||||
|
||||
SO_EXTENSION = so
|
||||
|
|
@ -83,3 +83,5 @@ ifeq ($(NO_ASM), 1)
|
|||
CFLAGS += -DNO_ASM
|
||||
endif
|
||||
|
||||
|
||||
SO_EXTENSION = dll
|
||||
|
|
@ -22,7 +22,11 @@
|
|||
|
||||
# include pre-make file with a bunch of definitions
|
||||
USES_GTK2 = true
|
||||
include ../pre.mk
|
||||
ifeq ($(WIN32),1)
|
||||
include ../pre.mk.win32
|
||||
else
|
||||
include ../pre.mk
|
||||
endif
|
||||
|
||||
# local CFLAGS, LIBS, and LDFLAGS
|
||||
CFLAGS += $(SDL_FLAGS) -fpic -DPIC -Wall
|
||||
|
|
|
|||
Loading…
Reference in a new issue