Skip to content

Commit

Permalink
Git converted windows <CR><NL> <NL>
Browse files Browse the repository at this point in the history
  • Loading branch information
dgud committed May 16, 2009
1 parent 185e05c commit 821c92a
Show file tree
Hide file tree
Showing 17 changed files with 1,542 additions and 1,542 deletions.
72 changes: 36 additions & 36 deletions test/Makefile.win32
@@ -1,40 +1,40 @@
# Copyright (c) 2001 Dan Gudmundsson
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# $Id$
#
ESRC = .
EBIN = .
ERLC = erlc
ERLINC = ..\include
ERL_FLAGS = -I..\.. -I$(ERLINC)
#
# $Id$
#
ESRC = .
EBIN = .
ERLC = erlc
ERLINC = ..\include
ERL_FLAGS = -I..\.. -I$(ERLINC)
ERL_COMPILE_FLAGS = -pa ..\..\esdl\ebin
!if !exist(..\ebin)
! if [mkdir ..\ebin]
! error "esdl: cannot create ..\priv"
! endif
!endif
TestTargets = \
$(EBIN)\testsprite.beam \
$(EBIN)\testgl.beam \
$(EBIN)\testbin.beam \
$(EBIN)\erldemo.beam \
$(EBIN)\testaudio.beam \
$(EBIN)\testjoy.beam
REMOVE_FILES=$(TestTargets:.beam=.removed)
.SUFFIXES: .erl .beam .removed
# Targets
target: $(TestTargets)
clean: $(REMOVE_FILES)
{$(EBIN)}.beam{$(EBIN)}.removed:
-del $(*R).beam
# Rules
{.}.erl{$(EBIN)}.beam:
$(ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $(*B).erl

!if !exist(..\ebin)
! if [mkdir ..\ebin]
! error "esdl: cannot create ..\priv"
! endif
!endif

TestTargets = \
$(EBIN)\testsprite.beam \
$(EBIN)\testgl.beam \
$(EBIN)\testbin.beam \
$(EBIN)\erldemo.beam \
$(EBIN)\testaudio.beam \
$(EBIN)\testjoy.beam

REMOVE_FILES=$(TestTargets:.beam=.removed)

.SUFFIXES: .erl .beam .removed
# Targets
target: $(TestTargets)

clean: $(REMOVE_FILES)

{$(EBIN)}.beam{$(EBIN)}.removed:
-del $(*R).beam
# Rules
{.}.erl{$(EBIN)}.beam:
$(ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $(*B).erl
68 changes: 34 additions & 34 deletions woggle/Makefile
@@ -1,34 +1,34 @@
# Copyright (c) 2001 Dan Gudmundsson and Patrik Nyblom
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# $Id$
#

ifeq ($(OS_FLAG), mingw)
include ../win32_conf/mingw_vars.mk
woggle:
(cd c_src; $(MAKE) OS_FLAG=$(OS_FLAG))
(cd src; $(MAKE) OS_FLAG=$(OS_FLAG))
(cd test; $(MAKE) OS_FLAG=$(OS_FLAG))

clean: top_clean
(cd c_src; $(MAKE) OS_FLAG=$(OS_FLAG) clean)
(cd src; $(MAKE) OS_FLAG=$(OS_FLAG) clean)
(cd test; $(MAKE) OS_FLAG=$(OS_FLAG) clean)


top_clean:
rm -f *~ erl_crash.dump core
rm -f tools/*~

else

woggle clean:
@echo Only windows for now.

endif




# Copyright (c) 2001 Dan Gudmundsson and Patrik Nyblom
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# $Id$
#

ifeq ($(OS_FLAG), mingw)
include ../win32_conf/mingw_vars.mk
woggle:
(cd c_src; $(MAKE) OS_FLAG=$(OS_FLAG))
(cd src; $(MAKE) OS_FLAG=$(OS_FLAG))
(cd test; $(MAKE) OS_FLAG=$(OS_FLAG))

clean: top_clean
(cd c_src; $(MAKE) OS_FLAG=$(OS_FLAG) clean)
(cd src; $(MAKE) OS_FLAG=$(OS_FLAG) clean)
(cd test; $(MAKE) OS_FLAG=$(OS_FLAG) clean)


top_clean:
rm -f *~ erl_crash.dump core
rm -f tools/*~

else

woggle clean:
@echo Only windows for now.

endif




52 changes: 26 additions & 26 deletions woggle/README
@@ -1,26 +1,26 @@
What's this?
This is only an embryo. It's going to be a lightweight version
of ESDL for applications only demanding windowed mode OpenGL.
* Woggle has a different event model than SDL's.
* Woggle is SDL derived work although it does not use the SDL libraries.
* Woggle depends on ESDL, but the ESDL driver or SDL itself is not needed
in runtime. No real SDL interfaces are used. ESDL sources are needed
at compile time to keep compatibility with the ESDDL opcodes.
* The erlang modules from ESDL are reused for woggle, which means you
can use woggle and ESDL in the same erlang installation without
clashes.
* I'm starting with windows, convinced that if I only get that working,
X-windows and MacOSX Aqua will be a breeze.
The name Woggle is an abbreviation of Wings3d OpenGL Engine,
where the extra g is there to avoid questions about pronunciation.
A Woggle is also some sort of ring that boyscouts wear around their
scarves. The connection between that and an Erlang-OpenGL-interface
still remains to be invented.
More info when I get more things working.
/Patrik
What's this?

This is only an embryo. It's going to be a lightweight version
of ESDL for applications only demanding windowed mode OpenGL.

* Woggle has a different event model than SDL's.
* Woggle is SDL derived work although it does not use the SDL libraries.
* Woggle depends on ESDL, but the ESDL driver or SDL itself is not needed
in runtime. No real SDL interfaces are used. ESDL sources are needed
at compile time to keep compatibility with the ESDDL opcodes.
* The erlang modules from ESDL are reused for woggle, which means you
can use woggle and ESDL in the same erlang installation without
clashes.
* I'm starting with windows, convinced that if I only get that working,
X-windows and MacOSX Aqua will be a breeze.

The name Woggle is an abbreviation of Wings3d OpenGL Engine,
where the extra g is there to avoid questions about pronunciation.

A Woggle is also some sort of ring that boyscouts wear around their
scarves. The connection between that and an Erlang-OpenGL-interface
still remains to be invented.

More info when I get more things working.

/Patrik
176 changes: 88 additions & 88 deletions woggle/c_src/Makefile
@@ -1,88 +1,88 @@
# Copyright (c) 2001 Dan Gudmundsson and Patrik Nyblom
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# $Id$
#

ifeq ($(OS_FLAG), mingw)
include ../../win32_conf/mingw_vars.mk
LIBS := $(GL_LIBS) -lgdi32

TARGETDIR = ../../priv

GCC_O = $(CC) -c $(CFLAGS) $<

ESDL_SRC = ../../c_src

# Optimization currently disabled
#CFLAGS := -g -O2 -funroll-loops -Wall -ffast-math -fomit-frame-pointer \
# -DWIN32 -D_WIN32 -D__WIN32__ -DFLAVOUR_WOGGLE $(GL_INCS) $(ERL_INCS) \
# -I$(ESDL_SRC) -I.
CFLAGS := -g -Wall \
-DWIN32 -D_WIN32 -D__WIN32__ -DFLAVOUR_WOGGLE $(GL_INCS) $(ERL_INCS) \
-I$(ESDL_SRC) -I.

# Files

TSOURCES = woggle_win.c woggle_test.c
SOURCES = \
woggle_win.c \
woggle_driver.c \
woggle_wrapper.c \
woggle_if.c \
woggle_compat_if.c \
$(ESDL_SRC)/esdl_gl.c \
$(ESDL_SRC)/esdl_glu.c \
$(ESDL_SRC)/esdl_glext.c \
$(ESDL_SRC)/esdl_util.c


TOBJECTS = $(TSOURCES:%.c=%.o)
OBJECTS0 = $(SOURCES:%.c=%.o)
OBJECTS = $(OBJECTS0:$(ESDL_SRC)/%.o=%.o)

THEADERS = woggle_win.h
HEADERS = woggle_win.h woggle_driver.h woggle_if.h woggle_if_fp.h\
$(ESDL_SRC)/esdl_gl.h $(ESDL_SRC)/esdl_gl_fp.h \
$(ESDL_SRC)/esdl_glext.h $(ESDL_SRC)/esdl_glext_fp.h \
$(ESDL_SRC)/esdl_glu.h $(ESDL_SRC)/esdl_glu_fp.h \
$(ESDL_SRC)/esdl_util.h

TTARGET = ./woggle_test.exe
TOBJECTS = ./woggle_test.o woggle_win.o
TARGET = $(TARGETDIR)/woggle_driver.$(SOEXT)
TARGET_JUNK = $(TARGETDIR)/woggle_driver.lib $(TARGETDIR)/woggle_driver.exp

all: $(TARGET) $(TTARGET)
@echo Build done

clean:
rm -f $(OBJECTS) $(TOBJECTS)
rm -f $(TARGET) $(TTARGET) $(TARGET_JUNK)
rm -f *~ erl_crash.dump

%.o: %.c $(HEADERS)
$(GCC_O)

%.o: $(ESDL_SRC)/%.c $(HEADERS)
$(GCC_O)

$(TTARGET): $(TOBJECTS)
$(CC) $(CFLAGS) $(TOBJECTS) $(LIBS) -o $(TTARGET)

$(TARGET): $(OBJECTS)
$(CC) $(CLINKFLAGS) $(CFLAGS) $(ERL_INCS) $(OBJECTS) $(LIBS) -o $(TARGET)
rm -f $(TARGET_JUNK)


else

target clean:
@echo Only windows for now.

endif




# Copyright (c) 2001 Dan Gudmundsson and Patrik Nyblom
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# $Id$
#

ifeq ($(OS_FLAG), mingw)
include ../../win32_conf/mingw_vars.mk
LIBS := $(GL_LIBS) -lgdi32

TARGETDIR = ../../priv

GCC_O = $(CC) -c $(CFLAGS) $<

ESDL_SRC = ../../c_src

# Optimization currently disabled
#CFLAGS := -g -O2 -funroll-loops -Wall -ffast-math -fomit-frame-pointer \
# -DWIN32 -D_WIN32 -D__WIN32__ -DFLAVOUR_WOGGLE $(GL_INCS) $(ERL_INCS) \
# -I$(ESDL_SRC) -I.
CFLAGS := -g -Wall \
-DWIN32 -D_WIN32 -D__WIN32__ -DFLAVOUR_WOGGLE $(GL_INCS) $(ERL_INCS) \
-I$(ESDL_SRC) -I.

# Files

TSOURCES = woggle_win.c woggle_test.c
SOURCES = \
woggle_win.c \
woggle_driver.c \
woggle_wrapper.c \
woggle_if.c \
woggle_compat_if.c \
$(ESDL_SRC)/esdl_gl.c \
$(ESDL_SRC)/esdl_glu.c \
$(ESDL_SRC)/esdl_glext.c \
$(ESDL_SRC)/esdl_util.c


TOBJECTS = $(TSOURCES:%.c=%.o)
OBJECTS0 = $(SOURCES:%.c=%.o)
OBJECTS = $(OBJECTS0:$(ESDL_SRC)/%.o=%.o)

THEADERS = woggle_win.h
HEADERS = woggle_win.h woggle_driver.h woggle_if.h woggle_if_fp.h\
$(ESDL_SRC)/esdl_gl.h $(ESDL_SRC)/esdl_gl_fp.h \
$(ESDL_SRC)/esdl_glext.h $(ESDL_SRC)/esdl_glext_fp.h \
$(ESDL_SRC)/esdl_glu.h $(ESDL_SRC)/esdl_glu_fp.h \
$(ESDL_SRC)/esdl_util.h

TTARGET = ./woggle_test.exe
TOBJECTS = ./woggle_test.o woggle_win.o
TARGET = $(TARGETDIR)/woggle_driver.$(SOEXT)
TARGET_JUNK = $(TARGETDIR)/woggle_driver.lib $(TARGETDIR)/woggle_driver.exp

all: $(TARGET) $(TTARGET)
@echo Build done

clean:
rm -f $(OBJECTS) $(TOBJECTS)
rm -f $(TARGET) $(TTARGET) $(TARGET_JUNK)
rm -f *~ erl_crash.dump

%.o: %.c $(HEADERS)
$(GCC_O)

%.o: $(ESDL_SRC)/%.c $(HEADERS)
$(GCC_O)

$(TTARGET): $(TOBJECTS)
$(CC) $(CFLAGS) $(TOBJECTS) $(LIBS) -o $(TTARGET)

$(TARGET): $(OBJECTS)
$(CC) $(CLINKFLAGS) $(CFLAGS) $(ERL_INCS) $(OBJECTS) $(LIBS) -o $(TARGET)
rm -f $(TARGET_JUNK)


else

target clean:
@echo Only windows for now.

endif




0 comments on commit 821c92a

Please sign in to comment.