m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compilation adjustment for win32. I suspect the other targets also need something for lua.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1260 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-01-16 18:40:38 +00:00
parent b62f86bf45
commit 247d7f54fd
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -44,6 +44,7 @@ ifdef COMSPEC
BIN = grafx2.exe BIN = grafx2.exe
COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb `sdl-config --cflags` $(TTFCOPT) $(JOYCOPT) $(LUACOPT) $(LAYERCOPT) COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb `sdl-config --cflags` $(TTFCOPT) $(JOYCOPT) $(LUACOPT) $(LAYERCOPT)
LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT) LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT)
LUALOPT = -llua
CC = gcc CC = gcc
OBJDIR = obj/win32 OBJDIR = obj/win32
# Resources (icon) # Resources (icon)
@ -88,9 +89,9 @@ else
SDLLOPT = -arch i386 -L/usr/lib -framework SDL -framework SDL_image -framework SDL_ttf -framework Cocoa -framework Carbon -framework OpenGL SDLLOPT = -arch i386 -L/usr/lib -framework SDL -framework SDL_image -framework SDL_ttf -framework Cocoa -framework Carbon -framework OpenGL
COPT = -D__macosx__ -D__linux__ -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g $(SDLCOPT) $(TTFCOPT) -I/usr/X11/include COPT = -D__macosx__ -D__linux__ -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g $(SDLCOPT) $(TTFCOPT) -I/usr/X11/include
LOPT = $(SDLLOPT) -L/usr/X11/lib -R/usr/X11/lib -lpng LOPT = $(SDLLOPT) -L/usr/X11/lib -R/usr/X11/lib -lpng
# Use gcc for compiling. Use ncc to build a callgraph and analyze the code. # Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
CC = gcc CC = gcc
#CC = nccgen -ncgcc -ncld -ncfabs #CC = nccgen -ncgcc -ncld -ncfabs
OBJDIR = obj/macosx OBJDIR = obj/macosx
PLATFORMOBJ = $(OBJDIR)/SDLMain.o PLATFORMOBJ = $(OBJDIR)/SDLMain.o
X11LOPT = X11LOPT =
@ -108,7 +109,7 @@ else
LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared
CC = gcc CC = gcc
OBJDIR = obj/aros OBJDIR = obj/aros
STRIP = strip --strip-unneeded --remove-section .comment STRIP = strip --strip-unneeded --remove-section .comment
ZIP = lha ZIP = lha
ZIPOPT = a ZIPOPT = a
@ -126,7 +127,7 @@ else
OBJDIR = obj/morphos OBJDIR = obj/morphos
ZIP = lha ZIP = lha
ZIPOPT = a ZIPOPT = a
PLATFORMFILES = misc/grafx2.info PLATFORMFILES = misc/grafx2.info
else else
ifeq ($(PLATFORM),AMIGA) # 5 ifeq ($(PLATFORM),AMIGA) # 5
@ -229,8 +230,8 @@ else
CP = cp CP = cp
ZIP = zip ZIP = zip
PLATFORMFILES = gfx2.png PLATFORMFILES = gfx2.png
LUACOPT = `pkg-config lua5.1 --cflags` LUACOPT = `pkg-config lua5.1 --cflags`
LUALOPT = `pkg-config lua5.1 --libs` LUALOPT = `pkg-config lua5.1 --libs`
# These can only be used under linux and maybe freebsd. They allow to compile for the gp2x or to create a windows binary # These can only be used under linux and maybe freebsd. They allow to compile for the gp2x or to create a windows binary
ifdef WIN32CROSS ifdef WIN32CROSS
@ -242,7 +243,7 @@ else
OBJDIR = obj/win32 OBJDIR = obj/win32
PLATFORM = win32 PLATFORM = win32
else else
ifdef GP2XCROSS ifdef GP2XCROSS
#cross compile an exec for the gp2x #cross compile an exec for the gp2x
CC = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-gcc CC = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-gcc
@ -260,9 +261,9 @@ else
BIN = grafx2 BIN = grafx2
COPT = -W -Wall -Wdeclaration-after-statement -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) $(LUACOPT) COPT = -W -Wall -Wdeclaration-after-statement -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) $(LUACOPT)
LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT) -lm LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT) -lm
# Use gcc for compiling. Use ncc to build a callgraph and analyze the code. # Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
CC = gcc CC = gcc
#CC = nccgen -ncgcc -ncld -ncfabs #CC = nccgen -ncgcc -ncld -ncfabs
OBJDIR = obj/unix OBJDIR = obj/unix
X11LOPT = -lX11 X11LOPT = -lX11
endif endif
@ -296,12 +297,12 @@ endif
#Lua scripting is optional too #Lua scripting is optional too
ifeq ($(NOLUA),1) ifeq ($(NOLUA),1)
LUACOPT = LUACOPT =
LUALOPT = LUALOPT =
LUALABEL = -nolua LUALABEL = -nolua
else else
LUACOPT += -D__ENABLE_LUA__ LUACOPT += -D__ENABLE_LUA__
LUALABEL = LUALABEL =
endif endif
#To enable Joystick emulation of cursor, make USE_JOYSTICK=1 (for input.o) #To enable Joystick emulation of cursor, make USE_JOYSTICK=1 (for input.o)

4
doc/COMPILING.txt
View File

@ -153,7 +153,7 @@ Lua:
Use sh shell Use sh shell
make mingw make mingw
(make install doesn't work, even with prefix) (make install doesn't work, even with prefix)
Copy luaconf.h, lualib.h, lua.h, lauxlib.h to c:\msys\mingw\include\lua5.1 Copy luaconf.h, lualib.h, lua.h, lauxlib.h to c:\msys\mingw\include
Copy liblua.a to c:\msys\mingw\lib RENAMED AS liblua5.1.a Copy liblua.a to c:\msys\mingw\lib
Copy lua51.dll to c:\msys\mingw\bin Copy lua51.dll to c:\msys\mingw\bin