浏览代码

Fix makefile for cross compilation

Dialga 10 年之前
父节点
当前提交
d50cb5b617
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      Makefile
  2. 1 1
      resources/Makefile.in-lua

+ 2 - 2
Makefile

@@ -133,9 +133,9 @@ ifdef WITH_LUA_SHARED
   LIBS += -llua5.2
   LIBS += -llua5.2
 endif
 endif
 
 
-ifneq (, $(findstring mingw32, $(shell gcc -dumpmachine)))
+ifneq (, $(findstring mingw32, $(shell $(CC) -dumpmachine)))
   BUILD_RESOURCES = $(BUILD_DIR)/$(WINDOWS_RESOURCES:.rc=.o)
   BUILD_RESOURCES = $(BUILD_DIR)/$(WINDOWS_RESOURCES:.rc=.o)
-  LIBS := $(filter-out -lrt, $(LIBS)) -lws2_32 -lcomdlg32 -mwindows
+  LIBS := -lws2_32 -mwindows
   SHARED_LIB = dll
   SHARED_LIB = dll
 else
 else
   SHARED_LIB = so
   SHARED_LIB = so

+ 1 - 1
resources/Makefile.in-lua

@@ -12,7 +12,7 @@ endif
 LUA_DIR = src/third_party/lua-5.2.4/src
 LUA_DIR = src/third_party/lua-5.2.4/src
 LUA_CFLAGS = -I$(LUA_DIR) -DLUA_COMPAT_ALL -DUSE_LUA
 LUA_CFLAGS = -I$(LUA_DIR) -DLUA_COMPAT_ALL -DUSE_LUA
 
 
-ifneq ($(OS),Windows_NT)
+ifneq ($(TARGET_OS),WIN32)
   LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
   LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 endif
 endif